From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 14 Jan 2016 22:05:02 +0000 (+0100)
Subject: Fix catharsis and crystals shader (make them conform to shader-audit conventions)
X-Git-Tag: xonotic-v0.8.2~149
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c77e2066e7b8196fe04b2f8585fd0bac8d0c7098;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix catharsis and crystals shader (make them conform to shader-audit conventions)
---

diff --git a/scripts/crystals.shader b/scripts/crystals.shader
deleted file mode 100644
index 14015805..00000000
--- a/scripts/crystals.shader
+++ /dev/null
@@ -1,13 +0,0 @@
-models/crystals/crystal1
-{
-	dpglossintensitymod 5
-	dpglossexponentmod 2
-	dpreflectcube cubemaps/default/sky
-	{
-		map "models/crystals/crystal1"
-	}
-	{
-		map $lightmap
-	}
-}
-
diff --git a/scripts/map_catharsis.shader b/scripts/map_catharsis.shader
index a1d5b186..f05f609b 100644
--- a/scripts/map_catharsis.shader
+++ b/scripts/map_catharsis.shader
@@ -162,46 +162,6 @@ textures/map_catharsis/50_armor
 	}
 	
 }
-textures/map_catharsis/dirt1
-{
-	qer_editorimage textures/map_catharsis/dirt1.tga
-
-	surfaceparm trans
-	surfaceparm nonsolid
-	surfaceparm nodlight
-	surfaceparm nolightmap
-
-	polygonOffset
-	sort 6
-	cull none
-
-
-	{
-		map textures/map_catharsis/dirt1.tga
-		blendFunc filter
-		rgbgen identity
-	}
-}
-textures/map_catharsis/dirt2
-{
-	qer_editorimage textures/map_catharsis/dirt2
-
-	surfaceparm trans
-	surfaceparm nonsolid
-	surfaceparm nodlight
-	surfaceparm nolightmap
-
-	polygonOffset
-	sort 6
-	cull none
-
-
-	{
-		map textures/map_catharsis/dirt2
-		blendFunc filter
-		rgbgen identity
-	}
-}
 textures/map_catharsis/red
 {
 	qer_editorimage textures/map_catharsis/red.tga
@@ -243,27 +203,3 @@ textures/map_catharsis/red-surfacelight
 		blendfunc filter
 	}
 }
-justinterrain
-          {
-                  q3map_nonplanar
-                  q3map_shadeangle 65
-                  q3map_lightmapSampleOffset 3
-                  q3map_lightmapSampleSize 64
-                  q3map_globalTexture
-     qer_editorimage textures/map_catharsis/rock.tga
-                  dpnoshadow
-  {
-    map textures/map_catharsis/rock.tga
-  }
-      {
-         map textures/map_catharsis/sand.tga
-                          blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-                          alphagen vertex
-      }
-           
-                  {
-                          map $lightmap
-                          blendfunc GL_DST_COLOR GL_ZERO
-                          rgbGen identity
-                  }
-}
\ No newline at end of file
diff --git a/scripts/model_crystals.shader b/scripts/model_crystals.shader
new file mode 100644
index 00000000..14015805
--- /dev/null
+++ b/scripts/model_crystals.shader
@@ -0,0 +1,13 @@
+models/crystals/crystal1
+{
+	dpglossintensitymod 5
+	dpglossexponentmod 2
+	dpreflectcube cubemaps/default/sky
+	{
+		map "models/crystals/crystal1"
+	}
+	{
+		map $lightmap
+	}
+}
+