Develop

.clang-format

@@ -70,7 +70,7 @@ NamespaceIndentation: All
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: false
 PenaltyBreakAssignment: '0'
-PointerAlignment: Right
+PointerAlignment: Left
 SortIncludes: 'true'
 SortUsingDeclarations: 'true'
 SpaceAfterTemplateKeyword: 'false'

.github/workflows/AutoMerger.yml

@@ -0,0 +1,28 @@
+name: Automerge
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+
+env:
+  MY_REPO: https://Arthapz:${{secrets.GITHUB_TOKEN}}@github.com/TapzCrew/StormKit.git
+  MY_BRANCH: develop
+
+  MASTER_REPO: https://github.com/TapzCrew/StormKit.git
+  MASTER_BRANCH: main
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Merge with master
+      run: |
+        git clone ${{env.MY_REPO}} -b ${{env.MY_BRANCH}} tmp
+        cd tmp
+        git config user.name "Automerge Bot"
+        git config user.email "arthur.laurent4@gmail.com"
+        git config pull.rebase false
+        git pull ${{env.MASTER_REPO}} ${{env.MASTER_BRANCH}}
+        git push
+

.github/workflows/Linux.yml

@@ -13,6 +13,18 @@ on:
       - 'LICENSE'
       - 'README.md'
 
+  push:
+    branches: [develop]
+    paths-ignore:
+      - '.github/workflows/Windows-MSVC.yml'
+      - '.github/workflows/Linux.yml'
+      - '.github/workflows/macOS.yml'
+      - '.github/workflows/iOS.yml'
+      - '.github/workflows/Android.yml'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'README.md'
+
 jobs:
   build:
     name: ${{ matrix.os }}-x64 ( ${{ matrix.kind }}-${{ matrix.mode }} )
@@ -48,30 +60,30 @@ jobs:
           xmake-version: branch@dev
           actions-cache-folder: .xmake-cache-${{ steps.cache_key.outputs.key }}
 
-      - name: Update xmake repository
-        run: xmake repo -vD --update
+      - name: Update xmake to patched xmake
+        run: xmake update -s https://github.com/Arthapz/xmake.git#modules
 
       - name: Retrieve dependencies hash
         id: dep_hash
         run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_OUTPUT
 
       - name: Retrieve cached xmake dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
           key: ${{ matrix.os }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.cache_key.outputs.key }}
 
       - name: Configure & Build
         id: build
         run: |
-          xmake f -vD --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --enable_examples=y --enable_tests=y --enable_gpu=n --libc++=y --toolchain=llvm --mold=y --sdk=/opt/llvm-git/usr --ldflags="-L/opt/llvm-git/usr/lib" --shflags="-L/opt/llvm-git/usr/lib"
-          xmake b -vD
+          xmake f -v --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --mold=y --runtimes="c++_shared" --sdk="/opt/llvm-git/usr"
+          xmake b -v
 
       - name: Tests
-        run: LD_LIBRARY_PATH="/opt/llvm-git/usr/lib" xmake test -vD
+        run: LD_LIBRARY_PATH="/opt/llvm-git/usr/lib" xmake test -v
 
       - name: Installation
-        run: xmake install -vD --installdir="${{ runner.workspace }}/output"
+        run: xmake install -v --installdir="${{ runner.workspace }}/output"
 
       - name: Upload artifacts
         id: upload

.github/workflows/Windows-LLVM.yml

@@ -13,6 +13,19 @@ on:
       - 'LICENSE'
       - 'README.md'
 
+  push:
+    branches: [develop]
+    paths-ignore:
+      - '.github/workflows/Windows-MSVC.yml'
+      - '.github/workflows/Linux.yml'
+      - '.github/workflows/macOS.yml'
+      - '.github/workflows/iOS.yml'
+      - '.github/workflows/Android.yml'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'README.md'
+
+
 jobs:
   build:
     name: ${{ matrix.os }}-LLVM-${{ matrix.arch }} ( ${{ matrix.kind }}-${{ matrix.mode }} )
@@ -49,22 +62,25 @@ jobs:
 
       - name: Cache LLVM
         id: cache_llvm
-        uses: actions/cache@v3.2.2
+        uses: actions/cache@v4
         with:
           path: ${{ runner.workspace }}/StormKit/llvm/
           key: ${{ matrix.os }}-llvm
+          save-always: true
           restore-keys: |
             ${{ matrix.os }}-llvm
 
       - name: Download and Uncompress LLVM
         if: ${{ steps.cache_llvm.outputs.cache-hit != 'true' }}
         run: |
