rvff-cxx (#41)

- complete rvff rewrite
- sat tiling rewrite
- map rivers
- issue template
- new ci
- intercept update
- logging
- vcpkg.json

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,57 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+assignees:
+  - TheWillard
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Loaded Mods
+      description: Please confirm that all required mods are actually loaded.
+      options:
+        - label: I checked that `@grad_meh` is loaded
+          required: true
+        - label: I checked that `@cba_a3` is loaded
+          required: true
+        - label: I checked that `@intcept` is loaded
+          required: true
+  - type: checkboxes
+    id: battleye
+    attributes:
+      label: Loaded Mods
+      description: BattlEye can cause problems with grad_meh. Make sure it is disabled!
+      options:
+        - label: I disabled BattlEye
+          required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us what did you expected to happen, and include the workshop links to relevant maps.
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: rpt
+    attributes:
+      label: RPT
+      description: Please copy and paste the relevant RPT. You can find it in the following directory `%localappdata%\Arma 3`
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: grad_meh Logs
+      description: Please copy and paste the relevant grad_meh log. You can find it in the following directory `%localappdata%\Arma 3`
+      render: shell
+    validations:
+      required: true
+

.github/workflows/build.yml

@@ -0,0 +1,75 @@
+name: C/C++ CI
+
+on:
+  push:
+  pull_request:
+
+env:
+  VCPKG_COMMIT: cc97b4536ae749ec0e4f643488b600b217540fb3
+  VCPKG_DIR: C:/deps/vcpkg
+  CMAKE_PRESET: ninja-msvc-vcpkg
+
+jobs:
+  job_build_cpp:
+    name: win
+    runs-on: windows-latest
+
+    steps:
+    # Checkout
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        fetch-depth: 0
+
+    # Setup MSVC
+    - uses: ilammy/msvc-dev-cmd@v1
+      with:
+        vsversion: 2022
+        toolset: 14
+
+    # Install latest CMake
+    - uses: lukka/get-cmake@latest
+
+    - name: Create folder
+      run: |
+        mkdir ${{ env.VCPKG_DIR }}
+
+    # Setup vcpkg and build deps
+    - name: Restore artifacts, or Run vcpkg, build and cache artifacts
+      uses: lukka/run-vcpkg@v11
+      id: runvcpkg
+      with:
+        vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
+        vcpkgDirectory: ${{ env.VCPKG_DIR }}
+
+    - name: Run CMake consuming CMakePresets.json and vcpkg.json by mean of vcpkg.
+      uses: lukka/run-cmake@v10
+      with:
+        configurePreset: ninja-release-vcpkg-win
+        buildPreset: ninja-msvc-vcpkg-release
+
+    # Build the mod
+    - uses: gruppe-adler/action-release-with-hemtt@v3
+      name: 'Build Mod with HEMTT'
+      id: build
+
+    # Upload the mod
+    - uses: actions/upload-artifact@v1
+      with:
+        name: ${{ steps.build.outputs.mod_name }}
+        path: ${{ steps.build.outputs.release_path }}
+
+    # zip it
+    - uses: papeloto/action-zip@v1
+      with:
+        files: \@${{ steps.build.outputs.mod_name }}/
+        dest: \@${{ steps.build.outputs.mod_name }}.zip
+
+    # release it
+    - uses: "marvinpinto/action-automatic-releases@latest"
+      if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        prerelease: true
+        files: |
+          \@${{needs.job_build_cpp.outputs.modName}}.zip

.gitignore

@@ -34,6 +34,7 @@
 
 # Others
 .vs
+.vscode
 .hemtt
 build
 *.pbo
@@ -49,6 +50,7 @@ cmake_install.cmake
 install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
+builds/
 
 # CodeBlocks
 *.cbp
@@ -60,4 +62,4 @@ CTestTestfile.cmake
 releases/*
 keys/*
 *.pbo
-*.biprivatekey
+*.biprivatekey

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "intercept"]
 	path = intercept
-	url = [email protected]:intercept/intercept.git
+	url = https://github.com/intercept/intercept.git
+[submodule "src/rvff-cxx"]
+	path = src/rvff-cxx
+	url = https://github.com/arma-tools/rvff-cxx.git

CMakeLists.txt

@@ -23,15 +23,20 @@ message("COMPILER USED: '${CMAKE_CXX_COMPILER_ID}'")
 set(CMAKE_CL_64 ${USE_64BIT_BUILD})
 
 if(USE_64BIT_BUILD)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/win64/")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/lib64/")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/lib64/")
 else()
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/win32/")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/lib32/")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/lib32/")
 endif()
 
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+set(Boost_NO_WARN_NEW_VERSIONS 1)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON) 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 

CMakePresets.json

@@ -0,0 +1,65 @@
+{
+  "version": 5,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 23,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "ninja-debug-vcpkg-win",
+      "displayName": "Ninja/Windows/Debug/VCPKG Config",
+      "description": "Ninja/Windows/Debug/VCPKG Config",
+      "binaryDir": "${sourceDir}/builds/${presetName}",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_TOOLCHAIN_FILE": {
+          "type": "FILEPATH",
+          "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        },
+        "CMAKE_INSTALL_PREFIX": {
+          "type": "FILEPATH",
+          "value": "${sourceDir}/install"
+        },
+        "USE_64BIT_BUILD": true,
+        "VCPKG_TARGET_TRIPLET": "x64-windows-static",
+        "CMAKE_C_COMPILER": "cl",
+        "CMAKE_CXX_COMPILER": "cl"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "ninja-release-vcpkg-win",
+      "displayName": "Ninja/Windows/Release/VCPKG Config",
+      "inherits": "ninja-debug-vcpkg-win",
+      "description": "Ninja/Windows/Release/VCPKG Config",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "ninja-msvc-vcpkg-debug",
+      "configurePreset": "ninja-debug-vcpkg-win",
+      "displayName": "Build ninja-msvc-vcpkg (Debug)",
+      "description": "Build ninja-msvc-vcpkg (Debug) Configurations",
+      "targets": "install",
+      "configuration": "Debug"
+    },
+    {
+      "name": "ninja-msvc-vcpkg-release",
+      "configurePreset": "ninja-release-vcpkg-win",
+      "displayName": "Build ninja-msvc-vcpkg (Release)",
+      "description": "Build ninja-msvc-vcpkg Configurations",
+      "targets": "install",
+      "configuration": "Release"
+    }
+  ]
+}

README.md

@@ -14,7 +14,12 @@ Download the latest version of the mod from our [releases page](https://github.c
 
 ## Usage
 Although we would say that using `grad_meh` is intuitive and mostly self-explanatory, we made <a href="https://youtu.be/VdIXrm_eUMc" target="_blank">this short video</a> on how to use it.  
-**HINT**: If you have any problems with the export not starting, try disabling BattlEye.
+
+## Troubleshooting
+- Make sure that `@grad_meh`, `@intercept` and `@CBA_A3` are loaded.
+- Make sure that BattlEye is disabled.
+- If you're still having problems check the rpt and grad_meh log files located in `C:\Users\<USERNAME>\AppData\Local\Arma 3` for any errors.
+- If all else fails, open a new issue and make sure you include the rpt and grad_meh log files.
 
 ## Limitations
 - To reduce complexity we only allow one export process at a time.

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
-#define MAJOR 1
-#define MINOR 0
-#define PATCHLVL 0
-#define BUILD 0
+#define MAJOR 0
+#define MINOR 7
+#define PATCHLVL 1
+#define BUILD 8