From 9e6ee7b2e248f764a584793cc5db6ab2fb9f778e Mon Sep 17 00:00:00 2001 From: Chewico Date: Thu, 22 Jan 2026 17:38:25 +0100 Subject: [PATCH] Changed Scene to World --- .../{Enviroment.h => EntityEnviroment.h} | 4 +-- Deer/Include/DeerCore/{Scene.h => World.h} | 12 ++++----- Deer/Include/DeerRender/EntityEnviroment.h | 2 ++ Deer/Include/DeerRender/Enviroment.h | 2 -- Deer/Include/DeerRender/RenderPiperline.h | 2 +- Deer/Include/DeerRender/{Scene.h => World.h} | 8 +++--- .../Scene/Serialization/Serialization.h | 27 ------------------- .../DeerCore/{Scene => World}/Components.cpp | 0 Deer/src/DeerCore/{Scene => World}/Entity.cpp | 2 +- .../DeerCore/{Scene => World}/Enviroment.cpp | 2 +- .../{Scene => World}/EnvironmentBuilder.cpp | 2 +- .../RelationshipComponentSerialization.h | 0 .../TransformComponentSerialization.h | 0 .../Serialization/EntitySerialization.h | 4 +-- .../Serialization/EntitySerializationStruct.h | 0 .../Serialization/EnvironmentSerialization.h | 2 +- .../Serialization/QuatSerialization.h | 0 .../Serialization/Serialization.cpp | 0 .../World/Serialization/Serialization.h | 27 +++++++++++++++++++ .../Serialization/SerializationGlobalVars.cpp | 0 .../Serialization/SerializationGlobalVars.h | 0 .../Serialization/Vec3Serialization.h | 0 .../{Scene/Scene.cpp => World/World.cpp} | 16 +++++------ .../SceneData.cpp => World/WorldData.cpp} | 6 ++--- .../{Scene/SceneData.h => World/WorldData.h} | 4 +-- .../{Scene => World}/Environment.cpp | 4 +-- .../Components/CameraSerializationComponent.h | 0 .../MeshRenderComponentSerialization.h | 0 .../TextureBindingSerializationComponent.h | 0 .../{Scene/Scene.cpp => World/World.cpp} | 14 +++++----- .../{Environment.h => EntityEnvironment.h} | 6 ++--- .../headers/DeerStudio/StudioAPI/Math.h | 4 +-- .../Registers/Environment.cpp | 2 +- .../AngelScriptEngine/Registers/Math.cpp | 8 +++--- DeerStudio/src/DeerStudio/DeerStudio.cpp | 4 +-- .../src/DeerStudio/StudioAPI/Entity.cpp | 12 ++++----- ...{Environment.cpp => EntityEnvironment.cpp} | 12 ++++----- DeerStudio/src/DeerStudio/StudioAPI/Math.cpp | 4 +-- Editor/Modules/Previewer/MeshPreview.as | 2 +- Editor/Modules/Viewport/Viewport.as | 2 +- 40 files changed, 97 insertions(+), 99 deletions(-) rename Deer/Include/DeerCore/{Enviroment.h => EntityEnviroment.h} (98%) rename Deer/Include/DeerCore/{Scene.h => World.h} (65%) create mode 100644 Deer/Include/DeerRender/EntityEnviroment.h delete mode 100644 Deer/Include/DeerRender/Enviroment.h rename Deer/Include/DeerRender/{Scene.h => World.h} (59%) delete mode 100755 Deer/src/DeerCore/Scene/Serialization/Serialization.h rename Deer/src/DeerCore/{Scene => World}/Components.cpp (100%) rename Deer/src/DeerCore/{Scene => World}/Entity.cpp (98%) rename Deer/src/DeerCore/{Scene => World}/Enviroment.cpp (99%) rename Deer/src/DeerCore/{Scene => World}/EnvironmentBuilder.cpp (85%) rename Deer/src/DeerCore/{Scene => World}/Serialization/Components/RelationshipComponentSerialization.h (100%) rename Deer/src/DeerCore/{Scene => World}/Serialization/Components/TransformComponentSerialization.h (100%) rename Deer/src/DeerCore/{Scene => World}/Serialization/EntitySerialization.h (96%) rename Deer/src/DeerCore/{Scene => World}/Serialization/EntitySerializationStruct.h (100%) rename Deer/src/DeerCore/{Scene => World}/Serialization/EnvironmentSerialization.h (97%) rename Deer/src/DeerCore/{Scene => World}/Serialization/QuatSerialization.h (100%) rename Deer/src/DeerCore/{Scene => World}/Serialization/Serialization.cpp (100%) create mode 100755 Deer/src/DeerCore/World/Serialization/Serialization.h rename Deer/src/DeerCore/{Scene => World}/Serialization/SerializationGlobalVars.cpp (100%) rename Deer/src/DeerCore/{Scene => World}/Serialization/SerializationGlobalVars.h (100%) rename Deer/src/DeerCore/{Scene => World}/Serialization/Vec3Serialization.h (100%) rename Deer/src/DeerCore/{Scene/Scene.cpp => World/World.cpp} (73%) rename Deer/src/DeerCore/{Scene/SceneData.cpp => World/WorldData.cpp} (62%) rename Deer/src/DeerCore/{Scene/SceneData.h => World/WorldData.h} (81%) rename Deer/src/DeerRender/{Scene => World}/Environment.cpp (97%) rename Deer/src/DeerRender/{Scene => World}/Serialization/Components/CameraSerializationComponent.h (100%) rename Deer/src/DeerRender/{Scene => World}/Serialization/Components/MeshRenderComponentSerialization.h (100%) rename Deer/src/DeerRender/{Scene => World}/Serialization/Components/TextureBindingSerializationComponent.h (100%) rename Deer/src/DeerRender/{Scene/Scene.cpp => World/World.cpp} (69%) rename DeerStudio/headers/DeerStudio/StudioAPI/{Environment.h => EntityEnvironment.h} (80%) rename DeerStudio/src/DeerStudio/StudioAPI/{Environment.cpp => EntityEnvironment.cpp} (87%) diff --git a/Deer/Include/DeerCore/Enviroment.h b/Deer/Include/DeerCore/EntityEnviroment.h similarity index 98% rename from Deer/Include/DeerCore/Enviroment.h rename to Deer/Include/DeerCore/EntityEnviroment.h index cdcd8a3..88ec23c 100755 --- a/Deer/Include/DeerCore/Enviroment.h +++ b/Deer/Include/DeerCore/EntityEnviroment.h @@ -8,7 +8,7 @@ #ifdef DEER_RENDER #include "DeerRender/Render/FrameBuffer.h" -#include "DeerRender/Scene.h" +#include "DeerRender/World.h" #endif #include @@ -63,7 +63,7 @@ namespace Deer { // Obtains the entity that is on the root of the environment inline Entity& getRoot() { return getEntity(0); } #ifdef DEER_RENDER - void render(const SceneCamera& camera); + void render(const WorldCamera& camera); #endif Scope m_registry; diff --git a/Deer/Include/DeerCore/Scene.h b/Deer/Include/DeerCore/World.h similarity index 65% rename from Deer/Include/DeerCore/Scene.h rename to Deer/Include/DeerCore/World.h index 7c9e4b0..387b38c 100755 --- a/Deer/Include/DeerCore/Scene.h +++ b/Deer/Include/DeerCore/World.h @@ -3,13 +3,11 @@ namespace Deer { class EntityEnvironment; - class SceneCamera; + class WorldCamera; class GizmoRenderer; - // A scene is a 3d simulation with its environment and voxel world in case - // of initialized, here things can be simulated - namespace Scene { - // Clears all the assets and memory the Scene had conained + namespace World { + // Clears all the assets and memory the World had conained void clear(); // This is the cycle to execution of scripts and physics @@ -23,10 +21,10 @@ namespace Deer { #ifdef DEER_RENDER // This function renders with the default camera in the environment void render(); - void render(const SceneCamera&); + void render(const WorldCamera&); extern GizmoRenderer gizmoRenderer; #endif extern EntityEnvironment environment; - } // namespace Scene + } // namespace World } // namespace Deer diff --git a/Deer/Include/DeerRender/EntityEnviroment.h b/Deer/Include/DeerRender/EntityEnviroment.h new file mode 100644 index 0000000..a35603c --- /dev/null +++ b/Deer/Include/DeerRender/EntityEnviroment.h @@ -0,0 +1,2 @@ +#pragma once +#include "DeerCore/EntityEnviroment.h" \ No newline at end of file diff --git a/Deer/Include/DeerRender/Enviroment.h b/Deer/Include/DeerRender/Enviroment.h deleted file mode 100644 index 6870c0e..0000000 --- a/Deer/Include/DeerRender/Enviroment.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "DeerCore/Enviroment.h" \ No newline at end of file diff --git a/Deer/Include/DeerRender/RenderPiperline.h b/Deer/Include/DeerRender/RenderPiperline.h index faf650a..8ab5d13 100644 --- a/Deer/Include/DeerRender/RenderPiperline.h +++ b/Deer/Include/DeerRender/RenderPiperline.h @@ -1,5 +1,5 @@ #pragma once -#include "DeerRender/Enviroment.h" +#include "DeerRender/EntityEnviroment.h" #include "DeerRender/Render/FrameBuffer.h" #include "DeerRender/Tools/Memory.h" diff --git a/Deer/Include/DeerRender/Scene.h b/Deer/Include/DeerRender/World.h similarity index 59% rename from Deer/Include/DeerRender/Scene.h rename to Deer/Include/DeerRender/World.h index c1dd6b6..991e49a 100755 --- a/Deer/Include/DeerRender/Scene.h +++ b/Deer/Include/DeerRender/World.h @@ -1,13 +1,13 @@ #pragma once -#include "DeerCore/Scene.h" +#include "DeerCore/World.h" #include "DeerRender/Components.h" namespace Deer { - struct SceneCamera { + struct WorldCamera { TransformComponent transform; CameraComponent camera; - SceneCamera() {} - SceneCamera(TransformComponent _transform, CameraComponent _camera) : transform(_transform), camera(_camera) {} + WorldCamera() {} + WorldCamera(TransformComponent _transform, CameraComponent _camera) : transform(_transform), camera(_camera) {} }; } // namespace Deer \ No newline at end of file diff --git a/Deer/src/DeerCore/Scene/Serialization/Serialization.h b/Deer/src/DeerCore/Scene/Serialization/Serialization.h deleted file mode 100755 index 762c6e5..0000000 --- a/Deer/src/DeerCore/Scene/Serialization/Serialization.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "cereal/cereal.hpp" -#include "cereal/types/string.hpp" -#include "cereal/types/vector.hpp" - -// Serialization Vars -#include "DeerCore/Scene/Serialization/SerializationGlobalVars.h" - -// GENERICS -#include "DeerCore/Scene/Serialization/QuatSerialization.h" -#include "DeerCore/Scene/Serialization/Vec3Serialization.h" - -// SCENE SPECIFIC -#include "DeerCore/Scene/Serialization/EntityEnvironmentSerialization.h" -#include "DeerCore/Scene/Serialization/EntitySerialization.h" - -// COMPONENTS SPECIFIC -#include "DeerCore/Scene/Serialization/Components/RelationshipComponentSerialization.h" -#include "DeerCore/Scene/Serialization/Components/TransformComponentSerialization.h" - -// RENDER SPECIFIC -#ifdef DEER_RENDER -#include "DeerRender/Scene/Serialization/Components/CameraSerializationComponent.h" -#include "DeerRender/Scene/Serialization/Components/MeshRenderComponentSerialization.h" -#include "DeerRender/Scene/Serialization/Components/TextureBindingSerializationComponent.h" -#endif diff --git a/Deer/src/DeerCore/Scene/Components.cpp b/Deer/src/DeerCore/World/Components.cpp similarity index 100% rename from Deer/src/DeerCore/Scene/Components.cpp rename to Deer/src/DeerCore/World/Components.cpp diff --git a/Deer/src/DeerCore/Scene/Entity.cpp b/Deer/src/DeerCore/World/Entity.cpp similarity index 98% rename from Deer/src/DeerCore/Scene/Entity.cpp rename to Deer/src/DeerCore/World/Entity.cpp index c91598c..dcc5d01 100755 --- a/Deer/src/DeerCore/Scene/Entity.cpp +++ b/Deer/src/DeerCore/World/Entity.cpp @@ -1,5 +1,5 @@ #include "DeerCore/Components.h" -#include "DeerCore/Enviroment.h" +#include "DeerCore/EntityEnviroment.h" #include "DeerCore/Log.h" namespace Deer { diff --git a/Deer/src/DeerCore/Scene/Enviroment.cpp b/Deer/src/DeerCore/World/Enviroment.cpp similarity index 99% rename from Deer/src/DeerCore/Scene/Enviroment.cpp rename to Deer/src/DeerCore/World/Enviroment.cpp index 9752e3f..6bf6d08 100755 --- a/Deer/src/DeerCore/Scene/Enviroment.cpp +++ b/Deer/src/DeerCore/World/Enviroment.cpp @@ -1,4 +1,4 @@ -#include "DeerCore/Enviroment.h" +#include "DeerCore/EntityEnviroment.h" #include "DeerCore/Application.h" #include "DeerCore/Components.h" diff --git a/Deer/src/DeerCore/Scene/EnvironmentBuilder.cpp b/Deer/src/DeerCore/World/EnvironmentBuilder.cpp similarity index 85% rename from Deer/src/DeerCore/Scene/EnvironmentBuilder.cpp rename to Deer/src/DeerCore/World/EnvironmentBuilder.cpp index 698363c..eb944a9 100644 --- a/Deer/src/DeerCore/Scene/EnvironmentBuilder.cpp +++ b/Deer/src/DeerCore/World/EnvironmentBuilder.cpp @@ -1,4 +1,4 @@ -#include "DeerCore/Enviroment.h" +#include "DeerCore/EntityEnviroment.h" namespace Deer { Scope ResourceBuilder::buildResource(const BaseDataType& baseData) { diff --git a/Deer/src/DeerCore/Scene/Serialization/Components/RelationshipComponentSerialization.h b/Deer/src/DeerCore/World/Serialization/Components/RelationshipComponentSerialization.h similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/Components/RelationshipComponentSerialization.h rename to Deer/src/DeerCore/World/Serialization/Components/RelationshipComponentSerialization.h diff --git a/Deer/src/DeerCore/Scene/Serialization/Components/TransformComponentSerialization.h b/Deer/src/DeerCore/World/Serialization/Components/TransformComponentSerialization.h similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/Components/TransformComponentSerialization.h rename to Deer/src/DeerCore/World/Serialization/Components/TransformComponentSerialization.h diff --git a/Deer/src/DeerCore/Scene/Serialization/EntitySerialization.h b/Deer/src/DeerCore/World/Serialization/EntitySerialization.h similarity index 96% rename from Deer/src/DeerCore/Scene/Serialization/EntitySerialization.h rename to Deer/src/DeerCore/World/Serialization/EntitySerialization.h index 991f91f..d1844f4 100755 --- a/Deer/src/DeerCore/Scene/Serialization/EntitySerialization.h +++ b/Deer/src/DeerCore/World/Serialization/EntitySerialization.h @@ -1,8 +1,8 @@ #pragma once #include "DeerCore/Components.h" -#include "DeerCore/Enviroment.h" -#include "DeerCore/Scene/Serialization/SerializationGlobalVars.h" +#include "DeerCore/EntityEnviroment.h" +#include "DeerCore/World/Serialization/SerializationGlobalVars.h" #include "EntitySerializationStruct.h" namespace Deer { diff --git a/Deer/src/DeerCore/Scene/Serialization/EntitySerializationStruct.h b/Deer/src/DeerCore/World/Serialization/EntitySerializationStruct.h similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/EntitySerializationStruct.h rename to Deer/src/DeerCore/World/Serialization/EntitySerializationStruct.h diff --git a/Deer/src/DeerCore/Scene/Serialization/EnvironmentSerialization.h b/Deer/src/DeerCore/World/Serialization/EnvironmentSerialization.h similarity index 97% rename from Deer/src/DeerCore/Scene/Serialization/EnvironmentSerialization.h rename to Deer/src/DeerCore/World/Serialization/EnvironmentSerialization.h index 0b0a3d0..a0415f2 100755 --- a/Deer/src/DeerCore/Scene/Serialization/EnvironmentSerialization.h +++ b/Deer/src/DeerCore/World/Serialization/EnvironmentSerialization.h @@ -2,7 +2,7 @@ #include #include -#include "DeerCore/Enviroment.h" +#include "DeerCore/EntityEnviroment.h" #include "EntitySerializationStruct.h" namespace Deer { diff --git a/Deer/src/DeerCore/Scene/Serialization/QuatSerialization.h b/Deer/src/DeerCore/World/Serialization/QuatSerialization.h similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/QuatSerialization.h rename to Deer/src/DeerCore/World/Serialization/QuatSerialization.h diff --git a/Deer/src/DeerCore/Scene/Serialization/Serialization.cpp b/Deer/src/DeerCore/World/Serialization/Serialization.cpp similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/Serialization.cpp rename to Deer/src/DeerCore/World/Serialization/Serialization.cpp diff --git a/Deer/src/DeerCore/World/Serialization/Serialization.h b/Deer/src/DeerCore/World/Serialization/Serialization.h new file mode 100755 index 0000000..c4c1f1a --- /dev/null +++ b/Deer/src/DeerCore/World/Serialization/Serialization.h @@ -0,0 +1,27 @@ +#pragma once + +#include "cereal/cereal.hpp" +#include "cereal/types/string.hpp" +#include "cereal/types/vector.hpp" + +// Serialization Vars +#include "DeerCore/World/Serialization/SerializationGlobalVars.h" + +// GENERICS +#include "DeerCore/World/Serialization/QuatSerialization.h" +#include "DeerCore/World/Serialization/Vec3Serialization.h" + +// SCENE SPECIFIC +#include "DeerCore/World/Serialization/EntityEnvironmentSerialization.h" +#include "DeerCore/World/Serialization/EntitySerialization.h" + +// COMPONENTS SPECIFIC +#include "DeerCore/World/Serialization/Components/RelationshipComponentSerialization.h" +#include "DeerCore/World/Serialization/Components/TransformComponentSerialization.h" + +// RENDER SPECIFIC +#ifdef DEER_RENDER +#include "DeerRender/World/Serialization/Components/CameraSerializationComponent.h" +#include "DeerRender/World/Serialization/Components/MeshRenderComponentSerialization.h" +#include "DeerRender/World/Serialization/Components/TextureBindingSerializationComponent.h" +#endif diff --git a/Deer/src/DeerCore/Scene/Serialization/SerializationGlobalVars.cpp b/Deer/src/DeerCore/World/Serialization/SerializationGlobalVars.cpp similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/SerializationGlobalVars.cpp rename to Deer/src/DeerCore/World/Serialization/SerializationGlobalVars.cpp diff --git a/Deer/src/DeerCore/Scene/Serialization/SerializationGlobalVars.h b/Deer/src/DeerCore/World/Serialization/SerializationGlobalVars.h similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/SerializationGlobalVars.h rename to Deer/src/DeerCore/World/Serialization/SerializationGlobalVars.h diff --git a/Deer/src/DeerCore/Scene/Serialization/Vec3Serialization.h b/Deer/src/DeerCore/World/Serialization/Vec3Serialization.h similarity index 100% rename from Deer/src/DeerCore/Scene/Serialization/Vec3Serialization.h rename to Deer/src/DeerCore/World/Serialization/Vec3Serialization.h diff --git a/Deer/src/DeerCore/Scene/Scene.cpp b/Deer/src/DeerCore/World/World.cpp similarity index 73% rename from Deer/src/DeerCore/Scene/Scene.cpp rename to Deer/src/DeerCore/World/World.cpp index 8d7e028..f8d617f 100755 --- a/Deer/src/DeerCore/Scene/Scene.cpp +++ b/Deer/src/DeerCore/World/World.cpp @@ -1,10 +1,10 @@ -#include "DeerCore/Scene.h" +#include "DeerCore/World.h" #include "DeerCore/Components.h" -#include "DeerCore/Enviroment.h" +#include "DeerCore/EntityEnviroment.h" #include "DeerCore/Log.h" -#include "DeerCore/Scene/SceneData.h" #include "DeerCore/Tools/Memory.h" +#include "DeerCore/World/WorldData.h" #ifdef DEER_RENDER #include "DeerRender/FrameBuffer.h" @@ -13,7 +13,7 @@ #endif namespace Deer { - void Scene::clear() { + void World::clear() { environment.clear(); #ifdef DEER_RENDER @@ -24,19 +24,19 @@ namespace Deer { #endif } - bool Scene::getExecutingState() { + bool World::getExecutingState() { return isExecuting; } - void Scene::initExecution() { + void World::initExecution() { DEER_CORE_ASSERT(!isExecuting, "Deer scene is already executing"); isExecuting = true; } - void Scene::tickExecution() { + void World::tickExecution() { } - void Scene::endExecution() { + void World::endExecution() { DEER_CORE_ASSERT(isExecuting, "Deer scene is not executing"); isExecuting = false; } diff --git a/Deer/src/DeerCore/Scene/SceneData.cpp b/Deer/src/DeerCore/World/WorldData.cpp similarity index 62% rename from Deer/src/DeerCore/Scene/SceneData.cpp rename to Deer/src/DeerCore/World/WorldData.cpp index 1cc7522..2582e49 100644 --- a/Deer/src/DeerCore/Scene/SceneData.cpp +++ b/Deer/src/DeerCore/World/WorldData.cpp @@ -1,10 +1,10 @@ -#include "DeerCore/Enviroment.h" +#include "DeerCore/EntityEnviroment.h" #include "DeerCore/Tools/Memory.h" namespace Deer { - namespace Scene { + namespace World { EntityEnvironment environment; bool isExecuting = false; - } // namespace Scene + } // namespace World } // namespace Deer diff --git a/Deer/src/DeerCore/Scene/SceneData.h b/Deer/src/DeerCore/World/WorldData.h similarity index 81% rename from Deer/src/DeerCore/Scene/SceneData.h rename to Deer/src/DeerCore/World/WorldData.h index aab0190..523b940 100644 --- a/Deer/src/DeerCore/Scene/SceneData.h +++ b/Deer/src/DeerCore/World/WorldData.h @@ -4,9 +4,9 @@ namespace Deer { class EntityEnvironment; - namespace Scene { + namespace World { extern EntityEnvironment environment; extern bool isExecuting; - } // namespace Scene + } // namespace World } // namespace Deer diff --git a/Deer/src/DeerRender/Scene/Environment.cpp b/Deer/src/DeerRender/World/Environment.cpp similarity index 97% rename from Deer/src/DeerRender/Scene/Environment.cpp rename to Deer/src/DeerRender/World/Environment.cpp index 3cc13b0..b0de5f8 100755 --- a/Deer/src/DeerRender/Scene/Environment.cpp +++ b/Deer/src/DeerRender/World/Environment.cpp @@ -1,4 +1,4 @@ -#include "DeerRender/Enviroment.h" +#include "DeerRender/EntityEnviroment.h" #include "DeerRender/Application.h" @@ -13,7 +13,7 @@ #include "DeerRender/Log.h" namespace Deer { - void EntityEnvironment::render(const SceneCamera& camera) { + void EntityEnvironment::render(const WorldCamera& camera) { glm::mat4 camMatrix = glm::inverse(camera.transform.getMatrix()); glm::mat4 projectionMatrix = camera.camera.getMatrix(); glm::mat4 invertZ = glm::scale(glm::mat4(1.0f), glm::vec3(1, 1, -1)); diff --git a/Deer/src/DeerRender/Scene/Serialization/Components/CameraSerializationComponent.h b/Deer/src/DeerRender/World/Serialization/Components/CameraSerializationComponent.h similarity index 100% rename from Deer/src/DeerRender/Scene/Serialization/Components/CameraSerializationComponent.h rename to Deer/src/DeerRender/World/Serialization/Components/CameraSerializationComponent.h diff --git a/Deer/src/DeerRender/Scene/Serialization/Components/MeshRenderComponentSerialization.h b/Deer/src/DeerRender/World/Serialization/Components/MeshRenderComponentSerialization.h similarity index 100% rename from Deer/src/DeerRender/Scene/Serialization/Components/MeshRenderComponentSerialization.h rename to Deer/src/DeerRender/World/Serialization/Components/MeshRenderComponentSerialization.h diff --git a/Deer/src/DeerRender/Scene/Serialization/Components/TextureBindingSerializationComponent.h b/Deer/src/DeerRender/World/Serialization/Components/TextureBindingSerializationComponent.h similarity index 100% rename from Deer/src/DeerRender/Scene/Serialization/Components/TextureBindingSerializationComponent.h rename to Deer/src/DeerRender/World/Serialization/Components/TextureBindingSerializationComponent.h diff --git a/Deer/src/DeerRender/Scene/Scene.cpp b/Deer/src/DeerRender/World/World.cpp similarity index 69% rename from Deer/src/DeerRender/Scene/Scene.cpp rename to Deer/src/DeerRender/World/World.cpp index dd66bde..4185b6c 100755 --- a/Deer/src/DeerRender/Scene/Scene.cpp +++ b/Deer/src/DeerRender/World/World.cpp @@ -1,25 +1,25 @@ -#include "DeerRender/Scene.h" +#include "DeerRender/World.h" #include "DeerRender/Components.h" -#include "DeerRender/Enviroment.h" +#include "DeerRender/EntityEnviroment.h" #include "DeerRender/Render/RenderCommand.h" -#include "DeerRender/Scene.h" +#include "DeerRender/World.h" namespace Deer { - void Scene::render() { + void World::render() { uint32_t mainCamera = environment.tryGetMainCamera(); if (mainCamera == 0) return; Entity& m_cameraEntity = environment.getEntity(mainCamera); - SceneCamera sceneCamera; + WorldCamera sceneCamera; sceneCamera.camera = m_cameraEntity.getComponent(); sceneCamera.transform = m_cameraEntity.getComponent(); - Scene::render(sceneCamera); + World::render(sceneCamera); } - void Scene::render(const SceneCamera& sceneCamera) { + void World::render(const WorldCamera& sceneCamera) { RenderCommand::setDepthBuffer(true); environment.render(sceneCamera); diff --git a/DeerStudio/headers/DeerStudio/StudioAPI/Environment.h b/DeerStudio/headers/DeerStudio/StudioAPI/EntityEnvironment.h similarity index 80% rename from DeerStudio/headers/DeerStudio/StudioAPI/Environment.h rename to DeerStudio/headers/DeerStudio/StudioAPI/EntityEnvironment.h index 4a2776a..971fd17 100644 --- a/DeerStudio/headers/DeerStudio/StudioAPI/Environment.h +++ b/DeerStudio/headers/DeerStudio/StudioAPI/EntityEnvironment.h @@ -1,14 +1,14 @@ #pragma once #include "GenericRefStructs.h" #include -// #include "DeerRender/Scene.h" +// #include "DeerRender/World.h" namespace Deer { - class SceneCamera; + class WorldCamera; namespace StudioAPI { struct EntityEnvironmentStruct : EntityEnvironmentHandleStruct { - void render(FrameBufferHandleStruct, SceneCamera&); + void render(FrameBufferHandleStruct, WorldCamera&); EntityHandleStruct getRootEntity(); EntityHandleStruct getEntity(int); diff --git a/DeerStudio/headers/DeerStudio/StudioAPI/Math.h b/DeerStudio/headers/DeerStudio/StudioAPI/Math.h index 15ed113..3efedf0 100644 --- a/DeerStudio/headers/DeerStudio/StudioAPI/Math.h +++ b/DeerStudio/headers/DeerStudio/StudioAPI/Math.h @@ -3,7 +3,7 @@ #include "glm/gtc/quaternion.hpp" #include "DeerRender/Components.h" -#include "DeerRender/Scene.h" +#include "DeerRender/World.h" namespace Deer { namespace StudioAPI { @@ -26,7 +26,7 @@ namespace Deer { void transform_construct(TransformComponent*); void camera_construct(CameraComponent*); - void sceneCamera_Construct(SceneCamera*); + void sceneCamera_Construct(WorldCamera*); glm::vec3 transform_relative(glm::vec3, TransformComponent*); diff --git a/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Environment.cpp b/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Environment.cpp index 6de2479..4b0ddd0 100644 --- a/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Environment.cpp +++ b/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Environment.cpp @@ -15,7 +15,7 @@ namespace Deer { REGISTER_GLOBAL_FUNC("EntityEnvironment createLoadEntityEnvironment(const string&in envId)", StudioAPI::createLoadEntityEnvironment); scriptEngine->SetDefaultNamespace(""); - REGISTER_OBJECT_METHOD("EntityEnvironment", "void render(FrameBuffer, SceneCamera&in)", StudioAPI::EntityEnvironmentStruct, render); + REGISTER_OBJECT_METHOD("EntityEnvironment", "void render(FrameBuffer, WorldCamera&in)", StudioAPI::EntityEnvironmentStruct, render); REGISTER_OBJECT_METHOD("EntityEnvironment", "Entity getRootEntity()", StudioAPI::EntityEnvironmentStruct, getRootEntity); REGISTER_OBJECT_METHOD("EntityEnvironment", "Entity getEntity(int)", StudioAPI::EntityEnvironmentStruct, getEntity); } diff --git a/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Math.cpp b/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Math.cpp index 59d5851..f7085b5 100644 --- a/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Math.cpp +++ b/DeerStudio/src/DeerStudio/AngelScriptEngine/Registers/Math.cpp @@ -27,9 +27,9 @@ namespace Deer { AS_CHECK(scriptEngine->RegisterObjectProperty("Camera", "float nearZ", asOFFSET(CameraComponent, nearZ))); AS_CHECK(scriptEngine->RegisterObjectProperty("Camera", "float farZ", asOFFSET(CameraComponent, farZ))); - AS_CHECK(scriptEngine->RegisterObjectType("SceneCamera", sizeof(SceneCamera), asOBJ_VALUE | asOBJ_POD | asGetTypeTraits())); - AS_CHECK(scriptEngine->RegisterObjectProperty("SceneCamera", "Camera camera", asOFFSET(SceneCamera, camera))); - AS_CHECK(scriptEngine->RegisterObjectProperty("SceneCamera", "Transform transform", asOFFSET(SceneCamera, transform))); + AS_CHECK(scriptEngine->RegisterObjectType("WorldCamera", sizeof(WorldCamera), asOBJ_VALUE | asOBJ_POD | asGetTypeTraits())); + AS_CHECK(scriptEngine->RegisterObjectProperty("WorldCamera", "Camera camera", asOFFSET(WorldCamera, camera))); + AS_CHECK(scriptEngine->RegisterObjectProperty("WorldCamera", "Transform transform", asOFFSET(WorldCamera, transform))); } void AngelScriptEngine::registerMathFunctions() { @@ -49,7 +49,7 @@ namespace Deer { REGISTER_EXT_OBJECT_CONSTRUCTOR("Transform", "void f()", StudioAPI::transform_construct); REGISTER_EXT_OBJECT_CONSTRUCTOR("Camera", "void f()", StudioAPI::camera_construct); - REGISTER_EXT_OBJECT_CONSTRUCTOR("SceneCamera", "void f()", StudioAPI::sceneCamera_Construct); + REGISTER_EXT_OBJECT_CONSTRUCTOR("WorldCamera", "void f()", StudioAPI::sceneCamera_Construct); REGISTER_EXT_OBJECT_METHOD("Transform", "vec3 relative(vec3)", StudioAPI::transform_relative); } diff --git a/DeerStudio/src/DeerStudio/DeerStudio.cpp b/DeerStudio/src/DeerStudio/DeerStudio.cpp index ef5559c..e1a9202 100644 --- a/DeerStudio/src/DeerStudio/DeerStudio.cpp +++ b/DeerStudio/src/DeerStudio/DeerStudio.cpp @@ -2,8 +2,8 @@ #include "DeerStudio/AngelScriptEngine.h" #include "DeerRender/DataStore.h" -#include "DeerRender/Scene.h" #include "DeerRender/Tools/Path.h" +#include "DeerRender/World.h" #include "DeerRender/Application.h" @@ -44,7 +44,7 @@ namespace Deer { AngelScriptEngine::deinitialize(); RenderUtils::deinitializeRenderUtils(); - Scene::clear(); + World::clear(); Application::shutdownWindow(); Log::shutdown(); diff --git a/DeerStudio/src/DeerStudio/StudioAPI/Entity.cpp b/DeerStudio/src/DeerStudio/StudioAPI/Entity.cpp index d4a2a05..0d966b4 100644 --- a/DeerStudio/src/DeerStudio/StudioAPI/Entity.cpp +++ b/DeerStudio/src/DeerStudio/StudioAPI/Entity.cpp @@ -2,14 +2,14 @@ #include "DeerStudio/AngelScriptEngine.h" #include "DeerRender/Components.h" -#include "DeerRender/Enviroment.h" -#include "DeerRender/Scene.h" +#include "DeerRender/EntityEnviroment.h" +#include "DeerRender/World.h" #include "DeerRender/Resource.h" #include -#define GET_ENV(env) ((env < 0) ? Scene::environment : Deer::Resource::unsafeFromId(environmentId).getData()) +#define GET_ENV(env) ((env < 0) ? World::environment : Deer::Resource::unsafeFromId(environmentId).getData()) #define GET_ENTITY(env, id) GET_ENV(env).getEntity(id) #define GET_MESH_COMPONENT(env, id) \ @@ -48,7 +48,7 @@ namespace Deer { EntityEnvironment* EntityHandleStruct::getEntityEntityEnvironment() { if (environmentId < 0) - return &Scene::environment; + return &World::environment; return &Resource::unsafeFromId(environmentId).getData(); } @@ -93,7 +93,7 @@ namespace Deer { bool EntityStruct::exists() { ASSERT_ENTITY("exists()", return false); - return Scene::environment.entityExists(entityId); + return World::environment.entityExists(entityId); } void EntityStruct::setParent(EntityHandleStruct parent_struct) { @@ -198,7 +198,7 @@ namespace Deer { EntityEnvironment* env; if (environmentId < 0) - env = &Scene::environment; + env = &World::environment; else env = &Resource::unsafeFromId(environmentId).getData(); diff --git a/DeerStudio/src/DeerStudio/StudioAPI/Environment.cpp b/DeerStudio/src/DeerStudio/StudioAPI/EntityEnvironment.cpp similarity index 87% rename from DeerStudio/src/DeerStudio/StudioAPI/Environment.cpp rename to DeerStudio/src/DeerStudio/StudioAPI/EntityEnvironment.cpp index 7080a7f..fcc458f 100644 --- a/DeerStudio/src/DeerStudio/StudioAPI/Environment.cpp +++ b/DeerStudio/src/DeerStudio/StudioAPI/EntityEnvironment.cpp @@ -1,27 +1,27 @@ -#include "DeerRender/Enviroment.h" +#include "DeerRender/EntityEnviroment.h" #include "DeerRender/Resource.h" -#include "DeerRender/Scene.h" #include "DeerRender/Tools/Memory.h" +#include "DeerRender/World.h" #include "DeerStudio/StudioAPI/EntityEnvironment.h" #include "DeerRender/FrameBuffer.h" -#include "DeerRender/Scene.h" +#include "DeerRender/World.h" #include namespace Deer { namespace StudioAPI { // The first element has to allways point to the main scene env - std::vector environments{&Scene::environment}; + std::vector environments{&World::environment}; - void EntityEnvironmentStruct::render(FrameBufferHandleStruct frameBuffer_handle, SceneCamera& sc) { + void EntityEnvironmentStruct::render(FrameBufferHandleStruct frameBuffer_handle, WorldCamera& sc) { Resource frameBufferResource = Resource::unsafeFromId(frameBuffer_handle.frameBufferId); FrameBuffer& frameBuffer = frameBufferResource.getData(); EntityEnvironment* envPtr = nullptr; if (environmentId < 0) { - envPtr = &Scene::environment; + envPtr = &World::environment; } else { Resource environmentResource = Resource::unsafeFromId(environmentId); envPtr = &environmentResource.getData(); diff --git a/DeerStudio/src/DeerStudio/StudioAPI/Math.cpp b/DeerStudio/src/DeerStudio/StudioAPI/Math.cpp index e86d53e..cb489e6 100644 --- a/DeerStudio/src/DeerStudio/StudioAPI/Math.cpp +++ b/DeerStudio/src/DeerStudio/StudioAPI/Math.cpp @@ -49,8 +49,8 @@ namespace Deer { void camera_construct(CameraComponent* mem) { new (mem) CameraComponent(); } - void sceneCamera_Construct(SceneCamera* mem) { - new (mem) SceneCamera(); + void sceneCamera_Construct(WorldCamera* mem) { + new (mem) WorldCamera(); } } // namespace StudioAPI diff --git a/Editor/Modules/Previewer/MeshPreview.as b/Editor/Modules/Previewer/MeshPreview.as index a0ee1ca..e821962 100644 --- a/Editor/Modules/Previewer/MeshPreview.as +++ b/Editor/Modules/Previewer/MeshPreview.as @@ -1,6 +1,6 @@ class RenderService : Service { EntityEnvir nment env; - SceneCamera sceneCamera; + WorldCamera sceneCamera; MeshComponent meshC; Entity child; diff --git a/Editor/Modules/Viewport/Viewport.as b/Editor/Modules/Viewport/Viewport.as index 825ddc3..65a3f02 100644 --- a/Editor/Modules/Viewport/Viewport.as +++ b/Editor/Modules/Viewport/Viewport.as @@ -1,6 +1,6 @@ class ViewportPanel : Panel { FrameBuffer frameBuffer; - SceneCamera sceneCamera; + WorldCamera sceneCamera; EntityEnvir nment mainEnv; float pitch = 0;