Changeset 821 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/media

Timestamp:

04/25/06 13:13:16 (18 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/media/general

Files:

• diffuseTexturing_FP20.cg (added)
• diffuseTexturing_VP20.cg (added)
• diffuse_FP20.cg (deleted)
• general.program (modified) (3 diffs)
• indirectTexturingDebugTexCoordCorrespondence_FP20.cg (modified) (1 diff)
• indirectTexturingDefault_FP20.cg (added)
• indirectTexturingDefault_VP20.cg (added)
• indirectTexturingDefault_glsl_FP20.shd (added)
• indirectTexturingDefault_glsl_VP20.shd (added)
• indirectTexturingDefault_hlsl_FP20.shd (added)
• indirectTexturingDefault_hlsl_VP20.shd (added)
• indirectTexturing_FP20.cg (deleted)
• indirectTexturing_VP20.cg (deleted)
• indirectTexturing_hlsl_FP20.shd (deleted)
• indirectTexturing_hlsl_VP20.shd (deleted)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/media/general/general.program

@@ -27 +27 @@
 }
 
-fragment_program diffuse_FP20 cg
+vertex_program diffuseTexturing_VP20 cg
 {
-        source diffuse_FP20.cg
+        source diffuseTexturing_VP20.cg
+        entry_point main_vp
+        profiles arbvp1 vs_2_0
+}
+
+fragment_program diffuseTexturing_FP20 cg
+{
+        source diffuseTexturing_FP20.cg
         entry_point main_fp
         profiles ps_2_0 arbfp1
@@ -41 +48 @@
 }
 
-vertex_program indirectTexturing_VP20 cg
+vertex_program indirectTexturingDefault_VP20 cg
 {
-        source indirectTexturing_VP20.cg
+        source indirectTexturingDefault_VP20.cg
         entry_point main_vp
-        profiles vs_2_0 arbvp1
+        profiles vs_2_0 arbvp1 
 }
 
-fragment_program indirectTexturing_FP20 cg
+fragment_program indirectTexturingDefault_FP20 cg
 {
-        source indirectTexturing_FP20.cg
+        source indirectTexturingDefault_FP20.cg
         entry_point main_fp
         profiles ps_2_0 arbfp1
 }
 
-vertex_program indirectTexturing_hlsl_VP20 hlsl
+vertex_program indirectTexturingDefault_hlsl_VP20 hlsl
 {
-        source indirectTexturing_hlsl_VP20.shd
+        source indirectTexturingDefault_hlsl_VP20.shd
         entry_point main_vp
         target vs_2_0
 }
 
-fragment_program indirectTexturing_hlsl_FP20 hlsl
+fragment_program indirectTexturingDefault_hlsl_FP20 hlsl
 {
-        source indirectTexturing_hlsl_FP20.shd
+        source indirectTexturingDefault_hlsl_FP20.shd
         entry_point main_fp
         target ps_2_0 
@@ -75 +82 @@
         profiles ps_2_0 arbfp1 
 }
+
+vertex_program indirectTexturingDefault_glsl_VP20 glsl
+{
+        source indirectTexturingDefault_glsl_VP20.shd
+}
+
+fragment_program indirectTexturingDefault_glsl_FP20 glsl
+{
+        source indirectTexturingDefault_glsl_FP20.shd
+}

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/media/general/indirectTexturingDebugTexCoordCorrespondence_FP20.cg

@@ -1 +1 @@
 sampler indirectTexture: register(s0);
 
-void main_fp(float2 posS: TEXCOORD0, 
-             float2 posT: TEXCOORD1,
+void main_fp(float2 texCoord: TEXCOORD0, 
+             float2 subTexCoord: TEXCOORD1,
              out float4 ocolor: COLOR,
              uniform sampler2D indirectTexture)
 {
 
-   float2 coords = posS + (float2(1.0, 1.0) - tex2D(indirectTexture, posT).xy); 
+   float2 coords = texCoord + (float2(1.0, 1.0) - tex2D(indirectTexture, subTexCoord).xy); 
    ocolor = float4(coords, 0.0, 1.0);
 }