Commit 8d288d32 authored by hybrid's avatar hybrid

Fixed init warning from gcc.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1808 dfc29bdd-3216-0410-991c-e03cc46cb475
parent d639c5c6
...@@ -26,21 +26,26 @@ namespace scene ...@@ -26,21 +26,26 @@ namespace scene
//! constructor //! constructor
CAnimatedMeshSceneNode::CAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent, ISceneManager* mgr, s32 id, CAnimatedMeshSceneNode::CAnimatedMeshSceneNode(IAnimatedMesh* mesh,
const core::vector3df& position, const core::vector3df& rotation, const core::vector3df& scale) ISceneNode* parent, ISceneManager* mgr, s32 id,
const core::vector3df& position,
const core::vector3df& rotation,
const core::vector3df& scale)
: IAnimatedMeshSceneNode(parent, mgr, id, position, rotation, scale), Mesh(0), : IAnimatedMeshSceneNode(parent, mgr, id, position, rotation, scale), Mesh(0),
BeginFrameTime(0), StartFrame(0), EndFrame(0), FramesPerSecond(25.f / 1000.f ), MeshForCurrentFrame(0),
CurrentFrameNr(0.f), JointMode(EJUOR_NONE), JointsUsed(false), BeginFrameTime(0), StartFrame(0), EndFrame(0), FramesPerSecond(0.f),
CurrentFrameNr(0.f), FrameWhenCurrentMeshWasGenerated(0.f),
JointMode(EJUOR_NONE), JointsUsed(false),
TransitionTime(0), Transiting(0.f), TransitingBlend(0.f), TransitionTime(0), Transiting(0.f), TransitingBlend(0.f),
Looping(true), ReadOnlyMaterials(false), Looping(true), ReadOnlyMaterials(false), RenderFromIdentity(0),
LoopCallBack(0), PassCount(0), Shadow(0), RenderFromIdentity(0), LoopCallBack(0), PassCount(0), Shadow(0)
MeshForCurrentFrame(0), FrameWhenCurrentMeshWasGenerated(0.f)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CAnimatedMeshSceneNode"); setDebugName("CAnimatedMeshSceneNode");
#endif #endif
BeginFrameTime = os::Timer::getTime(); BeginFrameTime = os::Timer::getTime();
FramesPerSecond = 25.f/100.f;
setMesh(mesh); setMesh(mesh);
} }
......
...@@ -162,7 +162,7 @@ namespace scene ...@@ -162,7 +162,7 @@ namespace scene
private: private:
//! Get a static mesh for the current frame of this animated mesh //! Get a static mesh for the current frame of this animated mesh
IMesh * getMeshForCurrentFrame(void); IMesh* getMeshForCurrentFrame(void);
f32 buildFrameNr( u32 timeMs); f32 buildFrameNr( u32 timeMs);
void checkJoints(); void checkJoints();
...@@ -171,7 +171,7 @@ namespace scene ...@@ -171,7 +171,7 @@ namespace scene
core::array<video::SMaterial> Materials; core::array<video::SMaterial> Materials;
core::aabbox3d<f32> Box; core::aabbox3d<f32> Box;
IAnimatedMesh* Mesh; IAnimatedMesh* Mesh;
IMesh * MeshForCurrentFrame; IMesh* MeshForCurrentFrame;
u32 BeginFrameTime; u32 BeginFrameTime;
s32 StartFrame; s32 StartFrame;
...@@ -180,16 +180,17 @@ namespace scene ...@@ -180,16 +180,17 @@ namespace scene
f32 CurrentFrameNr; f32 CurrentFrameNr;
f32 FrameWhenCurrentMeshWasGenerated; f32 FrameWhenCurrentMeshWasGenerated;
E_JOINT_UPDATE_ON_RENDER JointMode; //0-unused, 1-get joints only, 2-set joints only, 3-move and set //0-unused, 1-get joints only, 2-set joints only, 3-move and set
E_JOINT_UPDATE_ON_RENDER JointMode;
bool JointsUsed; bool JointsUsed;
u32 TransitionTime; //Transition time in millisecs u32 TransitionTime; //Transition time in millisecs
f32 Transiting; //is mesh transiting (plus cache of TransitionTime) f32 Transiting; //is mesh transiting (plus cache of TransitionTime)
f32 TransitingBlend; //0-1, calculated on buildFrameNr f32 TransitingBlend; //0-1, calculated on buildFrameNr
bool Looping; bool Looping;
bool ReadOnlyMaterials; bool ReadOnlyMaterials;
bool RenderFromIdentity;
IAnimationEndCallBack* LoopCallBack; IAnimationEndCallBack* LoopCallBack;
s32 PassCount; s32 PassCount;
...@@ -199,8 +200,6 @@ namespace scene ...@@ -199,8 +200,6 @@ namespace scene
core::array<IBoneSceneNode* > JointChildSceneNodes; core::array<IBoneSceneNode* > JointChildSceneNodes;
core::array<core::matrix4> PretransitingSave; core::array<core::matrix4> PretransitingSave;
bool RenderFromIdentity;
struct SMD3Special struct SMD3Special
{ {
core::stringc Tagname; core::stringc Tagname;
...@@ -214,7 +213,6 @@ namespace scene ...@@ -214,7 +213,6 @@ namespace scene
} }
}; };
SMD3Special MD3Special; SMD3Special MD3Special;
}; };
} // end namespace scene } // end namespace scene
......
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