diff --git a/Urcheon/Texset.py b/Urcheon/Texset.py index 52f980d..9553a39 100644 --- a/Urcheon/Texset.py +++ b/Urcheon/Texset.py @@ -356,7 +356,9 @@ def walk(self): for texture_source_dir in self.texture_source_dir_list: sloth_list = [] - for dir_name, subdir_name_list, file_name_list in os.walk(texture_source_dir): + texture_source_dir_fullpath = os.path.join(self.source_dir, texture_source_dir) + + for dir_name, subdir_name_list, file_name_list in os.walk(texture_source_dir_fullpath): dir_relpath = os.path.relpath(dir_name, self.source_dir) logging.debug("dir_name: " + dir_name + ", subdir_name_list: " + str(subdir_name_list) + ", file_name_list: " + str(file_name_list)) diff --git a/profile/map/daemon.conf b/profile/map/daemon.conf index b4f1989..7031ca4 100644 --- a/profile/map/daemon.conf +++ b/profile/map/daemon.conf @@ -5,41 +5,41 @@ extend = "common" [nometa] -bsp = { tool="q3map2", options="-bsp -keeplights" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights" } [novis] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta" } [nolight] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta" } vis = { tool="q3map2", options="-vis -fast" } [nodeluxe] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta" } vis = { tool="q3map2", options="-vis -fast" } -light = { tool="q3map2", options="-light -nocollapse -faster -fastallocate -patchshadows -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -faster -fastallocate-backsplasharea -patchshadows -lightmapsize 1024 -external" } [nosample] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta" } vis = { tool="q3map2", options="-vis -fast" } -light = { tool="q3map2", options="-light -nocollapse -faster -fastallocate -patchshadows -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -faster -fastallocate-backsplasharea -patchshadows -deluxe -lightmapsize 1024 -external" } [nobounce] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta -maxarea -samplesize 16" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta -maxarea -samplesize 16" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -faster -fastallocate -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 2 -samplesize 16 -randomsamples -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -faster -fastallocate-backsplasharea -patchshadows -samples 2 -samplesize 16 -randomsamples -deluxe -lightmapsize 1024 -external" } [fast] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta -maxarea -samplesize 16" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta -maxarea -samplesize 16" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -faster -fastbounce -fastallocate -nobouncestore -shade -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 2 -samplesize 16 -randomsamples -bouncegrid -bounce 1 -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -faster -fastbounce -fastallocate -nobouncestore -backsplasharea -shade -patchshadows -samples 2 -samplesize 16 -randomsamples -bouncegrid -bounce 1 -deluxe -lightmapsize 1024 -external" } [release] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -maxarea -samplesize 8" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -maxarea -samplesize 8" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -fastbounce -fastallocate -nobouncestore -shade -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -fastbounce -fastallocate -nobouncestore -backsplasharea -shade -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } [extreme] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -maxarea -samplesize 8" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -maxarea -samplesize 8" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -fastallocate -nobouncestore -shade -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -fastallocate -nobouncestore -backsplasharea -shade -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } diff --git a/profile/map/unvanquished.conf b/profile/map/unvanquished.conf index 854dcdc..2a410dd 100644 --- a/profile/map/unvanquished.conf +++ b/profile/map/unvanquished.conf @@ -5,25 +5,37 @@ extend = "daemon" [nobounce] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta -maxarea -samplesize 16" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta -maxarea -samplesize 16" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -faster -fastallocate -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 2 -samplesize 16 -randomsamples -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -faster -fastallocate-backsplasharea -patchshadows -samples 2 -samplesize 16 -randomsamples -deluxe -lightmapsize 1024 -external" } minimap = { tool="q3map2", options="-minimap" } [fast] -bsp = { tool="q3map2", options="-bsp -keeplights -meta -fastmeta -maxarea -samplesize 16" } +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -fastmeta -maxarea -samplesize 16" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -faster -fastbounce -fastallocate -nobouncestore -shade -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 2 -samplesize 16 -randomsamples -bouncegrid -bounce 1 -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -faster -fastbounce -fastallocate -nobouncestore -backsplasharea -shade -patchshadows -samples 2 -samplesize 16 -randomsamples -bouncegrid -bounce 1 -deluxe -lightmapsize 1024 -external" } minimap = { tool="q3map2", options="-minimap" } [release] +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -maxarea -samplesize 8" } +vis = { tool="q3map2", options="-vis" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -fastbounce -fastallocate -nobouncestore -backsplasharea -shade -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } +minimap = { tool="q3map2", options="-minimap" } + +[release-before-0-56] bsp = { tool="q3map2", options="-bsp -keeplights -meta -maxarea -samplesize 8" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -fastbounce -fastallocate -nobouncestore -shade -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -nocollapse -fastbounce -fastallocate -nobouncestore -shade -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } minimap = { tool="q3map2", options="-minimap" } -[extreme] +[release-before-0-52] bsp = { tool="q3map2", options="-bsp -keeplights -meta -maxarea -samplesize 8" } vis = { tool="q3map2", options="-vis" } -light = { tool="q3map2", options="-light -nocollapse -fastallocate -nobouncestore -shade -dirty -dirtscale 0.8 -dirtdepth 32 -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } +light = { tool="q3map2", options="-light -nocollapse -fast -fastbounce -fastallocate -nobouncestore -shade -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } +minimap = { tool="q3map2", options="-minimap" } + +[extreme] +bsp = { tool="q3map2", options="-bsp -sRGBcolor -sRGBtex -keeplights -meta -maxarea -samplesize 8" } +vis = { tool="q3map2", options="-vis" } +light = { tool="q3map2", options="-light -sRGBcolor -sRGBtex -sRGBlight -nocollapse -fastallocate -nobouncestore -backsplasharea -shade -patchshadows -samples 3 -samplesize 8 -randomsamples -bouncegrid -bounce 16 -deluxe -lightmapsize 1024 -external" } minimap = { tool="q3map2", options="-minimap" }