Merged mesh factory branch to main (#64)

engine3d-dev · Nov 23, 2024 · 7e62ed9 · 7e62ed9
1 parent bdf645a
commit 7e62ed9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/TestApp/CMakeLists.txt b/TestApp/CMakeLists.txt
@@ -43,4 +43,7 @@ build_demos(
 
 
     LINK_LIBRARIES engine3d
-)
+)
+
+target_include_directories(${PROJECT_NAME} PUBLIC ./)
+target_include_directories(${PROJECT_NAME} PRIVATE ../)
diff --git a/TestApp/Scenes/Assets/Components/Bodies/BodyContainer.hpp b/TestApp/Scenes/Assets/Components/Bodies/BodyContainer.hpp
@@ -1,3 +1,4 @@
+// #include <engine3d/Physics/JoltHandler.hpp>
 #include <engine3d/Physics/JoltHandler.hpp>
 // Jolt Includes
 class BodyContainer

diff --git a/TestApp/src/Scenes/Assets/Components/Graphics/SpriteRender3D.cpp b/TestApp/src/Scenes/Assets/Components/Graphics/SpriteRender3D.cpp
@@ -1,7 +1,7 @@
 #include <Scenes/Assets/Components/Graphics/SpriteRender3D.hpp>
-// #include "Scene"
-
+#include <Core/SceneManagment/SceneObjects/SceneObject.hpp>
 using namespace engine3d;
+
   const int Radius = 1;
   const int SectorCount = 10;
   const int StackCount = 10;

diff --git a/TestApp/src/Scenes/Assets/Components/Physics/PhysicsBody3D.cpp b/TestApp/src/Scenes/Assets/Components/Physics/PhysicsBody3D.cpp
@@ -1,7 +1,9 @@
+// #include <Scenes/Assets/Components/Physics/PhysicsBody3D.hpp>
 #include <Scenes/Assets/Components/Physics/PhysicsBody3D.hpp>
 #include <Jolt/Physics/Body/BodyCreationSettings.h>
 #include <Jolt/Physics/Body/BodyID.h>
 #include <glm/fwd.hpp>
+#include <Core/SceneManagment/SceneObjects/SceneObject.hpp>
 using namespace engine3d;
 
 PhysicsBody3D::PhysicsBody3D(BodyContainer * p_bodyCon)

diff --git a/TestApp/src/Scenes/Assets/Components/testComp.cpp b/TestApp/src/Scenes/Assets/Components/testComp.cpp
@@ -8,7 +8,7 @@
 #include <engine3d/Core/Event/KeyCodes.hpp>
 #include <engine3d/Core/TimeManagement/UpdateManagers/SyncUpdateManager.hpp>
 #include <Scenes/Assets/Components/testComp.hpp>
-// #include "Scene"
+#include <Core/SceneManagment/SceneObjects/SceneObject.hpp>
 
 using namespace engine3d;
     void testComp::OnIntegrate()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,8 +8,8 @@ set(VULKAN_SHADERS_INCLUDE_DIR ${VULKAN_INCLUDE_DIR}/Shaders)
 set(VULKAN_SHADERS_SRC_DIR ${VULKAN_SRC_DIR}/Shaders)
 
 
-build_library(
-    SOURCES
+add_library(
+    ${PROJECT_NAME}
     ${ENGINE_SRC_DIR}/Core/ApplicationInstance.cpp
 
     ${ENGINE_INCLUDE_NAME}/Core/EngineLogger.hpp

diff --git a/src/engine3d/Core/SceneManagment/Components/GameComponent.cpp b/src/engine3d/Core/SceneManagment/Components/GameComponent.cpp
@@ -1,4 +1,5 @@
 #include <Core/SceneManagment/Components/GameComponent.hpp>
+#include <Core/SceneManagment/SceneObjects/SceneObject.hpp>
 
 namespace engine3d
 {