AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 02:39:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codegen fixes, DPI scaling, SVG icons

Browse Source
This commit is contained in:
Jack Andersen
2019-05-26 15:29:10 -10:00
parent 9f94db6c82
commit d593500e18
195 changed files with 1720 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/CMakeLists.txt
View File

@@ -57,7 +57,7 @@ target_compile_definitions(
GLEW_STATIC
)
get_target_property(pwecore_include_directories pwe_core INCLUDE_DIRECTORIES)
gather_include_directories(pwecore_include_directories pwe_core)
add_codegen_targets(
"${source_files}"

4
src/Core/GameProject/CGameExporter.cpp
View File

@@ -20,9 +20,9 @@
#define EXPORT_COOKED 1
#if NOD_UCS2
static nod::SystemStringView TStringToNodString(const TString& string) { return ToWChar(string); }
#define TStringToNodString(string) ToWChar(string)
#else
static nod::SystemStringView TStringToNodString(const TString& string) { return *string; }
#define TStringToNodString(string) *string
#endif
CGameExporter::CGameExporter(EDiscType DiscType, EGame Game, bool FrontEnd, ERegion Region, const TString& rkGameName, const TString& rkGameID, float BuildVersion)

4
src/Core/GameProject/CGameProject.cpp
View File

@@ -6,9 +6,9 @@
#include <nod/nod.hpp>
#if NOD_UCS2
static nod::SystemStringView TStringToNodString(const TString& string) { return ToWChar(string); }
#define TStringToNodString(string) ToWChar(string)
#else
static nod::SystemStringView TStringToNodString(const TString& string) { return *string; }
#define TStringToNodString(string) *string
#endif
CGameProject::~CGameProject()

2
src/Core/Resource/Script/Property/CEnumProperty.h
View File

@@ -94,7 +94,7 @@ public:
virtual void InitFromArchetype(IProperty* pOther)
{
base::InitFromArchetype(pOther);
TTypedProperty<int32, TypeEnum>::InitFromArchetype(pOther);
TEnumPropertyBase* pOtherEnum = static_cast<TEnumPropertyBase*>(pOther);
mValues = pOtherEnum->mValues;
}