ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2026-05-14 03:06:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ped clothes not exploding

Browse Source
This commit is contained in:
dexy
2019-11-29 20:47:11 +11:00
Unverified
parent 181689ac95
commit ef1debfb41
30 changed files with 482 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CodeWalker.Shaders/BasicVS.hlsli
+40 -26
View File
@@ -60,6 +60,10 @@ cbuffer BoneMatrices : register(b7) //rage_bonemtx
{
row_major float3x4 gBoneMtx[255]; // Offset: 0 Size: 12240
}
cbuffer ClothVertices : register(b8) //pedcloth
{
float4 clothVertices[254]; // Offset: 64 Size: 4060
}
struct VS_OUTPUT
{
@@ -257,34 +261,44 @@ float3 GetGrassInstancePosition(float3 ipos, float3 vc0, float3 vc1, uint iid)
}
float3x4 BoneMatrix(float4 weights, float4 indices)
void BoneTransform(float4 weights, float4 indices, float3 ipos, float3 inorm, float3 itang, out float3 opos, out float3 onorm, out float3 otang)
{
uint4 binds = (uint4)(indices * 255.001953);
float3x4 b0 = gBoneMtx[binds.x];
float3x4 b1 = gBoneMtx[binds.y];
float3x4 b2 = gBoneMtx[binds.z];
float3x4 b3 = gBoneMtx[binds.w];
float4 t0 = b0[0]*weights.x + b1[0]*weights.y + b2[0]*weights.z + b3[0]*weights.w;
float4 t1 = b0[1]*weights.x + b1[1]*weights.y + b2[1]*weights.z + b3[1]*weights.w;
float4 t2 = b0[2]*weights.x + b1[2]*weights.y + b2[2]*weights.z + b3[2]*weights.w;
return float3x4(t0, t1, t2);
}
float3 BoneTransform(float3 ipos, float3x4 m)
{
float3 r;
float4 p = float4(ipos, 1);
r.x = dot(m[0], p);
r.y = dot(m[1], p);
r.z = dot(m[2], p);
return r;
}
float3 BoneTransformNormal(float3 inorm, float3x4 m)
{
float3 r;
r.x = dot(m[0].xyz, inorm);
r.y = dot(m[1].xyz, inorm);
r.z = dot(m[2].xyz, inorm);
return r;
if (binds.z > 254) //this is the signal to use clothVertices!
{
float4 cv0 = clothVertices[binds.w];
float4 cv1 = clothVertices[binds.x];
float4 cv2 = clothVertices[binds.y];
float3 r0 = cv0.zxy - cv1.zxy;
float3 r8 = cv2.yzx - cv1.yzx;
float3 r4 = normalize((r0.zxy * r8.yzx) - (r0.xyz * r8.xyz));
float3 r5 = (cv2.xyz*weights.x) + (cv1.xyz*weights.y) + (cv0.xyz*weights.z);
float r0w = (weights.w - 0.5) * 0.1;
r5 = (r0w * -r4) + r5;
opos = r5;
onorm = r4;
float3 r7 = r4.yzx * itang.zxy;//itang? transformed by bone?? weird
float3 r9 = r4.zxy * itang.yzx;
otang = (r9 - r7);
}
else
{
float3x4 b0 = gBoneMtx[binds.x];
float3x4 b1 = gBoneMtx[binds.y];
float3x4 b2 = gBoneMtx[binds.z];
float3x4 b3 = gBoneMtx[binds.w];
float4 t0 = b0[0]*weights.x + b1[0]*weights.y + b2[0]*weights.z + b3[0]*weights.w;
float4 t1 = b0[1]*weights.x + b1[1]*weights.y + b2[1]*weights.z + b3[1]*weights.w;
float4 t2 = b0[2]*weights.x + b1[2]*weights.y + b2[2]*weights.z + b3[2]*weights.w;
float3x4 m = float3x4(t0, t1, t2);
float4 p = float4(ipos, 1);
opos = float3(dot(m[0], p), dot(m[1], p), dot(m[2], p));
onorm = float3(dot(m[0].xyz, inorm), dot(m[1].xyz, inorm), dot(m[2].xyz, inorm));
otang = float3(dot(m[0].xyz, itang), dot(m[1].xyz, itang), dot(m[2].xyz, itang));
}
}
float3 ModelTransform(float3 ipos, float3 vc0, float3 vc1, uint iid)
{
CodeWalker.Shaders/BasicVS_PBBNCCT.hlsl
+2 -3
View File
@@ -15,11 +15,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, float3(0, 1, 0), bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour1.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = 0.5; // NormalTransform(float3(1, 0, 0)); //no tangent to use on this vertex type...
CodeWalker.Shaders/BasicVS_PBBNCCTTX.hlsl
+2 -4
View File
@@ -17,12 +17,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, input.Tangent.xyz, bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour1.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal.xyz, bone);
float3 btang = BoneTransformNormal(input.Tangent.xyz, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = NormalTransform(btang);
CodeWalker.Shaders/BasicVS_PBBNCCTX.hlsl
+2 -4
View File
@@ -16,12 +16,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, input.Tangent.xyz, bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour1.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal.xyz, bone);
float3 btang = BoneTransformNormal(input.Tangent.xyz, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = NormalTransform(btang);
CodeWalker.Shaders/BasicVS_PBBNCT.hlsl
+2 -3
View File
@@ -14,11 +14,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, float3(0, 1, 0), bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour0.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = 0.5; // NormalTransform(float3(1, 0, 0)); //no tangent to use on this vertex type...
CodeWalker.Shaders/BasicVS_PBBNCTT.hlsl
+2 -3
View File
@@ -15,11 +15,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, float3(0, 1, 0), bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour0.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = 0.5; // NormalTransform(float3(1, 0, 0)); //no tangent to use on this vertex type...
CodeWalker.Shaders/BasicVS_PBBNCTTT.hlsl
+2 -3
View File
@@ -16,11 +16,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, float3(0, 1, 0), bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour0.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = 0.5; // NormalTransform(float3(1, 0, 0)); //no tangent to use on this vertex type...
CodeWalker.Shaders/BasicVS_PBBNCTTX.hlsl
+2 -4
View File
@@ -16,12 +16,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, input.Tangent.xyz, bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour0.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal.xyz, bone);
float3 btang = BoneTransformNormal(input.Tangent.xyz, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = NormalTransform(btang);
CodeWalker.Shaders/BasicVS_PBBNCTX.hlsl
+2 -4
View File
@@ -15,12 +15,10 @@ struct VS_INPUT
VS_OUTPUT main(VS_INPUT input, uint iid : SV_InstanceID)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 bpos = BoneTransform(input.Position.xyz, bone);
float3 bpos, bnorm, btang;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, input.Normal, input.Tangent.xyz, bpos, bnorm, btang);
float3 opos = ModelTransform(bpos, input.Colour0.xyz, input.Colour0.xyz, iid);
float4 cpos = ScreenTransform(opos);
float3 bnorm = BoneTransformNormal(input.Normal.xyz, bone);
float3 btang = BoneTransformNormal(input.Tangent.xyz, bone);
float3 onorm = NormalTransform(bnorm);
float3 otang = NormalTransform(btang);
CodeWalker.Shaders/ShadowVS_Skin.hlsl
+33 -20
View File
@@ -34,6 +34,10 @@ cbuffer BoneMatrices : register(b7) //rage_bonemtx
{
row_major float3x4 gBoneMtx[255]; // Offset: 0 Size: 12240
}
cbuffer ClothVertices : register(b8) //pedcloth
{
float4 clothVertices[254]; // Offset: 64 Size: 4060
}
struct VS_INPUT
{
@@ -59,26 +63,35 @@ struct VS_OUTPUT
float3x4 BoneMatrix(float4 weights, float4 indices)
void BoneTransform(float4 weights, float4 indices, float3 ipos, out float3 opos)
{
uint4 binds = (uint4) (indices * 255.001953);
float3x4 b0 = gBoneMtx[binds.x];
float3x4 b1 = gBoneMtx[binds.y];
float3x4 b2 = gBoneMtx[binds.z];
float3x4 b3 = gBoneMtx[binds.w];
float4 t0 = b0[0] * weights.x + b1[0] * weights.y + b2[0] * weights.z + b3[0] * weights.w;
float4 t1 = b0[1] * weights.x + b1[1] * weights.y + b2[1] * weights.z + b3[1] * weights.w;
float4 t2 = b0[2] * weights.x + b1[2] * weights.y + b2[2] * weights.z + b3[2] * weights.w;
return float3x4(t0, t1, t2);
}
float3 BoneTransform(float3 ipos, float3x4 m)
{
float3 r;
float4 p = float4(ipos, 1);
r.x = dot(m[0], p);
r.y = dot(m[1], p);
r.z = dot(m[2], p);
return r;
if (binds.z > 254) //this is the signal to use clothVertices!
{
float4 cv0 = clothVertices[binds.w];
float4 cv1 = clothVertices[binds.x];
float4 cv2 = clothVertices[binds.y];
float3 r0 = cv0.zxy - cv1.zxy;
float3 r8 = cv2.yzx - cv1.yzx;
float3 r4 = normalize((r0.zxy * r8.yzx) - (r0.xyz * r8.xyz));
float3 r5 = (cv2.xyz * weights.x) + (cv1.xyz * weights.y) + (cv0.xyz * weights.z);
float r0w = (weights.w - 0.5) * 0.1;
r5 = (r0w * -r4) + r5;
opos = r5;
}
else
{
float3x4 b0 = gBoneMtx[binds.x];
float3x4 b1 = gBoneMtx[binds.y];
float3x4 b2 = gBoneMtx[binds.z];
float3x4 b3 = gBoneMtx[binds.w];
float4 t0 = b0[0] * weights.x + b1[0] * weights.y + b2[0] * weights.z + b3[0] * weights.w;
float4 t1 = b0[1] * weights.x + b1[1] * weights.y + b2[1] * weights.z + b3[1] * weights.w;
float4 t2 = b0[2] * weights.x + b1[2] * weights.y + b2[2] * weights.z + b3[2] * weights.w;
float3x4 m = float3x4(t0, t1, t2);
float4 p = float4(ipos, 1);
opos = float3(dot(m[0], p), dot(m[1], p), dot(m[2], p));
}
}
@@ -88,8 +101,8 @@ float3 BoneTransform(float3 ipos, float3x4 m)
VS_OUTPUT main(VS_INPUT input)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 ipos = BoneTransform(input.Position.xyz, bone);
float3 ipos;
BoneTransform(input.BlendWeights, input.BlendIndices, input.Position.xyz, ipos);
float3 tpos = (HasTransforms == 1) ? mul(float4(ipos, 1), Transform).xyz : ipos;
float3 spos = tpos * Scale;
float3 bpos = mulvq(spos, Orientation);