Merge pull request #137 from doodlum/dev

0.7.0

.github/workflows/build.yaml

@@ -1,63 +1,44 @@
-name: build Community Shaders for dist
+name: build Community Shaders and addons
+
 on:
   push:
     tags:
       - 'v*'
   workflow_dispatch:
+
 permissions:
   contents: write
 
 env:
-  VCPKG_COMMIT_ID: 9edb1b8e590cc086563301d735cae4b6e732d2d2
-  CMAKE_BUILD_TYPE: Release
+  VCPKG_COMMIT_ID: d99b6930b920d85dd4e1edbac37ecb3f354185c0
 
 jobs:
   compile:
-    name: build plugin
+    name: build plugin and addons
     runs-on: windows-latest
     steps:
         - uses: actions/checkout@v3
           with:
             submodules: 'true'
-
-        - uses: actions/cache@v3
-          with:
-              path: |
-                  build
-              key: ${{ runner.os }}-cmake-${{ hashFiles('CMakeLists.txt') }}
-              restore-keys: |
-                ${{ runner.os }}-cmake-
-                ${{ runner.os }}-
-                  
+
         - uses: ilammy/[email protected]
 
         - uses: lukka/run-vcpkg@v11
           with:
               vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
-
-        - name: check the stamp file
-          run: cmake -S . --preset=ALL --check-stamp-file "build\CMakeFiles\generate.stamp"
-
-        - name: run cmake to build
-          run: cmake --build build --config Release
 
-        - name: copy build artifacts into place
-          shell: bash
-          run: |
-              mkdir -p CommunityShaders/SKSE/Plugins
-              cp -p build/release/*.dll CommunityShaders/SKSE/Plugins
-              cp -p build/release/*.pdb CommunityShaders/SKSE/Plugins
-              cp -rp package/* CommunityShaders/
+        - name: cmake configure
+          run: cmake -S . --preset=ALL --check-stamp-file "build\CMakeFiles\generate.stamp"
 
-        - name: 7zip compress it
-          run: 7z a "CommunityShaders_${{ github.ref_name }}.7z" ./CommunityShaders
+        - name: cmake build
+          run: cmake --build build --config Release
 
         - name: create a tagged release and upload the archive
           uses: ncipollo/release-action@v1
           env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             name: Community Shaders ${{ github.ref_name }}
-            tag: ${{ github.ref_name }}
             draft: true
-            artifacts: "CommunityShaders_${{ github.ref_name }}.7z"
+            tag: ${{ github.ref_name }}
+            artifacts: "${{ github.workspace }}/dist/*.7z"

.github/workflows/todo.yaml

@@ -0,0 +1,22 @@
+# https://github.com/marketplace/actions/todo-to-issue#todo-to-issue-action
+name: "Run TODO to Issue"
+on:
+    push:
+    workflow_dispatch:
+        inputs:
+            MANUAL_COMMIT_REF:
+                description: "The SHA of the commit to get the diff for"
+                required: true
+            MANUAL_BASE_REF:
+                description: "By default, the commit entered above is compared to the one directly before it; to go back further, enter an earlier SHA here"
+                required: false
+jobs:
+    build:
+        runs-on: "ubuntu-latest"
+        steps:
+            - uses: "actions/checkout@v3"
+            - name: "TODO to Issue"
+              uses: "alstr/todo-to-issue-action@master"
+              env:
+                  MANUAL_COMMIT_REF: ${{ inputs.MANUAL_COMMIT_REF }}
+                  MANUAL_BASE_REF: ${{ inputs.MANUAL_BASE_REF }}

.github/workflows/wip.yaml

@@ -0,0 +1,12 @@
+name: WIP
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  wip:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: wip/action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)
 
 project(
 	CommunityShaders
-	VERSION 0.6.2
+	VERSION 0.7.0
 	LANGUAGES CXX
 )
 
@@ -25,6 +25,7 @@ include(XSEPlugin)
 # #######################################################################################################################
 # # Find dependencies
 # #######################################################################################################################
+find_path(BSHOSHANY_THREAD_POOL_INCLUDE_DIRS "BS_thread_pool.hpp")
 find_package(magic_enum CONFIG REQUIRED)
 find_package(xbyak CONFIG REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
@@ -37,6 +38,7 @@ find_package(pystring CONFIG REQUIRED)
 target_include_directories(
 	${PROJECT_NAME}
 	PRIVATE
+	${BSHOSHANY_THREAD_POOL_INCLUDE_DIRS}
 	${CLIB_UTIL_INCLUDE_DIRS}
 )
 

cmake/AddCXXFiles.cmake

@@ -41,4 +41,21 @@ function(add_cxx_files TARGET)
 		FILES ${SOURCE_FILES})
 
 	target_sources("${TARGET}" PRIVATE ${SOURCE_FILES})
+
+	file(GLOB_RECURSE HLSL_FILES
+		LIST_DIRECTORIES false
+		CONFIGURE_DEPENDS
+		"Features/**/*.hlsl"
+		"Features/**/*.hlsli"
+		"Package/**/*.hlsl"
+		"Package/**/*.hlsli"
+	)
+
+	source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/
+		PREFIX "HLSL Files"
+		FILES ${HLSL_FILES})
+
+	set_source_files_properties(${HLSL_FILES} PROPERTIES VS_TOOL_OVERRIDE "None")
+
+	target_sources("${TARGET}" PRIVATE ${HLSL_FILES})
 endfunction()

cmake/XSEPlugin.cmake

@@ -97,6 +97,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
 			/Zc:trigraphs
 			/Zc:wchar_t
 			/wd4200 # nonstandard extension used : zero-sized array in struct/union
+			/arch:AVX2
 	)
 
 	target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:/fp:strict>")