moved pants to 7, reflectmask to 5, reflectcube to 6, shadowmaportho to 15
authoreihrul <eihrul@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 4 Feb 2010 02:10:43 +0000 (02:10 +0000)
committereihrul <eihrul@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 4 Feb 2010 02:10:43 +0000 (02:10 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9929 d7cf8633-e32d-0410-b094-e92efae38249

render.h

index 23b6b31..d5c8a7b 100644 (file)
--- a/render.h
+++ b/render.h
@@ -433,7 +433,7 @@ typedef enum gl20_texunit_e
        // material properties for a colormapped material
        // conflicts with secondary material
        GL20TU_PANTS = 4,
-       GL20TU_SHIRT = 5,
+       GL20TU_SHIRT = 7,
        // fog fade in the distance
        GL20TU_FOGMASK = 8,
        // compiled ambient lightmap and deluxemap
@@ -452,9 +452,9 @@ typedef enum gl20_texunit_e
        GL20TU_SHADOWMAPCUBE = 11,
        GL20TU_SHADOWMAP2D = 11,
        GL20TU_CUBEPROJECTION = 12,
-       // orthographic-projection shadowmapping, reuses prepass screenspace depth, so must fix later if the two could ever coexist during final deferred lighting pass
-       GL20TU_SHADOWMAPORTHORECT = 13,
-       GL20TU_SHADOWMAPORTHO2D = 13,
+       // orthographic-projection shadowmapping
+       GL20TU_SHADOWMAPORTHORECT = 15,
+       GL20TU_SHADOWMAPORTHO2D = 15,
        // rtlight prepass data (screenspace depth and normalmap)
        GL20TU_SCREENDEPTH = 13,
        GL20TU_SCREENNORMALMAP = 14,
@@ -462,8 +462,8 @@ typedef enum gl20_texunit_e
        GL20TU_SCREENDIFFUSE = 11,
        GL20TU_SCREENSPECULAR = 12,
        // fake reflections
-       GL20TU_REFLECTMASK = 14,
-       GL20TU_REFLECTCUBE = 15
+       GL20TU_REFLECTMASK = 5,
+       GL20TU_REFLECTCUBE = 6
 }
 gl20_texunit;