merge remote and local changes

CMakeLists.txt

@@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 option(USE_FRAMEBUFFER "Use Linux framebuffer instead of SDL2" OFF)
 
+<<<<<<< HEAD
 set(ENGINE_SOURCES
     src/Asset/ObjLoader.cpp
     src/Asset/SpriteAssetLoader.cpp
@@ -26,6 +27,19 @@ set(ENGINE_SOURCES
     src/Rasterizer/TriangleRasterizer.cpp
     src/Scene/Camera.cpp
     src/Shading/BlinnPhongShader.cpp
+=======
+set(SOURCES
+        src/Apps/Demo/main.cpp
+        src/Gfx/Asset/ObjLoader.cpp
+        src/Gfx/Core/DepthBuffer.cpp
+        src/Gfx/Core/FrameBuffer.cpp
+        src/Gfx/Core/Renderer.cpp
+        src/Gfx/Draw2D/DrawContext.cpp
+        src/Gfx/Rasterizer/Rasterizer.cpp
+        src/Gfx/Rasterizer/TriangleRasterizer.cpp
+        src/Gfx/Scene/Camera.cpp
+        src/Gfx/Shading/BlinnPhongShader.cpp
+>>>>>>> 777ff96602c52c86f03d612bb4213de746f580a5
 )
 
 set(ENGINE_INCLUDE_DIRS
@@ -50,14 +64,30 @@ set(SOURCES
 )
 
 if(USE_FRAMEBUFFER)
-    list(APPEND SOURCES src/Platform/FBDisplay.cpp)
+    list(APPEND SOURCES src/Gfx/Platform/FBDisplay.cpp)
 else()
-    list(APPEND SOURCES src/Platform/SDLDisplay.cpp)
+    list(APPEND SOURCES src/Gfx/Platform/SDLDisplay.cpp)
 endif()
 
 add_executable(IMX6U-Game ${SOURCES})
 
+<<<<<<< HEAD
 target_include_directories(IMX6U-Game PRIVATE ${ENGINE_INCLUDE_DIRS})
+=======
+target_include_directories(IMX6U-Game PRIVATE
+        src/Gfx/Platform
+        src/Gfx/Asset
+        src/Gfx/Core
+        src/Gfx/Draw2D
+        src/Gfx/Math
+        src/Gfx/Rasterizer
+        src/Gfx/RenderData
+        src/Gfx/Scene
+        src/Gfx/Shading
+        assets/font
+        assets/sprite
+)
+>>>>>>> 777ff96602c52c86f03d612bb4213de746f580a5
 
 if(USE_FRAMEBUFFER)
     target_compile_definitions(IMX6U-Game PRIVATE USE_FRAMEBUFFER)