From 5c9e534fa08d100137cfeb70a3125f23450a8dad Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 26 Feb 2021 23:58:16 +0100 Subject: [PATCH] build menu: really keep lights on bsp stage, rename -keepLights to -keeplights MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/xonotic.game/default_build_menu.xml b/xonotic.game/default_build_menu.xml index 052fb1e..f2b81b8 100644 --- a/xonotic.game/default_build_menu.xml +++ b/xonotic.game/default_build_menu.xml @@ -2,7 +2,7 @@ "[RadiantPath]q3map2.[ExecutableType]" [ExtraQ3map2Args] -v -connect [MonitorAddress] -game xonotic -fs_basepath "[EnginePath]" -fs_homepath "[UserEnginePath]" -fs_game [GameName] -[q3map2] -meta -keepLights -v "[MapFile]" +[q3map2] -meta -keeplights -v "[MapFile]" [q3map2] -vis -fast -saveprt "[MapFile]" @@ -25,52 +25,52 @@ -[q3map2] -meta -keepLights -v "[MapFile]" +[q3map2] -meta -keeplights -v "[MapFile]" [q3map2] -vis -fast -saveprt "[MapFile]" [q3map2] -light -cheapgrid -faster "[MapFile]" -[q3map2] -meta -keepLights -v "[MapFile]" +[q3map2] -meta -keeplights -v "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -cheapgrid -faster "[MapFile]" -[q3map2] -meta -keepLights -v "[MapFile]" +[q3map2] -meta -keeplights -v "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -fast "[MapFile]" -[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -dirtscale 2 "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 -dirtscale 2 "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -patchmeta "[MapFile]" +[q3map2] -meta -keeplights -v -patchmeta "[MapFile]" [q3map2] -convert -format obj "[BspFile]" -[q3map2] -meta -keepLights -v -patchmeta "[MapFile]" +[q3map2] -meta -keeplights -v -patchmeta "[MapFile]" [q3map2] -convert -format obj -shadersasbitmap "[BspFile]" @@ -81,11 +81,11 @@ -[q3map2] -meta -keepLights -v -patchmeta "[MapFile]" +[q3map2] -meta -keeplights -v -patchmeta "[MapFile]" [q3map2] -convert -format ase "[BspFile]" -[q3map2] -meta -keepLights -v -patchmeta "[MapFile]" +[q3map2] -meta -keeplights -v -patchmeta "[MapFile]" [q3map2] -convert -format ase -shadersasbitmap "[BspFile]" @@ -99,30 +99,30 @@ [q3map2] -light -nosRGB -fast "[MapFile]" -[q3map2] -meta -keepLights -nosRGB -v "[MapFile]" +[q3map2] -meta -keeplights -nosRGB -v "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -nosRGB -fast "[MapFile]" -[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -dirtscale 2 "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 "[MapFile]" [q3map2] -minimap "[MapFile]" -[q3map2] -meta -keepLights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" +[q3map2] -meta -keeplights -v -nosRGB -maxarea -samplesize 8 -mv 1000000 -mi 6000000 "[MapFile]" [q3map2] -vis -saveprt "[MapFile]" [q3map2] -light -nosRGB -lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill -bounce 8 -dirtscale 2 "[MapFile]" [q3map2] -minimap "[MapFile]" -- 2.39.2