Merge branch 'development' into browncoat-lmg

Author: pawnishoovy

.github/parameters/macports.yml

@@ -12,4 +12,5 @@ ports:
   - name: luajit
   - name: flac
   - name: dylibbundler
-  - name: tree
+  - name: tree
+  - name: ccache

.github/workflows/clang-format.yml

@@ -31,11 +31,15 @@ jobs:
       - uses: actions/setup-python@v3
 
       - name: Install dependencies
-        run: sudo apt-get install -y clang-format
+        run: |
+          mkdir bin
+          wget https://github.com/muttleyxd/clang-tools-static-binaries/releases/download/master-8f72ab3c/clang-format-17_linux-amd64 -O bin/clang-format-17
+          chmod +x bin/clang-format-17
 
       - name: Run clang-format
         run: |
             .github/scripts/run-clang-format.py \
+                --clang-format-executable bin/clang-format-17 \
                 -i \
                 -r Source Data/Base.rte/Shaders \
                 --exclude Source/System/Base64 \
@@ -47,7 +51,8 @@ jobs:
       - name: Add missing newlines
         run: |
             .github/scripts/run-clang-format.py \
-                -i --clang-format-executable .github/scripts/add-eol.sh \
+                --clang-format-executable .github/scripts/add-eol.sh \
+                -i \
                 -r Source Data/Base.rte/Shaders \
                 --exclude Source/System/Base64 \
                 --exclude Source/System/BitMask \

.github/workflows/meson.yml

@@ -62,9 +62,14 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build ccache
           sudo pip install meson
 
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}
+
       - name: Set Version
         if: ${{inputs.new_release_version}}
         uses: ./.github/actions/set_version
@@ -74,22 +79,22 @@ jobs:
 
       - name: Setup Meson
         env:
-          CC: "gcc"
-          CXX: "g++"
+          CC: "ccache gcc"
+          CXX: "ccache g++"
         run: |
           meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=true build
 
       - name: Configure for AppImage
         if: ${{inputs.upload_artefacts}}
         env:
-          CC: "gcc"
-          CXX: "g++"
+          CC: "ccache gcc"
+          CXX: "ccache g++"
         run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
 
       - name: Build
         env:
-          CC: "gcc"
-          CXX: "g++"
+          CC: "ccache gcc"
+          CXX: "ccache g++"
         run: |
           meson compile -C build
 
@@ -147,19 +152,24 @@ jobs:
           new_release_version: ${{inputs.new_release_version}}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}
+
       - name: Setup Meson
         env:
-          CC: "gcc-${{env.GCC_VERSION}}"
-          CXX: "g++-${{env.GCC_VERSION}}"
+          CC: "ccache gcc-${{env.GCC_VERSION}}"
+          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
 
       - name: Configure for App Bundle
         if: ${{inputs.upload_artefacts}}
         env:
-          CC: "gcc-${{env.GCC_VERSION}}"
-          CXX: "g++-${{env.GCC_VERSION}}"
+          CC: "ccache gcc-${{env.GCC_VERSION}}"
+          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson configure \
@@ -170,8 +180,8 @@ jobs:
 
       - name: Build
         env:
-          CC: "gcc-${{env.GCC_VERSION}}"
-          CXX: "g++-${{env.GCC_VERSION}}"
+          CC: "ccache gcc-${{env.GCC_VERSION}}"
+          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson compile -C build

CHANGELOG.md

@@ -124,7 +124,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `FrameMan` Lua functions `SetHudDisabled(disabled, screenId)` and `IsHudDisabled(screenId)` that allows disabling a given screen's HUD, and checking whether it's currently disabled. The screenId parameters are optional and default to screen 0.
 
-- Exposed `FrameMan` property `ScreenCount` to Lua (R).
+- Exposed `FrameMan` properties `ScreenCount` and `ResolutionMultiplier` to Lua (R).
 
 </details>
 

Data/Base.rte/Shaders/Blit8.frag

@@ -6,9 +6,9 @@ in vec2 textureUV;
 out vec4 FragColor;
 
 uniform sampler2D rteTexture;
-uniform sampler1D rtePalette;
+uniform sampler2D rtePalette;
 
 void main() {
 	float colorIndex = texture(rteTexture, vec2(textureUV.x, -textureUV.y)).r;
-	FragColor = texture(rtePalette, colorIndex);
+	FragColor = texture(rtePalette, vec2(colorIndex, 0.0F));
 }

Data/Base.rte/Shaders/ScreenBlit.frag

@@ -20,5 +20,5 @@ void main() {
 	vec4 guiColor = texture2DAA(rteGUITexture, textureUV);
 	float guiSolid = step(0.00000001, guiColor.r + guiColor.g + guiColor.b);
 	float blendRatio = max(guiColor.a, guiSolid);
-	FragColor = (texture2DAA(rteTexture, textureUV) * (1 - blendRatio)) + guiColor * blendRatio;
+	FragColor = (texture2DAA(rteTexture, textureUV) * (1.0F - blendRatio)) + guiColor * blendRatio;
 }

README.md

