diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 34104e5f..adaab171 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,8 +2,9 @@ [/Script/EngineSettings.GameMapsSettings] GameDefaultMap=/Engine/Maps/Templates/OpenWorld -GlobalDefaultGameMode=/Game/IntegrationV7GameModeBaseBP.IntegrationV7GameModeBaseBP_C +GlobalDefaultGameMode=/Game/IntegrationGameModeBaseBP.IntegrationGameModeBaseBP_C GameInstanceClass=/Script/IntegrationV7.GameInstanceV7 +GlobalDefaultServerGameMode=/Game/IntegrationGameModeBaseBP.IntegrationGameModeBaseBP_C [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 @@ -54,9 +55,6 @@ CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' bAuthorizeAutomaticWidgetVariableCreation=False [/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] bEnablePlugin=True diff --git a/Content/IntegrationGameModeBaseBP.uasset b/Content/IntegrationGameModeBaseBP.uasset new file mode 100644 index 00000000..b0c21b8f --- /dev/null +++ b/Content/IntegrationGameModeBaseBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9280c4f366a393dafed32d4fe3920bc888d6e7d2ebc45e474b204f05d0f3a1e0 +size 53962 diff --git a/Content/IntegrationV7GameModeBaseBP.uasset b/Content/IntegrationV7GameModeBaseBP.uasset deleted file mode 100644 index fcec373c..00000000 --- a/Content/IntegrationV7GameModeBaseBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30443f1acb01420c83167031346ccc91b9270254ba0e02b808c4cda8baefca1c -size 54065 diff --git a/Content/a123.uasset b/Content/a123.uasset deleted file mode 100644 index 56a40b8c..00000000 --- a/Content/a123.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:706a99d45d5624d0e38ed6a98d93924dc57d4f8acdde41a4f9f72d6b6b725718 -size 20491 diff --git a/IntegrationV7.uproject b/Integration.uproject similarity index 92% rename from IntegrationV7.uproject rename to Integration.uproject index a84a26c4..79dee1a0 100644 --- a/IntegrationV7.uproject +++ b/Integration.uproject @@ -5,7 +5,7 @@ "Description": "", "Modules": [ { - "Name": "IntegrationV7", + "Name": "Integration", "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ diff --git a/Source/IntegrationV7.Target.cs b/Source/Integration.Target.cs similarity index 62% rename from Source/IntegrationV7.Target.cs rename to Source/Integration.Target.cs index b595cda4..152420d3 100644 --- a/Source/IntegrationV7.Target.cs +++ b/Source/Integration.Target.cs @@ -3,13 +3,13 @@ using UnrealBuildTool; 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; DefaultBuildSettings = BuildSettingsVersion.V2; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; - ExtraModuleNames.Add("IntegrationV7"); + ExtraModuleNames.Add("Integration"); } } diff --git a/Source/IntegrationV7/IntegrationV7.Build.cs b/Source/Integration/Integration.Build.cs similarity index 86% rename from Source/IntegrationV7/IntegrationV7.Build.cs rename to Source/Integration/Integration.Build.cs index fd08985d..430186ac 100644 --- a/Source/IntegrationV7/IntegrationV7.Build.cs +++ b/Source/Integration/Integration.Build.cs @@ -2,9 +2,9 @@ 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; diff --git a/Source/IntegrationV7/IntegrationV7.cpp b/Source/Integration/Integration.cpp similarity index 74% rename from Source/IntegrationV7/IntegrationV7.cpp rename to Source/Integration/Integration.cpp index 631f1783..8b2306bf 100644 --- a/Source/IntegrationV7/IntegrationV7.cpp +++ b/Source/Integration/Integration.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include "IntegrationV7.h" +#include "Integration.h" #include "Modules/ModuleManager.h" -IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, IntegrationV7, "IntegrationV7" ); +IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, Integration, "Integration" ); diff --git a/Source/IntegrationV7/IntegrationV7.h b/Source/Integration/Integration.h similarity index 100% rename from Source/IntegrationV7/IntegrationV7.h rename to Source/Integration/Integration.h diff --git a/Source/IntegrationV7/IntegrationV7GameModeBase.cpp b/Source/Integration/IntegrationGameModeBase.cpp similarity index 87% rename from Source/IntegrationV7/IntegrationV7GameModeBase.cpp rename to Source/Integration/IntegrationGameModeBase.cpp index d2e78246..59fd478c 100644 --- a/Source/IntegrationV7/IntegrationV7GameModeBase.cpp +++ b/Source/Integration/IntegrationGameModeBase.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include "IntegrationV7GameModeBase.h" +#include "IntegrationGameModeBase.h" #include "drvutil.hpp" #include "engineutil.hpp" #include @@ -8,7 +8,7 @@ -EngineWrapper AIntegrationV7GameModeBase::Luprex; +EngineWrapper AIntegrationGameModeBase::Luprex; //// Main loop. //while (!engw.get_stop_driver(&engw)) { @@ -21,7 +21,7 @@ EngineWrapper AIntegrationV7GameModeBase::Luprex; // engw.play_invoke_event_update(&engw, drvutil::get_monotonic_clock()); //} -AIntegrationV7GameModeBase::AIntegrationV7GameModeBase() { +AIntegrationGameModeBase::AIntegrationGameModeBase() { //PrimaryActorTick.bCanEverTick = true; // Probably wrong //PrimaryActorTick.bTickEvenWhenPaused = true; // Probably wrong //PrimaryActorTick.TickGroup = TG_PrePhysics; // Probably wrong @@ -29,7 +29,7 @@ AIntegrationV7GameModeBase::AIntegrationV7GameModeBase() { SetActorTickInterval(1.0f); // Probably wrong } -void AIntegrationV7GameModeBase::HandleConsoleOutput() { +void AIntegrationGameModeBase::HandleConsoleOutput() { uint32_t ndata; const char* data; Luprex.get_outgoing(&Luprex, 0, &ndata, &data); if (ndata == 0) return; @@ -41,7 +41,7 @@ void AIntegrationV7GameModeBase::HandleConsoleOutput() { ConsoleOutput.Append(fs); } -void AIntegrationV7GameModeBase::Tick(float DeltaSeconds) { +void AIntegrationGameModeBase::Tick(float DeltaSeconds) { Super::Tick(DeltaSeconds); if (!luprex_initialized()) { 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) { const TCHAR* fstchar = *fs; if (sizeof(TCHAR) == 2) { @@ -74,7 +74,7 @@ void AIntegrationV7GameModeBase::ConsoleSendInput(const FString& fs) { } } -void AIntegrationV7GameModeBase::BeginPlay() { +void AIntegrationGameModeBase::BeginPlay() { Super::BeginPlay(); if (!luprex_initialized()) { engineutil::init_wrapper(&Luprex); diff --git a/Source/IntegrationV7/IntegrationV7GameModeBase.h b/Source/Integration/IntegrationGameModeBase.h similarity index 83% rename from Source/IntegrationV7/IntegrationV7GameModeBase.h rename to Source/Integration/IntegrationGameModeBase.h index b287759c..add67c24 100644 --- a/Source/IntegrationV7/IntegrationV7GameModeBase.h +++ b/Source/Integration/IntegrationGameModeBase.h @@ -6,18 +6,18 @@ #include "GameFramework/GameModeBase.h" #include "enginewrapper.hpp" #include "engineutil.hpp" -#include "IntegrationV7GameModeBase.generated.h" +#include "IntegrationGameModeBase.generated.h" /** * */ UCLASS() -class INTEGRATIONV7_API AIntegrationV7GameModeBase : public AGameModeBase +class INTEGRATION_API AIntegrationGameModeBase : public AGameModeBase { GENERATED_BODY() public: - AIntegrationV7GameModeBase(); + AIntegrationGameModeBase(); virtual void BeginPlay() override; virtual void Tick(float) override; diff --git a/Source/IntegrationV7/MyLuprexGameStateBase.cpp b/Source/Integration/MyLuprexGameStateBase.cpp similarity index 100% rename from Source/IntegrationV7/MyLuprexGameStateBase.cpp rename to Source/Integration/MyLuprexGameStateBase.cpp diff --git a/Source/IntegrationV7/MyLuprexGameStateBase.h b/Source/Integration/MyLuprexGameStateBase.h similarity index 82% rename from Source/IntegrationV7/MyLuprexGameStateBase.h rename to Source/Integration/MyLuprexGameStateBase.h index 6f8d7d92..521d7b78 100644 --- a/Source/IntegrationV7/MyLuprexGameStateBase.h +++ b/Source/Integration/MyLuprexGameStateBase.h @@ -10,7 +10,7 @@ * */ UCLASS() -class INTEGRATIONV7_API AMyLuprexGameStateBase : public AGameStateBase +class INTEGRATION_API AMyLuprexGameStateBase : public AGameStateBase { GENERATED_BODY() public: diff --git a/Source/IntegrationV7/drvutil.cpp b/Source/Integration/drvutil.cpp similarity index 100% rename from Source/IntegrationV7/drvutil.cpp rename to Source/Integration/drvutil.cpp diff --git a/Source/IntegrationV7/drvutil.hpp b/Source/Integration/drvutil.hpp similarity index 100% rename from Source/IntegrationV7/drvutil.hpp rename to Source/Integration/drvutil.hpp diff --git a/Source/IntegrationV7/engineutil.cpp b/Source/Integration/engineutil.cpp similarity index 100% rename from Source/IntegrationV7/engineutil.cpp rename to Source/Integration/engineutil.cpp diff --git a/Source/IntegrationV7/engineutil.hpp b/Source/Integration/engineutil.hpp similarity index 100% rename from Source/IntegrationV7/engineutil.hpp rename to Source/Integration/engineutil.hpp diff --git a/Source/IntegrationV7/enginewrapper.hpp b/Source/Integration/enginewrapper.hpp similarity index 100% rename from Source/IntegrationV7/enginewrapper.hpp rename to Source/Integration/enginewrapper.hpp diff --git a/Source/IntegrationV7Editor.Target.cs b/Source/IntegrationEditor.Target.cs similarity index 61% rename from Source/IntegrationV7Editor.Target.cs rename to Source/IntegrationEditor.Target.cs index 2d45d1d8..80b23149 100644 --- a/Source/IntegrationV7Editor.Target.cs +++ b/Source/IntegrationEditor.Target.cs @@ -3,13 +3,13 @@ using UnrealBuildTool; 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; DefaultBuildSettings = BuildSettingsVersion.V2; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; - ExtraModuleNames.Add("IntegrationV7"); + ExtraModuleNames.Add("Integration"); } } diff --git a/Source/IntegrationV7/GameInstanceV7.cpp b/Source/IntegrationV7/GameInstanceV7.cpp deleted file mode 100644 index c9401010..00000000 --- a/Source/IntegrationV7/GameInstanceV7.cpp +++ /dev/null @@ -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"); -} \ No newline at end of file diff --git a/Source/IntegrationV7/GameInstanceV7.h b/Source/IntegrationV7/GameInstanceV7.h deleted file mode 100644 index 280c8587..00000000 --- a/Source/IntegrationV7/GameInstanceV7.h +++ /dev/null @@ -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(); -};