[Orxonox-commit 3676] r8359 - in data/branches/environment: . materials

[marwegma at orxonox.net]

Author: marwegma
Date: 2011-04-28 18:41:22 +0200 (Thu, 28 Apr 2011)
New Revision: 8359

Modified:
   data/branches/environment/AUTHORS
   data/branches/environment/materials/Godrays.material
Log:
Godrays: Fixed some syntax stuff with the compositor-material interface.

Modified: data/branches/environment/AUTHORS
===================================================================
--- data/branches/environment/AUTHORS	2011-04-28 16:26:33 UTC (rev 8358)
+++ data/branches/environment/AUTHORS	2011-04-28 16:41:22 UTC (rev 8359)
@@ -1,4 +1,4 @@
-Here we list the authors of all the media files in this repository. All files are released under the CC by-sa license which can be found in the LICENSE file in this directory, unless otherwise specified.
+Here we list the authors of all the media files in this repository. All files are released under the CC by-sa license which can be found in the LICENSE file in this directory, unless otherwise specified.
 
 File                                                        Author
 audio/ambient/default/allgorythm-lift_up.ogg                All-Go-Rhythm - Thierry Zaugg (www.bediff.com)
@@ -392,6 +392,8 @@
 materials/Flares.material                                   Fabian Landau
 materials/ghost.material                                    David Gassner
 materials/Glass.material                                    Fabian Landau?
+materials/Godrays.compositor                                Markus Wegmann
+materials/Godrays.material                                  Markus Wegmann
 materials/h2_green.material                                 David Gassner
 materials/hdr.material                                      Fabian Landau?
 materials/hoover.material                                   unknown
@@ -530,6 +532,8 @@
 programs/Example_Basic.cg                                   Reto Grieder
 programs/Example_Basic.hlsl                                 Reto Grieder
 programs/GlassFP.cg                                         Fabian Landau?
+programs/Godrays_raw.cg                                     Markus Wegmann
+programs/Godrays_blur.cg                                    Markus Wegmann
 programs/Grass.cg                                           Reto Grieder
 programs/GrayScale.cg                                       Fabian Landau?
 programs/hdr_bloom.glsl                                     Fabian Landau?

Modified: data/branches/environment/materials/Godrays.material
===================================================================
--- data/branches/environment/materials/Godrays.material	2011-04-28 16:26:33 UTC (rev 8358)
+++ data/branches/environment/materials/Godrays.material	2011-04-28 16:41:22 UTC (rev 8359)
@@ -34,7 +34,7 @@
 {
     source Godrays_blur.cg
     entry_point godrays_blur
-    profiles fp40 ps_3_0
+    profiles fp30 ps_3_0
 }
 
 
@@ -43,7 +43,14 @@
 {
     technique
     {
-        
+        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
+        }
+
         pass
         {
             fragment_program_ref GodraysBlurFragmentProgram
@@ -61,13 +68,22 @@
 {
     source Godrays_blur.cg
     entry_point godrays_combine
-    profiles fp40 ps_3_0
+    profiles fp30 ps_3_0
 }
 
 material Godrays/Combine
 {
     technique
     {
+        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 { }