]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Turn off renormalizing.
authorRudolf Polzer <rpolzer@google.com>
Thu, 18 Mar 2021 14:43:11 +0000 (07:43 -0700)
committerRudolf Polzer <rpolzer@google.com>
Thu, 18 Mar 2021 14:43:11 +0000 (07:43 -0700)
Crunch's renormalizing code looks hellish, and DP already renormalizes
normalmaps in the GLSL shader anyway.

Yes, means the mipmaps may not end up great. Should be OK though.

misc/tools/cached-converter.sh

index ec976351921dcd0329a86710e2ea5a8f379a1f80..cb90595351204fd0218bdc5418c8cef0be42fbb1 100755 (executable)
@@ -404,7 +404,10 @@ for F in "$@"; do
                        export S2TC_REFINE_COLORS=LOOP
                        export S2TC_DITHER_MODE=NONE
                        # Engine ignores alpha channel on these, so we can use the DXT1 black encoding.
-                       export CRUNCH_TEXTYPEFLAGS='-gamma 1.0 -renormalize -rtopmip -uniformMetrics -usetransparentindicesforblack'
+                       # Not that that color should happen very often on a deluxemap, but who knows.
+                       # NOT renormalizing, as DP does its own renormalization anyway in the GLSL shader
+                       # and crunch's renormalizing looks like it can cause banding artifacts.
+                       export CRUNCH_TEXTYPEFLAGS='-gamma 1.0 -uniformMetrics -usetransparentindicesforblack'
                        ;;
                *_norm)
                        export S2TC_COLORDIST_MODE=NORMALMAP
@@ -412,7 +415,9 @@ for F in "$@"; do
                        export S2TC_REFINE_COLORS=LOOP
                        export S2TC_DITHER_MODE=NONE
                        # Alpha channel here means height.
-                       export CRUNCH_TEXTYPEFLAGS='-gamma 1.0 -renormalize -rtopmip -uniformMetrics'
+                       # NOT renormalizing, as DP does its own renormalization anyway in the GLSL shader
+                       # and crunch's renormalizing looks like it can cause banding artifacts.
+                       export CRUNCH_TEXTYPEFLAGS='-gamma 1.0 -uniformMetrics'
                        ;;
                *)
                        export S2TC_COLORDIST_MODE=SRGB_MIXED