Changeset 2136

Timestamp:

02/20/07 14:13:51 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GTPCaustic.hlsl (modified) (6 diffs)
• GTPCaustic.material (modified) (4 diffs)

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

@@ -51 +51 @@
                            uniform float3 lastCenter,
                                    uniform float3 cameraPos,
-                                   uniform float reflIndex,
+                                   uniform float refIndex,
                                    uniform samplerCUBE DistanceMap : register(s0)):COLOR0
 {
@@ -61 +61 @@
         float3 V = normalize(IN.wPos.xyz - cameraPos);
                 
-        float3 R = refract(V, wNormal, reflIndex);              
+        float3 R = refract(V, wNormal, refIndex);               
         
         dir = R;                        
@@ -156 +156 @@
                                                 float4 texCoord : TEXCOORD0,
                                                 float4 color    : COLOR0,
+                                                uniform float WorldSize,
+                                                uniform float notUseIntensity,
                                                 uniform float4x4 WorldView,
                                                 uniform float4x4 Proj,
@@ -166 +168 @@
   float pixel = 1.0 / PhotonMapResolution;   
   float2 uv = float2(position.x, 1.0 - position.y);
+  uv += float2(pixel / 2.0,pixel / 2.0);
   float4 pos = tex2Dlod(PhotonHitMap, float4(uv,0,0)).rgba;
 
@@ -171 +174 @@
    {
                 OUT.color = float4(0,0,0,0);            
-                OUT.hPosition = float4(0, 0, -1000000, 1);
+                OUT.hPosition = float4(1000000, 1000000, 1000000, 1);
    }
    else
@@ -216 +219 @@
                         valids++;
                 }
-                //if(valids == 0) sumdist = 100000;             
+                
+                
                 float avrdist = sumdist / valids;
-                //float maxdist = 10;
-                //intensity = max(maxdist - avrdist, 0.0) / maxdist;
-                intensity = 5 / (avrdist * avrdist * 3.14);
-                //intensity = valids / 4.0;//avrdist;
-                
-                //OUT.color = float4(1,1,1,intensity);
+                if(valids == 0) avrdist = WorldSize / 1000.0;           
+                
+                intensity = WorldSize / (avrdist * avrdist * 3.14);
+                //intensity = 0.8;
+                
                 OUT.color = intensity;
+                if(notUseIntensity)
+                        OUT.color = float4(1,1,1,1);            
         }  
    

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

@@ -15 +15 @@
      param_named_auto cameraPos camera_position
      param_named lastCenter float3 0 0 0
-     param_named reflIndex float 0.85   
+     param_named refIndex float 0.85    
    }
    //cubemap of distances
@@ -71 +71 @@
      param_named_auto WorldView      worldview_matrix
      param_named_auto Proj           projection_matrix
-     param_named PhotonMapResolution float 32
+     param_named PhotonMapResolution float 64
+     param_named WorldSize float 10
    } 
    fragment_program_ref GTP/Caustic/CauCube_Triangles_PS
    {
      param_named CausticColor float4 0.7 0.7 0.5 1
+     
    }
    texture_unit
@@ -95 +97 @@
                         RenderTechnique ColorCubeMap
                         {
-                                update_interval         0
+                                update_interval         1
                                 update_all_face true                                                                    
                         }
                         RenderTechnique DistanceCubeMap
                         {
-                                update_interval         0
+                                update_interval         1
                                 update_all_face true                                                                            
                         }
@@ -106 +108 @@
                         {
                                 attenuation     1000
-                                photonmap_resolution 32
+                                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
-                                //caustic_map_material  GTP/Caustic/CauCube_Triangles
-                                //use_triangles true
-                                //blur_caustic_cubemap true                             
+                                //caustic_map_material  GTP/Caustic/CauCube_PointSprite
+                                caustic_map_material    GTP/Caustic/CauCube_Triangles
+                                use_triangles   true
+                                blur_caustic_cubemap true                               
                         }