Changeset 2337 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPCaustic

Timestamp:

04/24/07 14:10:34 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPCaustic/GTPCaustic.material (modified) (2 diffs)

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

@@ -117 +117 @@
                                 use_triangles   true
                                 blur_caustic_cubemap true                               
+                        }
+                        
+                 }      
+         vertex_program_ref GTP/Basic/Shaded_VS
+         {       
+            param_named_auto WorldViewProj worldviewproj_matrix 
+            param_named_auto World world_matrix
+            param_named_auto WorldInv inverse_world_matrix
+         } 
+         fragment_program_ref GTP/EnvMap/Localized_Refraction_PS
+         { 
+                    param_named_auto cameraPos camera_position
+            param_named lastCenter float3 0 0 0
+            param_named sFresnel float 0.1
+<<<<<<< .mine
+            param_named sRefraction float 0.85
+=======
+            param_named sRefraction float 0.8
+>>>>>>> .r2314
+             }          
+             //Cube map for reflections and refractions 
+             texture_unit
+             {
+            
+             }
+             //Cube map of distances
+             texture_unit
+             {
+                filtering none
+             }
+          }
+   }
+}
+
+material GTP/Caustic/Glass_PointSprite
+{
+   technique 
+   {   
+      pass 
+      { 
+                 IllumTechniques
+                 {
+                        RenderTechnique ColorCubeMap
+                        {
+                                update_interval         0
+                                update_all_face true                                                                    
+                        }
+                        RenderTechnique DistanceCubeMap
+                        {
+                                update_interval         0
+                                update_all_face true                                                                            
+                        }
+                        RenderTechnique CausticCaster
+                        {
+                                attenuation     1000
+                                update_interval 1
+                                update_all_face true
+                                photonmap_resolution 64
+                                caustic_cubemap_resolution 256
+                                photon_map_material     GTP/Caustic/PhotonMap_HitEnv
+                                caustic_map_material    GTP/Caustic/CauCube_PointSprite
+                                blur_caustic_cubemap false
                         }
                         
@@ -146 +208 @@
    }
 }
-
-material GTP/Caustic/Glass_PointSprite
-{
-   technique 
-   {   
-      pass 
-      { 
-                 IllumTechniques
-                 {
-                        RenderTechnique ColorCubeMap
-                        {
-                                update_interval         0
-                                update_all_face true                                                                    
-                        }
-                        RenderTechnique DistanceCubeMap
-                        {
-                                update_interval         0
-                                update_all_face true                                                                            
-                        }
-                        RenderTechnique CausticCaster
-                        {
-                                attenuation     1000
-                                update_interval 1
-                                update_all_face true
-                                photonmap_resolution 64
-                                caustic_cubemap_resolution 256
-                                photon_map_material     GTP/Caustic/PhotonMap_HitEnv
-                                caustic_map_material    GTP/Caustic/CauCube_PointSprite
-                                blur_caustic_cubemap false
-                        }
-                        
-                 }      
-         vertex_program_ref GTP/Basic/Shaded_VS
-         {       
-            param_named_auto WorldViewProj worldviewproj_matrix 
-            param_named_auto World world_matrix
-            param_named_auto WorldInv inverse_world_matrix
-         } 
-         fragment_program_ref GTP/EnvMap/Localized_Refraction_PS
-         { 
-                    param_named_auto cameraPos camera_position
-            param_named lastCenter float3 0 0 0
-            param_named sFresnel float 0.1
-            param_named sRefraction float 0.8
-             }          
-             //Cube map for reflections and refractions 
-             texture_unit
-             {
-            
-             }
-             //Cube map of distances
-             texture_unit
-             {
-                filtering none
-             }
-          }
-   }
-}