From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 25 Feb 2015 12:55:42 +0000 (+0100)
Subject: Use the new textures!
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5fb92d81de4d51d174a45bcb2b65b3db10a3f3b8;p=xonotic%2Fxonotic-maps.pk3dir.git

Use the new textures!
---

diff --git a/models/nest_chamber_13/nest_protect.map b/models/nest_chamber_13/nest_protect.map
index 6c6d7570..8c64535d 100644
--- a/models/nest_chamber_13/nest_protect.map
+++ b/models/nest_chamber_13/nest_protect.map
@@ -3,12 +3,12 @@
 {
 brushDef
 {
-( 16 8 0 ) ( 16 -8 0 ) ( -8 8 0 ) ( ( 0.009765625 0 500.75 ) ( 0 0.009765625 3.25 ) ) facility114invx/wall-corridor02invr 0 0 0
-( 16 16 48 ) ( -8 16 48 ) ( 16 16 -16 ) ( ( 0.009765625 0 508.5625 ) ( 0 0.009765625 508.84375 ) ) facility114invx/wall-corridor02invr 0 0 0
-( 16 8 48 ) ( 16 8 -16 ) ( 16 -8 48 ) ( ( 0.009765625 0 500.75 ) ( 0 0.009765625 508.84375 ) ) facility114invx/wall-corridor02invr 0 0 0
-( -8 -8 -8 ) ( 16 -8 -8 ) ( -8 8 -8 ) ( ( 0.009765625 0 500.75 ) ( 0 0.009765625 507.4375 ) ) facility114invx/wall-corridor02invr 0 0 0
-( -8 -16 -16 ) ( -8 -16 48 ) ( 16 -16 -16 ) ( ( 0.009765625 0 4.375 ) ( 0 0.009765625 508.84375 ) ) facility114invx/wall-corridor02invr 0 0 0
-( -16 -8 -16 ) ( -16 8 -16 ) ( -16 -8 48 ) ( ( 0.009765625 0 12.1875 ) ( 0 0.009765625 508.84375 ) ) facility114invx/wall-corridor02invr 0 0 0
+( 16 8 0 ) ( 16 -8 0 ) ( -8 8 0 ) ( ( 0.03125 0 -0.5 ) ( -0 0.03125 0.5 ) ) map_nest_chamber_13/nest 0 0 0
+( 16 16 48 ) ( -8 16 48 ) ( 16 16 -16 ) ( ( 0.03125 0 -0.5 ) ( -0 0.0000039063 0 ) ) map_nest_chamber_13/nest 0 0 0
+( 16 8 48 ) ( 16 8 -16 ) ( 16 -8 48 ) ( ( 0.03125 0 -0.5 ) ( -0 0.0000039063 0 ) ) map_nest_chamber_13/nest 0 0 0
+( -8 -8 -8 ) ( 16 -8 -8 ) ( -8 8 -8 ) ( ( 0.03125 0 -0.5 ) ( -0 0.03125 0.5 ) ) map_nest_chamber_13/nest 0 0 0
+( -8 -16 -16 ) ( -8 -16 48 ) ( 16 -16 -16 ) ( ( 0.03125 0 -0.5 ) ( -0 0.0000039063 0 ) ) map_nest_chamber_13/nest 0 0 0
+( -16 -8 -16 ) ( -16 8 -16 ) ( -16 -8 48 ) ( ( 0.03125 0 -0.5 ) ( -0 0.0000039063 0 ) ) map_nest_chamber_13/nest 0 0 0
 }
 }
 }
diff --git a/models/nest_chamber_13/nest_protect.mtl b/models/nest_chamber_13/nest_protect.mtl
index d0651d30..8e7ef294 100644
--- a/models/nest_chamber_13/nest_protect.mtl
+++ b/models/nest_chamber_13/nest_protect.mtl
@@ -1,4 +1,4 @@
 # Generated by Q3Map2 (ydnar) -convert -format obj
-newmtl textures/facility114invx/wall-corridor02invr
-Kd 0.850108 0.834451 1.000000
-map_Kd textures/facility114invx/wall-corridor02invr
+newmtl textures/map_nest_chamber_13/nest
+Kd 1.000000 0.999991 0.999991
+map_Kd textures/map_nest_chamber_13/nest
diff --git a/models/nest_chamber_13/nest_protect.obj b/models/nest_chamber_13/nest_protect.obj
index 501eeddd..a67839a9 100644
--- a/models/nest_chamber_13/nest_protect.obj
+++ b/models/nest_chamber_13/nest_protect.obj
@@ -3,23 +3,23 @@ o nest_protect
 mtllib nest_protect.mtl
 g mat0model0surf0
 # SURFACETYPE MST_PLANAR
-usemtl textures/facility114invx/wall-corridor02invr
+usemtl textures/map_nest_chamber_13/nest
 # vertex 1
 v 16.000000 16.000000 -8.000000
 vn 1.000000 0.000000 0.000000
-vt 0.906250 0.078125
+vt 1.000000 0.999969
 # vertex 2
 v 16.000000 -16.000000 -8.000000
 vn 1.000000 0.000000 0.000000
-vt 0.593750 0.078125
+vt 0.000000 0.999969
 # vertex 3
 v 16.000000 16.000000 0.000000
 vn 1.000000 0.000000 0.000000
-vt 0.906250 0.156250
+vt 1.000000 1.000000
 # vertex 4
 v 16.000000 -16.000000 0.000000
 vn 1.000000 0.000000 0.000000
-vt 0.593750 0.156250
+vt 0.000000 1.000000
 f 1/1/1 3/3/3 2/2/2
 f 3/3/3 4/4/4 2/2/2
 g mat0model0surf1
