diff options
Diffstat (limited to '')
-rw-r--r-- | ClientHamr/extantz/extantzCamera.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/ClientHamr/extantz/extantzCamera.h b/ClientHamr/extantz/extantzCamera.h index a81eb8a..cfd4361 100644 --- a/ClientHamr/extantz/extantzCamera.h +++ b/ClientHamr/extantz/extantzCamera.h | |||
@@ -24,14 +24,14 @@ namespace gui | |||
24 | namespace scene | 24 | namespace scene |
25 | { | 25 | { |
26 | 26 | ||
27 | ICameraSceneNode *addExtantzCamera(ISceneManager* sm, ISceneNode* parent, f32 rotateSpeed, f32 moveSpeed, s32 id, SKeyMap* keyMapArray, s32 keyMapSize, bool noVerticalMovement, f32 jumpSpeed, bool invertMouseY, bool makeActive); | 27 | ICameraSceneNode *addExtantzCamera(ISceneManager* sm, ISceneNode* parent, f32 rotateSpeed, f32 moveSpeed, s32 id, bool noVerticalMovement, f32 jumpSpeed, bool invertMouseY, bool makeActive); |
28 | 28 | ||
29 | class extantzCamera : public ISceneNodeAnimator | 29 | class extantzCamera : public ISceneNodeAnimator |
30 | { | 30 | { |
31 | public: | 31 | public: |
32 | 32 | ||
33 | //! Constructor | 33 | //! Constructor |
34 | extantzCamera(gui::ICursorControl* cursorControl, f32 rotateSpeed = 100.0f, f32 moveSpeed = .5f, f32 jumpSpeed=0.f, SKeyMap* keyMapArray=0, u32 keyMapSize=0, bool noVerticalMovement=false, bool invertY=false); | 34 | extantzCamera(gui::ICursorControl* cursorControl, f32 rotateSpeed = 100.0f, f32 moveSpeed = .5f, f32 jumpSpeed=0.f, bool noVerticalMovement=false, bool invertY=false); |
35 | 35 | ||
36 | //! Destructor | 36 | //! Destructor |
37 | virtual ~extantzCamera(); | 37 | virtual ~extantzCamera(); |
@@ -39,9 +39,6 @@ namespace scene | |||
39 | //! Animates the scene node, currently only works on cameras | 39 | //! Animates the scene node, currently only works on cameras |
40 | virtual void animateNode(ISceneNode* node, u32 timeMs); | 40 | virtual void animateNode(ISceneNode* node, u32 timeMs); |
41 | 41 | ||
42 | //! Event receiver | ||
43 | virtual bool OnEvent(const SEvent& event); | ||
44 | |||
45 | //! Returns the speed of movement in units per second | 42 | //! Returns the speed of movement in units per second |
46 | virtual f32 getMoveSpeed() const; | 43 | virtual f32 getMoveSpeed() const; |
47 | 44 | ||
@@ -54,18 +51,6 @@ namespace scene | |||
54 | //! Set the rotation speed | 51 | //! Set the rotation speed |
55 | virtual void setRotateSpeed(f32 rotateSpeed); | 52 | virtual void setRotateSpeed(f32 rotateSpeed); |
56 | 53 | ||
57 | //! Sets the keyboard mapping for this animator (old style) | ||
58 | //! \param keymap: an array of keyboard mappings, see SKeyMap | ||
59 | //! \param count: the size of the keyboard map array | ||
60 | virtual void setKeyMap(SKeyMap *map, u32 count); | ||
61 | |||
62 | //! Sets the keyboard mapping for this animator | ||
63 | //! \param keymap The new keymap array | ||
64 | virtual void setKeyMap(const core::array<SKeyMap>& keymap); | ||
65 | |||
66 | //! Gets the keyboard mapping for this animator | ||
67 | virtual const core::array<SKeyMap>& getKeyMap() const; | ||
68 | |||
69 | //! Sets whether vertical movement should be allowed. | 54 | //! Sets whether vertical movement should be allowed. |
70 | virtual void setVerticalMovement(bool allow); | 55 | virtual void setVerticalMovement(bool allow); |
71 | 56 | ||
@@ -77,7 +62,7 @@ namespace scene | |||
77 | //! This animator will receive events when attached to the active camera | 62 | //! This animator will receive events when attached to the active camera |
78 | virtual bool isEventReceiverEnabled() const | 63 | virtual bool isEventReceiverEnabled() const |
79 | { | 64 | { |
80 | return true; | 65 | return false; |
81 | } | 66 | } |
82 | 67 | ||
83 | //! Returns the type of this animator | 68 | //! Returns the type of this animator |
@@ -107,13 +92,11 @@ namespace scene | |||
107 | 92 | ||
108 | s32 LastAnimationTime; | 93 | s32 LastAnimationTime; |
109 | 94 | ||
110 | core::array<SKeyMap> KeyMap; | ||
111 | core::position2d<f32> CenterCursor, CursorPos; | 95 | core::position2d<f32> CenterCursor, CursorPos; |
112 | 96 | ||
113 | bool CursorKeys[EKA_COUNT]; | 97 | bool CursorKeys[EKA_COUNT]; |
114 | 98 | ||
115 | bool firstUpdate; | 99 | bool firstUpdate; |
116 | bool firstInput; | ||
117 | bool NoVerticalMovement; | 100 | bool NoVerticalMovement; |
118 | }; | 101 | }; |
119 | 102 | ||