Rename vmt-lightpreview to vmt-preview and update HDR flag

Renames the 'vmt-lightpreview' tool and all related references to 'vmt-preview' across documentation, CMake, and source files. Updates the HDR lightfile_t enum value from 'lithdr' to 'hdr' and adjusts all code and documentation to use the new flag and tool name. Also introduces a SaveLightmapProgress helper for intermediate BSP writes.

Author: themuffinator

AGENTS.md

@@ -21,7 +21,7 @@ VibeyMapTools (VMT) is a BSP compilation toolset for Quake engine mapping. It is
 | `vmt-bspinfo` | BSP information utility | `src/bspinfo/` |
 | `vmt-bsputil` | BSP manipulation utility | `src/bsputil/` |
 | `vmt-maputil` | Map file Lua scripting | `src/maputil/` |
-| `vmt-lightpreview` | Real-time preview GUI | `src/lightpreview/` |
+| `vmt-preview` | Real-time preview GUI | `src/lightpreview/` |
 
 ## Repository Structure
 
@@ -42,7 +42,7 @@ VibeyMapTools/
 |   |-- bspinfo/    # vmt-bspinfo source
 |   |-- bsputil/    # vmt-bsputil source
 |   |-- maputil/    # vmt-maputil source
-|   `-- lightpreview/ # vmt-lightpreview tool
+|   `-- lightpreview/ # vmt-preview tool
 |-- tests/          # Test suite (maps/ subdirectory contains test .map files)
 |-- CMakeLists.txt
 |-- README.md
@@ -88,7 +88,7 @@ cmake --build build --target package
 ### Dependencies
 
 - **Required**: C++20 compiler, CMake 3.14+, Intel Embree 4.x, oneTBB
-- **Optional**: Qt6 (for vmt-lightpreview), CUDA/OptiX (GPU lighting), Intel OIDN (denoising)
+- **Optional**: Qt6 (for vmt-preview), CUDA/OptiX (GPU lighting), Intel OIDN (denoising)
 
 ## Code Conventions
 
@@ -222,7 +222,7 @@ CMake generates `version.hh` in `build/include` for compile-time version info.
 
 - **Tool naming**: Executables use `vmt-` prefix, but source directories do not (e.g., `src/qbsp/` builds `vmt-bsp`)
 - **Submodules**: Run `git submodule update --init --recursive` after cloning
-- **Qt6**: Only needed for `vmt-lightpreview`, disabled by default
+- **Qt6**: Only needed for `vmt-preview`, disabled by default
 - **Embree/TBB**: Required dependencies; set `embree_DIR`/`TBB_DIR` if CMake cannot find them
 
 ## Contact

BUILDING.md

@@ -14,7 +14,7 @@ Same workflow, new name, extra toys. If you used ericw-tools, this should feel i
 | `bspinfo` | `vmt-bspinfo` |
 | `bsputil` | `vmt-bsputil` |
 | `maputil` | `vmt-maputil` |
-| `lightpreview` | `vmt-lightpreview` |
+| `lightpreview` | `vmt-preview` |
 
 **Still the same (legacy comfy mode):**
 - Quake II + Remaster support stays put (`-q2bsp`, `-lightgrid`, `-world_units_per_luxel`) 🧠🎮
@@ -39,7 +39,7 @@ Same workflow, new name, extra toys. If you used ericw-tools, this should feel i
 - **Intel Embree 4.x + oneTBB** (required for `vmt-light` builds)
 
 ### Optional extras (spicy toppings)
-- **Qt6** (for `vmt-lightpreview`)
+- **Qt6** (for `vmt-preview`)
 - **NVIDIA CUDA Toolkit** + **OptiX SDK 7.x** (GPU raytracing)
 - **Intel Open Image Denoise (OIDN)** (AI-based lightmap denoising)
 
@@ -82,7 +82,7 @@ cmake --build . --parallel
 ```bash
 # Install dependencies via Homebrew
 brew install cmake embree tbb qt@6
-# Qt6 is only needed for vmt-lightpreview
+# Qt6 is only needed for vmt-preview
 
 # Clone and build
 git clone --recursive https://github.com/themuffinator/VibeyMapTools.git
@@ -111,16 +111,51 @@ If CMake cannot find them, pass the package config paths:
 cmake .. -Dembree_DIR=/path/to/embree/lib/cmake/embree-4.x -DTBB_DIR=/path/to/tbb/lib/cmake/tbb
 ```
 
-### NVIDIA OptiX (GPU Raytracing) ⚡
+### NVIDIA OptiX (GPU Raytracing) ?
 
