From 170869648c8b0f5cc8470ac38088d6aa5b2822e6 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Mon, 16 Oct 2023 12:48:43 -0400 Subject: [PATCH] fix package mode build Cog Data asset should now be correctly loaded in package mode --- Config/DefaultGame.ini | 4 +++- .../Source/CogEngine/Private/CogEngineWindow_Inspector.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 3b6b285..f3e7f4d 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -17,7 +17,9 @@ bIgnoreMissingCookedAssetRegistryData=False -PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) +PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) +PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass="/Script/Engine.PrimaryAssetLabel",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) -+PrimaryAssetTypesToScan=(PrimaryAssetType="Cog",AssetBaseClass="/Script/Engine.PrimaryDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook)) ++PrimaryAssetTypesToScan=(PrimaryAssetType="CogAbilityDataAsset",AssetBaseClass="/Script/CogAbility.CogAbilityDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook)) ++PrimaryAssetTypesToScan=(PrimaryAssetType="CogEngineDataAsset",AssetBaseClass="/Script/CogEngine.CogEngineDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook)) ++PrimaryAssetTypesToScan=(PrimaryAssetType="CogInputDataAsset",AssetBaseClass="/Script/CogInput.CogInputDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug/")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook)) bOnlyCookProductionAssets=False bShouldManagerDetermineTypeAndName=False bShouldGuessTypeAndNameInEditor=True diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp index 7e69761..9c28674 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Inspector.cpp @@ -532,6 +532,7 @@ bool UCogEngineWindow_Inspector::RenderProperty(const FProperty* Property, uint8 ImGui::PopTextWrapPos(); ImGui::EndTooltip(); } +#if WITH_EDITORONLY_DATA else if (Property->HasMetaData("Tooltip")) { if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary)) @@ -539,14 +540,13 @@ bool UCogEngineWindow_Inspector::RenderProperty(const FProperty* Property, uint8 ImGui::BeginTooltip(); ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f); -#if WITH_EDITORONLY_DATA ImGui::Text(TCHAR_TO_ANSI(*Property->GetToolTipText(false).ToString())); -#endif // WITH_EDITORONLY_DATA ImGui::Text("Details [CTRL]"); ImGui::PopTextWrapPos(); ImGui::EndTooltip(); } } +#endif // WITH_EDITORONLY_DATA //--------------------------------------------------------------------------------------