mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-21 01:01:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

use bone weights for animation (#1728)

Browse Source
This commit is contained in:
nathants
2021-04-19 09:26:40 -07:00
committed by GitHub
parent 581bd0eb02
commit 1c45a882f7
1 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/models.c
View File

@@ -1425,10 +1425,22 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
int vCounter = 0; int vCounter = 0;
int boneCounter = 0; int boneCounter = 0;
int boneId = 0; int boneId = 0;
float boneWeight = 0.0;
for (int i = 0; i < model.meshes[m].vertexCount; i++) for (int i = 0; i < model.meshes[m].vertexCount; i++)
{
model.meshes[m].animVertices[vCounter] = 0;
model.meshes[m].animVertices[vCounter + 1] = 0;
model.meshes[m].animVertices[vCounter + 2] = 0;
model.meshes[m].animNormals[vCounter] = 0;
model.meshes[m].animNormals[vCounter + 1] = 0;
model.meshes[m].animNormals[vCounter + 2] = 0;
for (int j = 0; j < 4; j++)
{ {
boneId = model.meshes[m].boneIds[boneCounter]; boneId = model.meshes[m].boneIds[boneCounter];
boneWeight = model.meshes[m].boneWeights[boneCounter];
inTranslation = model.bindPose[boneId].translation; inTranslation = model.bindPose[boneId].translation;
inRotation = model.bindPose[boneId].rotation; inRotation = model.bindPose[boneId].rotation;
//inScale = model.bindPose[boneId].scale; //inScale = model.bindPose[boneId].scale;
@@ -1443,9 +1455,9 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
animVertex = Vector3Subtract(animVertex, inTranslation); animVertex = Vector3Subtract(animVertex, inTranslation);
animVertex = Vector3RotateByQuaternion(animVertex, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); animVertex = Vector3RotateByQuaternion(animVertex, QuaternionMultiply(outRotation, QuaternionInvert(inRotation)));
animVertex = Vector3Add(animVertex, outTranslation); animVertex = Vector3Add(animVertex, outTranslation);
model.meshes[m].animVertices[vCounter] = animVertex.x; model.meshes[m].animVertices[vCounter] += animVertex.x * boneWeight;
model.meshes[m].animVertices[vCounter + 1] = animVertex.y; model.meshes[m].animVertices[vCounter + 1] += animVertex.y * boneWeight;
model.meshes[m].animVertices[vCounter + 2] = animVertex.z; model.meshes[m].animVertices[vCounter + 2] += animVertex.z * boneWeight;
// Normals processing // Normals processing
// NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals) // NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals)
@@ -1453,13 +1465,13 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
{ {
animNormal = (Vector3){ model.meshes[m].normals[vCounter], model.meshes[m].normals[vCounter + 1], model.meshes[m].normals[vCounter + 2] }; animNormal = (Vector3){ model.meshes[m].normals[vCounter], model.meshes[m].normals[vCounter + 1], model.meshes[m].normals[vCounter + 2] };
animNormal = Vector3RotateByQuaternion(animNormal, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); animNormal = Vector3RotateByQuaternion(animNormal, QuaternionMultiply(outRotation, QuaternionInvert(inRotation)));
model.meshes[m].animNormals[vCounter] = animNormal.x; model.meshes[m].animNormals[vCounter] += animNormal.x * boneWeight;
model.meshes[m].animNormals[vCounter + 1] = animNormal.y; model.meshes[m].animNormals[vCounter + 1] += animNormal.y * boneWeight;
model.meshes[m].animNormals[vCounter + 2] = animNormal.z; model.meshes[m].animNormals[vCounter + 2] += animNormal.z * boneWeight;
}
boneCounter += 1;
} }
vCounter += 3; vCounter += 3;
boneCounter += 4;
} }
// Upload new vertex data to GPU for model drawing // Upload new vertex data to GPU for model drawing