-1. Install CUDA Toolkit from https://developer.nvidia.com/cuda-toolkit
-2. Download OptiX SDK from https://developer.nvidia.com/designworks/optix/download
-3. Set environment variable:
-   ```powershell
-   $env:OPTIX_ROOT_DIR = "C:\ProgramData\NVIDIA Corporation\OptiX SDK 7.7.0"
-   ```
+This enables the `-gpu` path in `vmt-light` (OptiX-backed raytracing). If OptiX isn't found, `-gpu`
+falls back to Embree and prints "GPU Raytracing compiled out."
 
-CMake will detect OptiX and enable GPU support.
+**1) Install the prerequisites**
+- NVIDIA GPU + recent driver
+- CUDA Toolkit (from https://developer.nvidia.com/cuda-toolkit)
+- OptiX SDK 7.x (from https://developer.nvidia.com/designworks/optix/download)
+
+**2) Set OptiX SDK path**
+Point `OPTIX_ROOT_DIR` at the OptiX SDK root (the directory that contains `include/optix.h`).
+
+Windows (PowerShell):
+```powershell
+$env:OPTIX_ROOT_DIR = "C:\ProgramData\NVIDIA Corporation\OptiX SDK 7.7.0"
+```
+
+Linux/macOS (bash/zsh):
+```bash
+export OPTIX_ROOT_DIR=/opt/optix/OptiX_SDK_7.7.0
+```
+
+**3) Reconfigure + rebuild**
+```bash
+cmake -B build -DCMAKE_BUILD_TYPE=Release
+cmake --build build --config Release
+```
+
+**4) Verify OptiX is detected**
+In CMake output you should see:
+- `CUDA found. Checking for OptiX...`
+- `OptiX found at <path>`
+
+**5) Run with GPU tracing**
+```bash
+vmt-light -gpu mymap.bsp
+```
+
+If you still see "GPU Raytracing compiled out", OptiX headers were not found. Double-check the
+`OPTIX_ROOT_DIR` value and that `include/optix.h` exists.
+
+**Troubleshooting**
+- If CUDA isn't found, set `CUDAToolkit_ROOT` or install a matching Toolkit version for your GPU driver.
+- If the build system caches a failed OptiX lookup, delete `build/` or clear the CMake cache.
 
 ### Intel OIDN (AI Denoising) 🤖
 
@@ -134,7 +169,7 @@ cmake .. -DOpenImageDenoise_DIR=/path/to/oidn/lib/cmake/OpenImageDenoise
 
 | Option | Default | Description |
 |--------|---------|-------------|
-| `ENABLE_LIGHTPREVIEW` | ON | Enable Qt-based `vmt-lightpreview` |
+| `ENABLE_LIGHTPREVIEW` | ON | Enable Qt-based `vmt-preview` |
 | `DISABLE_TESTS` | OFF | Skip building tests |
 | `DISABLE_DOCS` | OFF | Skip docs build |
 | `VIBEYMAPTOOLS_ASAN` | OFF | Enable AddressSanitizer for all targets |
@@ -153,7 +188,7 @@ After a successful build, you'll find in `build/`:
 | `vmt-bspinfo` | BSP information utility |
 | `vmt-bsputil` | BSP manipulation utility |
 | `vmt-maputil` | Lua scripting for .map workflows |
-| `vmt-lightpreview` | Realtime lighting preview (experimental) |
+| `vmt-preview` | Realtime lighting preview (experimental) |
 
 ## ✅ Running Tests
 

README.md

@@ -46,7 +46,7 @@ Formerly ericw-tools, now with extra sparkle ✨🎧🛠️
 <td>Lua scripting for .map workflows</td>
 </tr>
 <tr>
-<td><b>vmt-lightpreview</b></td>
+<td><b>vmt-preview</b></td>
 <td>Realtime lighting preview (Qt)</td>
 </tr>
 </table>
@@ -65,7 +65,7 @@ Same bones, new polish. If you used `qbsp/vis/light` before, your muscle memory
 | `bspinfo` | `vmt-bspinfo` |
 | `bsputil` | `vmt-bsputil` |
 | `maputil` | `vmt-maputil` |
-| `lightpreview` | `vmt-lightpreview` |
+| `lightpreview` | `vmt-preview` |
 
 **What stayed the same (cozy mode):**
 - Classic compile flow: `bsp -> vis -> light`
@@ -77,6 +77,8 @@ Same bones, new polish. If you used `qbsp/vis/light` before, your muscle memory
 - `vmt-` prefix on every binary so ericw-tools can live side-by-side 🧹✨
 - Semantic versioning + tag-driven releases with CI-built packages 📦🚀
 - Build metadata + `version.hh` for scripting and diagnostics 🧾🛠️
+- Improved Half-Life support (updated behavior + smoother compatibility) ??
+- Numerous bug fixes and improvements across the toolchain ?????
 
 
 ## 🚀 Quick Start
