Changeset 8359 for data/branches

Timestamp:

Apr 28, 2011, 6:41:22 PM (14 years ago)

Author:

marwegma

Message:

Godrays: Fixed some syntax stuff with the compositor-material interface.

Location:

data/branches/environment

Files:

• AUTHORS (modified) (3 diffs)
• materials/Godrays.material (modified) (4 diffs)

data/branches/environment/AUTHORS

@@ -1 @@
-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
@@ -393 +393 @@
 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?
@@ -531 +533 @@
 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?

data/branches/environment/materials/Godrays.material

@@ -35 +35 @@
     source Godrays_blur.cg
     entry_point godrays_blur
-    profiles fp40 ps_3_0
+    profiles fp30 ps_3_0
 }
 
@@ -44 +44 @@
     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
         {
@@ -62 +69 @@
     source Godrays_blur.cg
     entry_point godrays_combine
-    profiles fp40 ps_3_0
+    profiles fp30 ps_3_0
 }
 
@@ -69 +76 @@
     technique
     {
+        texture_unit scene_decal
+        {
+            content_type compositor Godrays rt_scene
+        }
+        texture_unit blur_decal
+        {
+            content_type compositor Godrays rt_blur
+        }
+
         pass
         {