testing builds

turanszkij · Jan 20, 2025 · 94b56be · 94b56be
1 parent 03958b5
commit 94b56be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 138 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -8,145 +8,13 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  UPX_VERSION: 4.2.4
+  CCACHE_VERSION: 4.10.2
 
 jobs:
-
-  windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Initial compile
-      shell: cmd
-      run: |
-        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:OfflineShaderCompiler /m /p:Configuration=Release /p:Platform=x64
-
-    - name: Generate shader dump
-      shell: cmd
-      run: |
-        cd "WickedEngine"
-        "../BUILD/x64/Release/OfflineShaderCompiler/OfflineShaderCompiler.exe" hlsl6 spirv shaderdump strip_reflection
-
-    - name: Recompile with shader dump
-      shell: cmd
-      run: |
-        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:clean /m /p:Configuration=Release /p:Platform=x64
-        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:Editor_Windows /m /p:Configuration=Release /p:Platform=x64
-
-    - name: Move files
-      shell: cmd
-      run: |
-        move BUILD\x64\Release\Editor_Windows\Editor_Windows.exe .\
-        move Editor\config.ini .\
-        move Editor\startup.lua .\
-        move Editor\languages .\
-        move Editor\fonts .\
-
-    - name: Install official UPX
-      shell: cmd
-      run: |
-        curl -sOSL https://github.com/upx/upx/releases/download/v%UPX_VERSION%/upx-%UPX_VERSION%-win64.zip
-        unzip -qj upx-%UPX_VERSION%-win64.zip upx-%UPX_VERSION%-win64/upx.exe
-
-    - name: Compress Editor with UPX
-      shell: cmd
-      run: upx --best Editor_Windows.exe
-
-    - name: Package Editor
-      uses: actions/upload-artifact@v4
-      with:
-        name: Editor (Windows)
-        path: |
-          languages/
-          fonts/
-          config.ini
-          startup.lua
-          Editor_Windows.exe
-
-
-  linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Restore CCache database
-      id: restore-ccache
-      uses: actions/cache/restore@v4
-      with:
-        path: ~/.cache/ccache
-        key: ccache-${{ github.run_id }}
-        restore-keys: ccache
-
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt install libsdl2-dev ccache
-
-    - name: Initial compile
-      run: |
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        CCACHE_NODIRECT=1 make -j$(nproc)
-
-    - name: Generate shader dump
-      run: |
-        cd build/WickedEngine
-        ./offlineshadercompiler spirv rebuild shaderdump
-        mv wiShaderDump.h ../../WickedEngine/
-
-    - name: Recompile with shader dump
-      run: |
-        cd build
-        CCACHE_NODIRECT=1 make -B -j $(nproc)
-
-    - name: Save Ccache database
-      id: save-ccache
-      if: always() && steps.restore-ccache.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ~/.cache/ccache
-        key: ${{ steps.restore-ccache.outputs.cache-primary-key }}
-
-    - name: Move binaries
-      run: |
-        mv build/Editor/WickedEngineEditor ./Editor_Linux
-        mv Editor/config.ini ./
-        mv Editor/startup.lua ./
-        mv Editor/languages ./
-        mv Editor/fonts ./
-
-    - name: Install official UPX
-      run: |
-        curl -sOSL https://github.com/upx/upx/releases/download/v$UPX_VERSION/upx-$UPX_VERSION-amd64_linux.tar.xz
-        tar xf upx-$UPX_VERSION-amd64_linux.tar.xz upx-$UPX_VERSION-amd64_linux/upx
-
-    - name: Compress Editor with UPX
-      run: upx-$UPX_VERSION-amd64_linux/upx --best Editor_Linux
-
-    - name: Package Editor
-      uses: actions/upload-artifact@v4
-      with:
-        name: Editor (Linux)
-        path: |
-          languages/
-          fonts/
-          config.ini
-          startup.lua
-          Editor_Linux
-
-
-  content:
+  test:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Package Content
-      uses: actions/upload-artifact@v4
-      with:
-        name: Content
-        path: |
-          Content/Documentation
-          Content/models
-          Content/scripts
-          Content/terrain
+    - run: |
+        curl -sOSL https://github.com/ccache/ccache/releases/download/v$Env:CCACHE_VERSION/ccache-$Env:CCACHE_VERSION-windows-x86_64.zip
+        unzip -qj ccache-$Env:CCACHE_VERSION-windows-x86_64.zip ccache.exe
+        dir ccache.exe
diff --git a/Editor/config.ini b/Editor/config.ini
@@ -20,6 +20,7 @@ physics = true
 grid_helper = true
 language = English
 
+focus_mode = true
 [hotkeys]
 #Formatting CTRL+KEY, SHIFT+KEY, CTRL+SHIFT+KEY <- KEY means nothing just replace with an actual key
 #[The keys that have CTRL+SHIFT in them require those keys otherwise it wont work, case sensitive.]
@@ -139,3 +140,4 @@ options.width = 338.000000
 options.height = 500.000000
 components.width = 338.000000
 components.height = 500.000000
+entities.height = 300.000000