shader-audit: more fixes

diff --git a/env/exosystem/exosystem2_bk.tga b/env/exosystem/exosystem2_bk.tga
deleted file mode 100644 (file)
index 3529c9a..0000000
Binary files a/env/exosystem/exosystem2_bk.tga and /dev/null differ

diff --git a/env/exosystem/exosystem2_dn.tga b/env/exosystem/exosystem2_dn.tga
deleted file mode 100644 (file)
index eb16ba0..0000000
Binary files a/env/exosystem/exosystem2_dn.tga and /dev/null differ

diff --git a/env/exosystem/exosystem2_ft.tga b/env/exosystem/exosystem2_ft.tga
deleted file mode 100644 (file)
index e323551..0000000
Binary files a/env/exosystem/exosystem2_ft.tga and /dev/null differ

diff --git a/env/exosystem/exosystem2_lf.tga b/env/exosystem/exosystem2_lf.tga
deleted file mode 100644 (file)
index d73f64e..0000000
Binary files a/env/exosystem/exosystem2_lf.tga and /dev/null differ

diff --git a/env/exosystem/exosystem2_preview.png b/env/exosystem/exosystem2_preview.png
deleted file mode 100644 (file)
index c5e2ccd..0000000
Binary files a/env/exosystem/exosystem2_preview.png and /dev/null differ

diff --git a/env/exosystem/exosystem2_rt.tga b/env/exosystem/exosystem2_rt.tga
deleted file mode 100644 (file)
index 898392d..0000000
Binary files a/env/exosystem/exosystem2_rt.tga and /dev/null differ

diff --git a/env/exosystem/exosystem2_up.tga b/env/exosystem/exosystem2_up.tga
deleted file mode 100644 (file)
index a7bae49..0000000
Binary files a/env/exosystem/exosystem2_up.tga and /dev/null differ

diff --git a/env/exosystem/exosystem_preview.png b/env/exosystem/exosystem_preview.png
deleted file mode 100644 (file)
index dc5cd53..0000000
Binary files a/env/exosystem/exosystem_preview.png and /dev/null differ

diff --git a/env/exosystem2/exosystem2_bk.tga b/env/exosystem2/exosystem2_bk.tga
new file mode 100644 (file)
index 0000000..3529c9a
Binary files /dev/null and b/env/exosystem2/exosystem2_bk.tga differ

diff --git a/env/exosystem2/exosystem2_dn.tga b/env/exosystem2/exosystem2_dn.tga
new file mode 100644 (file)
index 0000000..eb16ba0
Binary files /dev/null and b/env/exosystem2/exosystem2_dn.tga differ

diff --git a/env/exosystem2/exosystem2_ft.tga b/env/exosystem2/exosystem2_ft.tga
new file mode 100644 (file)
index 0000000..e323551
Binary files /dev/null and b/env/exosystem2/exosystem2_ft.tga differ

diff --git a/env/exosystem2/exosystem2_lf.tga b/env/exosystem2/exosystem2_lf.tga
new file mode 100644 (file)
index 0000000..d73f64e
Binary files /dev/null and b/env/exosystem2/exosystem2_lf.tga differ

diff --git a/env/exosystem2/exosystem2_rt.tga b/env/exosystem2/exosystem2_rt.tga
new file mode 100644 (file)
index 0000000..898392d
Binary files /dev/null and b/env/exosystem2/exosystem2_rt.tga differ

diff --git a/env/exosystem2/exosystem2_up.tga b/env/exosystem2/exosystem2_up.tga
new file mode 100644 (file)
index 0000000..a7bae49
Binary files /dev/null and b/env/exosystem2/exosystem2_up.tga differ

