Josh update branch (#63)

* Josh update branch (#58) * build: successful editor build * Pushing MeshChanges * Changed and fixed the cmake list. Changed vulkan model, spriterenderer3d(unfinished) --------- Co-authored-by: Josh Aponte <[email protected]> Co-authored-by: ZacharyH777 <[email protected]> Co-authored-by: Aaron <[email protected]>
engine3d-dev · Nov 23, 2024 · bdf645a · bdf645a
1 parent cd5c380
commit bdf645a
Show file tree

Hide file tree

Showing 31 changed files with 307 additions and 368 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,4 +6,4 @@ set(ENGINE_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/engine3d)
 
 build_library(
     DIRECTORIES src Editor TestApp
-)
+)
diff --git a/TestApp/CMakeLists.txt b/TestApp/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.25)
 project(TestApp CXX)
 
-set(SCENE_TEST_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/SceneTest)
-
 build_demos(
     SOURCES
     Application.cpp
@@ -30,8 +28,19 @@ build_demos(
     Scenes/Assets/SceneInstances/ShowCaseSceneInstance.hpp
     src/Scenes/Assets/SceneInstances/ShowCaseSceneInstance.cpp
 
-    LINK_LIBRARIES engine3d
-)
+    #Graphics
+    Scenes/Assets/Components/Graphics/SpriteRender3D.hpp
+    src/Scenes/Assets/Components/Graphics/SpriteRender3D.cpp
 
-# target_include_directories(${PROJECT_NAME} PUBLIC ${SCENE_TEST_INCLUDE_DIR})
-target_include_directories(${PROJECT_NAME} PUBLIC ./ ../)
+    #Graphics Meshes ChildrenMeshes
+    Scenes/Assets/Components/Graphics/Meshes/ChildrenMeshes/CubeMesh.hpp
+    src/Scenes/Assets/Components/Graphics/Meshes/ChildrenMeshes/CubeMesh.cpp
+    Scenes/Assets/Components/Graphics/Meshes/ChildrenMeshes/SphereMesh.hpp
+    # src/Scenes/Assets/Components/Graphics/Meshes/ChildrenMeshes/SphereMesh.cpp
+    src/Scenes/Assets/Components/Graphics/Meshes/ChildrenMeshes/SphereMesh.cpp
+    Scenes/Assets/Components/Graphics/Meshes/MeshContainer.hpp
+    src/Scenes/Assets/Components/Graphics/Meshes/MeshContainer.cpp
+
+
+    LINK_LIBRARIES engine3d
+)
diff --git a/TestApp/SceneTest/Scenes/Assets/Components/Bodies/BodyContainer.hpp b/TestApp/SceneTest/Scenes/Assets/Components/Bodies/BodyContainer.hpp
diff --git a/TestApp/SceneTest/Scenes/Assets/Components/Bodies/Shapes/BoxShaper.hpp b/TestApp/SceneTest/Scenes/Assets/Components/Bodies/Shapes/BoxShaper.hpp
diff --git a/TestApp/SceneTest/Scenes/Assets/Components/Bodies/Shapes/SphereShaper.hpp b/TestApp/SceneTest/Scenes/Assets/Components/Bodies/Shapes/SphereShaper.hpp
diff --git a/TestApp/SceneTest/Scenes/Assets/Components/Physics/PhysicsBody3D.hpp b/TestApp/SceneTest/Scenes/Assets/Components/Physics/PhysicsBody3D.hpp
diff --git a/TestApp/SceneTest/Scenes/Assets/Components/testComp.hpp b/TestApp/SceneTest/Scenes/Assets/Components/testComp.hpp
diff --git a/TestApp/SceneTest/Scenes/Assets/SceneInstances/ShowCaseSceneInstance.hpp b/TestApp/SceneTest/Scenes/Assets/SceneInstances/ShowCaseSceneInstance.hpp
diff --git a/TestApp/SceneTest/src/Scenes/Assets/Components/Bodies/BodyContainer.cpp b/TestApp/SceneTest/src/Scenes/Assets/Components/Bodies/BodyContainer.cpp
diff --git a/TestApp/SceneTest/src/Scenes/Assets/Components/Bodies/Shapes/BoxShaper.cpp b/TestApp/SceneTest/src/Scenes/Assets/Components/Bodies/Shapes/BoxShaper.cpp
diff --git a/TestApp/SceneTest/src/Scenes/Assets/Components/Bodies/Shapes/SphereShaper.cpp b/TestApp/SceneTest/src/Scenes/Assets/Components/Bodies/Shapes/SphereShaper.cpp
diff --git a/TestApp/SceneTest/src/Scenes/Assets/Components/Physics/PhysicsBody3D.cpp b/TestApp/SceneTest/src/Scenes/Assets/Components/Physics/PhysicsBody3D.cpp
diff --git a/TestApp/SceneTest/src/Scenes/Assets/Components/testComp.cpp b/TestApp/SceneTest/src/Scenes/Assets/Components/testComp.cpp
diff --git a/TestApp/SceneTest/src/Scenes/Assets/SceneInstances/ShowCaseSceneInstance.cpp b/TestApp/SceneTest/src/Scenes/Assets/SceneInstances/ShowCaseSceneInstance.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ set(ENGINE_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/engine3d) @@
     build_library(
         DIRECTORIES src Editor TestApp
-    )
+    )