Merge pull request #158 from rollingrock/v78

V78

Author: ArthurHub

.clang-format

@@ -13,18 +13,18 @@ AlignTrailingComments: false
 AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Empty
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: false
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: true
+BinPackArguments: false
 BinPackParameters: true
 BitFieldColonSpacing: After
 BraceWrapping:
@@ -47,14 +47,15 @@ BraceWrapping:
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: AfterColon
+BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: AfterColon
 BreakStringLiterals: true
 ColumnLimit: 180
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
+PackConstructorInitializers: Never
 Cpp11BracedListStyle: false
 DeriveLineEnding: true
 DerivePointerAlignment: false

.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: build
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  windows:
+    # The "default" CMake preset uses generator "Visual Studio 18 2026" / toolset v145.
+    runs-on: windows-2025-vs2026
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Bridge VCPKG_ROOT
+        shell: pwsh
+        run: |
+          if (-not $env:VCPKG_INSTALLATION_ROOT) {
+            throw "VCPKG_INSTALLATION_ROOT is not set on the runner."
+          }
+          "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Configure CMake
+        run: cmake --preset default
+
+      - name: Build
+        run: cmake --build build --config Release

.github/workflows/maintenance.yml

@@ -0,0 +1,53 @@
+name: maintenance
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  maintenance:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout pull request branch
+        if: github.event_name == 'pull_request'
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Checkout
+        if: github.event_name != 'pull_request'
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install pre-commit
+        run: python -m pip install pre-commit
+
+      # Same-repo branches (push / non-fork PR): auto-fix and commit back.
+      - name: Run pre-commit
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+        continue-on-error: true
+        run: pre-commit run --all-files --show-diff-on-failure
+
+      - name: Commit maintenance fixes
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "chore: maintenance"
+
+      - name: Verify pre-commit
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+        run: pre-commit run --all-files --show-diff-on-failure
+
+      # Fork PRs are read-only: check and fail with diffs, never push back.
+      - name: Run pre-commit for external pull requests
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+        run: pre-commit run --all-files --show-diff-on-failure

.gitignore

@@ -4,7 +4,8 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 .vscode
-build*
+/build*/
+build_output.txt
 
 CMakeUserPresets*.json
 

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+# Pre-commit hooks for FRIK.
+# Local install (each developer, once):  python -m pip install pre-commit && pre-commit install
+# GitHub Actions (.github/workflows/maintenance.yml) is the server-side fallback.
+ci:
+  autofix_prs: true
+
+repos:
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v18.1.8
+    hooks:
+      - id: clang-format
+        types_or: [c++, c]
+        args: [--style=file]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      # The repo enforces CRLF (.gitattributes + .editorconfig + clang-format UseCRLF).
+      # Only use line-ending-safe hooks here; clang-format owns C/C++ whitespace + EOF.
+      - id: mixed-line-ending
+        args: [--fix=crlf]
+      - id: check-yaml
+      - id: check-merge-conflict
+      - id: check-added-large-files
+        args: [--maxkb=5120]

AGENTS.md

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 4.2)
 # >>> Project
 set(NAME "FRIK")
 set(FRIENDLY_NAME "FRIK")
-set(VERSION 0.77.12)
+set(VERSION 0.78.0)
 
 message(">>> Start build for '${NAME}' v${VERSION}")
 

CMakeLists.txt

@@ -13,13 +13,22 @@
 # Any change to the file while the game is running will be detected and applied immediately.
 # Useful to modify advanced settings and seeing the effects without restarting the game.
 #
-# -------------------
-# Valid Buttons List:
-# B / Y = 1
-# Grip = 2
-# A / X = 7
-# Touchpad / Thumbstick Press = 32
-# Unbound = 99
+# ---------------------
+# Input Binding Format:
+# Controller bindings are a single, case-insensitive line:
+#   "<hand> <type> <button> [duration] [+[hand:]modifier]"
+#
+#   hand     = primary | offhand | left | right
+#   type     = tap | press | release | longpress | double | hold | touch | axis
+#   button   = trigger | grip | a | b (menu) | thumbstick | system
+#   duration = optional seconds; meaning depends on type (e.g. longpress hold threshold)
+#   modifier = optional button held while the binding fires:
+#              "+grip" on the same hand, or "+offhand:grip" on a specific hand
+#
+# Examples:
+#   offhand tap grip             -> quick press+release of the offhand grip
+#   primary longpress a 0.6      -> hold the primary A button for 0.6s
+#   primary press trigger +grip  -> press trigger while holding grip on the same hand
 
 
 
