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 61c81c234fc4029c1cc1000426539b1e2a130d38..46dcb86575400ff0c5e645905fa76ee6149ce505 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -233,8 +233,8 @@ use_texture()
                                        ;;
                        esac
                        ;;
                                        ;;
                        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"/*)
                        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 (file)
index 0000000..8dbd271
--- /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 (file)
index e4b9d86..0000000
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 (file)
index 97903ab..0000000
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 (file)
index 0000000..fff343c
Binary files /dev/null and b/textures/solarpanel/panels_norm.tga differ