Changeset 7883 for data/trunk

Timestamp:

Feb 14, 2011, 12:15:39 PM (14 years ago)

Author:

landauf

Message:

no fucking clue what I'm doing here, but it looks like I just fixed the Bloom shader in combination with a GUI

(the old implementation used a material with alpha_blend for the compositor's output, hence Ogre rendered the GUI first and the shader afterward. the new implementation uses a cg program to create the bloom effect which seems to work)

Location:

data/trunk

Files:

• materials/Bloom.material (modified) (5 diffs)
• materials/Shaders.compositor (modified) (3 diffs)
• programs/BloomFP.cg (added)

data/trunk/materials/Bloom.material

@@ -69 +69 @@
                         texture_unit RT
                         {
-                tex_coord_set 0
+                                tex_coord_set 0
                                 tex_address_mode clamp
                                 filtering linear linear linear
@@ -92 +92 @@
                         texture_unit RT
                         {
-                tex_coord_set 0
+                                tex_coord_set 0
                                 tex_address_mode clamp
                                 filtering linear linear linear
@@ -120 +120 @@
                         texture_unit
                         {
-                tex_coord_set 0
+                                tex_coord_set 0
                                 tex_address_mode clamp
                                 filtering linear linear linear
@@ -144 +144 @@
                         texture_unit
                         {
-                tex_coord_set 0
+                                tex_coord_set 0
                                 tex_address_mode clamp
                                 filtering linear linear linear
@@ -152 +152 @@
 }
 
-/// Overlay quad
+fragment_program Ogre/Compositor/BloomFP cg
+{
+        source BloomFP.cg
+        entry_point Bloom_ps
+        profiles ps_2_0 arbfp1
+}
+
 material Ogre/Compositor/BloomBlend
 {
-    technique
-    {
-        pass
-        {
-            lighting on
-            diffuse 0.0 0.0 0.0 0.5
-            specular 0.0 0.0 0.0 0.0
-            ambient 0.0 0.0 0.0
-            emissive 1.0 1.0 1.0
-            cull_hardware none
-            depth_check off
-            scene_blend alpha_blend
+        technique
+        {
 
-            texture_unit
-            {
-                tex_coord_set 0
+                pass
+                {
+                        cull_hardware none
+                        cull_software none
+                        depth_func always_pass
+
+                        vertex_program_ref Ogre/Compositor/StdQuad_Tex2a_vp
+                        {
+                        }
+
+                        fragment_program_ref Ogre/Compositor/BloomFP
+                        {
+                        }
+
+                        texture_unit
+                        {
+                                tex_coord_set 0
                                 tex_address_mode clamp
-                                filtering linear linear linear
-            }
-        }
-    }
+                                filtering trilinear
+                        }
+
+                        texture_unit
+                        {
+                                tex_coord_set 0
+                                tex_address_mode clamp
+                                filtering trilinear
+                        }
+                }
+        }
 }

data/trunk/materials/Shaders.compositor

@@ -6 +6 @@
     {
         // Temporary textures
-        texture rt0 128 128 PF_A8R8G8B8
-        texture rt1 128 128 PF_A8R8G8B8
+        texture rt_output target_width target_height PF_R8G8B8
+        texture rt0 128 128 PF_R8G8B8
+        texture rt1 128 128 PF_R8G8B8
+
+        target rt_output
+        {
+            // Render output from previous compositor (or original scene)
+            input previous
+        }
+
+        target rt0
+        {
+            // Start with clear texture
+            input none
+            // Vertical blur pass
+            pass render_quad
+            {
+                // Renders a fullscreen quad with a material
+                material Ogre/Compositor/Blur0
+                input 0 rt_output
+            }
+        }
 
         target rt1
         {
-            // Render output from previous compositor (or original scene)
-            input previous
-        }
-
-        target rt0
-        {
             // Start with clear texture
             input none
-            // Vertical blur pass
-            pass render_quad
-            {
-                // Renders a fullscreen quad with a material
-                material Ogre/Compositor/Blur0
-                input 0 rt1
-            }
-        }
-
-        target rt1
-        {
-            // Start with clear texture
-            input none
             // Horizontal blur pass
             pass render_quad
@@ -44 +45 @@
         {
             // Start with clear output
-            input previous
+            input none
             // Draw a fullscreen quad
             pass render_quad
@@ -50 +51 @@
                 // Renders a fullscreen quad with a material
                 material Ogre/Compositor/BloomBlend
-                input 0 rt1
+                input 0 rt_output
+                input 1 rt1
             }
         }