ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use hardware skinning GR in sp_mesh_node

Browse Source
This commit is contained in:
Benau 2018-01-13 15:16:16 +08:00
parent 24308ced03
commit 9e90bd251d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/graphics/sp/sp_mesh_node.cpp
View File

@ -21,6 +21,7 @@
#include "graphics/sp/sp_mesh.hpp" #include "graphics/sp/sp_mesh.hpp"
#include "graphics/sp/sp_mesh_buffer.hpp" #include "graphics/sp/sp_mesh_buffer.hpp"
#include "graphics/sp/sp_shader.hpp" #include "graphics/sp/sp_shader.hpp"
#include "graphics/graphics_restrictions.hpp"
#include "graphics/irr_driver.hpp" #include "graphics/irr_driver.hpp"
#include "graphics/material.hpp" #include "graphics/material.hpp"
#include "graphics/render_info.hpp" #include "graphics/render_info.hpp"
@ -68,7 +69,11 @@ void SPMeshNode::setAnimationState(bool val)
{ {
return; return;
} }
m_animated = !m_mesh->isStatic() && val; #ifndef SERVER_ONLY
m_animated = !m_mesh->isStatic() && val &&
!GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_HARDWARE_SKINNING);
#endif
} // setAnimationState } // setAnimationState
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -86,7 +91,11 @@ void SPMeshNode::setMesh(irr::scene::IAnimatedMesh* mesh)
m_texture_matrices.resize(m_mesh->getMeshBufferCount()); m_texture_matrices.resize(m_mesh->getMeshBufferCount());
if (!m_mesh->isStatic()) if (!m_mesh->isStatic())
{ {
m_animated = !m_mesh->isStatic(); #ifndef SERVER_ONLY
m_animated = !m_mesh->isStatic() &&
!GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_HARDWARE_SKINNING);
#endif
unsigned bone_idx = 0; unsigned bone_idx = 0;
m_skinning_matrices.resize(m_mesh->getJointCount()); m_skinning_matrices.resize(m_mesh->getJointCount());
for (Armature& arm : m_mesh->getArmatures()) for (Armature& arm : m_mesh->getArmatures())