oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00
Code Wiki Activity

things have changed

Browse source
This commit is contained in:
Lars Mueller 2025-05-24 17:31:53 +02:00
parent 4b916a2453
commit 3388a561e9
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
irr/include/SkinnedMesh.h
View file

@ -411,14 +411,8 @@ protected:
bool HasAnimation; bool HasAnimation;
bool PreparedForSkinning; bool PreparedForSkinning;
bool AnimateNormals; bool AnimateNormals;
<<<<<<< HEAD
bool HardwareSkinning;
SourceFormat SrcFormat; SourceFormat SrcFormat;
||||||| parent of 44f1cd940 (progress)
bool HardwareSkinning;
=======
>>>>>>> 44f1cd940 (progress)
}; };
// Interface for mesh loaders // Interface for mesh loaders

1
irr/include/matrix4.h
View file

@ -12,7 +12,6 @@
#include "aabbox3d.h" #include "aabbox3d.h"
#include "rect.h" #include "rect.h"
#include <cassert> #include <cassert>
#include "IrrCompileConfig.h" // for IRRLICHT_API
namespace irr namespace irr
{ {

7
irr/src/CAnimatedMeshSceneNode.cpp
View file

@ -23,6 +23,7 @@
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
#include <optional> #include <optional>
#include <cassert>
namespace irr namespace irr
{ {
@ -191,7 +192,7 @@ void CAnimatedMeshSceneNode::OnAnimate(u32 timeMs)
if (auto *skinnedMesh = dynamic_cast<SkinnedMesh*>(Mesh)) { if (auto *skinnedMesh = dynamic_cast<SkinnedMesh*>(Mesh)) {
for (u16 i = 0; i < PerJoint.SceneNodes.size(); ++i) for (u16 i = 0; i < PerJoint.SceneNodes.size(); ++i)
PerJoint.GlobalMatrices[i] = PerJoint.SceneNodes[i]->getRelativeTransformation(); PerJoint.GlobalMatrices[i] = PerJoint.SceneNodes[i]->getRelativeTransformation();
_IRR_DEBUG_BREAK_IF(PerJoint.GlobalMatrices.size() != skinnedMesh->getJointCount()); assert(PerJoint.GlobalMatrices.size() == skinnedMesh->getJointCount());
skinnedMesh->calculateGlobalMatrices(PerJoint.GlobalMatrices); skinnedMesh->calculateGlobalMatrices(PerJoint.GlobalMatrices);
Box = skinnedMesh->calculateBoundingBox(PerJoint.GlobalMatrices); Box = skinnedMesh->calculateBoundingBox(PerJoint.GlobalMatrices);
} else { } else {
@ -213,7 +214,7 @@ void CAnimatedMeshSceneNode::render()
++PassCount; ++PassCount;
scene::IMesh *m = getMeshForCurrentFrame(); scene::IMesh *m = getMeshForCurrentFrame();
_IRR_DEBUG_BREAK_IF(!m); assert(m);
driver->setTransform(video::ETS_WORLD, AbsoluteTransformation); driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
@ -552,7 +553,7 @@ void CAnimatedMeshSceneNode::addJoints()
ISceneNode *parent = this; ISceneNode *parent = this;
if (joint->ParentJointID) if (joint->ParentJointID)
parent = PerJoint.SceneNodes.at(*joint->ParentJointID); // exists because of topo. order parent = PerJoint.SceneNodes.at(*joint->ParentJointID); // exists because of topo. order
_IRR_DEBUG_BREAK_IF(!parent); assert(parent);
const auto *matrix = std::get_if<core::matrix4>(&joint->transform); const auto *matrix = std::get_if<core::matrix4>(&joint->transform);
PerJoint.SceneNodes.push_back(new CBoneSceneNode( PerJoint.SceneNodes.push_back(new CBoneSceneNode(
parent, SceneManager, 0, i, joint->Name, parent, SceneManager, 0, i, joint->Name,