@@ -97,7 +99,7 @@ vmt-light -gpu -extra4 -bounce 2 -denoise mymap.bsp
 - 🤖 AI denoising with Intel OIDN (`-denoise`)
 - 🎛️ Stochastic sampling (`-stochastic`) for complex scenes
 - 🔁 Incremental lighting (`-incremental`) for fast iteration loops
-- 🌈 HDR lightmaps (`-lithdr`) for engines that support it
+- 🌈 HDR lightmaps (`-hdr`) for engines that support it
 
 ## 📦 Downloads
 
@@ -111,24 +113,24 @@ vmt-light -gpu -extra4 -bounce 2 -denoise mymap.bsp
 
 ## 🧪 Building from Source
 
-```bash
-git clone --recursive https://github.com/themuffinator/VibeyMapTools.git
-cd VibeyMapTools && cmake -B build -DCMAKE_BUILD_TYPE=Release
-cmake --build build
-```
-
-macOS 10.15+ prep: `brew install cmake embree tbb qt@6` (Qt6 only needed for `vmt-lightpreview`)
-
-<details>
-<summary><b>Requirements</b></summary>
-
-- CMake 3.14+
-- C++20 compiler (MSVC 2019+, GCC 9+, Clang 10+)
-- macOS 10.15+ (Catalina) recommended for Apple builds
-- Embree 4.x + oneTBB (required for `vmt-light`)
+```bash
+git clone --recursive https://github.com/themuffinator/VibeyMapTools.git
+cd VibeyMapTools && cmake -B build -DCMAKE_BUILD_TYPE=Release
+cmake --build build
+```
+
+macOS 10.15+ prep: `brew install cmake embree tbb qt@6` (Qt6 only needed for `vmt-preview`)
+
+<details>
+<summary><b>Requirements</b></summary>
+
+- CMake 3.14+
+- C++20 compiler (MSVC 2019+, GCC 9+, Clang 10+)
+- macOS 10.15+ (Catalina) recommended for Apple builds
+- Embree 4.x + oneTBB (required for `vmt-light`)
 
 **Optional extras:**
-- Qt6 (for `vmt-lightpreview`)
+- Qt6 (for `vmt-preview`)
 - CUDA + OptiX SDK (GPU raytracing)
 - Intel OIDN (AI denoising)
 

WIKI.md

@@ -22,7 +22,7 @@ Welcome to the VibeyMapTools documentation hub. This page is your neon sign to t
 | **vmt-bspinfo** | [bspinfo.rst](docs/bspinfo.rst) | BSP information utility |
 | **vmt-bsputil** | [bsputil.rst](docs/bsputil.rst) | BSP manipulation utility |
 | **vmt-maputil** | [maputil.rst](docs/maputil.rst) | Map file Lua scripting tool |
-| **vmt-lightpreview** | [lightpreview.rst](docs/lightpreview.rst) | Real-time lighting preview (experimental) |
+| **vmt-preview** | [lightpreview.rst](docs/lightpreview.rst) | Real-time lighting preview (experimental) |
 
 ### Full Documentation
 The complete documentation is available in the [`docs/`](docs/) folder and at **github.com/themuffinator/VibeyMapTools**.
@@ -34,7 +34,7 @@ The complete documentation is available in the [`docs/`](docs/) folder and at **
 Same workflow, new name, bonus polish. The big changes are mostly naming + release tooling:
 
 - `qbsp/vis/light` -> `vmt-bsp/vmt-vis/vmt-light`
-- All binaries are `vmt-` prefixed to differentiate from ericw-tools (including `vmt-maputil` and `vmt-lightpreview`)
+- All binaries are `vmt-` prefixed to differentiate from ericw-tools (including `vmt-maputil` and `vmt-preview`)
 - CI-built packages + semantic versioning
 - Quake II + Remaster support is unchanged (`-q2bsp`, `-lightgrid`, `-world_units_per_luxel`)
 - Upstream docs still apply: https://ericwa.github.io/ericw-tools/ 📚
@@ -49,7 +49,7 @@ Same workflow, new name, bonus polish. The big changes are mostly naming + relea
 | `bspinfo` | `vmt-bspinfo` |
 | `bsputil` | `vmt-bsputil` |
 | `maputil` | `vmt-maputil` |
-| `lightpreview` | `vmt-lightpreview` |
+| `lightpreview` | `vmt-preview` |
 
 
 ---
@@ -92,7 +92,7 @@ Keeps caches so you can relight fast without reprocessing everything.
 ### Bounce Lighting (`-bounce N`) 💡
 Simulates indirect illumination by bouncing light off surfaces. Higher values = more realistic but slower.
 
-### HDR Lightmaps (`-lithdr`) 🌈
+### HDR Lightmaps (`-hdr`) 🌈
 Generates high dynamic range lightmaps for engines that support it.
 
 ### Surface Lights (`_surface`) 🌟

docs/lightpreview.rst

