OCAP 2.0: Modular architecture with database export

.editorconfig

@@ -5,8 +5,8 @@ root = true
 
 # every file
 [*]
-indent_style = tab
-indent_size = 4
+indent_style = space
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

.gitignore

@@ -1,3 +1,7 @@
 *.pbo
 
 *.bak
+
+.hemttout/
+
+hemtt.exe

.hemtt/project.toml

@@ -0,0 +1,17 @@
+name = "OCAP"
+prefix = "ocap"
+mainprefix = "x"
+author = "OCAP2 Team"
+[files]
+include = [
+    "mod.cpp",
+    "licence.txt",
+    "logo_ocap.paa",
+]
+
+[lints.sqf]
+# Suppress errors until code is fixed
+command_case = false
+banned_commands = false
+undefined = false
+format_args = false

CLAUDE.md

@@ -9,68 +9,93 @@ OCAP2 (Operation Capture and Playback v2) is an Arma 3 addon that records gamepl
 **Language**: SQF (Arma 3 scripting language)
 **Dependencies**: Arma 3 2.04+, CBA (Community Base Addons), optional ACE3 integration
 
-## Development
+## Build
 
-There is no build system for SQF development. Edit `.sqf` files directly and pack the addon as a `.pbo` file using Arma 3 tools (Addon Builder or similar).
+Uses HEMTT for building PBO files:
+```bash
+hemtt build        # Development build
+hemtt release      # Release build
+```
 
-The extension DLL (`OcapReplaySaver2`) handles performance-critical data export and requires separate compilation.
+The extension DLL (`ocap_recorder`) handles database export and requires separate compilation (see extension repo).
 
 ## Architecture
 
+Modular CBA-style addon structure:
+
 ```
-addons/@ocap/addons/ocap/
-├── config.cpp              # CfgPatches, CfgFunctions, CfgRemoteExec definitions
-├── script_macros.hpp       # LOG, DEBUG, BOOL macros and ARR2-ARR6 array helpers
-└── functions/              # All SQF functions
+addons/
+├── main/           # Core settings, macros, version info
+├── recorder/       # Capture loop, event handlers, export
+├── database/       # Database connection, metrics, real-time data streaming
+└── extension/      # Extension DLL wrapper
 ```
 
+Each addon follows XEH structure:
+- `XEH_preInit.sqf` - CBA settings registration
+- `XEH_postInit.sqf` - Post-init logic
+- `XEH_prep.sqf` - Function preparation
+- `config.cpp` - CfgPatches, CfgFunctions
+- `script_component.hpp` - Component-specific macros
+
 ### Key Files
 
-- **fn_startCaptureLoop.sqf**: Core capture loop (runs ~10Hz), tracks all units and vehicles per frame
-- **fn_extension.sqf**: Wrapper for native DLL extension calls
-- **fn_addEventHandlers.sqf**: Sets up fired/hit/killed/connected event handlers
-- **fn_getUnitType.sqf**: Classifies unit roles (medic, engineer, crew, etc.)
+- **recorder/fnc_captureLoop.sqf**: Core capture loop, tracks units and vehicles per frame
+- **recorder/fnc_addEventMission.sqf**: Mission event handlers setup
+- **recorder/fnc_eh_firedMan.sqf**: Fired event handler with projectile tracking
+- **database/fnc_initDB.sqf**: Database connection and mission context initialization
+- **database/fnc_metricsLoop.sqf**: Server performance metrics collection
 
 ### Configuration
 
-User settings are in `userconfig/ocap/config.hpp`. Key options:
-- `ocap_autoStart`: Auto-start recording on session begin
-- `ocap_minPlayerCount`: Minimum players required to start
-- `ocap_frameCaptureDelay`: Capture interval in seconds
-- `ocap_excludeClassFromRecord`: Classes to exclude from recording
+All settings use CBA Settings system (configurable in-game via addon options):
+- `OCAP_enabled`: Master recording toggle
+- `OCAP_settings_autoStart`: Auto-start on session begin
+- `OCAP_settings_minPlayerCount`: Minimum players to start
+- `OCAP_settings_frameCaptureDelay`: Capture interval in seconds
+- `OCAP_settings_excludeClassFromRecord`: Classes to exclude
 
 ## Code Conventions
 
-### Function Documentation
-Every function has a JSDoc-style header block:
+### CBA Macros
+Functions use CBA component macros defined in `main/script_macros.hpp`:
 ```sqf
-/*
- * Script: fn_example.sqf
- * Description: What this function does
- * Parameters:
- *   _param1 - description
- * Returns: description
- * Examples: (examples)
- * Public: Yes/No
- * Author: Name
- */
+FUNC(name)           // Expands to OCAP_recorder_fnc_name
+GVAR(name)           // Expands to OCAP_recorder_name (component variable)
+EGVAR(comp,name)     // Expands to OCAP_comp_name (external component variable)
+QGVAR(name)          // Quoted variable name
+LOG(), INFO(), WARNING(), ERROR()  // Logging macros
 ```
 
 ### Includes
 All functions must include at the top:
 ```sqf
-#include "\userconfig\ocap\config.hpp"
-#include "script_macros.hpp"
+#include "script_component.hpp"
 ```
 
-### Naming
-- Global functions: `ocap_fnc_<name>` (defined in config.cpp)
-- Global variables: `ocap_<name>`
-- Macros: `LOG("message")`, `DEBUG("message")`, `BOOL(value)`
+### Function Documentation
+```sqf
+/* ----------------------------------------------------------------------------
+FILE: fnc_example.sqf
+
+FUNCTION: OCAP_recorder_fnc_example
+
+Description:
+  What this function does
+
+Parameters:
+  _param1 - description
+
+Returns:
+  description
+
+Public:
+  No
+
+Author:
+  Name
+---------------------------------------------------------------------------- */
+```
 
 ### ACE3 Integration
-ACE3 support is optional with graceful fallback. The `fn_trackAce*.sqf` functions handle:
-- Explosive lifecycle tracking (throw-to-detonation)
-- Placed charges and mines
-- Remote detonation events
-- Thrown grenades with 3D position tracking
+ACE3 support is optional with graceful fallback. `fnc_aceExplosives.sqf` handles placed explosives and detonation tracking.

README.md

@@ -1 +1,39 @@
-OCAP-addon
+# OCAP Addon
+
+Arma 3 addon for Operation Capture and Playback (OCAP). Records gameplay data during missions for web-based playback analysis.
+
+> **Note:** For general OCAP information, documentation, and issue tracking, see the main repository: https://github.com/OCAP2/OCAP
+
+## Requirements
+
+- Arma 3 2.10+
+- [CBA_A3](https://steamcommunity.com/workshop/filedetails/?id=450814997)
+- [OCAP Recorder Extension](https://github.com/OCAP2/extension) (for database export)
+- Optional: ACE3 for enhanced medical state tracking
+
+## Installation
+
+Subscribe via Steam Workshop or download the latest release and place the `@OCAP` folder in your Arma 3 directory.
+
+## Building from Source
+
+Requires [HEMTT](https://github.com/BrettMayson/HEMTT):
+
+```bash
+hemtt build        # Development build
+hemtt release      # Release build with signed PBOs
+```
+
+## Configuration
+
+All settings are configurable in-game via CBA Settings (Options > Addon Options > OCAP).
+
+Key settings:
+- **Recording Enabled** - Master toggle
+- **Auto Start Recording** - Start recording when minimum player count is reached
+- **Minimum Player Count** - Players required for auto-start
+- **Frame Capture Delay** - Interval between position captures (seconds)
+
+## License
+
+GNU General Public License v3.0