Changed V7 to No V7

This commit is contained in:
2023-06-09 14:36:47 -04:00
parent 7fb8c5fefa
commit a436c20037
21 changed files with 27 additions and 65 deletions

View File

@@ -2,8 +2,9 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Engine/Maps/Templates/OpenWorld GameDefaultMap=/Engine/Maps/Templates/OpenWorld
GlobalDefaultGameMode=/Game/IntegrationV7GameModeBaseBP.IntegrationV7GameModeBaseBP_C GlobalDefaultGameMode=/Game/IntegrationGameModeBaseBP.IntegrationGameModeBaseBP_C
GameInstanceClass=/Script/IntegrationV7.GameInstanceV7 GameInstanceClass=/Script/IntegrationV7.GameInstanceV7
GlobalDefaultServerGameMode=/Game/IntegrationGameModeBaseBP.IntegrationGameModeBaseBP_C
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
@@ -54,9 +55,6 @@ CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
bAuthorizeAutomaticWidgetVariableCreation=False bAuthorizeAutomaticWidgetVariableCreation=False
[/Script/Engine.Engine] [/Script/Engine.Engine]
+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/IntegrationV7")
+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/IntegrationV7")
+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="IntegrationV7GameModeBase")
[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
bEnablePlugin=True bEnablePlugin=True

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -5,7 +5,7 @@
"Description": "", "Description": "",
"Modules": [ "Modules": [
{ {
"Name": "IntegrationV7", "Name": "Integration",
"Type": "Runtime", "Type": "Runtime",
"LoadingPhase": "Default", "LoadingPhase": "Default",
"AdditionalDependencies": [ "AdditionalDependencies": [

View File

@@ -3,13 +3,13 @@
using UnrealBuildTool; using UnrealBuildTool;
using System.Collections.Generic; using System.Collections.Generic;
public class IntegrationV7Target : TargetRules public class IntegrationTarget : TargetRules
{ {
public IntegrationV7Target( TargetInfo Target) : base(Target) public IntegrationTarget( TargetInfo Target) : base(Target)
{ {
Type = TargetType.Game; Type = TargetType.Game;
DefaultBuildSettings = BuildSettingsVersion.V2; DefaultBuildSettings = BuildSettingsVersion.V2;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1;
ExtraModuleNames.Add("IntegrationV7"); ExtraModuleNames.Add("Integration");
} }
} }

View File

@@ -2,9 +2,9 @@
using UnrealBuildTool; using UnrealBuildTool;
public class IntegrationV7 : ModuleRules public class Integration : ModuleRules
{ {
public IntegrationV7(ReadOnlyTargetRules Target) : base(Target) public Integration(ReadOnlyTargetRules Target) : base(Target)
{ {
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;

View File

@@ -1,6 +1,6 @@
// Copyright Epic Games, Inc. All Rights Reserved. // Copyright Epic Games, Inc. All Rights Reserved.
#include "IntegrationV7.h" #include "Integration.h"
#include "Modules/ModuleManager.h" #include "Modules/ModuleManager.h"
IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, IntegrationV7, "IntegrationV7" ); IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, Integration, "Integration" );

View File

@@ -1,6 +1,6 @@
// Copyright Epic Games, Inc. All Rights Reserved. // Copyright Epic Games, Inc. All Rights Reserved.
#include "IntegrationV7GameModeBase.h" #include "IntegrationGameModeBase.h"
#include "drvutil.hpp" #include "drvutil.hpp"
#include "engineutil.hpp" #include "engineutil.hpp"
#include <string> #include <string>
@@ -8,7 +8,7 @@
EngineWrapper AIntegrationV7GameModeBase::Luprex; EngineWrapper AIntegrationGameModeBase::Luprex;
//// Main loop. //// Main loop.
//while (!engw.get_stop_driver(&engw)) { //while (!engw.get_stop_driver(&engw)) {
@@ -21,7 +21,7 @@ EngineWrapper AIntegrationV7GameModeBase::Luprex;
// engw.play_invoke_event_update(&engw, drvutil::get_monotonic_clock()); // engw.play_invoke_event_update(&engw, drvutil::get_monotonic_clock());
//} //}
AIntegrationV7GameModeBase::AIntegrationV7GameModeBase() { AIntegrationGameModeBase::AIntegrationGameModeBase() {
//PrimaryActorTick.bCanEverTick = true; // Probably wrong //PrimaryActorTick.bCanEverTick = true; // Probably wrong
//PrimaryActorTick.bTickEvenWhenPaused = true; // Probably wrong //PrimaryActorTick.bTickEvenWhenPaused = true; // Probably wrong
//PrimaryActorTick.TickGroup = TG_PrePhysics; // Probably wrong //PrimaryActorTick.TickGroup = TG_PrePhysics; // Probably wrong
@@ -29,7 +29,7 @@ AIntegrationV7GameModeBase::AIntegrationV7GameModeBase() {
SetActorTickInterval(1.0f); // Probably wrong SetActorTickInterval(1.0f); // Probably wrong
} }
void AIntegrationV7GameModeBase::HandleConsoleOutput() { void AIntegrationGameModeBase::HandleConsoleOutput() {
uint32_t ndata; const char* data; uint32_t ndata; const char* data;
Luprex.get_outgoing(&Luprex, 0, &ndata, &data); Luprex.get_outgoing(&Luprex, 0, &ndata, &data);
if (ndata == 0) return; if (ndata == 0) return;
@@ -41,7 +41,7 @@ void AIntegrationV7GameModeBase::HandleConsoleOutput() {
ConsoleOutput.Append(fs); ConsoleOutput.Append(fs);
} }
void AIntegrationV7GameModeBase::Tick(float DeltaSeconds) { void AIntegrationGameModeBase::Tick(float DeltaSeconds) {
Super::Tick(DeltaSeconds); Super::Tick(DeltaSeconds);
if (!luprex_initialized()) { if (!luprex_initialized()) {
return; return;
@@ -61,7 +61,7 @@ void AIntegrationV7GameModeBase::Tick(float DeltaSeconds) {
} }
} }
void AIntegrationV7GameModeBase::ConsoleSendInput(const FString& fs) { void AIntegrationGameModeBase::ConsoleSendInput(const FString& fs) {
if (Luprex.engine) { if (Luprex.engine) {
const TCHAR* fstchar = *fs; const TCHAR* fstchar = *fs;
if (sizeof(TCHAR) == 2) { if (sizeof(TCHAR) == 2) {
@@ -74,7 +74,7 @@ void AIntegrationV7GameModeBase::ConsoleSendInput(const FString& fs) {
} }
} }
void AIntegrationV7GameModeBase::BeginPlay() { void AIntegrationGameModeBase::BeginPlay() {
Super::BeginPlay(); Super::BeginPlay();
if (!luprex_initialized()) { if (!luprex_initialized()) {
engineutil::init_wrapper(&Luprex); engineutil::init_wrapper(&Luprex);

View File

@@ -6,18 +6,18 @@
#include "GameFramework/GameModeBase.h" #include "GameFramework/GameModeBase.h"
#include "enginewrapper.hpp" #include "enginewrapper.hpp"
#include "engineutil.hpp" #include "engineutil.hpp"
#include "IntegrationV7GameModeBase.generated.h" #include "IntegrationGameModeBase.generated.h"
/** /**
* *
*/ */
UCLASS() UCLASS()
class INTEGRATIONV7_API AIntegrationV7GameModeBase : public AGameModeBase class INTEGRATION_API AIntegrationGameModeBase : public AGameModeBase
{ {
GENERATED_BODY() GENERATED_BODY()
public: public:
AIntegrationV7GameModeBase(); AIntegrationGameModeBase();
virtual void BeginPlay() override; virtual void BeginPlay() override;
virtual void Tick(float) override; virtual void Tick(float) override;

View File

@@ -10,7 +10,7 @@
* *
*/ */
UCLASS() UCLASS()
class INTEGRATIONV7_API AMyLuprexGameStateBase : public AGameStateBase class INTEGRATION_API AMyLuprexGameStateBase : public AGameStateBase
{ {
GENERATED_BODY() GENERATED_BODY()
public: public:

View File

@@ -3,13 +3,13 @@
using UnrealBuildTool; using UnrealBuildTool;
using System.Collections.Generic; using System.Collections.Generic;
public class IntegrationV7EditorTarget : TargetRules public class IntegrationEditorTarget : TargetRules
{ {
public IntegrationV7EditorTarget( TargetInfo Target) : base(Target) public IntegrationEditorTarget( TargetInfo Target) : base(Target)
{ {
Type = TargetType.Editor; Type = TargetType.Editor;
DefaultBuildSettings = BuildSettingsVersion.V2; DefaultBuildSettings = BuildSettingsVersion.V2;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1;
ExtraModuleNames.Add("IntegrationV7"); ExtraModuleNames.Add("Integration");
} }
} }

View File

@@ -1,14 +0,0 @@
// Fill out your copyright notice in the Description page of Project Settings.
#include "GameInstanceV7.h"
static void printq(const char* msg) {
if (GEngine)
GEngine->AddOnScreenDebugMessage(-1, 15.0f, FColor::Yellow, FString(msg));
}
void UGameInstanceV7::Init() {
printq("In GameInstance Init");
}

View File

@@ -1,19 +0,0 @@
// Fill out your copyright notice in the Description page of Project Settings.
#pragma once
#include "CoreMinimal.h"
#include "Engine/GameInstance.h"
#include "GameInstanceV7.generated.h"
/**
*
*/
UCLASS()
class INTEGRATIONV7_API UGameInstanceV7 : public UGameInstance
{
GENERATED_BODY()
public:
virtual void Init();
};