From aa7d54f04dc3eefed2cbf050199d641f035ecf47 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 9 Jul 2014 19:28:56 +0000
Subject: Updated shaders to the new shader file format.

---
 base/materials/common.shader | 160 ++++++++++++++++++++++++++-----------------
 1 file changed, 99 insertions(+), 61 deletions(-)

(limited to 'base/materials/common.shader')

diff --git a/base/materials/common.shader b/base/materials/common.shader
index b353a49..b88da99 100644
--- a/base/materials/common.shader
+++ b/base/materials/common.shader
@@ -22,13 +22,6 @@ textures/common/noclip
 	surfaceparm playerclip
 }
 
-textures/common/engine
-{
-	qer_editorimage textures/common/engine
-	engine
-	bright
-}
-
 textures/common/origin
 {
 	qer_editorimage textures/common/origin
@@ -47,149 +40,194 @@ textures/common/bounds
 	//ignore
 }
 
+textures/common/engine
+{
+	qer_editorimage textures/common/engine
+	{
+		engine
+		bright
+	}
+}
+
 // entity color shaders
 
 textures/common/entity
 {
 	qer_editorimage textures/common/entity
-	entity
-	color 1.00 1.00 1.00
+	{	
+		color 1.00 1.00 1.00
+		entity
+	}
 }
 
 textures/common/entity_shiny
 {
 	qer_editorimage textures/common/entity
-	entity
-	color 1.00 1.00 1.00
-	texture textures/fx/generic_env.png
-	environment
+	{		
+		color 1.00 1.00 1.00
+		entity
+		map textures/fx/generic_env
+		environment
+	}
 }
 
 textures/common/entity_bright
 {
 	qer_editorimage textures/common/entity
-	entity
-	color 1.00 1.00 1.00
-	bright
+	{
+		entity
+		color 1.00 1.00 1.00
+		bright
+	}
 }
 
 textures/common/entity_dark
 {
 	qer_editorimage textures/common/entity_dark
-	entity
-	color 0.50 0.50 0.50
+	{
+		entity
+		color 0.50 0.50 0.50
+	}
 }
 
 textures/common/entity_dark_shiny
 {
 	qer_editorimage textures/common/entity_dark
-	entity
-	color 0.50 0.50 0.50
-	texture textures/fx/generic_env.png
-	environment
+	{
+		entity
+		color 0.50 0.50 0.50
+		map textures/fx/generic_env
+		environment
+	}
 }
 
 textures/common/entity_dark_bright
 {
 	qer_editorimage textures/common/entity_dark
-	entity
-	color 0.50 0.50 0.50
-	bright
+	{
+		entity
+		color 0.50 0.50 0.50
+		bright
+	}
 }
 
 textures/common/entity_second
 {
 	qer_editorimage textures/common/entity_second
-	entitySecond
-	color 1.00 1.00 1.00
+	{
+		entitySecond
+		color 1.00 1.00 1.00
+	}
 }
 
 textures/common/entity_second_shiny
 {
 	qer_editorimage textures/common/entity_second
-	entitySecond
-	color 1.00 1.00 1.00
-	texture textures/fx/generic_env.png
-	environment
+	{
+		entitySecond
+		color 1.00 1.00 1.00
+		map textures/fx/generic_env
+		environment
+	}
 }
 
 textures/common/entity_second_bright
 {
 	qer_editorimage textures/common/entity_second
-	entitySecond
-	color 1.00 1.00 1.00
-	bright
+	{
+		entitySecond
+		color 1.00 1.00 1.00
+		bright
+	}
 }
 
 textures/common/entity_second_dark
 {
 	qer_editorimage textures/common/entity_second_dark
-	entitySecond
-	color 0.50 0.50 0.50
+	{
+		entitySecond
+		color 0.50 0.50 0.50
+	}
 }
 
 textures/common/entity_second_dark_shiny
 {
 	qer_editorimage textures/common/entity_second_dark
-	entitySecond
-	color 0.50 0.50 0.50
-	texture textures/fx/generic_env.png
-	environment
+	{
+		entitySecond
+		color 0.50 0.50 0.50
+		map textures/fx/generic_env
+		environment
+	}
 }
 
 textures/common/entity_second_dark_bright
 {
 	qer_editorimage textures/common/entity_second_dark
-	entitySecond
-	color 0.50 0.50 0.50
-	bright
+	{
+		entitySecond
+		color 0.50 0.50 0.50
+		bright
+	}
 }
 
 // don't touch
 textures/common/entity_third
 {
 	qer_editorimage textures/common/entity_third
-	entityThird
-	color 1.00 1.00 1.00
+	{
+		entityThird
+		color 1.00 1.00 1.00
+	}
 }
 
 textures/common/entity_third_shiny
 {
 	qer_editorimage textures/common/entity_third
-	entityThird
-	color 1.00 1.00 1.00
-	texture textures/fx/generic_env.png
-	environment
+	{
+		entityThird
+		color 1.00 1.00 1.00
+		map textures/fx/generic_env
+		environment
+	}
 }
 
 textures/common/entity_third_bright
 {
 	qer_editorimage textures/common/entity_third
-	entityThird
-	color 1.00 1.00 1.00
-	bright
+	{
+		entityThird
+		color 1.00 1.00 1.00
+		bright
+	}
 }
 
 textures/common/entity_third_dark
 {
 	qer_editorimage textures/common/entity_third_dark
-	entityThird
-	color 0.50 0.50 0.50
+	{
+		entityThird
+		color 0.50 0.50 0.50
+	}
 }
 
 textures/common/entity_third_dark_shiny
 {
 	qer_editorimage textures/common/entity_third_dark
-	entityThird
-	color 0.50 0.50 0.50
-	texture textures/fx/generic_env.png
-	environment
+	{
+		entityThird
+		color 0.50 0.50 0.50
+		map textures/fx/generic_env
+		environment
+	}
 }
 
 textures/common/entity_third_dark_bright
 {
 	qer_editorimage textures/common/entity_third_dark
-	entityThird
-	color 0.50 0.50 0.50
-	bright
+	{
+		entityThird
+		color 0.50 0.50 0.50
+		bright
+	}
 }
-- 
cgit v1.2.3