fix morphed's tree model

diff --git a/models/grass03.md3 b/models/grass03.md3
new file mode 100644 (file)
index 0000000..c96e60c
Binary files /dev/null and b/models/grass03.md3 differ

diff --git a/scripts/nexcompat-tree.shader b/scripts/nexcompat-tree.shader
index f047b4440205029fe1c640f2d0356269e131b245..174ca150fe05b6cfbfdfec32a34412cdef83004e 100644 (file)
--- a/scripts/nexcompat-tree.shader
+++ b/scripts/nexcompat-tree.shader
@@ -1,7 +1,7 @@
 
 leaves2
 {
-       qer_editorimage textures/leaves2.tga
+       qer_editorimage leaves2.tga
        qer_trans 0.6
        deformVertexes autosprite
        surfaceparm trans
@@ -10,25 +10,7 @@ leaves2
        q3map_vertexScale 1
        deformVertexes wave 128 sin 0 1 0 0.4 
        {
-               map textures/leaves2.tga
-               alphaFunc GT0
-               rgbGen vertex
-       }
-}
-
-textures/morph/leaves3
-{
-cull none
-       qer_editorimage textures/leaves6.tga
-       qer_trans 0.6
-       surfaceparm trans
-//     surfaceparm nolightmap
-       surfaceparm alphashadow
-       deformVertexes autosprite
-       q3map_vertexScale 1
-       deformVertexes wave 128 sin 0 1 0 0.4 
-       {
-               map textures/leaves6.tga
+               map leaves2.tga
                alphaFunc GT0
                rgbGen vertex
        }
@@ -37,7 +19,7 @@ cull none
 grass01
 {
 cull none
-       qer_editorimage textures/grass.tga
+       qer_editorimage grass.tga
        qer_trans 0.2
        deformVertexes autosprite
        surfaceparm nolightmap
@@ -45,42 +27,7 @@ cull none
        surfaceparm trans
        deformVertexes wave 128 sin 0 1 0 0.2
        {
-               map textures/grass.tga
-               alphaFunc GT0
-               rgbGen vertex
-       }
-}
-
-grass02
-{
-       distancecull 256 1024 0.4
-       cull none
-       qer_editorimage textures/grass2.tga
-       qer_trans 0.2
-       surfaceparm nolightmap
-       surfaceparm trans
-       q3map_vertexScale 1
-       deformVertexes autosprite
-       deformVertexes wave 128 sin 0 1 0 0.1 
-       {
-               map textures/grass2.tga
-               alphaFunc GT0
-               rgbGen vertex
-       }
-}
-
-leaves4
-{
-cull none
-       qer_editorimage textures/leaves7.tga
-       qer_trans 0.6
-       deformVertexes autosprite
-       surfaceparm nolightmap
-       surfaceparm trans
-       q3map_vertexScale 1
-       deformVertexes wave 128 sin 0 1 0 0.5
-       {
-               map textures/leaves7.tga
+               map grass.tga
                alphaFunc GT0
                rgbGen vertex
        }
@@ -89,19 +36,19 @@ cull none
 grass03
 {
 cull none
-       qer_editorimage textures/grass03.tga
+       qer_editorimage grass03.tga
        qer_trans 0.8
        surfaceparm trans
        surfaceparm nolightmap
        q3map_vertexScale 1
        deformVertexes wave 128 sin 0 1 0 0.1 
        {
-               map textures/grass03.tga
+               map grass03.tga
                rgbGen vertex
        }
 }
 
-textures/morphed/skyhigh
+morphed/skyhigh
 {
        qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
        q3map_noTJunc
@@ -115,7 +62,7 @@ textures/morphed/skyhigh
        skyparms env/med-troubadour-gray/med-troubadour-gray - -
 }
 
-textures/morphed/flagred
+morphed/flagred
        {
        surfaceparm nonsolid
        surfaceparm nomarks
@@ -124,11 +71,11 @@ textures/morphed/flagred
        tessSize 64
        deformVertexes wave 194 sin 0 3 0 .4
        {
-       map textures/morphed/flagred.tga
+       map morphed/flagred.tga
        rgbGen vertex
        }
        }
-textures/morphed/flagblue
+morphed/flagblue
        {
        surfaceparm nonsolid
        surfaceparm nomarks
@@ -137,27 +84,17 @@ textures/morphed/flagblue
        tessSize 64
        deformVertexes wave 194 sin 0 3 0 .4
        {
-       map textures/morphed/flagblue.tga
+       map morphed/flagblue.tga
        rgbGen vertex
        }
        }
-
-e8teamcolor
-       {
-       qer_editorimage textures/morphed/e8support02c_shirt.jpg
-       map textures/morphed/e8support02c.tga
-               {
-               map $lightmap
-               rgbGen identity
-               }
-       }
        
 thrust
 {
        {
                surfaceparam nolightmap
                surfaceparam pointlight
-               map textures/thrust.tga
+               map thrust.tga
                tcMod scroll 0 5
        }
 }

diff --git a/textures/grass2.tga b/textures/grass2.tga
deleted file mode 100644 (file)
index f0ea62a..0000000
Binary files a/textures/grass2.tga and /dev/null differ

diff --git a/textures/leaves6.tga b/textures/leaves6.tga
deleted file mode 100644 (file)
index 6110f38..0000000
Binary files a/textures/leaves6.tga and /dev/null differ

diff --git a/textures/leaves7.tga b/textures/leaves7.tga
deleted file mode 100644 (file)
index e3a81b1..0000000
Binary files a/textures/leaves7.tga and /dev/null differ

diff --git a/textures/leaves7_norm.tga b/textures/leaves7_norm.tga
deleted file mode 100644 (file)
index 46d8bca..0000000
Binary files a/textures/leaves7_norm.tga and /dev/null differ

diff --git a/textures/morphed/e8support02c.tga b/textures/morphed/e8support02c.tga
deleted file mode 100644 (file)
index 7dc7a0d..0000000
Binary files a/textures/morphed/e8support02c.tga and /dev/null differ

diff --git a/textures/morphed/e8support02c_gloss.jpg b/textures/morphed/e8support02c_gloss.jpg
deleted file mode 100644 (file)
index 7521315..0000000
Binary files a/textures/morphed/e8support02c_gloss.jpg and /dev/null differ

diff --git a/textures/morphed/e8support02c_norm.tga b/textures/morphed/e8support02c_norm.tga
deleted file mode 100644 (file)
index 5200aaa..0000000
Binary files a/textures/morphed/e8support02c_norm.tga and /dev/null differ

diff --git a/textures/morphed/e8support02c_shirt.jpg b/textures/morphed/e8support02c_shirt.jpg
deleted file mode 100644 (file)
index d3a28d9..0000000
Binary files a/textures/morphed/e8support02c_shirt.jpg and /dev/null differ