From: Morphed <Morphed@o2.pl>
Date: Tue, 28 Sep 2010 14:54:30 +0000 (+0200)
Subject: fix for duplicates, and height maps for normal maps
X-Git-Tag: xonotic-v0.5.0~92^2~23^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=517428d8f83a13dd96f059f66075c8d2e84e7cb6;p=xonotic%2Fxonotic-maps.pk3dir.git

fix for duplicates, and height maps for normal maps
---

diff --git a/models/industrial/lightbox_norm.tga b/models/industrial/lightbox_norm.tga
index 872bcdb0..f17149e9 100644
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 11096854..edb2af83 100644
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 3404bcb5..76ead9e7 100644
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 09791520..f9cce337 100644
--- 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 4c419319..cf903278 100644
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 ec39b29f..3f2ae414 100644
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 b9d055b5..e3717ae8 100644
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 a398b906..6d69028b 100644
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 6be21f9e..4a9fc31c 100644
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 1d657e1a..cb14341d 100644
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
index 3ed7789a..00000000
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
index e436ee11..00000000
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
index 4c419319..00000000
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
index 1bf98a33..00000000
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
index 8e68030b..00000000
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
index ec39b29f..00000000
Binary files a/textures/metaltechx/wall/wires_norm.tga and /dev/null differ