Changeset 2404 for GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/trollvs.cg

Timestamp:

06/05/07 01:57:13 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/trollvs.cg (modified) (4 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/trollvs.cg

@@ -5 +5 @@
         float2 uv       : TEXCOORD0,
         float3 tangent  : TANGENT,
-        float  blendIdx : BLENDINDICES,
+        float4  blendIdx : BLENDINDICES,
+        float4 blendWgt : BLENDWEIGHT,
         out float4 oPosition : POSITION,
         out float2 oUv       : TEXCOORD0,
-        out float3 oTangent: TEXCOORD1,
-        out float3 oBinormal: TEXCOORD2,
+        //out float3 oTangent: TEXCOORD1,
+        //out float3 oBinormal: TEXCOORD2,
         out float3 oNormal   : TEXCOORD3,
         out float3 V: TEXCOORD4,
         out float3 L: TEXCOORD5,
-        uniform float3x4   worldMatrix3x4Array[67],
+        uniform float3x4   worldMatrix3x4Array[69],
         uniform float4x4 viewProjectionMatrix,
         uniform float4   lightPos,
@@ -19 +20 @@
 {
         // transform by indexed matrix
-        float4 blendPos = float4(mul(worldMatrix3x4Array[blendIdx], position).xyz, 1.0);
+        float4 blendPos = float4(0,0,0,1);
+        blendPos.xyz += mul(worldMatrix3x4Array[blendIdx[0]], position).xyz * blendWgt[0];
+        blendPos.xyz += mul(worldMatrix3x4Array[blendIdx[1]], position).xyz * blendWgt[1];
+        
         // view / projection
         oPosition = mul(viewProjectionMatrix, blendPos);
         // transform normal
-        oNormal = mul((float3x3)worldMatrix3x4Array[blendIdx], normal);
-        oTangent = mul((float3x3)worldMatrix3x4Array[blendIdx], tangent);
+        //oNormal = mul((float3x3)worldMatrix3x4Array[blendIdx], normal);
+        //oTangent = mul((float3x3)worldMatrix3x4Array[blendIdx], tangent);
         oNormal = normalize(oNormal);
-        oTangent = normalize(oTangent);
-        oBinormal = cross(oTangent, oNormal);
+//      oTangent = normalize(oTangent);
+//      oBinormal = cross(oTangent, oNormal);
         // Lighting - support point and directional
         L =  lightPos.xyz - blendPos.xyz * lightPos.w;
@@ -38 +42 @@
 void trollSkinning_SMGen_One_Weight_vp(
         float4 position : POSITION,
-        float  blendIdx : BLENDINDICES,
+        float4  blendIdx : BLENDINDICES,
+        float4 blendWgt : BLENDWEIGHT,  
         out float4 oPosition : POSITION,
         out float3 cPos:TEXCOORD0,      
@@ -48 +53 @@
 {
         // transform by indexed matrix
-        float4 blendPos = float4(mul(worldMatrix3x4Array[blendIdx], position).xyz, 1.0);
+        float4 blendPos = float4(0,0,0,1);
+        blendPos.xyz += mul(worldMatrix3x4Array[blendIdx[0]], position).xyz * blendWgt[0];
+        blendPos.xyz += mul(worldMatrix3x4Array[blendIdx[1]], position).xyz * blendWgt[1];
+        
         // view / projection
         cPos = mul(viewMatrix, blendPos).xyz;