ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2026-05-13 20:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Skin mesh now using correct bone transforms

Browse Source
This commit is contained in:
dexy
2019-11-03 22:43:39 +11:00
Unverified
parent 9f84ba8ad0
commit 6be0d5cb30
9 changed files with 342 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shaders/CodeWalkerShaders.vcxproj
+10
View File
@@ -486,6 +486,16 @@
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
</FxCompile>
<FxCompile Include="ShadowVS_Skin.hlsl">
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
</FxCompile>
<FxCompile Include="SkydomePS.hlsl">
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
Shaders/CodeWalkerShaders.vcxproj.filters
+1
View File
@@ -74,6 +74,7 @@
<FxCompile Include="BasicVS_PBBNCCT.hlsl" />
<FxCompile Include="BasicVS_PBBNCCTX.hlsl" />
<FxCompile Include="BasicVS_PBBNCTTX.hlsl" />
<FxCompile Include="ShadowVS_Skin.hlsl" />
</ItemGroup>
<ItemGroup>
<None Include="Quaternion.hlsli" />
Shaders/ShadowVS_Skin.cso
BIN
View File
Binary file not shown.
Shaders/ShadowVS_Skin.hlsl
+127
View File
@@ -0,0 +1,127 @@
#include "Common.hlsli"
#include "Quaternion.hlsli"
cbuffer VSSceneVars : register(b0)
{
float4x4 ViewProj;
float4 WindVector;
}
cbuffer VSEntityVars : register(b1)
{
float4 CamRel;
float4 Orientation;
uint HasSkeleton;
uint HasTransforms;
uint TintPaletteIndex;
uint Pad1;
float3 Scale;
uint Pad2;
}
cbuffer VSModelVars : register(b2)
{
float4x4 Transform;
}
cbuffer GeomVars : register(b3)
{
uint EnableTexture;
uint EnableTint;
uint IsDecal;
uint EnableWind;
float4 WindOverrideParams;
}
cbuffer BoneMatrices : register(b7) //rage_bonemtx
{
row_major float3x4 gBoneMtx[255]; // Offset: 0 Size: 12240
}
struct VS_INPUT
{
float4 Position : POSITION;
float4 BlendWeights : BLENDWEIGHTS;
float4 BlendIndices : BLENDINDICES;
float3 Normal : NORMAL;
float2 Texcoord : TEXCOORD0;
float4 Colour : COLOR0;
};
struct VS_OUTPUT
{
float4 Position : SV_POSITION;
//float3 Normal : NORMAL;
float2 Texcoord : TEXCOORD0;
//float4 Colour : COLOR0;
//float4 Tint : COLOR1;
};
//Texture2D<float4> TintPalette : register(t0);
//SamplerState TextureSS : register(s0);
float3x4 BoneMatrix(float4 weights, float4 indices)
{
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;
}
VS_OUTPUT main(VS_INPUT input)
{
VS_OUTPUT output;
float3x4 bone = BoneMatrix(input.BlendWeights, input.BlendIndices);
float3 ipos = BoneTransform(input.Position.xyz, bone);
float3 tpos = (HasTransforms == 1) ? mul(float4(ipos, 1), Transform).xyz : ipos;
float3 spos = tpos * Scale;
float3 bpos = mulvq(spos, Orientation);
if (EnableWind)
{
bpos = GeomWindMotion(bpos, input.Colour.xyz, WindVector, WindOverrideParams);
}
float3 opos = CamRel.xyz + bpos;
float4 pos = float4(opos, 1);
float4 cpos = mul(pos, ViewProj);
//if (IsDecal == 1)
//{
// //cpos.z -= 0.003; //todo: correct decal z-bias
//}
//cpos.z = saturate(cpos.z); //might need work
//cpos.z = DepthFunc(cpos.zw);
//float3 inorm = input.Normal;
//float3 tnorm = (HasTransforms == 1) ? mul(inorm, (float3x3)Transform) : inorm;
//float3 bnorm = normalize(mulvq(tnorm, Orientation));
//float4 tnt = 0;
//if (EnableTint == 1)
//{
// tnt = TintPalette.SampleLevel(TextureSS, float2(input.Colour.b, TintYVal), 0);
//}
output.Position = cpos;
//output.Normal = bnorm;
output.Texcoord = input.Texcoord;
//output.Colour = input.Colour;
//output.Tint = tnt;
return output;
}