Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-18 05:33:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: drop _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_

Browse Source 
it's enabled inconditionally
This commit is contained in:
Loic Blot 2023-10-09 09:02:46 +02:00 committed by sfan5
parent dd14486d3f
commit ae63f1bf02
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/Irrlicht/CAnimatedMeshSceneNode.cpp
View File

@ -7,9 +7,7 @@
#include "ISceneManager.h" #include "ISceneManager.h"
#include "S3DVertex.h" #include "S3DVertex.h"
#include "os.h" #include "os.h"
#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
#include "CSkinnedMesh.h" #include "CSkinnedMesh.h"
#endif
#include "IDummyTransformationSceneNode.h" #include "IDummyTransformationSceneNode.h"
#include "IBoneSceneNode.h" #include "IBoneSceneNode.h"
#include "IMaterialRenderer.h" #include "IMaterialRenderer.h"
@ -187,10 +185,6 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
} }
else else
{ {
#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
return 0;
#else
// As multiple scene nodes may be sharing the same skinned mesh, we have to // As multiple scene nodes may be sharing the same skinned mesh, we have to
// re-animate it every frame to ensure that this node gets the mesh that it needs. // re-animate it every frame to ensure that this node gets the mesh that it needs.
@ -223,7 +217,6 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
} }
return skinnedMesh; return skinnedMesh;
#endif
} }
} }
@ -466,11 +459,6 @@ u32 CAnimatedMeshSceneNode::getMaterialCount() const
//! the corresponding joint, if the mesh in this scene node is a skinned mesh. //! the corresponding joint, if the mesh in this scene node is a skinned mesh.
IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName) IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
{ {
#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
os::Printer::log("Compiled without _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_", ELL_WARNING);
return 0;
#else
if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
{ {
os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING); os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
@ -496,7 +484,6 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
} }
return JointChildSceneNodes[number]; return JointChildSceneNodes[number];
#endif
} }
@ -505,11 +492,6 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
//! the corresponding joint, if the mesh in this scene node is a skinned mesh. //! the corresponding joint, if the mesh in this scene node is a skinned mesh.
IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID) IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
{ {
#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
os::Printer::log("Compiled without _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_", ELL_WARNING);
return 0;
#else
if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
{ {
os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING); os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
@ -525,23 +507,17 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
} }
return JointChildSceneNodes[jointID]; return JointChildSceneNodes[jointID];
#endif
} }
//! Gets joint count. //! Gets joint count.
u32 CAnimatedMeshSceneNode::getJointCount() const u32 CAnimatedMeshSceneNode::getJointCount() const
{ {
#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
return 0;
#else
if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
return 0; return 0;
ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh; ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh;
return skinnedMesh->getJointCount(); return skinnedMesh->getJointCount();
#endif
} }
@ -702,9 +678,6 @@ void CAnimatedMeshSceneNode::setRenderFromIdentity(bool enable)
//! updates the joint positions of this mesh //! updates the joint positions of this mesh
void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions) void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
{ {
#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
return;
#else
if (Mesh && Mesh->getMeshType() == EAMT_SKINNED ) if (Mesh && Mesh->getMeshType() == EAMT_SKINNED )
{ {
checkJoints(); checkJoints();
@ -776,17 +749,12 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
} }
} }
} }
#endif
} }
/*! /*!
*/ */
void CAnimatedMeshSceneNode::checkJoints() void CAnimatedMeshSceneNode::checkJoints()
{ {
#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
return;
#else
if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
return; return;
@ -803,7 +771,6 @@ void CAnimatedMeshSceneNode::checkJoints()
JointsUsed=true; JointsUsed=true;
JointMode=EJUOR_READ; JointMode=EJUOR_READ;
} }
#endif
} }
/*! /*!

1
source/Irrlicht/CMakeLists.txt
View File

@ -71,7 +71,6 @@ endif()
# Platform-independent configuration (hard-coded currently) # Platform-independent configuration (hard-coded currently)
add_definitions( add_definitions(
-DIRR_ENABLE_BUILTIN_FONT -DIRR_ENABLE_BUILTIN_FONT
-D_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
) )
# Platform-specific configuration # Platform-specific configuration