-          C:/msys64/usr/bin/wget 'https://github.com/Arthapz/llvm-patched/raw/main/windows/llvm-x64.7z'
-          7z x llvm-x64.7z
-          rm llvm-x64.7z
+          C:/msys64/usr/bin/wget 'https://github.com/Arthapz/llvm-prebuilt/raw/main/Windows/llvm.7z.001'
+          C:/msys64/usr/bin/wget 'https://github.com/Arthapz/llvm-prebuilt/raw/main/Windows/llvm.7z.002'
+          7z x llvm.7z.001
+          rm llvm.7z.001
+          rm llvm.7z.002
 
       - name: Set xmake env
-        run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $env:GITHUB_ENV
+        run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Install xmake
         uses: xmake-io/github-action-setup-xmake@v1
@@ -73,35 +89,35 @@ jobs:
           actions-cache-folder: .xmake-cache-${{ steps.cache_key.outputs.key }}
 
       - name: Update xmake to patched xmake
-        run: xmake update -s https://github.com/Arthapz/xmake.git#modules
+        run: xmake update -s --integrate github:Arthapz/xmake#modules
+
+      - name: Update xmake repository
+        run: xmake repo --update -v
 
-      # - name: Update xmake repository
-      #   run: xmake repo --update
-      #
       - name: Retrieve dependencies hash
         id: dep_hash
-        run: echo "hash=$(xmake l utils.ci.packageskey)" >> $env:GITHUB_OUTPUT
+        run: echo "hash=$(xmake l utils.ci.packageskey)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
 
       - name: Retrieve cached xmake dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
           key: ${{ matrix.os }}-LLVM-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.cache_key.outputs.key }}
 
       - name: Configure & Build
         id: build_llvm
         run: |
-          xmake f -vD --yes -a ${{ matrix.arch }}  -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --enable_examples=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm/" --runtimes="c++_shared"
-          xmake b -vD
+          xmake f -v --yes -a ${{ matrix.arch }}  -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --examples=y --tests=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm/" --runtimes="c++_shared"
+          xmake b -v
 
       - name: Tests
         run: |
           cp "${{ runner.workspace }}/StormKit/llvm/lib/c++.dll" "${{ runner.workspace }}/StormKit/build/windows/${{ matrix.arch }}/${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }}/"
-          xmake test -vD
+          xmake test -v
 
       - name: Installation
         run: |
-          xmake install -vD --installdir="${{ runner.workspace }}/output"
+          xmake install -v --installdir="${{ runner.workspace }}/output"
           cp "${{ runner.workspace }}/StormKit/llvm/lib/c++.dll" "${{ runner.workspace }}/output/bin/"
           rmdir /s /q "StormKit"
 

.github/workflows/macOS.yml

@@ -13,6 +13,18 @@ on:
       - 'LICENSE'
       - 'README.md'
 
+  push:
+    branches: [develop]
+    paths-ignore:
+      - '.github/workflows/Windows-MSVC.yml'
+      - '.github/workflows/Linux.yml'
+      - '.github/workflows/macOS.yml'
+      - '.github/workflows/iOS.yml'
+      - '.github/workflows/Android.yml'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'README.md'
+
 jobs:
   build:
     name: ${{ matrix.os }}-x64 ( ${{ matrix.kind }}-${{ matrix.mode }} )
@@ -41,13 +53,21 @@ jobs:
 
       - name: Cache LLVM
         id: cache_llvm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ${{ runner.workspace }}/StormKit/llvm
+          path: ${{ runner.workspace }}/StormKit/llvm-minified
           key: ${{ matrix.os }}-llvm
+          save-always: true
           restore-keys: |
             ${{ matrix.os }}-llvm
 
+      - name: Download and Uncompress LLVM
+        if: ${{ steps.cache_llvm.outputs.cache-hit != 'true' }}
+        run: |
+          wget 'https://github.com/Arthapz/llvm-prebuilt/raw/main/macOS/llvm.7z.001'
+          7z x llvm.7z.001
+          rm llvm.7z.001
+
       - name: Set xmake env
         run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
 
@@ -57,37 +77,33 @@ jobs:
           xmake-version: branch@dev
           actions-cache-folder: .xmake-cache-${{ steps.cache_key.outputs.key }}
 
+      - name: Update xmake to patched xmake
+        run: xmake update -s https://github.com/Arthapz/xmake.git#modules
+
       - name: Update xmake repository
-        run: xmake repo -vD --update
+        run: xmake repo --update -v
 
       - name: Retrieve dependencies hash
         id: dep_hash
         run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_OUTPUT
 
       - name: Retrieve cached xmake dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
           key: macOS-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.cache_key.outputs.key }}
 
-      - name: Download and Uncompress LLVM
-        if: ${{ steps.cache_llvm.outputs.cache-hit != 'true' }}
-        run: |
-          wget 'http://86.221.35.29:1337/llvm-macos.7z'
-          7z x llvm-macos.7z
-          rm llvm-macos.7z
-
       - name: Configure & Build
         id: build
         run: |
