From 9657ac63c312f42f5ddd76b68497c3362e854be6 Mon Sep 17 00:00:00 2001 From: ouczbs Date: Sun, 17 Mar 2024 21:36:46 +0800 Subject: [PATCH] update --- engine/src/engine/app.cpp | 2 +- engine/src/engine/data/global.cpp | 0 engine/src/engine/data/global.h | 7 ++++ engine/src/engine/data/project_setting.cpp | 0 engine/src/engine/data/project_setting.h | 32 +++++++++++++++++++ .../property/actor_property.h | 0 .../{object => data}/property/property.cpp | 0 .../{object => data}/property/property.h | 0 engine/src/engine/object/mesh/actor.cpp | 2 +- 9 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 engine/src/engine/data/global.cpp create mode 100644 engine/src/engine/data/global.h create mode 100644 engine/src/engine/data/project_setting.cpp create mode 100644 engine/src/engine/data/project_setting.h rename engine/src/engine/{object => data}/property/actor_property.h (100%) rename engine/src/engine/{object => data}/property/property.cpp (100%) rename engine/src/engine/{object => data}/property/property.h (100%) diff --git a/engine/src/engine/app.cpp b/engine/src/engine/app.cpp index 0dc07db..fb2757a 100644 --- a/engine/src/engine/app.cpp +++ b/engine/src/engine/app.cpp @@ -2,7 +2,7 @@ #include "render/renderapi.h" #include "render/window.h" #include "object/mesh/actor.h" -#include "object/property/actor_property.h" +#include "data/property/actor_property.h" #include "asset/asset_manager.h" #include "object/scene/scene_manager.h" namespace engineapi { diff --git a/engine/src/engine/data/global.cpp b/engine/src/engine/data/global.cpp new file mode 100644 index 0000000..e69de29 diff --git a/engine/src/engine/data/global.h b/engine/src/engine/data/global.h new file mode 100644 index 0000000..cf67b55 --- /dev/null +++ b/engine/src/engine/data/global.h @@ -0,0 +1,7 @@ +#pragma once +#include +using std::string; +namespace engineapi +{ + +} \ No newline at end of file diff --git a/engine/src/engine/data/project_setting.cpp b/engine/src/engine/data/project_setting.cpp new file mode 100644 index 0000000..e69de29 diff --git a/engine/src/engine/data/project_setting.h b/engine/src/engine/data/project_setting.h new file mode 100644 index 0000000..9e52cc4 --- /dev/null +++ b/engine/src/engine/data/project_setting.h @@ -0,0 +1,32 @@ +#pragma once +#include +#include "asset/render/asset_enum.h" +using std::string; +namespace engineapi +{ + struct ProjectSetting { + public: + string path; + string defaultScene; + RenderPipelineType renderPipelineType; + unsigned int width; + unsigned int height; + bool enableDynamicBatch; + bool preserveIntermediateShader; + bool enableGraphicsDebug; + bool logToFile; + bool stablePhysics; + + // Editor + unsigned int hierarchyWidth; + unsigned int hierarchyHeight; + unsigned int consoleWidth; + unsigned int consoleHeight; + unsigned int projectWidth; + unsigned int projectHeight; + unsigned int inspectorWidth; + unsigned int inspectorHeight; + unsigned int mainBarWidth; + unsigned int mainBarHeight; + }; +} \ No newline at end of file diff --git a/engine/src/engine/object/property/actor_property.h b/engine/src/engine/data/property/actor_property.h similarity index 100% rename from engine/src/engine/object/property/actor_property.h rename to engine/src/engine/data/property/actor_property.h diff --git a/engine/src/engine/object/property/property.cpp b/engine/src/engine/data/property/property.cpp similarity index 100% rename from engine/src/engine/object/property/property.cpp rename to engine/src/engine/data/property/property.cpp diff --git a/engine/src/engine/object/property/property.h b/engine/src/engine/data/property/property.h similarity index 100% rename from engine/src/engine/object/property/property.h rename to engine/src/engine/data/property/property.h diff --git a/engine/src/engine/object/mesh/actor.cpp b/engine/src/engine/object/mesh/actor.cpp index 9c9d18f..2cbae35 100644 --- a/engine/src/engine/object/mesh/actor.cpp +++ b/engine/src/engine/object/mesh/actor.cpp @@ -1,6 +1,6 @@ #include "actor.h" #include "asset/asset_manager.h" -#include "../property/actor_property.h" +#include "data/property/actor_property.h" namespace engineapi { ActorMesh::ActorMesh(Model& model, ActorProperty& property) :DynamicMesh(model)