]> git.rm.cloudns.org Git - xonotic/netradiant-xonoticpack.git/commitdiff
projects / xonotic / netradiant-xonoticpack.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: deb9652)
build menu: really keep lights on bsp stage, rename -keepLights to -keeplights
authorThomas Debesse <dev@illwieckz.net>
Fri, 26 Feb 2021 22:58:16 +0000 (23:58 +0100)
committerThomas Debesse <dev@illwieckz.net>
Mon, 1 Mar 2021 23:24:05 +0000 (00:24 +0100)
The option was misnamed when introduced in 4491fb4 7 years ago:

https://gitlab.com/xonotic/netradiant-xonoticpack/-/commit/4491fb4e31cc854b2e9db0e68b155728ea11d9b9

Fortunately this option is enabled by default in q3map2 since more than 10 years commit e347299 at NetRadiant:

https://gitlab.com/xonotic/netradiant/-/commit/e34729907cc073c56d438c0f52d1c77cae9bcf94

Unfortunateky it means all maps built with this build menu since 7 years
did not keep lights…

Q3map2 printed this:

> WARNING: Unknown option "-keepLights"

xonotic.game/default_build_menu.xml patch | blob | history

diff --git a/xonotic.game/default_build_menu.xml b/xonotic.game/default_build_menu.xml
index 052fb1e1f0b4f508ddc0f42f2456d5a6fb9f7a64..f2b81b8e95f282b949d590387cb4faff23a4403d 100644 (file)
--- a/xonotic.game/default_build_menu.xml
+++ b/xonotic.game/default_build_menu.xml
@@ -2,7 +2,7 @@
 <project version="2.0">
 <var name="q3map2">&quot;[RadiantPath]q3map2.[ExecutableType]&quot; [ExtraQ3map2Args] -v<cond value="[MonitorAddress]"> -connect [MonitorAddress]</cond> -game xonotic -fs_basepath &quot;[EnginePath]&quot; -fs_homepath &quot;[UserEnginePath]&quot;<cond value="[GameName]"> -fs_game [GameName]</cond></var>
 <build name="Single: -bsp">
-<command>[q3map2] -meta -keepLights -v &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v &quot;[MapFile]&quot;</command>
 </build>
 <build name="Single: -vis -fast">
 <command>[q3map2] -vis -fast -saveprt &quot;[MapFile]&quot;</command>
@@ -25,52 +25,52 @@
 </build>
 <separator/>
 <build name="Test: -bsp, -vis -fast, -light low">
-<command>[q3map2] -meta -keepLights -v &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -fast -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -cheapgrid -faster &quot;[MapFile]&quot;</command>
 </build>
 <build name="Test: -bsp, -vis, -light low">
-<command>[q3map2] -meta -keepLights -v &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -cheapgrid -faster &quot;[MapFile]&quot;</command>
 </build>
 <build name="Test: -bsp, -vis, -light medium">
-<command>[q3map2] -meta -keepLights -v &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -fast &quot;[MapFile]&quot;</command>
 </build>
 <separator/>
 <build name="Final: (Xonotic default)">
-<command>[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <build name="Final: '-light + -dirtscale 2' (Xonotic approved)">
-<command>[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -dirtscale 2 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <build name="Final: '-light + -bounce 8' (Xonotic approved)">
-<command>[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <build name="Final: '-light + -bounce 8 -dirtscale 2' (Xonotic approved)">
-<command>[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 -dirtscale 2 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <separator/>
 <build name="convert to .OBJ for modelling apps">
-<command>[q3map2] -meta -keepLights -v -patchmeta &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -patchmeta &quot;[MapFile]&quot;</command>
 <command>[q3map2] -convert -format obj &quot;[BspFile]&quot;</command>
 </build>
 <build name="convert to .OBJ for mapping">
-<command>[q3map2] -meta -keepLights -v -patchmeta &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -patchmeta &quot;[MapFile]&quot;</command>
 <command>[q3map2] -convert -format obj -shadersasbitmap &quot;[BspFile]&quot;</command>
 </build>
 <build name="convert to .OBJ for modelling apps (quick and dirty)">
@@ -81,11 +81,11 @@
 </build>
 <separator/>
 <build name="convert to .ASE for modelling apps">
-<command>[q3map2] -meta -keepLights -v -patchmeta &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -patchmeta &quot;[MapFile]&quot;</command>
 <command>[q3map2] -convert -format ase &quot;[BspFile]&quot;</command>
 </build>
 <build name="convert to .ASE for mapping">
-<command>[q3map2] -meta -keepLights -v -patchmeta &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -patchmeta &quot;[MapFile]&quot;</command>
 <command>[q3map2] -convert -format ase -shadersasbitmap &quot;[BspFile]&quot;</command>
 </build>
 <build name="convert to .ASE for modelling apps (quick and dirty)">
@@ -99,30 +99,30 @@
 <command>[q3map2] -light -nosRGB -fast &quot;[MapFile]&quot;</command>
 </build>
 <build name="Test/Legacy: -bsp, -vis, -light -nosRGB medium (OLD LIGHTING)">
-<command>[q3map2] -meta -keepLights -nosRGB -v &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -nosRGB -v &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -nosRGB -fast &quot;[MapFile]&quot;</command>
 </build>
 <build name="Legacy: '-nosRGB' (OLD LIGHTING)">
-<command>[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <build name="Legacy: '-nosRGB -light + -dirtscale 2' (OLD LIGHTING)">
-<command>[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -dirtscale 2 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <build name="Legacy: '-nosRGB -light + -bounce 8' (OLD LIGHTING)">
-<command>[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>
 </build>
 <build name="Legacy: '-nosRGB -light + -bounce 8 -dirtscale 2' (OLD LIGHTING)">
-<command>[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
+<command>[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -vis -saveprt &quot;[MapFile]&quot;</command>
 <command>[q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 -dirtscale 2 &quot;[MapFile]&quot;</command>
 <command>[q3map2] -minimap &quot;[MapFile]&quot;</command>