Changeset 2527 for GTP/trunk/App/Demos/Illum/Ogre/Media/Station

Timestamp:

07/05/07 16:18:22 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media/Station

Files:

• StationBase.hlsl (modified) (1 diff)
• station.material (modified) (3 diffs)
• stationIllum.hlsl (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/Station/StationBase.hlsl

@@ -250 +250 @@
         {
                 //Color *= 0.00000000001;
-                Color += diffuseColor * Caustics(CausticCubeMap, CausticCasterDepthMap, IN.wPos - causticCasterCenter1, causticAttenuationRange1);
+                Color.rgb += diffuseColor.rgb * Caustics(CausticCubeMap, CausticCasterDepthMap, IN.wPos - causticCasterCenter1, causticAttenuationRange1);
         }
         //Color.a = dist;

GTP/trunk/App/Demos/Illum/Ogre/Media/Station/station.material

@@ -263 +263 @@
 }
 
+material GTP/Station/CauCube_Point
+{
+ technique
+ {
+  pass
+  { 
+   cull_hardware none
+   scene_blend src_alpha one
+   depth_check off
+   vertex_program_ref GTP/Caustic/CauCube_PointSprite_VS
+   {
+     param_named_auto WorldView     worldview_matrix
+     param_named_auto Proj          projection_matrix
+     param_named CauSpriteSize      float 20
+   } 
+   fragment_program_ref GTP/Caustic/CauCube_Point_PS
+   {
+     param_named CausticColor float4          1 1 1 0.09
+     param_named_auto targetResolution viewport_width
+   }
+   texture_unit
+   {
+     vertex_texture true         
+   }
+   texture_unit
+   {
+     texture PowerOfPhotonHitTexel.dds
+   }
+  }
+ }
+}
+
 material GTP/Station/CauCube_Triangles
 {
@@ -278 +310 @@
      param_named_auto Proj           projection_matrix
      param_named PhotonMapResolution float 64
-     param_named WorldSize float 0.01
+     param_named WorldSize float 0.1
    } 
    fragment_program_ref GTP/Caustic/CauCube_Triangles_PS
@@ -385 +417 @@
                                 update_interval 1
                                 update_all_face true
-                                photonmap_resolution 128
+                                photonmap_resolution 64
                                 caustic_cubemap_resolution 256
                                 photon_map_material     GTP/Station/PhotonMap_HitEnv
-                                caustic_map_material    GTP/Station/CauCube_PointSprite
+                                caustic_map_material    GTP/Station/CauCube_Point
                                 //caustic_map_material  GTP/Station/CauCube_Triangles
                                 //use_triangles true

GTP/trunk/App/Demos/Illum/Ogre/Media/Station/stationIllum.hlsl

@@ -156 +156 @@
 }
 
-float Caustics(samplerCUBE cauMap, samplerCUBE distMap, float3 dir, float attenuation)
+float3 Caustics(samplerCUBE cauMap, samplerCUBE distMap, float3 dir, float attenuation)
 {
         float d = length(dir);
@@ -163 +163 @@
         caustics *= 1.0 - saturate(d / attenuation);
         
-        return caustics.r;
+        return caustics.rgb;
 }