Check for weights

Author: appgurueu

irr/include/SkinnedMesh.h

@@ -43,7 +43,6 @@ class SkinnedMesh : public IAnimatedMesh
 	//! constructor
 	SkinnedMesh(SourceFormat src_format) :
 		EndFrame(0.f), FramesPerSecond(25.f),
-		HasAnimation(false), PreparedForSkinning(false),
 		SrcFormat(src_format)
 	{
 		SkinningBuffers = &LocalBuffers;
@@ -128,9 +127,9 @@ class SkinnedMesh : public IAnimatedMesh
 	void convertMeshToTangents();
 
 	//! Does the mesh have no animation
-	bool isStatic() const {
-		return !HasAnimation;
-	}
+	bool isStatic() const { return !HasAnimation; }
+	//! Does the mesh have skinning weights?
+	bool hasWeights() const { return HasWeights; }
 
 	//! Back up static pose after local buffers have been modified directly
 	void updateStaticPose();
@@ -334,7 +333,8 @@ class SkinnedMesh : public IAnimatedMesh
 	}
 
 protected:
-	bool checkForAnimation() const;
+	bool checkForWeights() const;
+	bool checkForKeys() const;
 
 	void prepareForSkinning();
 
@@ -368,8 +368,9 @@ class SkinnedMesh : public IAnimatedMesh
 	f32 EndFrame;
 	f32 FramesPerSecond;
 
-	bool HasAnimation;
-	bool PreparedForSkinning;
+	bool HasAnimation = false;
+	bool HasWeights = false;
+	bool PreparedForSkinning = false;
 	bool UseSwSkinning = false;
 
 	SourceFormat SrcFormat;

irr/src/AnimatedMeshSceneNode.cpp

@@ -198,11 +198,10 @@ void AnimatedMeshSceneNode::render()
 
 	if (auto *sm = dynamic_cast<SkinnedMesh *>(Mesh)) {
 		sm->rigidAnimation(PerJoint.GlobalMatrices);
-		// TODO check whether there are any weights to make use of these joint transforms
 		if (sm->useSoftwareSkinning()) {
 			// Perform software skinning; matrices have already been calculated in OnAnimate
 			sm->skinMesh(PerJoint.GlobalMatrices);
-		} else {
+		} else if (sm->hasWeights()) {
 			driver->setJointTransforms(sm->calculateSkinMatrices(PerJoint.GlobalMatrices));
 		}
 	}

irr/src/SkinnedMesh.cpp

@@ -234,27 +234,23 @@ void SkinnedMesh::calculateGlobalMatrices(std::vector<core::matrix4> &matrices)
 	}
 }
 
-bool SkinnedMesh::checkForAnimation() const
+bool SkinnedMesh::checkForWeights() const
 {
-	for (auto *joint : AllJoints) {
-		if (!joint->keys.empty()) {
-			return true;
-		}
-	}
-
-	// meshes with weights are animatable
-	for (auto *buf : LocalBuffers) {
-		if (buf->getWeights()) {
-			return true;
-		}
-	}
+	return std::any_of(LocalBuffers.begin(), LocalBuffers.end(),
+			[](const auto *buf) { return buf->getWeights() != nullptr; });
+}
 
-	return false;
+bool SkinnedMesh::checkForKeys() const
+{
+	return std::any_of(AllJoints.begin(), AllJoints.end(),
+			[](const auto *joint) { return !joint->keys.empty(); });
 }
 
 void SkinnedMesh::prepareForSkinning()
 {
-	HasAnimation = checkForAnimation();
+	HasWeights = checkForWeights();
+	// Meshes with weights are animatable (e.g. with bone overrides)
+	HasAnimation = HasWeights || checkForKeys();
 	if (!HasAnimation || PreparedForSkinning)
 		return;
 
@@ -400,6 +396,17 @@ SkinnedMesh *SkinnedMeshBuilder::finalize() &&
 	// (see e.g. SkinnedMesh::calculateGlobalMatrices)
 	topoSortJoints();
 
+	// Add all weights such that checkForWeights() works as expected
+	for (const auto &weight : weights) {
+		auto *buf = mesh->LocalBuffers.at(weight.buffer_id);
+		auto *weights = buf->getWeights();
+		if (!weights) {
+			buf->addWeightBuffer();
+			weights = buf->getWeights();
+		}
+		weights->addWeight(weight.vertex_id, weight.joint_id, weight.strength);
+	}
+
 	mesh->prepareForSkinning();
 
 	std::vector<core::matrix4> matrices;
@@ -425,16 +432,6 @@ SkinnedMesh *SkinnedMeshBuilder::finalize() &&
 		}
 	}
 
-	for (const auto &weight : weights) {
-		auto *buf = mesh->LocalBuffers.at(weight.buffer_id);
-		auto *weights = buf->getWeights();
-		if (!weights) {
-			buf->addWeightBuffer();
-			weights = buf->getWeights();
-		}
-		weights->addWeight(weight.vertex_id, weight.joint_id, weight.strength);
-	}
-
 	for (auto *buffer : mesh->LocalBuffers) {
 		// With HW skinning, the VBOs should be static by default
 		buffer->setHardwareMappingHint(EHM_STATIC);