Various tweaks

This commit is contained in:
Wojtek Figat
2024-02-14 18:21:30 +01:00
parent ebcc864b06
commit 42363e411e
7 changed files with 38 additions and 62 deletions

View File

@@ -1431,7 +1431,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
Transform srcNode = data.Skeleton.Nodes[nodeIndex].LocalTransform;
auto& node = data.Skeleton.Nodes[nodeIndex];
if (auto* channel = animation.GetChannel(node.Name))
channel->Evaluate(frame, &srcNode, false);
channel->Evaluate((float)frame, &srcNode, false);
pose.Nodes[nodeIndex] = srcNode;
}
@@ -1439,7 +1439,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
key = Float3::Zero;
for (int32 nodeIndex = 0; nodeIndex < nodes; nodeIndex++)
key += pose.GetNodeModelTransformation(data.Skeleton, nodeIndex).Translation;
key /= nodes;
key /= (float)nodes;
}
// Calculate skeleton center of mass movement over the animation frames
@@ -1448,7 +1448,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
for (int32 frame = 0; frame < frames; frame++)
{
auto& key = rootChannel.Position[frame];
key.Time = frame;
key.Time = (float)frame;
key.Value = centerOfMass[frame] - centerOfMassRefPose;
}
@@ -1494,7 +1494,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
Transform srcNode = data.Skeleton.Nodes[nodeIndex].LocalTransform;
auto& node = data.Skeleton.Nodes[nodeIndex];
if (auto* channel = animation.GetChannel(node.Name))
channel->Evaluate(frame, &srcNode, false);
channel->Evaluate((float)frame, &srcNode, false);
pose.Nodes[nodeIndex] = srcNode;
}