Commit 2f2e88d8 authored by hybrid's avatar hybrid

Fix reorder warning in .x loader.

Remove unused member from FPS cam.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2073 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 7472bcd8
...@@ -234,8 +234,6 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs) ...@@ -234,8 +234,6 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs)
camera->setPosition(pos); camera->setPosition(pos);
// write right target // write right target
TargetVector = target;
target += pos; target += pos;
camera->setTarget(target); camera->setTarget(target);
} }
...@@ -310,8 +308,8 @@ void CSceneNodeAnimatorCameraFPS::setVerticalMovement(bool allow) ...@@ -310,8 +308,8 @@ void CSceneNodeAnimatorCameraFPS::setVerticalMovement(bool allow)
NoVerticalMovement = !allow; NoVerticalMovement = !allow;
} }
//! Sets whether the Y axis of the mouse should be inverted. //! Sets whether the Y axis of the mouse should be inverted.
void CSceneNodeAnimatorCameraFPS::setInvertMouse(bool invert) void CSceneNodeAnimatorCameraFPS::setInvertMouse(bool invert)
{ {
if (invert) if (invert)
......
...@@ -79,8 +79,8 @@ namespace scene ...@@ -79,8 +79,8 @@ namespace scene
//! Creates a clone of this animator. //! Creates a clone of this animator.
/** Please note that you will have to drop /** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer after calling (IReferenceCounted::drop()) the returned pointer once you're
this. */ done with it. */
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0); virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
struct SCamKeyMap struct SCamKeyMap
...@@ -112,7 +112,6 @@ namespace scene ...@@ -112,7 +112,6 @@ namespace scene
s32 LastAnimationTime; s32 LastAnimationTime;
core::vector3df TargetVector;
core::array<SCamKeyMap> KeyMap; core::array<SCamKeyMap> KeyMap;
core::position2d<f32> CenterCursor, CursorPos; core::position2d<f32> CenterCursor, CursorPos;
......
...@@ -28,9 +28,9 @@ namespace scene ...@@ -28,9 +28,9 @@ namespace scene
//! Constructor //! Constructor
CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs) CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)
: SceneManager(smgr), FileSystem(fs), AnimatedMesh(0), : SceneManager(smgr), FileSystem(fs), AllJoints(0), AnimatedMesh(0),
BinaryNumCount(0), Buffer(0), P(0), End(0), BinaryFormat(false), Buffer(0), P(0), End(0), BinaryNumCount(0), Line(0),
CurFrame(0), MajorVersion(0), MinorVersion(0), FloatSize(0) CurFrame(0), MajorVersion(0), MinorVersion(0), BinaryFormat(false), FloatSize(0)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CXMeshFileLoader"); setDebugName("CXMeshFileLoader");
......
...@@ -165,8 +165,8 @@ private: ...@@ -165,8 +165,8 @@ private:
bool readRGB(video::SColor& color); bool readRGB(video::SColor& color);
bool readRGBA(video::SColor& color); bool readRGBA(video::SColor& color);
ISceneManager* SceneManager; ISceneManager* SceneManager;
io::IFileSystem* FileSystem; io::IFileSystem* FileSystem;
core::array<CSkinnedMesh::SJoint*> *AllJoints; core::array<CSkinnedMesh::SJoint*> *AllJoints;
......
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