Use the new textures!

diff --git a/models/nest_chamber_13/nest_protect.map b/models/nest_chamber_13/nest_protect.map
index 6c6d7570cd59efff6f416d5189edc2a1001c4f2c..8c64535d9742e7e9dc0bb7cb936be3511a763813 100644 (file)
--- 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 d0651d3081d4f946eab00611bc72c965c2fb93ea..8e7ef2941bb9f0886ea6bdb69df197c526df8dd4 100644 (file)
--- 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\r
-newmtl textures/facility114invx/wall-corridor02invr\r
-Kd 0.850108 0.834451 1.000000\r
-map_Kd textures/facility114invx/wall-corridor02invr\r
+newmtl textures/map_nest_chamber_13/nest\r
+Kd 1.000000 0.999991 0.999991\r
+map_Kd textures/map_nest_chamber_13/nest\r

diff --git a/models/nest_chamber_13/nest_protect.obj b/models/nest_chamber_13/nest_protect.obj
index 501eeddd6b48feb1216de4284a4334cf8eb7623b..a67839a94a2092a37adfa3d17fe653fbf8978733 100644 (file)
--- 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\r
 g mat0model0surf0\r
 # SURFACETYPE MST_PLANAR\r
-usemtl textures/facility114invx/wall-corridor02invr\r
+usemtl textures/map_nest_chamber_13/nest\r
 # vertex 1\r
 v 16.000000 16.000000 -8.000000\r
 vn 1.000000 0.000000 0.000000\r
-vt 0.906250 0.078125\r
+vt 1.000000 0.999969\r
 # vertex 2\r
 v 16.000000 -16.000000 -8.000000\r
 vn 1.000000 0.000000 0.000000\r
-vt 0.593750 0.078125\r
+vt 0.000000 0.999969\r
 # vertex 3\r
 v 16.000000 16.000000 0.000000\r
 vn 1.000000 0.000000 0.000000\r
-vt 0.906250 0.156250\r
+vt 1.000000 1.000000\r
 # vertex 4\r
 v 16.000000 -16.000000 0.000000\r
 vn 1.000000 0.000000 0.000000\r
-vt 0.593750 0.156250\r
+vt 0.000000 1.000000\r
 f 1/1/1 3/3/3 2/2/2\r
 f 3/3/3 4/4/4 2/2/2\r
 g mat0model0surf1\r
@@ -27,19 +27,19 @@ g mat0model0surf1
 # vertex 5\r
 v -16.000000 16.000000 0.000000\r
 vn 0.000000 1.000000 0.000000\r
-vt 0.718750 0.156250\r
+vt 1.000000 1.000000\r
 # vertex 6\r
 v -16.000000 16.000000 -8.000000\r
 vn 0.000000 1.000000 0.000000\r
-vt 0.718750 0.078125\r
+vt 1.000000 0.999969\r
 # vertex 7\r
 v 16.000000 16.000000 0.000000\r
 vn 0.000000 1.000000 0.000000\r
-vt 0.406250 0.156250\r
+vt 0.000000 1.000000\r
 # vertex 8\r
 v 16.000000 16.000000 -8.000000\r
 vn 0.000000 1.000000 0.000000\r
-vt 0.406250 0.078125\r
+vt 0.000000 0.999969\r
 f 5/5/5 7/7/7 6/6/6\r
 f 7/7/7 8/8/8 6/6/6\r
 g mat0model0surf2\r
@@ -47,19 +47,19 @@ g mat0model0surf2
 # vertex 9\r
 v 16.000000 -16.000000 0.000000\r
 vn 0.000000 0.000000 1.000000\r
-vt 0.593750 0.593750\r
+vt 0.000000 0.000000\r
 # vertex 10\r
 v -16.000000 -16.000000 0.000000\r
 vn 0.000000 0.000000 1.000000\r
-vt 0.593750 0.906250\r
+vt 0.000000 1.000000\r
 # vertex 11\r
 v 16.000000 16.000000 0.000000\r
 vn 0.000000 0.000000 1.000000\r