diff --git a/scripts/common.shader b/scripts/common.shader
index 80643be393ed5f71c2aeff59a8df500af9ff9cbc..f771dda01ab283d297a73cb2055496f696633daf 100644 (file)
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -118,7 +118,6 @@ textures/common/nodrop
 
 textures/common/noimpact
 {
-       qer_editorimage textures/common/nolightmap.tga
        qer_nocarve
        qer_trans 0.5
        surfaceparm nodraw
@@ -165,7 +164,6 @@ textures/common/terrain
 textures/common/terrain2
 {
        q3map_terrain
-       qer_editorimage textures/common/terrain.tga
        surfaceparm dust
        surfaceparm nodraw
        surfaceparm nomarks

diff --git a/scripts/exosystem.shader b/scripts/exosystem.shader
deleted file mode 100644 (file)
index 782d163..0000000
--- a/scripts/exosystem.shader
+++ /dev/null
@@ -1,29 +0,0 @@
-textures/skies/exosystem
-{
-       qer_editorimage env/exosystem/exosystem_preview.tga
-       
-       surfaceparm noimpact
-       surfaceparm nolightmap
-       surfaceparm nomarks
-       surfaceparm sky
-       
-       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
-       q3map_sun 1 1 1 350 60 41.743
-       q3map_surfacelight 550
-       skyparms env/exosystem/exosystem - -
-}
-
-textures/skies/exosystem2
-{
-       qer_editorimage env/exosystem/exosystem2_preview.tga
-       
-       surfaceparm noimpact
-       surfaceparm nolightmap
-       surfaceparm nomarks
-       surfaceparm sky
-       
-       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
-       q3map_sun 1 .40625 .17578125 150 -55.452 17.379
-       q3map_surfacelight 300
-       skyparms env/exosystem/exosystem2 - -
-}
\ No newline at end of file

diff --git a/scripts/extragalactic.shader b/scripts/extragalactic.shader
deleted file mode 100644 (file)
index f3a44cb..0000000
--- a/scripts/extragalactic.shader
+++ /dev/null
@@ -1,39 +0,0 @@
-textures/skies/extragalactic_asteroids
-{
-       qer_editorimage env/extragalactic/asteroids_bk.tga
-       surfaceparm sky
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm noimpact
-       surfaceparm nomarks
-
-       skyparms env/extragalactic/asteroids - - //farbox cloudheight nearbox
-       q3map_sunExt 1 0.75 0.5 320 27 42 0 16 //rgb intensity degrees elevation deviance samples
-}
-
-textures/skies/extragalactic_nebulae
-{
-       qer_editorimage env/extragalactic/nebulae_bk.tga
-       surfaceparm sky
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm noimpact
-       surfaceparm nomarks
-
-       skyparms env/extragalactic/nebulae - - //farbox cloudheight nearbox
-    q3map_skyLight 50 4 //amount iterations
-       q3map_sunExt 1 0.9 0.8 300 66 36 3 16 //rgb intensity degrees elevation deviance samples
-}
-
-textures/skies/extragalactic_planets
-{
-       qer_editorimage env/extragalactic/planets_bk.tga
-       surfaceparm sky
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm noimpact
-       surfaceparm nomarks
-
-       skyparms env/extragalactic/planets - - //farbox cloudheight nearbox
-       q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples
-}

diff --git a/scripts/skies_exosystem.shader b/scripts/skies_exosystem.shader
new file mode 100644 (file)
index 0000000..710f57a
--- /dev/null
+++ b/scripts/skies_exosystem.shader
@@ -0,0 +1,14 @@
+textures/skies/exosystem
+{
+       qer_editorimage textures/skies/exosystem.tga
+       
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm sky
+       
+       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
+       q3map_sun 1 1 1 350 60 41.743
+       q3map_surfacelight 550
+       skyparms env/exosystem/exosystem - -
+}

diff --git a/scripts/skies_exosystem2.shader b/scripts/skies_exosystem2.shader
new file mode 100644 (file)
index 0000000..2ed77c1
--- /dev/null
+++ b/scripts/skies_exosystem2.shader
@@ -0,0 +1,14 @@
+textures/skies/exosystem2
+{
+       qer_editorimage textures/skies/exosystem2.tga
+       
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm sky
+       
+       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
+       q3map_sun 1 .40625 .17578125 150 -55.452 17.379
+       q3map_surfacelight 300
+       skyparms env/exosystem2/exosystem2 - -
+}

diff --git a/scripts/skies_extragalactic.shader b/scripts/skies_extragalactic.shader
new file mode 100644 (file)
index 0000000..f571964
--- /dev/null
+++ b/scripts/skies_extragalactic.shader
@@ -0,0 +1,39 @@
+textures/skies/extragalactic_asteroids
+{
+       qer_editorimage textures/skies/extragalactic_asteroids.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/extragalactic/asteroids - - //farbox cloudheight nearbox
+       q3map_sunExt 1 0.75 0.5 320 27 42 0 16 //rgb intensity degrees elevation deviance samples
+}
+
+textures/skies/extragalactic_nebulae
+{
+       qer_editorimage textures/skies/extragalactic_nebulae.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/extragalactic/nebulae - - //farbox cloudheight nearbox
+    q3map_skyLight 50 4 //amount iterations
+       q3map_sunExt 1 0.9 0.8 300 66 36 3 16 //rgb intensity degrees elevation deviance samples
+}
+
+textures/skies/extragalactic_planets
+{
+       qer_editorimage textures/skies/extragalactic_planets.tga
+       surfaceparm sky
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm noimpact
+       surfaceparm nomarks
+
+       skyparms env/extragalactic/planets - - //farbox cloudheight nearbox
+       q3map_sunExt 1 0.9 0.8 320 124 42 0 16 //rgb intensity degrees elevation deviance samples
+}

diff --git a/textures/common/terrain2.tga b/textures/common/terrain2.tga
new file mode 100644 (file)
index 0000000..16a2482
Binary files /dev/null and b/textures/common/terrain2.tga differ

diff --git a/textures/skies/exosystem.png b/textures/skies/exosystem.png
new file mode 100644 (file)
index 0000000..dc5cd53
Binary files /dev/null and b/textures/skies/exosystem.png differ

diff --git a/textures/skies/exosystem2.png b/textures/skies/exosystem2.png
new file mode 100644 (file)
index 0000000..c5e2ccd
Binary files /dev/null and b/textures/skies/exosystem2.png differ

diff --git a/textures/skies/extragalactic_asteroids.tga b/textures/skies/extragalactic_asteroids.tga
new file mode 100644 (file)
index 0000000..6283f11
Binary files /dev/null and b/textures/skies/extragalactic_asteroids.tga differ

diff --git a/textures/skies/extragalactic_nebulae.tga b/textures/skies/extragalactic_nebulae.tga
new file mode 100644 (file)
index 0000000..d3e792d
Binary files /dev/null and b/textures/skies/extragalactic_nebulae.tga differ

diff --git a/textures/skies/extragalactic_planets.tga b/textures/skies/extragalactic_planets.tga
new file mode 100644 (file)
index 0000000..6c1789c
Binary files /dev/null and b/textures/skies/extragalactic_planets.tga differ