Commit 920e2cfa authored by hybrid's avatar hybrid

Reorder members.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2560 dfc29bdd-3216-0410-991c-e03cc46cb475
parent bfbe6299
...@@ -18,9 +18,11 @@ namespace scene ...@@ -18,9 +18,11 @@ namespace scene
//! constructor //! constructor
CSkinnedMesh::CSkinnedMesh() CSkinnedMesh::CSkinnedMesh()
: SkinningBuffers(0), HasAnimation(0), PreparedForSkinning(0), : SkinningBuffers(0), AnimationFrames(0.f),
AnimationFrames(0.f), LastAnimatedFrame(0.f), LastSkinnedFrame(0.f), LastAnimatedFrame(0.f), LastSkinnedFrame(0.f),
BoneControlUsed(false), AnimateNormals(true), HardwareSkinning(0), InterpolationMode(EIM_LINEAR) InterpolationMode(EIM_LINEAR),
HasAnimation(false), PreparedForSkinning(false),
BoneControlUsed(false), AnimateNormals(true), HardwareSkinning(false)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CSkinnedMesh"); setDebugName("CSkinnedMesh");
...@@ -459,7 +461,6 @@ void CSkinnedMesh::skinMesh() ...@@ -459,7 +461,6 @@ void CSkinnedMesh::skinMesh()
for (i=0; i<SkinningBuffers->size(); ++i) for (i=0; i<SkinningBuffers->size(); ++i)
(*SkinningBuffers)[i]->setDirty(EBT_VERTEX); (*SkinningBuffers)[i]->setDirty(EBT_VERTEX);
} }
} }
...@@ -710,8 +711,6 @@ bool CSkinnedMesh::setHardwareSkinning(bool on) ...@@ -710,8 +711,6 @@ bool CSkinnedMesh::setHardwareSkinning(bool on)
LocalBuffers[buffer_id]->boundingBoxNeedsRecalculated(); LocalBuffers[buffer_id]->boundingBoxNeedsRecalculated();
} }
} }
} }
HardwareSkinning=on; HardwareSkinning=on;
......
...@@ -147,7 +147,6 @@ namespace scene ...@@ -147,7 +147,6 @@ namespace scene
virtual void updateBoundingBox(void); virtual void updateBoundingBox(void);
private: private:
void checkForAnimation(); void checkForAnimation();
void normalizeWeights(); void normalizeWeights();
...@@ -177,26 +176,22 @@ private: ...@@ -177,26 +176,22 @@ private:
core::array<SJoint*> AllJoints; core::array<SJoint*> AllJoints;
core::array<SJoint*> RootJoints; core::array<SJoint*> RootJoints;
bool HasAnimation; core::aabbox3d<f32> BoundingBox;
bool PreparedForSkinning; core::array< core::array<bool> > Vertices_Moved;
f32 AnimationFrames; f32 AnimationFrames;
f32 LastAnimatedFrame; f32 LastAnimatedFrame;
f32 LastSkinnedFrame; f32 LastSkinnedFrame;
bool BoneControlUsed;
bool AnimateNormals;
bool HardwareSkinning;
E_INTERPOLATION_MODE InterpolationMode; E_INTERPOLATION_MODE InterpolationMode;
core::aabbox3d<f32> BoundingBox; bool HasAnimation;
bool PreparedForSkinning;
core::array< core::array<bool> > Vertices_Moved; bool BoneControlUsed;
bool AnimateNormals;
bool HardwareSkinning;
}; };
} // end namespace scene } // end namespace scene
...@@ -204,5 +199,3 @@ private: ...@@ -204,5 +199,3 @@ private:
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment