Changeset 8357 for data/branches/environment/materials

Timestamp:

Apr 28, 2011, 5:41:04 PM (14 years ago)

Author:

marwegma

Message:

Godrays.compositor added, extended Godrays.material, unified the Godrays code a bit.

Location:

data/branches/environment/materials

Files:

• Godrays.compositor (added)
• Godrays.material (modified) (4 diffs)

data/branches/environment/materials/Godrays.material

@@ -1 +1 @@
 /**
-*
+* 
 * \author Markus Wegmann
 *
@@ -31 +31 @@
 
 
-fragment_program GodrayBlurFragmentProgram cg
+fragment_program GodraysBlurFragmentProgram cg
 {
     source Godrays_blur.cg
-    entry_point godray_blur
-    profiles ps_3_0 fp40
+    entry_point godrays_blur
+    profiles fp40 ps_3_0
 }
 
 
-material Godrays/Blur/RadialBlur
+
+material Godrays/Blur
 {
     technique
@@ -46 +47 @@
         pass
         {
-            fragment_program_ref GodrayBlurFragmentProgram
+            fragment_program_ref GodraysBlurFragmentProgram
             { 
                 param_indexed 0 float2 0.0 0.0
@@ -52 +53 @@
                 param_indexed 2 float 0.1
                 param_indexed 3 float 0.7
-                // The raw decal has to be loaded manually by api.
             }
         }
     }
 }
+
+fragment_program GodraysCombineFragmentProgram cg
+{
+    source Godrays_blur.cg
+    entry_point godrays_combine
+    profiles fp40 ps_3_0
+}
+
+material Godrays/Combine
+{
+    technique
+    {
+        pass
+        {  
+            fragment_program_ref GodraysCombineFragmentProgram { }
+        }
+    }
+}