@@ -27,19 +27,19 @@ g mat0model0surf1
 # vertex 5
 v -16.000000 16.000000 0.000000
 vn 0.000000 1.000000 0.000000
-vt 0.718750 0.156250
+vt 1.000000 1.000000
 # vertex 6
 v -16.000000 16.000000 -8.000000
 vn 0.000000 1.000000 0.000000
-vt 0.718750 0.078125
+vt 1.000000 0.999969
 # vertex 7
 v 16.000000 16.000000 0.000000
 vn 0.000000 1.000000 0.000000
-vt 0.406250 0.156250
+vt 0.000000 1.000000
 # vertex 8
 v 16.000000 16.000000 -8.000000
 vn 0.000000 1.000000 0.000000
-vt 0.406250 0.078125
+vt 0.000000 0.999969
 f 5/5/5 7/7/7 6/6/6
 f 7/7/7 8/8/8 6/6/6
 g mat0model0surf2
@@ -47,19 +47,19 @@ g mat0model0surf2
 # vertex 9
 v 16.000000 -16.000000 0.000000
 vn 0.000000 0.000000 1.000000
-vt 0.593750 0.593750
+vt 0.000000 0.000000
 # vertex 10
 v -16.000000 -16.000000 0.000000
 vn 0.000000 0.000000 1.000000
-vt 0.593750 0.906250
+vt 0.000000 1.000000
 # vertex 11
 v 16.000000 16.000000 0.000000
 vn 0.000000 0.000000 1.000000
-vt 0.906250 0.593750
+vt 1.000000 0.000000
 # vertex 12
 v -16.000000 16.000000 0.000000
 vn 0.000000 0.000000 1.000000
-vt 0.906250 0.906250
+vt 1.000000 1.000000
 f 9/9/9 11/11/11 10/10/10
 f 11/11/11 12/12/12 10/10/10
 g mat0model0surf3
@@ -67,19 +67,19 @@ g mat0model0surf3
 # vertex 13
 v -16.000000 16.000000 -8.000000
 vn 0.000000 0.000000 -1.000000
-vt 0.906250 0.406250
+vt 1.000000 0.000000
 # vertex 14
 v -16.000000 -16.000000 -8.000000
 vn 0.000000 0.000000 -1.000000
-vt 0.593750 0.406250
+vt 0.000000 0.000000
 # vertex 15
 v 16.000000 16.000000 -8.000000
 vn 0.000000 0.000000 -1.000000
-vt 0.906250 0.718750
+vt 1.000000 1.000000
 # vertex 16
 v 16.000000 -16.000000 -8.000000
 vn 0.000000 0.000000 -1.000000
-vt 0.593750 0.718750
+vt 0.000000 1.000000
 f 13/13/13 15/15/15 14/14/14
 f 15/15/15 16/16/16 14/14/14
 g mat0model0surf4
@@ -87,19 +87,19 @@ g mat0model0surf4
 # vertex 17
 v 16.000000 -16.000000 -8.000000
 vn 0.000000 -1.000000 0.000000
-vt 0.531250 0.078125
+vt 1.000000 0.999969
 # vertex 18
 v -16.000000 -16.000000 -8.000000
 vn 0.000000 -1.000000 0.000000
-vt 0.218750 0.078125
+vt 0.000000 0.999969
 # vertex 19
 v 16.000000 -16.000000 0.000000
 vn 0.000000 -1.000000 0.000000
-vt 0.531250 0.156250
+vt 1.000000 1.000000
 # vertex 20
 v -16.000000 -16.000000 0.000000
 vn 0.000000 -1.000000 0.000000
-vt 0.218750 0.156250
+vt 0.000000 1.000000
 f 17/17/17 19/19/19 18/18/18
 f 19/19/19 20/20/20 18/18/18
 g mat0model0surf5
@@ -107,18 +107,18 @@ g mat0model0surf5
 # vertex 21
 v -16.000000 -16.000000 0.000000
 vn -1.000000 0.000000 0.000000
-vt 0.343750 0.156250
+vt 1.000000 1.000000
 # vertex 22
 v -16.000000 -16.000000 -8.000000
 vn -1.000000 0.000000 0.000000
-vt 0.343750 0.078125
+vt 1.000000 0.999969
 # vertex 23
 v -16.000000 16.000000 0.000000
 vn -1.000000 0.000000 0.000000
-vt 0.031250 0.156250
+vt 0.000000 1.000000
 # vertex 24
 v -16.000000 16.000000 -8.000000
 vn -1.000000 0.000000 0.000000
-vt 0.031250 0.078125
+vt 0.000000 0.999969
 f 21/21/21 23/23/23 22/22/22
 f 23/23/23 24/24/24 22/22/22
diff --git a/scripts/map_nest_chamber_13.shader b/scripts/map_nest_chamber_13.shader
index 4eb97030..28685bc4 100644
--- a/scripts/map_nest_chamber_13.shader
+++ b/scripts/map_nest_chamber_13.shader
@@ -1,12 +1,13 @@
 textures/map_nest_chamber_13/nest
 {
-	q3r_editorimage textures/map_nest_chamber_13/nest_red
+	qer_editorimage "textures/map_nest_chamber_13/nest_red.tga"
 	{
 		map $lightmap
 		blendfunc filter
 		rgbGen identity
 	}
 	{
-		animmap 2 textures/map_nest_chamber_13/nest_red textures/map_nest_chamber_13/nest_yellow
+		map "textures/map_nest_chamber_13/nest_red.tga"
+		animmap 2 "textures/map_nest_chamber_13/nest_red.tga" "textures/map_nest_chamber_13/nest_yellow.tga"
 	}
 }