Changeset 2414 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPostProc

Timestamp:

06/06/07 10:25:13 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPostProc

Files:

• GTPPostProc.hlsl (modified) (1 diff)
• GTPPostProc.material (modified) (6 diffs)
• GTPPostProc.program (modified) (1 diff)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPostProc/GTPPostProc.hlsl

@@ -48 +48 @@
    IN.texCoord += float2(0.5/width, 0.5/height);
    return tex2D(Texture1,IN.texCoord ) + tex2D(Texture2,IN.texCoord );
+}
+
+float4 Combine_PS(VS_OUT IN,
+                uniform float width,
+                uniform float height,
+                uniform float weight1,
+                uniform float weight2,
+                uniform sampler2D Texture1: register(s0),
+                uniform sampler2D Texture2: register(s1)
+                 ):COLOR
+{       
+   IN.texCoord += float2(0.5/width, 0.5/height);
+   return tex2D(Texture1,IN.texCoord ) * weight1 + tex2D(Texture2,IN.texCoord ) * weight2;
 }
 

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPostProc/GTPPostProc.material

@@ -95 +95 @@
 }
 
+material GTP/PostProc/Combine
+{
+   technique maintechnique
+   { 
+      pass mainpass
+      {
+         vertex_program_ref GTP/PostProc/PostProc_VS
+         {
+       
+         } 
+         fragment_program_ref GTP/PostProc/Combine_PS
+         { 
+             param_named_auto width viewport_width      
+             param_named_auto height viewport_height 
+             param_named weight1 float 1.0
+             param_named weight2 float 1.0
+         }
+         texture_unit
+         {
+           // filtering none      
+         }
+         texture_unit
+         {
+           // filtering none    
+         }
+      }
+   }
+}
+
 material GTP/PostProc/Luminance
 {
@@ -122 +151 @@
 material GTP/PostProc/GlowCut
 {
-   technique 
-   { 
-      pass 
+   technique maintechnique
+   { 
+      pass mainpass
       {
         vertex_program_ref GTP/PostProc/PostProc_VS
@@ -133 +162 @@
                 param_named_auto width viewport_width   
                 param_named_auto height viewport_height
-                param_named cutValue float 35.0
+                param_named cutValue float 35
                 //param_named cutValue float 4.5
                 param_named timeBlur float 0.4          
@@ -151 +180 @@
 material GTP/PostProc/GlowBlurH
 {
-   technique 
-   { 
-      pass 
+   technique maintechnique
+   { 
+      pass mainpass
       {
          vertex_program_ref GTP/PostProc/PostProc_VS
@@ -176 +205 @@
 material GTP/PostProc/GlowBlurV
 {
-   technique 
-   { 
-      pass 
+   technique maintechnique
+   { 
+      pass mainpass
       {
          vertex_program_ref GTP/PostProc/PostProc_VS
@@ -216 +245 @@
           param_named_auto height viewport_height 
           param_named Stretch float 1.2
-          param_named_auto timeBlur frame_time 0.2
+          param_named_auto timeBlur frame_time 0.6
           //param_named timeBlur float 1
         }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPostProc/GTPPostProc.program

@@ -31 +31 @@
         source GTPPostProc.hlsl
         entry_point Add_PS
+        target ps_2_0
+} 
+
+fragment_program GTP/PostProc/Combine_PS hlsl
+{
+        source GTPPostProc.hlsl
+        entry_point Combine_PS
         target ps_2_0
 }