@@ -24,10 +24,9 @@ You'll probably want [Visual Studio Community Edition](https://visualstudio.micr
 You also need to have both x86 and x64 versions of the [Visual C++ Redistributable for Visual Studio 2015-2022](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) installed in order to run the compiled builds.  
 You may also want to check out the list of recommended Visual Studio plugins [here](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/wiki/Information,-Recommended-Plugins-and-Useful-Links).
 
-2. Clone this Source Repository and the [Data Repository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data) in neighboring folders.  
-**Do Not** change the folder names unless you want to make trouble for yourself.
+2. Clone this Repository into a folder.  
 
-3. Copy the following libraries from `Cortex-Command-Community-Project-Source\external\lib\win` into the **Data Repository**:
+3. Copy the following libraries from `Cortex-Command-Community-Project\external\lib\win` into the root directory:
 * `fmod.dll`
 * `SDL2.dll`
 
@@ -85,32 +84,25 @@ For unspecified versions assume compatibility with the latest ubuntu LTS release
 
 1. Install Dependencies (see [below](#installing-dependencies) for instructions).
 
-2. Clone this Source Repository and the [Data Respository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data).
+2. Clone this Repository and open a terminal in it.
 
-3. Open a terminal in the Source Repository.
-
-4. `meson setup build` or `meson setup --buildtype=debug build` for debug build (default is release build)  
+3. `meson setup build` or `meson setup --buildtype=debug build` for debug build (default is release build)  
 	For macOS you need to specify gcc, with `env CC=gcc-13 CXX=g++-13 meson setup build`
 
-5. `ninja -C build`
+4. `ninja -C build`
 
-6. (optional) `sudo ninja install -C build` (To uninstall later, keep the build directory intact. The game can then be uninstalled by `sudo ninja uninstall -C build`)
+5. (optional) `sudo ninja install -C build` (To uninstall later, keep the build directory intact. The game can then be uninstalled by `sudo ninja uninstall -C build`)
 
-If you want to change the buildtype afterwards, you can use `meson configure --buildtype {release or debug}` in the build directory or create a secondary build directory as in Step 4. There are also additional build options documented in the [wiki](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/wiki/Meson-build-options) as well as through running `meson configure` in the build directory.
+If you want to change the buildtype afterwards, you can use `meson configure --buildtype {release or debug}` in the build directory or create a secondary build directory as in Step 3. There are also additional build options documented in the [wiki](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/wiki/Meson-build-options) as well as through running `meson configure` in the build directory.
 
 ## Running
-(If you installed the game in step 6 above, it should appear with your regular applications and will just run)
-
-1. Copy (or link, might be preferable for testing builds) `build/CortexCommand` or `build/CortexCommand_debug` (depending on if you made a debug build) into the **Data Repository**.
-
-   `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/build/CortexCommand . `
-
-2. (*optional*) Copy (link) all `libfmod` files from `external/lib/[os]/[arch]` into the **Data Repository**.
-  - Linux: `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/external/lib/linux/x86_64/libfmod.so* .`
-  - macOS: `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/external/lib/macOS/libfmod.dylib .`
+(If you installed the game in step 5 above, it should appear with your regular applications and will just run)
 
+1. (*optional*) Copy (link) all `libfmod` files from `external/lib/[os]/[arch]` into the repository.
+  - Linux: `cd $REPOSITORY; ln -s ../external/lib/linux/x86_64/libfmod.so* .`
+  - macOS: `cd $REPOSITORY; ln -s ../external/lib/macOS/libfmod.dylib .`
 
-4. Run `./CortexCommand` or `./CortexCommand_debug` in the **Data Repository**.
+2. Run `./CortexCommand` or `./CortexCommand_debug`.
 
 ## Installing Dependencies
 
@@ -184,5 +176,4 @@ If you're familiar with github you should be familiar with making issues. It's a
 
 # How to Contribute #
 
-If you've got experience with the game's ini data through modding it, are good at spriting or know Lua, maybe you can contribute some of your time directly to the project. We'll look at any pull requests that come in and are always happy to have more hands on deck.
-If you're an experienced programmer (particularly with C++), there's also tons of work to be done in our [source](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source) repository.
+If you've got any C++ experience, experience with the game's ini data through modding it, are good at spriting or know Lua, you can contribute some of your time directly to the project. We'll look at any pull requests that come in and are always happy to have more hands on deck.

RTEA.common.props

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_WINDOWS;WIN32;NOMINMAX;NOGDI;NOKERNEL;NONLS;NOMEMMGR;NOGDICAPMASKS;NOVIRTUALKEYCODES;NOWINMESSAGES;NOWINSTYLES;NOMETAFILE;NOSCROLL;NOTEXTMETRIC;NOCOMM;NOKANJI;NOHELP;NOPROFILER;NODEFERWINDOWPOS;NOMCX;NOMENUS;NOICONS;NOKEYSTATES;NOSYSCOMMANDS;NORASTEROPS;NOSHOWWINDOW;OEMRESOURCE;NOATOM;NODRAWTEXT;NOCOLOR;NOCTLMGR;NOMSG;NOOPENFILE;NOSERVICE;NOSOUND;NOWH;NOWINOFFSETS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>