zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder members. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2560 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2009-08-05 14:35:42 +00:00
parent bfbe6299c8
commit 920e2cfaad
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Irrlicht/CSkinnedMesh.cpp
View File

@ -18,9 +18,11 @@ namespace scene
//! constructor
CSkinnedMesh::CSkinnedMesh()
: SkinningBuffers(0), HasAnimation(0), PreparedForSkinning(0),
AnimationFrames(0.f), LastAnimatedFrame(0.f), LastSkinnedFrame(0.f),
BoneControlUsed(false), AnimateNormals(true), HardwareSkinning(0), InterpolationMode(EIM_LINEAR)
: SkinningBuffers(0), AnimationFrames(0.f),
LastAnimatedFrame(0.f), LastSkinnedFrame(0.f),
InterpolationMode(EIM_LINEAR),
HasAnimation(false), PreparedForSkinning(false),
BoneControlUsed(false), AnimateNormals(true), HardwareSkinning(false)
{
#ifdef _DEBUG
setDebugName("CSkinnedMesh");
@ -459,7 +461,6 @@ void CSkinnedMesh::skinMesh()
for (i=0; i<SkinningBuffers->size(); ++i)
(*SkinningBuffers)[i]->setDirty(EBT_VERTEX);
}
}
@ -710,8 +711,6 @@ bool CSkinnedMesh::setHardwareSkinning(bool on)
LocalBuffers[buffer_id]->boundingBoxNeedsRecalculated();
}
}
}
HardwareSkinning=on;

21
source/Irrlicht/CSkinnedMesh.h
View File

@ -147,7 +147,6 @@ namespace scene
virtual void updateBoundingBox(void);
private:
void checkForAnimation();
void normalizeWeights();
@ -177,26 +176,22 @@ private:
core::array<SJoint*> AllJoints;
core::array<SJoint*> RootJoints;
bool HasAnimation;
core::aabbox3d<f32> BoundingBox;
bool PreparedForSkinning;
core::array< core::array<bool> > Vertices_Moved;
f32 AnimationFrames;
f32 LastAnimatedFrame;
f32 LastSkinnedFrame;
bool BoneControlUsed;
bool AnimateNormals;
bool HardwareSkinning;
E_INTERPOLATION_MODE InterpolationMode;
core::aabbox3d<f32> BoundingBox;
core::array< core::array<bool> > Vertices_Moved;
bool HasAnimation;
bool PreparedForSkinning;
bool BoneControlUsed;
bool AnimateNormals;
bool HardwareSkinning;
};
} // end namespace scene
@ -204,5 +199,3 @@ private:
#endif