From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 15 Jan 2016 02:39:28 +0000 (+0100)
Subject: Fix most of solarpanel.
X-Git-Tag: xonotic-v0.8.2~147
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d2f74541c9117d27ff4aeef8f1b6a49ca1b107a;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix most of solarpanel.

Might still have inverted normals... need to check.
---

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 61c81c23..46dcb865 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -233,8 +233,8 @@ use_texture()
 					;;
 			esac
 			;;
-		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod
-		textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*)
+		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod, solarpanel
+		textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*|textures/solarpanel/*)
 			pre=`echo "$1" | cut -d / -f 1-2`
 			case "$2" in
 				"$pre"/*)
diff --git a/scripts/solarpanel.shader b/scripts/solarpanel.shader
new file mode 100644
index 00000000..8dbd271d
--- /dev/null
+++ b/scripts/solarpanel.shader
@@ -0,0 +1,27 @@
+textures/solarpanel/panels
+{
+	qer_editorimage textures/solarpanel/panels.tga
+	{
+		map textures/solarpanel/panels
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
+textures/solarpanel/solarmetal
+{
+	qer_editorimage textures/solarpanel/solarmetal.tga
+	{
+		map textures/solarpanel/solarmetal
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
diff --git a/textures/solarpanel/panels_bump.jpg b/textures/solarpanel/panels_bump.jpg
deleted file mode 100644
index e4b9d860..00000000
Binary files a/textures/solarpanel/panels_bump.jpg and /dev/null differ
diff --git a/textures/solarpanel/panels_norm.jpg b/textures/solarpanel/panels_norm.jpg
deleted file mode 100644
index 97903abc..00000000
Binary files a/textures/solarpanel/panels_norm.jpg and /dev/null differ
diff --git a/textures/solarpanel/panels_norm.tga b/textures/solarpanel/panels_norm.tga
new file mode 100644
index 00000000..fff343ce
Binary files /dev/null and b/textures/solarpanel/panels_norm.tga differ