[Orxonox-commit 3707] r8387 - data/branches/environment/materials

[marwegma at orxonox.net]

Author: marwegma
Date: 2011-05-02 19:58:56 +0200 (Mon, 02 May 2011)
New Revision: 8387

Modified:
   data/branches/environment/materials/Godrays.compositor
   data/branches/environment/materials/Godrays.material
Log:
Godrays: Fixed some parsing errors in the material and compositor scripts.

Modified: data/branches/environment/materials/Godrays.compositor
===================================================================
--- data/branches/environment/materials/Godrays.compositor	2011-05-02 15:17:20 UTC (rev 8386)
+++ data/branches/environment/materials/Godrays.compositor	2011-05-02 17:58:56 UTC (rev 8387)
@@ -13,13 +13,16 @@
         
         target rt_raw
         {
-            clear
+            pass clear
             {
-                buffers colour
-                colour_value 0.0 0.0 0.0 1.0 // Clear by sky colour. Default is black.
+                clear
+                {
+                    buffers colour depth stencil
+                    colour_value 0.0 0.0 0.0 1.0 // Clear by sky colour. Default is black
+                }
             }
 
-            render_scene // render_custom?
+            pass render_scene // render_custom?
             {
                 first_render_queue 40
                 last_render_queue 40
@@ -27,7 +30,7 @@
                 material Godrays/Raw/Obstacle
             }
 
-            render_scene
+            pass render_scene
             {
                 first_render_queue 60
                 last_render_queue 60
@@ -40,7 +43,7 @@
 
         target rt_blur
         {
-            render_quad
+            pass render_quad
             {
                 material Godrays/Blur
 
@@ -51,7 +54,7 @@
 
         target_output
         {
-            render_quad
+            pass render_quad
             {
                 material Godrays/Combine
                 

Modified: data/branches/environment/materials/Godrays.material
===================================================================
--- data/branches/environment/materials/Godrays.material	2011-05-02 15:17:20 UTC (rev 8386)
+++ data/branches/environment/materials/Godrays.material	2011-05-02 17:58:56 UTC (rev 8387)
@@ -12,7 +12,7 @@
         pass
         {
             ambient 1.0 1.0 1.0 1.0
-            lightning off
+            lighting off
         }
     }
 }
@@ -24,7 +24,7 @@
         pass
         {
             ambient 0.0 0.0 0.0 1.0
-            lightning off
+            lighting off
         }
     }
 }
@@ -43,18 +43,19 @@
 {
     technique
     {
-        texture_unit raw_decal
+
+        pass
         {
-            tex_address_mode border
-            tex_border_colour 0.0 0.0 0.0 1.0 // Set manually to sky color by api.
+            texture_unit //raw_decal
+            {
+                tex_address_mode border
+                tex_border_colour 0.0 0.0 0.0 1.0 // Set manually to sky color by api.
 
-            content_type compositor Godrays rt_raw
-        }
+                content_type compositor Godrays rt_raw
+            }
 
-        pass
-        {
             fragment_program_ref GodraysBlurFragmentProgram
-            { 
+            {
                 param_indexed 0 float2 0.0 0.0
                 param_indexed 1 float 1.0
                 param_indexed 2 float 0.1
@@ -75,17 +76,17 @@
 {
     technique
     {
-        texture_unit scene_decal
+        pass
         {
-            content_type compositor Godrays rt_scene
-        }
-        texture_unit blur_decal
-        {
-            content_type compositor Godrays rt_blur
-        }
+            texture_unit //scene_decal
+            {
+                content_type compositor Godrays rt_scene
+            }
+            texture_unit //blur_decal
+            {
+                content_type compositor Godrays rt_blur
+            }
 
-        pass
-        {  
             fragment_program_ref GodraysCombineFragmentProgram { }
         }
     }