@@ -134,13 +143,13 @@ PipBoyOffDelay = 1000
 # Basically it shortens the "PipBoyOffDelay" to quickly close Pipboy by starting to move
 AllowMovementWhenNotLookingAtPipboy = true
 
-# Which controller and button will open/close the Pipboy
-# 0 if left controller / 1 is right controller
-# 33 - trigger, 2 - grip, 7 - A/X, 1 - B/Y
-OperatePipboyWithButtonArm = 0
-OperatePipboyWithButtonID = 33
-OperatePipboyWithButtonOffArm = 0
-OperatePipboyWithButtonOffID = 2
+# Which controller input opens / closes the Pipboy (see "Input Binding Format" near the top of this file)
+sPipboyOpenButton = offhand tap trigger
+sPipboyCloseButton = offhand tap grip
+# Controller input that must be held to move the holo Pipboy screen in place (see iDampenPipboyScreenMode = 2)
+sHoldPipboyScreenButton = offhand holddown grip 0.3
+# Controller input that enters the wrist-Pipboy configuration mode (the trailing number is the hold duration in seconds)
+sEnterPipboyConfigButton = primary longpress thumbstick 2.0
 
 # When using touch method to operate Pipboy it's the distance of the primary hand from
 # Pipboy that will change hand pose to pointing. Set to 0 to disable. (default: 12)
@@ -176,8 +185,10 @@ bRemoveFlashlight = false
 # Controlled in-game by grabbing the flashlight near the top of the head when it's on on
 iFlashlightLocation = 0
 
-# Button used to switch between torch on head or hand
-SwitchTorchButton = 2
+# Input used to switch the torch between head and hand (tapped on whichever hand is near the head)
+# One binding per hand (see "Input Binding Format" near the top of this file)
+sSwitchTorchLeftButton = left tap grip
+sSwitchTorchRightButton = right tap grip
 
 
 ### Fallout London VR
@@ -187,9 +198,8 @@ SwitchTorchButton = 2
 # Set to 0 to disable and use regular Pipboy setting (OperatePipboyWithButtonXXX above)
 fAttaboyGrabActivationDistance = 15.0
 
-# The controller button id to use to open/close (grab and return) the Attaboy
-# 32 - thumbstick press, 2 - grip, 7 - A/X, 1 - B/Y
-iAttaboyGrabButtonId = 2
+# The controller input to open/close (grab and return) the Attaboy (see "Input Binding Format" near the top)
+sAttaboyGrabButton = left tap grip
 
 
 ### Weapons and Hands
@@ -207,7 +217,10 @@ EnableGripButton = true
 EnableGripButtonOnePress = true
 EnableGripButtonToLetGo = false
 GripLetGoThreshold = 2.5
-GripButtonID = 2
+# Offhand input to grip / release a two-handed weapon (press to grab, and to let go in modes 2/4)
+sGripButton = offhand press grip
+# Offhand input that must stay held to keep gripping (mode 3 lets go when this is released)
+sGripHoldButton = offhand hold grip
 
 # Dampen hands settings - set strength from 0 to 0.95
 DampenHands = true
@@ -230,15 +243,19 @@ ScopeAdjustDistance = 15.0
 # How far out in front the selfie mode body is.
 selfieOutFrontDistance = 120.000000
 
+# Controller input that toggles selfie mode, only when the Pipboy is off (see "Input Binding Format" near the top of this file)
+sToggleSelfieButton = primary tap a
+
 # If to show the HUD in powerarmor
 showPAHUD = true
 
 # Special flag to allow using Pipboy in Fallout London VR
 bIgnoreFalloutLondonVR = false
 
-# How long to hold both controller sticks to open the configuration menu (in seconds)
+# Controller input that opens the configuration menu (see "Input Binding Format" near the top of this file)
+# Default: long-press both thumbsticks (the trailing number is the hold duration in seconds)
 # HTC Vive Pro 2 issue: https://www.nexusmods.com/fallout4/mods/53464?tab=posts&comment_id=163662949
-fOpenConfigurationModePressDelay = 1.5
+sOpenConfigButton = primary longpress thumbstick 1.5 +offhand:thumbstick
 
 
 [SmoothMovementVR]
@@ -297,4 +314,4 @@ sDebugFlowText2 =
 sDebugDumpDataOnceNames =
 
 # Internal use for versioning
-iVersion = 16
+iVersion = 17