P0k3rf4ce
diff --git a/‎.github/workflows/manage-pr-on-issue.yml‎
Lines changed: 102 additions & 0 deletions b/‎.github/workflows/manage-pr-on-issue.yml‎
Lines changed: 102 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 16 additions & 1 deletion b/‎.gitignore‎
Lines changed: 16 additions & 1 deletion
diff --git a/‎CMakeLists.txt‎
Lines changed: 143 additions & 31 deletions b/‎CMakeLists.txt‎
Lines changed: 143 additions & 31 deletions
diff --git a/‎CMakePresets.json‎
100644100755
Lines changed: 4 additions & 3 deletions b/‎CMakePresets.json‎
100644100755
Lines changed: 4 additions & 3 deletions
diff --git a/‎README.md‎
Lines changed: 12 additions & 0 deletions b/‎README.md‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎assets/default-2.frag‎
Lines changed: 14 additions & 0 deletions b/‎assets/default-2.frag‎
Lines changed: 14 additions & 0 deletions
@@ -0,0 +1,102 @@
+
+name: Manage issue/PR on review submission
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  merge:
+    if: github.event.review.state == 'approved'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.head_ref }}
+
+    - name: Set up Git
+      run: |
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "actions@github.com"
+
+    - name: merge pr
+      id: merge_pr
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh pr merge --squash ${{ github.event.pull_request.number }}
+
+    - name: close issue
+      id: close_issue
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+
+        # get issue num
+        TITLE="${{ github.event.pull_request.title }}"
+        [[ $TITLE =~ \#([0-9]+) ]]
+        NUM=${BASH_REMATCH[1]}
+
+        # close issue
+        gh issue close $NUM \
+        --reason 'completed' \
+        --comment "Implemented by PR \#${{ github.event.pull_request.number }}"
+
+
+  set_ipr:
+    if: github.event.review.state == 'changes_requested'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.head_ref }}
+
+    - name: Set up Git
+      run: |
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "actions@github.com"
+
+    - name: mark pr as draft
+      id: make_draft
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh pr ready --undo ${{ github.event.pull_request.number }}
+
+    - name: get issue number
+      id: get_issue_num
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        TITLE="${{ github.event.pull_request.title }}"
+        [[ $TITLE =~ \#([0-9]+) ]]
+        NUM=${BASH_REMATCH[1]}
+        echo "ISSUE_NUM=$NUM" >> $GITHUB_ENV
+
+    - name: get issue item id
+      id: get_issue_item_id
+      env:
+        GH_TOKEN: ${{ secrets.EMMY_TOKEN }}
+      run: |
+
+        # get issue item id
+        ID=$(gh project item-list 5 --owner "P0k3rf4ce" --limit 2000 --format json | jq -r \
+                              '.items[] | select(.content.number == ${{ env.ISSUE_NUM }}) | .id')
+        echo "ITEM_ID=$ID" >> $GITHUB_ENV
+
+    - name: move to ipr
+      id: move_to_ipr
+      env:
+        GH_TOKEN: ${{ secrets.EMMY_TOKEN }}
+      run: |
+        gh project item-edit \
+          --project-id "PVT_kwHOBKGPPs4BDYld" \
+          --field-id "PVTSSF_lAHOBKGPPs4BDYldzg1UalY" \
+          --single-select-option-id "47fc9ee4" \
+          --id "${{ env.ITEM_ID }}"
+
+
@@ -8,4 +8,19 @@ run.sh
 build_and_run.sh
 build.sh
 .idea/
-.cmake/
+.cmake/
+test_coverage.sh
+CLAUDE.md
+scripts
+coverage*
+*.log
+*.profraw
+.cache
+shaders/*.spv
+
+
+
+# Experimental/temporary files
+ModelLoader.cpp
+
+imgui.ini
@@ -1,7 +1,6 @@
-# CMakeLists.txt (top of file, BEFORE project())
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.7)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -14,47 +13,160 @@ if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 endif()
 
-add_executable(SauceEngine src/main.cpp)
+set(EXEC_NAME SauceEngine)
+add_executable(${EXEC_NAME} src/main.cpp)
+
+if (!WIN32) 
+  target_compile_options(${EXEC_NAME} PUBLIC -Wall -Wpedantic -Wextra -Wreorder-init-list -g -O2)
+endif()
+
+find_package(Vulkan REQUIRED)
+target_link_libraries(${EXEC_NAME} PUBLIC Vulkan::Vulkan)
+
+find_package(Boost REQUIRED COMPONENTS program_options)
+target_link_libraries(${EXEC_NAME} PUBLIC Boost::program_options)
+
+find_package(glfw3 CONFIG REQUIRED)
+target_link_libraries(${EXEC_NAME} PRIVATE glfw)
+
+find_package(imgui CONFIG REQUIRED)
+target_link_libraries(${EXEC_NAME} PRIVATE imgui::imgui)
+
+find_path(TINYGLTF_INCLUDE_DIRS "tiny_gltf.h")
+target_include_directories(${EXEC_NAME} PRIVATE ${TINYGLTF_INCLUDE_DIRS})
 
 target_include_directories(SauceEngine PRIVATE
   ${PROJECT_SOURCE_DIR}/include
 )
 
-find_package(glad CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE glad::glad)
+file(GLOB_RECURSE UI_COMPONENT_SOURCES
+  "${PROJECT_SOURCE_DIR}/src/app/ui/*.cpp" 
+) 
 
-find_package(glfw3 CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE glfw)
+target_sources(${EXEC_NAME} PRIVATE
+  src/app/modeling/Transform.cpp
+  src/app/modeling/Texture.cpp
+  src/app/modeling/TextureCache.cpp
+  src/app/modeling/Material.cpp
+  src/app/modeling/Mesh.cpp
+  src/app/modeling/ModelNode.cpp
+  src/app/modeling/Model.cpp
+  src/app/modeling/GLTFLoader.cpp
+  src/app/modeling/GLTFExporter.cpp
+  src/app/components/TransformComponent.cpp
+  src/app/components/MeshRendererComponent.cpp
+  src/app/Scene.cpp
+  src/app/ImGuiRenderer.cpp
+  src/app/SauceEngineApp.cpp
+  src/app/IBLGenerator.cpp
+  src/app/ui/ImGuiComponentManager.cpp
+  ${UI_COMPONENT_SOURCES}
+)
 
-find_package(Eigen3 CONFIG REQUIRED NO_MODULE)
-target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen)
+add_subdirectory(${PROJECT_SOURCE_DIR}/shaders)
+# add_dependencies(${EXEC_NAME} shaders)  # Requires slangc; pre-compiled .spv files used instead
 
-find_package(Boost REQUIRED COMPONENTS program_options)
-target_link_libraries(${PROJECT_NAME} PRIVATE Boost::program_options)
+# Model test executable
+add_executable(modeltest src/modeltest.cpp)
+target_include_directories(modeltest PRIVATE ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(modeltest PRIVATE ${TINYGLTF_INCLUDE_DIRS})
 
-find_package(Qt6Widgets CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets)
+if (!WIN32)
+  target_compile_options(modeltest PUBLIC -Wall -Wpedantic -Wextra -Wreorder-init-list -g -O2)
+endif()
 
-# Deploy Qt runtime dependencies (DLLs and plugins)
-if(WIN32)
-    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E echo "Deploying Qt dependencies..."
-        COMMAND Qt6::windeployqt --no-compiler-runtime --no-translations "$<TARGET_FILE:${PROJECT_NAME}>"
-        COMMENT "Running windeployqt to deploy Qt dependencies"
-    )
+target_sources(modeltest PRIVATE
+  src/app/modeling/Transform.cpp
+  src/app/modeling/Texture.cpp
+  src/app/modeling/TextureCache.cpp
+  src/app/modeling/Material.cpp
+  src/app/modeling/Mesh.cpp
+  src/app/modeling/ModelNode.cpp
+  src/app/modeling/Model.cpp
+  src/app/modeling/GLTFLoader.cpp
+)
+
+# We need Vulkan headers (but won't initialize Vulkan)
+target_link_libraries(modeltest PUBLIC Vulkan::Vulkan)
+
+# ModelViewer executable
+add_executable(modelviewer src/modelviewer.cpp)
+
+target_include_directories(modelviewer PRIVATE
+    ${PROJECT_SOURCE_DIR}/include
+    ${TINYGLTF_INCLUDE_DIRS}
+)
+
+if (!WIN32)
+    target_compile_options(modelviewer PUBLIC -Wall -Wpedantic -Wextra -Wreorder-init-list -g -O2)
+endif()
+
+target_sources(modelviewer PRIVATE
+    src/app/ModelViewerRenderer.cpp
+    src/app/modeling/Transform.cpp
+    src/app/modeling/Texture.cpp
+    src/app/modeling/TextureCache.cpp
+    src/app/modeling/Material.cpp
+    src/app/modeling/Mesh.cpp
+    src/app/modeling/ModelNode.cpp
+    src/app/modeling/Model.cpp
+    src/app/modeling/GLTFLoader.cpp
+    src/app/ImGuiRenderer.cpp
+)
+
+target_link_libraries(modelviewer PUBLIC Vulkan::Vulkan)
+target_link_libraries(modelviewer PRIVATE glfw)
+target_link_libraries(modelviewer PRIVATE imgui::imgui)
+
+add_dependencies(modelviewer shaders)
+
+# SauceEditor executable
+add_executable(sauceeditor src/editor/main.cpp)
+
+target_include_directories(sauceeditor PRIVATE
+    ${PROJECT_SOURCE_DIR}/include
+    ${TINYGLTF_INCLUDE_DIRS}
+)
+
+if (!WIN32)
+    target_compile_options(sauceeditor PUBLIC -Wall -Wpedantic -Wextra -Wreorder-init-list -g -O2)
+endif()
+
+file(GLOB_RECURSE EDITOR_SOURCES
+    "${PROJECT_SOURCE_DIR}/src/editor/*.cpp"
+)
+
+target_sources(sauceeditor PRIVATE
+    ${EDITOR_SOURCES}
+    src/app/modeling/Transform.cpp
+    src/app/modeling/Texture.cpp
+    src/app/modeling/TextureCache.cpp
+    src/app/modeling/Material.cpp
+    src/app/modeling/Mesh.cpp
+    src/app/modeling/ModelNode.cpp
+    src/app/modeling/Model.cpp
+    src/app/modeling/GLTFLoader.cpp
+    src/app/modeling/GLTFExporter.cpp
+    src/app/components/TransformComponent.cpp
+    src/app/components/MeshRendererComponent.cpp
+    src/app/Scene.cpp
+    src/app/ImGuiRenderer.cpp
+)
+
+target_link_libraries(sauceeditor PUBLIC Vulkan::Vulkan)
+target_link_libraries(sauceeditor PRIVATE glfw)
+target_link_libraries(sauceeditor PRIVATE imgui::imgui)
+
+# Editor only needs GLSL shaders, not the Slang ones
+if(TARGET editorGridVert)
+  add_dependencies(sauceeditor editorGridVert editorGridFrag editorUnlitVert editorUnlitFrag)
 endif()
 
-add_subdirectory(${PROJECT_SOURCE_DIR}/src/animation)
-add_subdirectory(${PROJECT_SOURCE_DIR}/src/modeling)
-add_subdirectory(${PROJECT_SOURCE_DIR}/src/rendering)
-add_subdirectory(${PROJECT_SOURCE_DIR}/src/shared)
 add_subdirectory(${PROJECT_SOURCE_DIR}/src/launcher)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE launcherLib sharedLib animationLib modelingLib renderingLib)
+target_link_libraries(${EXEC_NAME} PRIVATE launcherLib)
 
-find_package(assimp CONFIG REQUIRED)
-target_link_libraries(modelingLib PRIVATE assimp::assimp)
+if(APPLE)
+    target_link_options(${EXEC_NAME} PRIVATE "LINKER:-no_warn_duplicate_libraries")
+endif()
 
-if (BUILD_TESTS)
-    add_subdirectory(${PROJECT_SOURCE_DIR}/test)
-endif()
 
@@ -1,13 +1,14 @@
 {
-  "version": 2,
+  "version": 3,
   "configurePresets": [
     {
       "name": "vcpkg",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-        "BUILD_TESTS": "ON"      
+        "VCPKG_INSTALLED_DIR": "${sourceDir}/build/vcpkg_installed",
+        "BUILD_TESTS": "OFF"
       }
     }
   ]
-}
+}
@@ -14,6 +14,18 @@ https://cmake.org/download/
 
 download the source distribution and then use the default install settings.
 
+### Step 0.5: Install Vulkan SDK
+
+Download the Vulkan SDK from here: https://vulkan.lunarg.com/sdk/home
+
+After installing, you need to enable the environment variables so CMake and the application can find the Vulkan headers and libraries. 
+
+(For Mac users) Add the following to your shell configuration (e.g., `~/.zshrc` or `~/.bashrc`), replacing the path with your actual installation path and version:
+
+```sh
+source ".../VulkanSDK/<VulkanSDK-version>/setup-env.sh"
+```
+
 ### Step 1: Download and set up vcpkg
 
 Download vcpkg anywhere on your computer (not in our repo):
 
@@ -0,0 +1,14 @@
+#version 330 core
+
+// Input from vertex shader
+in vec3 FragPos;       // Fragment position in world space
+in vec3 Normal;        // Fragment normal in world space
+in vec2 TexCoord;      // Texture coordinates
+
+// Output color
+out vec4 FragColor;
+
+void main()
+{
+    FragColor = vec4(1.0, 1.0, 1.0, 1.0);
+}
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`{`
`2`		`- "version": 2,`
	`2`	`+ "version": 3,`
`3`	`3`	`"configurePresets": [`
`4`	`4`	`{`
`5`	`5`	`"name": "vcpkg",`
`6`	`6`	`"binaryDir": "${sourceDir}/build",`
`7`	`7`	`"cacheVariables": {`
`8`	`8`	`"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",`
`9`		`- "BUILD_TESTS": "ON"`
	`9`	`+ "VCPKG_INSTALLED_DIR": "${sourceDir}/build/vcpkg_installed",`
	`10`	`+ "BUILD_TESTS": "OFF"`
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`	`]`
`13`		`-}`
	`14`	`+}`