fix for duplicates, and height maps for normal maps

diff --git a/models/industrial/lightbox_norm.tga b/models/industrial/lightbox_norm.tga
index 872bcdb05ae43d8ea6ee2fe9d9e7acdb0b4baa0d..f17149e9463d947c78a2feae2f4006e692fb14c1 100644 (file)
Binary files a/models/industrial/lightbox_norm.tga and b/models/industrial/lightbox_norm.tga differ

diff --git a/models/industrial/socket_norm.tga b/models/industrial/socket_norm.tga
index 110968540f23e45e2d17124a2604089252bc9c9d..edb2af833c4876ca238302168e7b22d742bb9175 100644 (file)
Binary files a/models/industrial/socket_norm.tga and b/models/industrial/socket_norm.tga differ

diff --git a/models/industrial/top_norm.tga b/models/industrial/top_norm.tga
index 3404bcb5f83f7b9be3962ef7737854ecac2ce279..76ead9e7fd1cef90f65e734ef1d6b03efe531e9b 100644 (file)
Binary files a/models/industrial/top_norm.tga and b/models/industrial/top_norm.tga differ

diff --git a/scripts/metaltechx.shader b/scripts/metaltechx.shader
index 09791520cc671d9ebf17d9086e9b8d3eb0501714..f9cce337f76fc2e10321c47704d37ad9a7436bd9 100644 (file)
--- a/scripts/metaltechx.shader
+++ b/scripts/metaltechx.shader
@@ -120,32 +120,6 @@ textures/metaltechx/wall-alu_cap
 }
 
 
-textures/metaltechx/wall-grate
-{
-       qer_editorimage textures/metaltechx/wall/grate
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       surfaceparm metalsteps
-       surfaceparm trans
-       q3map_bouncescale 1.75
-
-
-       {
-               map textures/metaltechx/wall/grate
-                               blendfunc blend
-               
-       }
-
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-
 textures/metaltechx/wall-alu_base
 {
        qer_editorimage textures/metaltechx/wall/alu_base
@@ -193,28 +167,3 @@ textures/metaltechx/wall-alu02
        }
 }
 
-
-textures/metaltechx/wall-wires
-{
-       qer_editorimage textures/metaltechx/wall/wires
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       surfaceparm metalsteps
-       q3map_bouncescale 1.50
-
-
-       {
-               map textures/metaltechx/wall/wires
-                               
-       }
-
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-

diff --git a/textures/metaltechx/detail/grate_norm.tga b/textures/metaltechx/detail/grate_norm.tga
index 4c4193190de662e0c968df35f8dcee10a7c9f337..cf903278114aaaeca8a1b3b71a4234a91b9e4cf7 100644 (file)
Binary files a/textures/metaltechx/detail/grate_norm.tga and b/textures/metaltechx/detail/grate_norm.tga differ

diff --git a/textures/metaltechx/detail/wires_norm.tga b/textures/metaltechx/detail/wires_norm.tga
index ec39b29f59babc800afa4b6005485f25b858a77d..3f2ae4148767c45a6fe4b4b424f133901423875b 100644 (file)
Binary files a/textures/metaltechx/detail/wires_norm.tga and b/textures/metaltechx/detail/wires_norm.tga differ

diff --git a/textures/metaltechx/wall/alu02_norm.tga b/textures/metaltechx/wall/alu02_norm.tga
index b9d055b5c9c5b977a46319c039e00eda12bdcfa2..e3717ae8dcbe1d5e9baff2042211c36942ef87b5 100644 (file)
Binary files a/textures/metaltechx/wall/alu02_norm.tga and b/textures/metaltechx/wall/alu02_norm.tga differ

diff --git a/textures/metaltechx/wall/alu_cap_norm.tga b/textures/metaltechx/wall/alu_cap_norm.tga
index a398b90665e2083d39dec8518344d76619575ca2..6d69028ba736255dd042e08a1866f0cbf172d18c 100644 (file)
Binary files a/textures/metaltechx/wall/alu_cap_norm.tga and b/textures/metaltechx/wall/alu_cap_norm.tga differ

diff --git a/textures/metaltechx/wall/alu_norm.tga b/textures/metaltechx/wall/alu_norm.tga
index 6be21f9ec255c19be06af78ef99a68cd1cbd2a25..4a9fc31cb962c4c5ea38ac9daa954044cb86dc54 100644 (file)
Binary files a/textures/metaltechx/wall/alu_norm.tga and b/textures/metaltechx/wall/alu_norm.tga differ

diff --git a/textures/metaltechx/wall/aluyellow_norm.tga b/textures/metaltechx/wall/aluyellow_norm.tga
index 1d657e1ad52ce22edad0f9a21ac19706247e6579..cb14341d3732da7e9e8b147cd9f3e2b04fc0232b 100644 (file)
Binary files a/textures/metaltechx/wall/aluyellow_norm.tga and b/textures/metaltechx/wall/aluyellow_norm.tga differ

diff --git a/textures/metaltechx/wall/grate.tga b/textures/metaltechx/wall/grate.tga
deleted file mode 100644 (file)
index 3ed7789..0000000
Binary files a/textures/metaltechx/wall/grate.tga and /dev/null differ

diff --git a/textures/metaltechx/wall/grate_gloss.tga b/textures/metaltechx/wall/grate_gloss.tga
deleted file mode 100644 (file)
index e436ee1..0000000
Binary files a/textures/metaltechx/wall/grate_gloss.tga and /dev/null differ

diff --git a/textures/metaltechx/wall/grate_norm.tga b/textures/metaltechx/wall/grate_norm.tga
deleted file mode 100644 (file)
index 4c41931..0000000
Binary files a/textures/metaltechx/wall/grate_norm.tga and /dev/null differ

diff --git a/textures/metaltechx/wall/wires.tga b/textures/metaltechx/wall/wires.tga
deleted file mode 100644 (file)
index 1bf98a3..0000000
Binary files a/textures/metaltechx/wall/wires.tga and /dev/null differ

diff --git a/textures/metaltechx/wall/wires_gloss.tga b/textures/metaltechx/wall/wires_gloss.tga
deleted file mode 100644 (file)
index 8e68030..0000000
Binary files a/textures/metaltechx/wall/wires_gloss.tga and /dev/null differ

diff --git a/textures/metaltechx/wall/wires_norm.tga b/textures/metaltechx/wall/wires_norm.tga
deleted file mode 100644 (file)
index ec39b29..0000000
Binary files a/textures/metaltechx/wall/wires_norm.tga and /dev/null differ