Choose whether to use HW skinning shader appropriately

Author: appgurueu

irr/include/IAnimatedMesh.h

@@ -21,6 +21,9 @@ class IAnimatedMesh : public IMesh
 
 	virtual void prepareForAnimation(u16 max_hw_joints) = 0;
 
+	//! Whether the mesh needs shader-based hardware skinning
+	virtual bool needsHwSkinning() const = 0;
+
 	//! Returns the type of the animated mesh. Useful for safe downcasts.
 	E_ANIMATED_MESH_TYPE getMeshType() const = 0;
 };

irr/include/SMesh.h

@@ -139,6 +139,7 @@ struct SMesh final : public IAnimatedMesh
 
 	f32 getMaxFrameNumber() const override { return 0.0f; }
 	void prepareForAnimation(u16 max_hw_joints) override {}
+	bool needsHwSkinning() const override { return false; }
 	E_ANIMATED_MESH_TYPE getMeshType() const override { return EAMT_STATIC; }
 };
 

irr/include/SkinnedMesh.h

@@ -60,6 +60,8 @@ class SkinnedMesh : public IAnimatedMesh
 
 	void prepareForAnimation(u16 max_hw_joints) override;
 
+	bool needsHwSkinning() const override { return !UseSwSkinning && HasWeights; }
+
 	bool useSoftwareSkinning() const { return UseSwSkinning; }
 
 	//! Turns the given array of local matrices into an array of global matrices

src/client/content_cao.cpp

@@ -581,33 +581,34 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 	infostream << "GenericCAO::addToScene(): " <<
 		enum_to_string(es_ObjectVisual, m_prop.visual)<< std::endl;
 
-	if (m_prop.visual != OBJECTVISUAL_NODE &&
-			m_prop.visual != OBJECTVISUAL_WIELDITEM &&
-			m_prop.visual != OBJECTVISUAL_ITEM)
-	{
-		IShaderSource *shader_source = m_client->getShaderSource();
-		MaterialType material_type;
-
-		if (m_prop.shaded && m_prop.glow == 0)
-			material_type = (m_prop.use_texture_alpha) ?
-				TILE_MATERIAL_ALPHA : TILE_MATERIAL_BASIC;
-		else
-			material_type = (m_prop.use_texture_alpha) ?
-				TILE_MATERIAL_PLAIN_ALPHA : TILE_MATERIAL_PLAIN;
-
-		u32 shader_id = shader_source->getShader("object_shader", material_type, NDT_NORMAL,
-			false, true);
-		// TODO proper condition for whether we'll need skinning
-		m_material_type = shader_source->getShaderInfo(shader_id).material;
-	} else {
-		// Not used, so make sure it's not valid
-		m_material_type = video::EMT_INVALID;
-	}
+	auto updateMaterialType = [this](bool hw_skin) {
+		if (m_prop.visual != OBJECTVISUAL_NODE &&
+				m_prop.visual != OBJECTVISUAL_WIELDITEM &&
+				m_prop.visual != OBJECTVISUAL_ITEM)
+		{
+			IShaderSource *shader_source = m_client->getShaderSource();
+			MaterialType material_type;
+
+			if (m_prop.shaded && m_prop.glow == 0)
+				material_type = (m_prop.use_texture_alpha) ?
+					TILE_MATERIAL_ALPHA : TILE_MATERIAL_BASIC;
+			else
+				material_type = (m_prop.use_texture_alpha) ?
+					TILE_MATERIAL_PLAIN_ALPHA : TILE_MATERIAL_PLAIN;
+
+			u32 shader_id = shader_source->getShader("object_shader", material_type, NDT_NORMAL,
+				false, hw_skin);
+			m_material_type = shader_source->getShaderInfo(shader_id).material;
+		} else {
+			// Not used, so make sure it's not valid
+			m_material_type = video::EMT_INVALID;
+		}
+	};
 
 	m_matrixnode = m_smgr->addDummyTransformationSceneNode();
 	m_matrixnode->grab();
 
-	auto setMaterial = [this] (video::SMaterial &mat) {
+	auto setMaterial = [this](video::SMaterial &mat) {
 		if (m_material_type != video::EMT_INVALID)
 			mat.MaterialType = m_material_type;
 		mat.FogEnable = true;
@@ -617,12 +618,15 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 		});
 	};
 
-	auto setSceneNodeMaterials = [setMaterial] (scene::ISceneNode *node) {
+	auto setSceneNodeMaterials = [&] (scene::ISceneNode *node, bool hw_skin = false) {
+		updateMaterialType(hw_skin);
 		node->forEachMaterial(setMaterial);
 	};
 
 	switch(m_prop.visual) {
 	case OBJECTVISUAL_UPRIGHT_SPRITE: {
+		updateMaterialType(false);
+
 		auto mesh = make_irr<scene::SMesh>();
 		f32 dx = BS * m_prop.visual_size.X / 2;
 		f32 dy = BS * m_prop.visual_size.Y / 2;
@@ -696,7 +700,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 			// set vertex colors to ensure alpha is set
 			setMeshColor(m_animated_meshnode->getMesh(), video::SColor(0xFFFFFFFF));
 
-			setSceneNodeMaterials(m_animated_meshnode);
+			setSceneNodeMaterials(m_animated_meshnode, mesh->needsHwSkinning());
 
 			m_animated_meshnode->forEachMaterial([this] (auto &mat) {
 				mat.BackfaceCulling = m_prop.backface_culling;