@@ -1,5 +1,5 @@
 ================
-vmt-lightpreview
+vmt-preview
 ================
 
 Real-Time Lighting Preview — GUI tool for interactive BSP compilation and visualization
@@ -8,7 +8,7 @@ Real-Time Lighting Preview — GUI tool for interactive BSP compilation and visu
 Description
 -----------
 
-:program:`vmt-lightpreview` is a graphical tool that unifies :doc:`qbsp`, :doc:`vis`, 
+:program:`vmt-preview` is a graphical tool that unifies :doc:`qbsp`, :doc:`vis`, 
 and :doc:`light` with a 3D viewport for visualizing the output in real-time.
 
 .. note::
@@ -52,7 +52,7 @@ Usage
 
 .. code-block:: bash
 
-   vmt-lightpreview mymap.map
+   vmt-preview mymap.map
 
 The tool will automatically compile the map and display it in the viewport.
 Changes to lighting parameters can be previewed interactively.

src/include/light/light.hh

@@ -183,11 +183,11 @@ enum class lightfile_t
     // write .lit (version 2) file
     lit2 = 4,
     // write .lit (version LIT_VERSION_E5BGR9) file with HDR lighting
-    lithdr = 8,
+    hdr = 8,
     // write LIGHTING_E5BGR9 BSPX lump
     bspxhdr = 16,
     // bitmask for all HDR formats
-    all_hdr_formats = (lithdr | bspxhdr)
+    all_hdr_formats = (hdr | bspxhdr)
 };
 
 enum class luxfile_t

src/light/light.cc

@@ -350,7 +350,7 @@ light_settings::light_settings()
           &experimental_group, "writes both rgb and directions data into the bsp itself"},
       hdr{this, "hdr",
           [&](const std::string &, parser_base_t &, source) {
-              write_litfile |= lightfile_t::lithdr;
+              write_litfile |= lightfile_t::hdr;
               return true;
           },
           &experimental_group, "write .lit file with e5bgr9 data"},
@@ -506,7 +506,7 @@ void light_settings::light_postinitialize(int argc, const char **argv)
         logging::print("BSPX colored light output requested on command line.\n");
     if (write_litfile & lightfile_t::lit2)
         logging::print(".lit (version 2) colored light output requested on command line.\n");
-    if (write_litfile & lightfile_t::lithdr)
+    if (write_litfile & lightfile_t::hdr)
         logging::print(".lit (HDR) light output requested on command line.\n");
     if (write_litfile & lightfile_t::bspxhdr)
         logging::print("BSPX HDR light output requested on command line.\n");
@@ -799,6 +799,22 @@ static void FindModelInfo(const mbsp_t *bsp)
     Q_assert(modelinfo.size() == bsp->dmodels.size());
 }
 
+static void SaveLightmapProgress(bspdata_t *bspdata, const fs::path &source)
+{
+    SaveLightmapSurfaces(bspdata, source);
+
+    if (light_options.litonly.value()) {
+        return;
+    }
+
+    // Write a converted copy so the active lighting data stays in generic format.
+    bspdata_t write_bsp = *bspdata;
+    if (!ConvertBSPFormat(&write_bsp, write_bsp.loadversion)) {
+        Error("Failed to convert BSP for intermediate write");
+    }
+    WriteBSPFile(source, &write_bsp);
+}
+
 /*
  * =============
  *  LightWorld
@@ -883,7 +899,7 @@ static void LightWorld(bspdata_t *bspdata, const fs::path &source, bool forcedsc
 
     // Save progress after direct lighting
     logging::print("Saving progress after direct lighting...\n");
-    SaveLightmapSurfaces(bspdata, source);
+    SaveLightmapProgress(bspdata, source);
 
     if (bouncerequired && !light_options.nolighting.value()) {
 
@@ -909,7 +925,7 @@ static void LightWorld(bspdata_t *bspdata, const fs::path &source, bool forcedsc
 
             // Save progress after each bounce pass
             logging::print("Saving progress after bounce pass {}...\n", i);
-            SaveLightmapSurfaces(bspdata, source);
+            SaveLightmapProgress(bspdata, source);
         }
     }
 

src/light/write.cc

@@ -1337,7 +1337,7 @@ void SaveLightmapSurfaces(bspdata_t *bspdata, const fs::path &source)
     bspdata->bspx.entries.erase("LIGHTING_E5BGR9");
 
     // lit/lux files (or their BSPX equivalents)
-    if (light_options.write_litfile & lightfile_t::lithdr) {
+    if (light_options.write_litfile & lightfile_t::hdr) {
         WriteLitFile(bsp, g_ctx->faces_sup, source, LIT_VERSION_E5BGR9, lit_filebase, lux_filebase, hdr_filebase);
     }
     if (light_options.write_litfile & lightfile_t::lit) {