Skip to content

D
deprecated-irrlicht-mac
Commit f15aa6b0 authored by hybrid's avatar hybrid
Browse files
Options

Cleanup for FPS cam. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1339 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 6ae52733
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp
View file @ f15aa6b0
...@@ -10,14 +10,13 @@ namespace irr ...@@ -10,14 +10,13 @@ namespace irr
namespace scene namespace scene
{ {
const f32 MAX_VERTICAL_ANGLE = 88.0f;
//! constructor //! constructor
CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cursorControl, f32 rotateSpeed, CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cursorControl,
f32 moveSpeed, f32 jumpSpeed, SKeyMap* keyMapArray, s32 keyMapSize, bool noVerticalMovement) f32 rotateSpeed, f32 moveSpeed, f32 jumpSpeed,
: CursorControl(cursorControl), MoveSpeed(moveSpeed), RotateSpeed(rotateSpeed), JumpSpeed(jumpSpeed), SKeyMap* keyMapArray, u32 keyMapSize, bool noVerticalMovement)
firstUpdate(true), LastAnimationTime(0), NoVerticalMovement(noVerticalMovement) : CursorControl(cursorControl), MaxVerticalAngle(88.0f),
MoveSpeed(moveSpeed/1000.0f), RotateSpeed(rotateSpeed), JumpSpeed(jumpSpeed),
LastAnimationTime(0), firstUpdate(true), NoVerticalMovement(noVerticalMovement)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CCameraSceneNodeAnimatorFPS"); setDebugName("CCameraSceneNodeAnimatorFPS");
...@@ -26,8 +25,6 @@ CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cu ...@@ -26,8 +25,6 @@ CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cu
if (CursorControl) if (CursorControl)
CursorControl->grab(); CursorControl->grab();
MoveSpeed /= 1000.0f;
allKeysUp(); allKeysUp();
// create key map // create key map
...@@ -44,7 +41,7 @@ CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cu ...@@ -44,7 +41,7 @@ CSceneNodeAnimatorCameraFPS::CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cu
{ {
// create custom key map // create custom key map
setKeyMap(keyMapArray, keyMapSize); setKeyMap(keyMapArray, keyMapSize);
}// end if }
} }
...@@ -67,11 +64,13 @@ bool CSceneNodeAnimatorCameraFPS::OnEvent(const SEvent& evt) ...@@ -67,11 +64,13 @@ bool CSceneNodeAnimatorCameraFPS::OnEvent(const SEvent& evt)
{ {
case EET_KEY_INPUT_EVENT: case EET_KEY_INPUT_EVENT:
for (u32 i=0; i<KeyMap.size(); ++i) for (u32 i=0; i<KeyMap.size(); ++i)
{
if (KeyMap[i].keycode == evt.KeyInput.Key) if (KeyMap[i].keycode == evt.KeyInput.Key)
{ {
CursorKeys[KeyMap[i].action] = evt.KeyInput.PressedDown; CursorKeys[KeyMap[i].action] = evt.KeyInput.PressedDown;
return true; return true;
} }
}
break; break;
case EET_MOUSE_INPUT_EVENT: case EET_MOUSE_INPUT_EVENT:
...@@ -92,12 +91,10 @@ bool CSceneNodeAnimatorCameraFPS::OnEvent(const SEvent& evt) ...@@ -92,12 +91,10 @@ bool CSceneNodeAnimatorCameraFPS::OnEvent(const SEvent& evt)
void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs) void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs)
{ {
ICameraSceneNode* camera = 0;
if (node->getType() != ESNT_CAMERA) if (node->getType() != ESNT_CAMERA)
return; return;
camera = static_cast<ICameraSceneNode*>(node); ICameraSceneNode* camera = static_cast<ICameraSceneNode*>(node);
if (firstUpdate) if (firstUpdate)
{ {
...@@ -113,55 +110,52 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs) ...@@ -113,55 +110,52 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs)
} }
// get time // get time
f32 timeDiff = 0.f; f32 timeDiff = (f32) ( timeMs - LastAnimationTime );
timeDiff = (f32) ( timeMs - LastAnimationTime );
LastAnimationTime = timeMs; LastAnimationTime = timeMs;
// update position // update position
core::vector3df pos = camera->getPosition(); core::vector3df pos = camera->getPosition();
// Update rotation // Update rotation
core::vector3df Target = (camera->getTarget() - camera->getAbsolutePosition()); core::vector3df target = (camera->getTarget() - camera->getAbsolutePosition());
core::vector3df RelativeRotation = Target.getHorizontalAngle(); core::vector3df relativeRotation = target.getHorizontalAngle();
if (CursorControl) if (CursorControl)
{ {
if (CursorPos != CenterCursor) if (CursorPos != CenterCursor)
{ {
RelativeRotation.Y -= (0.5f - CursorPos.X) * RotateSpeed; relativeRotation.Y -= (0.5f - CursorPos.X) * RotateSpeed;
RelativeRotation.X -= (0.5f - CursorPos.Y) * RotateSpeed; relativeRotation.X -= (0.5f - CursorPos.Y) * RotateSpeed;
// X < MAX_VERTICAL_ANGLE or X > 360-MAX_VERTICAL_ANGLE // X < MaxVerticalAngle or X > 360-MaxVerticalAngle
if (RelativeRotation.X > MAX_VERTICAL_ANGLE*2 && if (relativeRotation.X > MaxVerticalAngle*2 &&
RelativeRotation.X < 360.0f-MAX_VERTICAL_ANGLE) relativeRotation.X < 360.0f-MaxVerticalAngle)
{ {
RelativeRotation.X = 360.0f-MAX_VERTICAL_ANGLE; relativeRotation.X = 360.0f-MaxVerticalAngle;
} }
else else
if (RelativeRotation.X > MAX_VERTICAL_ANGLE && if (relativeRotation.X > MaxVerticalAngle &&
RelativeRotation.X < 360.0f-MAX_VERTICAL_ANGLE) relativeRotation.X < 360.0f-MaxVerticalAngle)
{ {
RelativeRotation.X = MAX_VERTICAL_ANGLE; relativeRotation.X = MaxVerticalAngle;
} }
// reset cursor position // reset cursor position
CursorControl->setPosition(0.5f, 0.5f); CursorControl->setPosition(0.5f, 0.5f);
CenterCursor = CursorControl->getRelativePosition(); CenterCursor = CursorControl->getRelativePosition();
} }
} }
// set target // set target
Target.set(0,0,1); target.set(0,0,1);
core::matrix4 mat; core::matrix4 mat;
mat.setRotationDegrees(core::vector3df( RelativeRotation.X, RelativeRotation.Y, 0)); mat.setRotationDegrees(core::vector3df(relativeRotation.X, relativeRotation.Y, 0));
mat.transformVect(Target); mat.transformVect(target);
core::vector3df movedir = Target; core::vector3df movedir = target;
if (NoVerticalMovement) if (NoVerticalMovement)
movedir.Y = 0.f; movedir.Y = 0.f;
...@@ -176,7 +170,7 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs) ...@@ -176,7 +170,7 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs)
// strafing // strafing
core::vector3df strafevect = Target; core::vector3df strafevect = target;
strafevect = strafevect.crossProduct(camera->getUpVector()); strafevect = strafevect.crossProduct(camera->getUpVector());
if (NoVerticalMovement) if (NoVerticalMovement)
...@@ -201,36 +195,40 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs) ...@@ -201,36 +195,40 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs)
// write right target // write right target
TargetVector = Target; TargetVector = target;
Target += pos; target += pos;
camera->setTarget(Target); camera->setTarget(target);
} }
void CSceneNodeAnimatorCameraFPS::allKeysUp() void CSceneNodeAnimatorCameraFPS::allKeysUp()
{ {
for (s32 i=0; i<6; ++i) for (u32 i=0; i<6; ++i)
CursorKeys[i] = false; CursorKeys[i] = false;
} }
//! Sets the rotation speed //! Sets the rotation speed
void CSceneNodeAnimatorCameraFPS::setRotateSpeed(f32 speed) void CSceneNodeAnimatorCameraFPS::setRotateSpeed(f32 speed)
{ {
RotateSpeed = speed; RotateSpeed = speed;
} }
//! Sets the movement speed //! Sets the movement speed
void CSceneNodeAnimatorCameraFPS::setMoveSpeed(f32 speed) void CSceneNodeAnimatorCameraFPS::setMoveSpeed(f32 speed)
{ {
MoveSpeed = speed; MoveSpeed = speed;
} }
//! Gets the rotation speed //! Gets the rotation speed
f32 CSceneNodeAnimatorCameraFPS::getRotateSpeed() const f32 CSceneNodeAnimatorCameraFPS::getRotateSpeed() const
{ {
return RotateSpeed; return RotateSpeed;
} }
// Gets the movement speed // Gets the movement speed
f32 CSceneNodeAnimatorCameraFPS::getMoveSpeed() const f32 CSceneNodeAnimatorCameraFPS::getMoveSpeed() const
{ {
...@@ -272,6 +270,6 @@ void CSceneNodeAnimatorCameraFPS::setVerticalMovement(bool allow) ...@@ -272,6 +270,6 @@ void CSceneNodeAnimatorCameraFPS::setVerticalMovement(bool allow)
} }
} // namespace scene } // namespace scene
} // namespace irr } // namespace irr
source/Irrlicht/CSceneNodeAnimatorCameraFPS.h
View file @ f15aa6b0
...@@ -28,7 +28,7 @@ namespace scene ...@@ -28,7 +28,7 @@ namespace scene
//! Constructor //! Constructor
CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cursorControl, CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cursorControl,
f32 rotateSpeed = 100.0f, f32 moveSpeed = 500.0f, f32 jumpSpeed=0.f, f32 rotateSpeed = 100.0f, f32 moveSpeed = 500.0f, f32 jumpSpeed=0.f,
SKeyMap* keyMapArray=0, s32 keyMapSize=0, bool noVerticalMovement=false); SKeyMap* keyMapArray=0, u32 keyMapSize=0, bool noVerticalMovement=false);
//! Destructor //! Destructor
virtual ~CSceneNodeAnimatorCameraFPS(); virtual ~CSceneNodeAnimatorCameraFPS();
...@@ -84,21 +84,23 @@ namespace scene ...@@ -84,21 +84,23 @@ namespace scene
void allKeysUp(); void allKeysUp();
bool CursorKeys[6];
gui::ICursorControl *CursorControl; gui::ICursorControl *CursorControl;
f32 MaxVerticalAngle;
f32 MoveSpeed; f32 MoveSpeed;
f32 RotateSpeed; f32 RotateSpeed;
f32 JumpSpeed; f32 JumpSpeed;
bool firstUpdate;
s32 LastAnimationTime; s32 LastAnimationTime;
core::vector3df TargetVector; core::vector3df TargetVector;
core::array<SCamKeyMap> KeyMap; core::array<SCamKeyMap> KeyMap;
core::position2d<f32> CenterCursor, CursorPos; core::position2d<f32> CenterCursor, CursorPos;
bool CursorKeys[6];
bool firstUpdate;
bool NoVerticalMovement; bool NoVerticalMovement;
}; };
......
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