better tcmods, shader rename

diff --git a/models/map_opera/goldendetails.md3_0.skin b/models/map_opera/goldendetails.md3_0.skin
new file mode 100644 (file)
index 0000000..331d501
--- /dev/null
+++ b/models/map_opera/goldendetails.md3_0.skin
@@ -0,0 +1 @@
+gold,textures/map_opera/gold

diff --git a/models/map_opera/opera3.ase b/models/map_opera/opera3.ase
index 79e89847d73cecda5533c167908da0bd7f9598cd..d3fcc9e4bd534653277958e88c9489820e2473c1 100644 (file)
--- a/models/map_opera/opera3.ase
+++ b/models/map_opera/opera3.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 4\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "light concrete"\r
+               *MATERIAL_NAME "textures/map_opera/lightconcrete"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.6431        0.6431  0.6431\r
                *MATERIAL_DIFFUSE 0.6431        0.6431  0.6431\r
@@ -28,7 +28,7 @@
                *MATERIAL_XP_TYPE Filter\r
        }\r
        *MATERIAL 1 {\r
-               *MATERIAL_NAME "dark concrete "\r
+               *MATERIAL_NAME "textures/map_opera/darkconcrete"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.3686        0.3686  0.3686\r
                *MATERIAL_DIFFUSE 0.3686        0.3686  0.3686\r
@@ -44,7 +44,7 @@
                *MATERIAL_XP_TYPE Filter\r
        }\r
        *MATERIAL 2 {\r
-               *MATERIAL_NAME "red cloth"\r
+               *MATERIAL_NAME "textures/map_opera/redcloth"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 1.0000        0.0000  0.0000\r
                *MATERIAL_DIFFUSE 1.0000        0.0000  0.0000\r
@@ -60,7 +60,7 @@
                *MATERIAL_XP_TYPE Filter\r
        }\r
        *MATERIAL 3 {\r
-               *MATERIAL_NAME "gold"\r
+               *MATERIAL_NAME "textures/map_opera/gold"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 1.0000        0.6353  0.0000\r
                *MATERIAL_DIFFUSE 1.0000        0.6353  0.0000\r

diff --git a/scripts/map_opera.shader b/scripts/map_opera.shader
index c44bc06d866c3d4b50237800ea77bede7f9e5d0d..58cd3a4cfbd9c419308e1260d4f648b868d2fad0 100644 (file)
--- a/scripts/map_opera.shader
+++ b/scripts/map_opera.shader
@@ -1,4 +1,4 @@
-"light concrete"
+textures/map_opera/lightconcrete
 {
        qer_editorimage textures/exomorphx/base/concrete
        dpoffsetmapping - .05538845958254273813 match8 91.30766800000000000000
@@ -6,6 +6,7 @@
        dpglossexponentmod  4
        dpreflectcube env/exomorph/exomorph
        q3map_bouncescale 1.25
+       q3map_tcmod scale 256 256
        {
                map textures/exomorphx/base/concrete
        }
@@ -17,10 +18,11 @@
        }
 }
 
-"dark concrete "
+textures/map_opera/darkconcrete
 {
         qer_editorimage textures/trak5x/base/base_base1b.tga
         q3map_bounceScale 1.25
+       q3map_tcmod scale 256 256
         {
                 map textures/trak5x/base/base_base1b.tga
         }
@@ -32,11 +34,13 @@
         }
 }
 
-"red cloth"
+textures/map_opera/redcloth
 {
         qer_editorimage textures/narmorx/base/concrete05_red.tga
         dpoffsetmapping - 0.5 match8 119
         q3map_bounceScale 1.25
+       q3map_tcmod scale 16 16
+       cull none
         {
                 map textures/narmorx/base/concrete05_red.tga
                                 
@@ -56,7 +60,7 @@ textures/map_opera/chairs_red
         q3map_bounceScale 1.25
         {
                 map textures/narmorx/base/concrete05_red.tga
-                                
+               tcmod scale 16 16
         }
         {
                 map $lightmap
@@ -66,7 +70,7 @@ textures/map_opera/chairs_red
         }
 }
 
-"gold"
+textures/map_opera/gold
 {
        cull none // gold is precious
        {

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 8970ec03c5e59a0dd7f9e7fc37fba77402772688..af6a3fe7d42d454392967003f32fc1b184179796 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -52,3 +52,4 @@ trak4x
 trak5x
 trak6x
 trak7x
+map_opera