-          xmake f -vD --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --enable_examples=y --enable_tests=y --enable_gpu=n --libc++=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm/" --ldflags="-L${{ runner.workspace }}/StormKit/llvm/lib" --shflags="-L${{ runner.workspace }}/StormKit/llvm/lib"
-          xmake b -vD
+          xmake f -v --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm-minified/" --runtimes="c++_shared"
+          xmake b -v
 
       - name: Tests
-        run: DYLD_LIBRARY_PATH="${{ runner.workspace }}/StormKit/llvm/lib" xmake test -vD
+        run: DYLD_LIBRARY_PATH="${{ runner.workspace }}/StormKit/llvm/lib" xmake test -v
 
       - name: Installation
-        run: xmake install -vD --installdir="${{ runner.workspace }}/output"
+        run: xmake install -v --installdir="${{ runner.workspace }}/output"
 
       - name: Upload artifacts
         id: upload

examples/engine/triangle/src/Constants.mpp

@@ -13,7 +13,6 @@ import std;
 import stormkit.Core;
 import stormkit.Log;
 
-
 export {
     struct Vertex {
         stormkit::core::math::Vector2F position;

examples/engine/triangle/src/main.cpp

@@ -11,25 +11,27 @@ import stormkit.Wsi;
 
 import App;
 
-#include <stormkit/Main/MainMacro.hpp>
 #include <stormkit/Core/PlatformMacro.hpp>
+#include <stormkit/Main/MainMacro.hpp>
 
 ////////////////////////////////////////
 ////////////////////////////////////////
 auto main(std::span<const std::string_view> args) -> int {
     using namespace stormkit;
 
+    stormkit::core::printStacktrace();
+
     wsi::parseArgs(args);
     // core::setupSignalHandler();
 
     auto logger = log::Logger::createLoggerInstance<log::ConsoleLogger>();
-    logger.ilog("Using StormKit {}.{}.{} (branch: {}, commit_hash: {}), built with {}",
-         core::STORMKIT_MAJOR_VERSION,
-         core::STORMKIT_MINOR_VERSION,
-         core::STORMKIT_PATCH_VERSION,
-         core::STORMKIT_GIT_BRANCH,
-         core::STORMKIT_GIT_COMMIT_HASH,
-         STORMKIT_COMPILER);
+    logger.ilog("Using StormKit {}.{}.{}\n    branch: {}\n    commit_hash: {}\n    built with {}",
+                core::STORMKIT_MAJOR_VERSION,
+                core::STORMKIT_MINOR_VERSION,
+                core::STORMKIT_PATCH_VERSION,
+                core::STORMKIT_GIT_BRANCH,
+                core::STORMKIT_GIT_COMMIT_HASH,
+                STORMKIT_COMPILER);
 
     try {
         auto app = App {};

examples/engine/triangle/xmake.lua

@@ -1,28 +1,28 @@
--- add_requires("nzsl", { configs = { fs_watcher = false } })
---
--- target("triangle")
--- do
--- 	set_kind("binary")
--- 	set_languages("cxxlatest", "clatest")
---
--- 	-- add_rules("@nzsl/compile.shaders")
--- 	add_rules("compile.shaders")
--- 	add_deps("stormkit-core", "stormkit-main", "stormkit-log", "stormkit-wsi", "stormkit-engine")
---
--- 	if is_mode("debug") then
--- 		add_defines("STORMKIT_BUILD_DEBUG")
--- 		add_defines("STORMKIT_ASSERT=1")
--- 		set_suffixname("-d")
--- 	else
--- 		add_defines("STORMKIT_ASSERT=0")
--- 	end
---
--- 	add_files("src/*.cpp")
--- 	add_files("src/*.mpp")
--- 	add_files("shaders/*.nzsl")
--- 	if is_plat("windows") then
--- 		add_files("win32/*.manifest")
--- 	end
---
--- 	set_group("examples/stormkit-engine")
--- end
+add_requires("nzsl", { configs = { runtimes = "", fs_watcher = false } })
+
+target("triangle")
+do
+	set_kind("binary")
+	set_languages("cxxlatest", "clatest")
+
+	-- add_rules("@nzsl/compile.shaders")
+	add_rules("compile.shaders")
+	add_deps("stormkit-core", "stormkit-main", "stormkit-log", "stormkit-wsi", "stormkit-engine")
+
+	if is_mode("debug") then
+		add_defines("STORMKIT_BUILD_DEBUG")
+		add_defines("STORMKIT_ASSERT=1")
+		set_suffixname("-d")
+	else
+		add_defines("STORMKIT_ASSERT=0")
+	end
+
+	add_files("src/*.cpp")
+	add_files("src/*.mpp")
+	add_files("shaders/*.nzsl")
+	if is_plat("windows") then
+		add_files("win32/*.manifest")
+	end
+
+	set_group("examples/stormkit-engine")
+end