Changeset 8357 for data/branches

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

Files:

• materials/Godrays.compositor (added)
• materials/Godrays.material (modified) (4 diffs)
• programs/Godrays_blur.cg (modified) (8 diffs)
• programs/Godrays_raw.cg (modified) (2 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 { }
+        }
+    }
+}

data/branches/environment/programs/Godrays_blur.cg

@@ -1 +1 @@
 /**
 *
-* \brief Godrays_*.cg is a radial blur based shader implementation of the natural effects of godrays (ray light scattering). The vertex function ScreenQuadVS() skips the default wvp-transform, that is irrelevant for screenspace effects.
+* \brief Godrays_*.cg is a radial blur based shader implementation of the natural effects of godrays (ray light scattering). The vertex function ScreenQuadVS() skips the default wvp-transform, what is irrelevant in Ogre when doing a "render_quad"-pass... just to say!
 *
 * \author Markus Wegmann
@@ -27 +27 @@
 //// Fragment Shader ////
 
-void godray_blur(
+void godrays_blur(
         OneTexelVertex IN,
                 
@@ -66 +66 @@
 
 
-void combineRenderAndGodrays(
+void godrays_combine(
         OneTexelVertex IN,
 
@@ -103 +103 @@
 > = {0f,0f,0f,1.0f};
 
-float GodrayExposure = 1f;
-float GodrayDecay = 0.1f;
-float GodrayDensity = 0.7f;
+float GodraysExposure = 1f;
+float GodraysDecay = 0.1f;
+float GodraysDensity = 0.7f;
 
 texture ScnTarget : RenderColorTarget <
@@ -122 +122 @@
 };
 
-texture GodrayTarget : RenderColorTarget <
+texture GodraysTarget : RenderColorTarget <
         float2 ViewPortRatio = {1,1};
     int MipLevels = 1;
@@ -129 +129 @@
 >;
 
-sampler2D GodrayDecal = sampler_state {
-    Texture = <GodrayTarget>;
+sampler2D GodraysDecal = sampler_state {
+    Texture = <GodraysTarget>;
         WrapS = ClampToEdge;
     WrapT = ClampToEdge;
@@ -188 +188 @@
                 
                 VertexShader = compile vp40 ScreenQuadVS();
-        FragmentProgram = compile fp40 godray_blur(
+        FragmentProgram = compile fp40 godrays_blur(
             ProjSunLightPosition,
-                        GodrayExposure, 
-                        GodrayDecay, 
-                        GodrayDensity,
+                        GodraysExposure, 
+                        GodraysDecay, 
+                        GodraysDensity,
                         ScnDecal);
         }
@@ -208 +208 @@
                 
                 VertexShader = compile vp40 ScreenQuadVS();
-        FragmentProgram = compile fp40 combineRenderAndGodrays(
+        FragmentProgram = compile fp40 godrays_combine(
                         ScnDecal,
-                        GodrayDecal);
+                        GodraysDecal);
         }
 }

data/branches/environment/programs/Godrays_raw.cg

@@ -25 +25 @@
 
 
-void black_shader(
+void obstacle_shader(
     float4 position : POSITION,
 
@@ -84 +84 @@
                         CullFaceEnable = true;
                 
-                        VertexProgram = compile vp40 black_shader(WvpXf);
+                        VertexProgram = compile vp40 obstacle_shader(WvpXf);
                 }
 }