Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 17:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor cleanup around measurements of joint radius

Browse source
This commit is contained in:
Andrew Meadows 2014-07-17 12:42:18 -07:00
parent b22652f441
commit 53ee5f2340
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/fbx/src/FBXReader.cpp
View file

@ -967,14 +967,16 @@ QString getString(const QVariant& value) {
class JointShapeInfo { class JointShapeInfo {
public: public:
JointShapeInfo() : numVertices(0), numProjectedVertices(0), averageVertex(0.f), boneBegin(0.f), averageRadius(0.f) { JointShapeInfo() : numVertices(0), numProjectedVertices(0),
extents.reset(); sumVertexWeights(0.0f), sumWeightedRadii(0.0f),
averageVertex(0.f), boneBegin(0.f), averageRadius(0.f) {
} }
// NOTE: the points here are in the "joint frame" which has the "jointEnd" at the origin // NOTE: the points here are in the "joint frame" which has the "jointEnd" at the origin
int numVertices; // num vertices from contributing meshes int numVertices; // num vertices from contributing meshes
int numProjectedVertices; // num vertices that successfully project onto bone axis int numProjectedVertices; // num vertices that successfully project onto bone axis
Extents extents; // max and min extents of mesh vertices (in joint frame) float sumVertexWeights;
float sumWeightedRadii;
glm::vec3 averageVertex; // average of all mesh vertices (in joint frame) glm::vec3 averageVertex; // average of all mesh vertices (in joint frame)
glm::vec3 boneBegin; // parent joint location (in joint frame) glm::vec3 boneBegin; // parent joint location (in joint frame)
float averageRadius; // average distance from mesh points to averageVertex float averageRadius; // average distance from mesh points to averageVertex
@ -1740,14 +1742,13 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
const float EXPANSION_WEIGHT_THRESHOLD = 0.25f; const float EXPANSION_WEIGHT_THRESHOLD = 0.25f;
if (weight > EXPANSION_WEIGHT_THRESHOLD) { if (weight > EXPANSION_WEIGHT_THRESHOLD) {
const glm::vec3& vertex = extracted.mesh.vertices.at(it.value()); const glm::vec3& vertex = extracted.mesh.vertices.at(it.value());
float proj = glm::dot(boneDirection, vertex - boneEnd); float proj = glm::dot(boneDirection, boneEnd - vertex);
if (proj < 0.0f && proj > -boneLength) { if (proj > 0.0f && proj < boneLength) {
joint.boneRadius = glm::max(joint.boneRadius, joint.boneRadius = glm::max(joint.boneRadius,
radiusScale * glm::distance(vertex, boneEnd + boneDirection * proj)); radiusScale * glm::distance(vertex, boneEnd - boneDirection * proj));
++jointShapeInfo.numProjectedVertices; ++jointShapeInfo.numProjectedVertices;
} }
glm::vec3 vertexInJointFrame = rotateMeshToJoint * (radiusScale * (vertex - boneEnd)); glm::vec3 vertexInJointFrame = rotateMeshToJoint * (radiusScale * (vertex - boneEnd));
jointShapeInfo.extents.addPoint(vertexInJointFrame);
jointShapeInfo.averageVertex += vertexInJointFrame; jointShapeInfo.averageVertex += vertexInJointFrame;
++jointShapeInfo.numVertices; ++jointShapeInfo.numVertices;
} }
@ -1792,13 +1793,12 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
glm::vec3 averageVertex(0.f); glm::vec3 averageVertex(0.f);
foreach (const glm::vec3& vertex, extracted.mesh.vertices) { foreach (const glm::vec3& vertex, extracted.mesh.vertices) {
float proj = glm::dot(boneDirection, vertex - boneEnd); float proj = glm::dot(boneDirection, boneEnd - vertex);
if (proj < 0.0f && proj > -boneLength) { if (proj > 0.0f && proj < boneLength) {
joint.boneRadius = glm::max(joint.boneRadius, radiusScale * glm::distance(vertex, boneEnd + boneDirection * proj)); joint.boneRadius = glm::max(joint.boneRadius, radiusScale * glm::distance(vertex, boneEnd - boneDirection * proj));
++jointShapeInfo.numProjectedVertices; ++jointShapeInfo.numProjectedVertices;
} }
glm::vec3 vertexInJointFrame = rotateMeshToJoint * (radiusScale * (vertex - boneEnd)); glm::vec3 vertexInJointFrame = rotateMeshToJoint * (radiusScale * (vertex - boneEnd));
jointShapeInfo.extents.addPoint(vertexInJointFrame);
jointShapeInfo.averageVertex += vertexInJointFrame; jointShapeInfo.averageVertex += vertexInJointFrame;
averageVertex += vertex; averageVertex += vertex;
} }