From 0475bf8f9c87229fdf4d57d2e59175b7c9cb5231 Mon Sep 17 00:00:00 2001
From: rambetter <rambetter>
Date: Wed, 12 Jan 2011 08:33:40 +0000
Subject: [PATCH] In decal_misalignment regression test for q3map2,
 accidentally had checked in the wrong shader file, ramb_common.shader. 
 Replacing with radiant_regression_tests.shader.

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@428 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
 .../scripts/radiant_regression_tests.shader   |  29 +++
 .../scripts/ramb_common.shader                | 170 ------------------
 2 files changed, 29 insertions(+), 170 deletions(-)
 create mode 100644 regression_tests/q3map2/decal_misalignment/scripts/radiant_regression_tests.shader
 delete mode 100644 regression_tests/q3map2/decal_misalignment/scripts/ramb_common.shader

diff --git a/regression_tests/q3map2/decal_misalignment/scripts/radiant_regression_tests.shader b/regression_tests/q3map2/decal_misalignment/scripts/radiant_regression_tests.shader
new file mode 100644
index 0000000..af31c07
--- /dev/null
+++ b/regression_tests/q3map2/decal_misalignment/scripts/radiant_regression_tests.shader
@@ -0,0 +1,29 @@
+textures/radiant_regression_tests/tile_trans
+{
+    qer_trans 0.9
+    q3map_bounceScale 0.0
+    surfaceparm trans
+    cull disable
+    polygonOffset
+    {
+        map textures/radiant_regression_tests/tile_trans.tga
+        blendFunc blend
+        alphaGen const 1
+    }
+}
+
+textures/radiant_regression_tests/glass
+{
+    qer_editorImage textures/radiant_regression_tests/qer_glass.tga
+    qer_trans 0.6
+    q3map_bounceScale 0.0
+    surfaceparm nolightmap
+    surfaceparm detail
+    surfaceparm trans
+    cull disable
+    {
+        map textures/radiant_regression_tests/glass.tga
+        blendFunc add
+        tcGen environment
+    }
+}
diff --git a/regression_tests/q3map2/decal_misalignment/scripts/ramb_common.shader b/regression_tests/q3map2/decal_misalignment/scripts/ramb_common.shader
deleted file mode 100644
index 2dce0da..0000000
--- a/regression_tests/q3map2/decal_misalignment/scripts/ramb_common.shader
+++ /dev/null
@@ -1,170 +0,0 @@
-textures/ramb_common/caulk
-{
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nomarks
-}
-
-textures/ramb_common/hollowcaulk
-{
-    qer_editorImage textures/ramb_common/caulk.jpg
-    qer_trans 0.5
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nomarks
-    surfaceparm nonsolid
-}
-
-textures/ramb_common/nonsolidcaulk
-{
-    qer_editorImage textures/ramb_common/caulk.jpg
-    qer_trans 0.2
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nonsolid
-    surfaceparm trans
-    surfaceparm nomarks
-    surfaceparm detail
-}
-
-textures/ramb_common/softslickcaulk
-{
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nomarks
-    surfaceparm nodamage
-    surfaceparm slick
-}
-
-textures/ramb_common/softcaulk
-{
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nomarks
-    surfaceparm nodamage
-}
-
-textures/ramb_common/trigger
-{
-    qer_trans 0.5
-    qer_nocarve
-    surfaceparm nodraw
-    surfaceparm detail
-}
-
-textures/ramb_common/playerclip
-{
-    qer_trans 0.5
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nonsolid
-    surfaceparm trans
-    surfaceparm nomarks
-    surfaceparm noimpact
-    surfaceparm playerclip
-    surfaceparm slick
-    surfaceparm nodamage
-    surfaceparm detail
-}
-
-textures/ramb_common/tractionplayerclip
-{
-    qer_trans 0.5
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nonsolid
-    surfaceparm trans
-    surfaceparm nomarks
-    surfaceparm noimpact
-    surfaceparm playerclip
-    surfaceparm nodamage
-    surfaceparm detail
-}
-
-textures/ramb_common/nodrop
-{
-    qer_trans 0.3
-    qer_nocarve
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nonsolid
-    surfaceparm trans
-    surfaceparm nomarks
-    surfaceparm detail
-    surfaceparm nodrop
-}
-
-textures/ramb_common/clearfiller
-{
-    qer_trans 0.4
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm trans
-    surfaceparm nodamage
-    surfaceparm detail
-}
-
-textures/ramb_common/slickclearfiller
-{
-    qer_trans 0.4
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm trans
-    surfaceparm slick
-    surfaceparm nodamage
-    surfaceparm detail
-}
-
-textures/ramb_common/origin
-{
-    qer_nocarve
-    surfaceparm nodraw
-    surfaceparm nolightmap
-    surfaceparm nonsolid
-    surfaceparm trans
-    surfaceparm origin
-}
-
-textures/ramb_common/hint
-{
-    qer_nocarve
-    qer_trans 0.30
-    surfaceparm nodraw
-    surfaceparm nonsolid
-    surfaceparm structural
-    surfaceparm trans
-    surfaceparm hint
-}
-
-textures/ramb_common/alpha50
-{
-    qer_editorImage textures/ramb_common/alpha.jpg
-    qer_trans 0.4
-    q3map_alphaMod volume
-    q3map_alphaMod set 0.5
-    surfaceparm nodraw
-    surfaceparm nonsolid
-    surfaceparm trans
-}
-
-textures/ramb_common/alpha35
-{
-    qer_editorImage textures/ramb_common/alpha.jpg
-    qer_trans 0.3
-    q3map_alphaMod volume
-    q3map_alphaMod set 0.35
-    surfaceparm nodraw
-    surfaceparm nonsolid
-    surfaceparm trans
-}
-
-textures/ramb_common/alpha20
-{
-    qer_editorImage textures/ramb_common/alpha.jpg
-    qer_trans 0.2
-    q3map_alphaMod volume
-    q3map_alphaMod set 0.2
-    surfaceparm nodraw
-    surfaceparm nonsolid
-    surfaceparm trans
-}