-vt 0.906250 0.593750\r
+vt 1.000000 0.000000\r
 # vertex 12\r
 v -16.000000 16.000000 0.000000\r
 vn 0.000000 0.000000 1.000000\r
-vt 0.906250 0.906250\r
+vt 1.000000 1.000000\r
 f 9/9/9 11/11/11 10/10/10\r
 f 11/11/11 12/12/12 10/10/10\r
 g mat0model0surf3\r
@@ -67,19 +67,19 @@ g mat0model0surf3
 # vertex 13\r
 v -16.000000 16.000000 -8.000000\r
 vn 0.000000 0.000000 -1.000000\r
-vt 0.906250 0.406250\r
+vt 1.000000 0.000000\r
 # vertex 14\r
 v -16.000000 -16.000000 -8.000000\r
 vn 0.000000 0.000000 -1.000000\r
-vt 0.593750 0.406250\r
+vt 0.000000 0.000000\r
 # vertex 15\r
 v 16.000000 16.000000 -8.000000\r
 vn 0.000000 0.000000 -1.000000\r
-vt 0.906250 0.718750\r
+vt 1.000000 1.000000\r
 # vertex 16\r
 v 16.000000 -16.000000 -8.000000\r
 vn 0.000000 0.000000 -1.000000\r
-vt 0.593750 0.718750\r
+vt 0.000000 1.000000\r
 f 13/13/13 15/15/15 14/14/14\r
 f 15/15/15 16/16/16 14/14/14\r
 g mat0model0surf4\r
@@ -87,19 +87,19 @@ g mat0model0surf4
 # vertex 17\r
 v 16.000000 -16.000000 -8.000000\r
 vn 0.000000 -1.000000 0.000000\r
-vt 0.531250 0.078125\r
+vt 1.000000 0.999969\r
 # vertex 18\r
 v -16.000000 -16.000000 -8.000000\r
 vn 0.000000 -1.000000 0.000000\r
-vt 0.218750 0.078125\r
+vt 0.000000 0.999969\r
 # vertex 19\r
 v 16.000000 -16.000000 0.000000\r
 vn 0.000000 -1.000000 0.000000\r
-vt 0.531250 0.156250\r
+vt 1.000000 1.000000\r
 # vertex 20\r
 v -16.000000 -16.000000 0.000000\r
 vn 0.000000 -1.000000 0.000000\r
-vt 0.218750 0.156250\r
+vt 0.000000 1.000000\r
 f 17/17/17 19/19/19 18/18/18\r
 f 19/19/19 20/20/20 18/18/18\r
 g mat0model0surf5\r
@@ -107,18 +107,18 @@ g mat0model0surf5
 # vertex 21\r
 v -16.000000 -16.000000 0.000000\r
 vn -1.000000 0.000000 0.000000\r
-vt 0.343750 0.156250\r
+vt 1.000000 1.000000\r
 # vertex 22\r
 v -16.000000 -16.000000 -8.000000\r
 vn -1.000000 0.000000 0.000000\r
-vt 0.343750 0.078125\r
+vt 1.000000 0.999969\r
 # vertex 23\r
 v -16.000000 16.000000 0.000000\r
 vn -1.000000 0.000000 0.000000\r
-vt 0.031250 0.156250\r
+vt 0.000000 1.000000\r
 # vertex 24\r
 v -16.000000 16.000000 -8.000000\r
 vn -1.000000 0.000000 0.000000\r
-vt 0.031250 0.078125\r
+vt 0.000000 0.999969\r
 f 21/21/21 23/23/23 22/22/22\r
 f 23/23/23 24/24/24 22/22/22\r

diff --git a/scripts/map_nest_chamber_13.shader b/scripts/map_nest_chamber_13.shader
index 4eb970301566d8bb0f0a838cd48c7c1fc0c996a7..28685bc46cb524791fb10d2159d675ae529b9dd8 100644 (file)
--- 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"
        }
 }