From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 9 Oct 2011 15:18:06 +0000 (+0200)
Subject: better tcmods, shader rename
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=013828c15ce3f81a912e9da6615b67724c5e6770;p=xonotic%2Fxonotic-maps.pk3dir.git

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
index 00000000..331d501c
--- /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 79e89847..d3fcc9e4 100644
--- a/models/map_opera/opera3.ase
+++ b/models/map_opera/opera3.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {
 	*MATERIAL_COUNT 4
 	*MATERIAL 0 {
-		*MATERIAL_NAME "light concrete"
+		*MATERIAL_NAME "textures/map_opera/lightconcrete"
 		*MATERIAL_CLASS "Standard"
 		*MATERIAL_AMBIENT 0.6431	0.6431	0.6431
 		*MATERIAL_DIFFUSE 0.6431	0.6431	0.6431
@@ -28,7 +28,7 @@
 		*MATERIAL_XP_TYPE Filter
 	}
 	*MATERIAL 1 {
-		*MATERIAL_NAME "dark concrete "
+		*MATERIAL_NAME "textures/map_opera/darkconcrete"
 		*MATERIAL_CLASS "Standard"
 		*MATERIAL_AMBIENT 0.3686	0.3686	0.3686
 		*MATERIAL_DIFFUSE 0.3686	0.3686	0.3686
@@ -44,7 +44,7 @@
 		*MATERIAL_XP_TYPE Filter
 	}
 	*MATERIAL 2 {
-		*MATERIAL_NAME "red cloth"
+		*MATERIAL_NAME "textures/map_opera/redcloth"
 		*MATERIAL_CLASS "Standard"
 		*MATERIAL_AMBIENT 1.0000	0.0000	0.0000
 		*MATERIAL_DIFFUSE 1.0000	0.0000	0.0000
@@ -60,7 +60,7 @@
 		*MATERIAL_XP_TYPE Filter
 	}
 	*MATERIAL 3 {
-		*MATERIAL_NAME "gold"
+		*MATERIAL_NAME "textures/map_opera/gold"
 		*MATERIAL_CLASS "Standard"
 		*MATERIAL_AMBIENT 1.0000	0.6353	0.0000
 		*MATERIAL_DIFFUSE 1.0000	0.6353	0.0000
diff --git a/scripts/map_opera.shader b/scripts/map_opera.shader
index c44bc06d..58cd3a4c 100644
--- 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 8970ec03..af6a3fe7 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -52,3 +52,4 @@ trak4x
 trak5x
 trak6x
 trak7x
+map_opera