From 479a67a731be5a5e8035ea7acce0344c7c605814 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Mon, 10 Sep 2012 23:29:38 +0200 Subject: Merge with changes from Zaba999 fork. --- src/object/motion/motion.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/object/motion/motion.h') diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index 9828283..2ec5c5d 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -51,20 +51,20 @@ public: virtual bool Create(Math::Vector pos, float angle, ObjectType type, float power); virtual bool EventProcess(const Event &event); virtual Error SetAction(int action, float time=0.2f); - virtual int RetAction(); + virtual int GetAction(); virtual bool SetParam(int rank, float value); - virtual float RetParam(int rank); + virtual float GetParam(int rank); virtual bool Write(char *line); virtual bool Read(char *line); virtual void SetLinVibration(Math::Vector dir); - virtual Math::Vector RetLinVibration(); + virtual Math::Vector GetLinVibration(); virtual void SetCirVibration(Math::Vector dir); - virtual Math::Vector RetCirVibration(); + virtual Math::Vector GetCirVibration(); virtual void SetInclinaison(Math::Vector dir); - virtual Math::Vector RetInclinaison(); + virtual Math::Vector GetInclinaison(); protected: -- cgit v1.2.3-1-g7c22 From 68d9c61e97522213d27745c4c6dac4c839bff77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Tue, 11 Sep 2012 22:45:48 +0200 Subject: [src/object] motion.* motionant.* motionbee.* should compile --- src/object/motion/motion.h | 66 ++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 31 deletions(-) (limited to 'src/object/motion/motion.h') diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index 2ec5c5d..1f8f7ab 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -25,17 +25,21 @@ class CInstanceManager; -class CD3DEngine; + +namespace Gfx { +class CEngine; class CLight; -class CParticule; +class CParticle; class CTerrain; class CWater; class CCamera; +} + class CBrain; class CPhysics; class CObject; class CRobotMain; -class CSound; +class CSoundInterface; class CMotion @@ -47,44 +51,44 @@ public: void SetPhysics(CPhysics* physics); void SetBrain(CBrain* brain); - virtual void DeleteObject(bool bAll=false); - virtual bool Create(Math::Vector pos, float angle, ObjectType type, float power); - virtual bool EventProcess(const Event &event); - virtual Error SetAction(int action, float time=0.2f); - virtual int GetAction(); + virtual void DeleteObject(bool bAll=false); + virtual bool Create(Math::Vector pos, float angle, ObjectType type, float power); + virtual bool EventProcess(const Event &event); + virtual Error SetAction(int action, float time=0.2f); + virtual int GetAction(); - virtual bool SetParam(int rank, float value); - virtual float GetParam(int rank); + virtual bool SetParam(int rank, float value); + virtual float GetParam(int rank); - virtual bool Write(char *line); - virtual bool Read(char *line); + virtual bool Write(char *line); + virtual bool Read(char *line); - virtual void SetLinVibration(Math::Vector dir); + virtual void SetLinVibration(Math::Vector dir); virtual Math::Vector GetLinVibration(); - virtual void SetCirVibration(Math::Vector dir); + virtual void SetCirVibration(Math::Vector dir); virtual Math::Vector GetCirVibration(); - virtual void SetInclinaison(Math::Vector dir); + virtual void SetInclinaison(Math::Vector dir); virtual Math::Vector GetInclinaison(); protected: protected: - CInstanceManager* m_iMan; - CD3DEngine* m_engine; - CLight* m_light; - CParticule* m_particule; - CTerrain* m_terrain; - CWater* m_water; - CCamera* m_camera; - CObject* m_object; - CBrain* m_brain; - CPhysics* m_physics; - CRobotMain* m_main; - CSound* m_sound; - - int m_actionType; - float m_actionTime; - float m_progress; + CInstanceManager* m_iMan; + Gfx::CEngine* m_engine; + Gfx::CLight* m_light; + Gfx::CParticle* m_particule; + Gfx::CTerrain* m_terrain; + Gfx::CWater* m_water; + Gfx::CCamera* m_camera; + CObject* m_object; + CBrain* m_brain; + CPhysics* m_physics; + CRobotMain* m_main; + CSoundInterface* m_sound; + + int m_actionType; + float m_actionTime; + float m_progress; Math::Vector m_linVibration; // linear vibration Math::Vector m_cirVibration; // circular vibration -- cgit v1.2.3-1-g7c22 From 8f285465e82877183cf004ffd6f7bd889b0a4ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Thu, 13 Sep 2012 17:40:39 +0200 Subject: [object/motion] Folder compiles --- src/object/motion/motion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/object/motion/motion.h') diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index 1f8f7ab..ef943d2 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -76,7 +76,7 @@ protected: CInstanceManager* m_iMan; Gfx::CEngine* m_engine; Gfx::CLight* m_light; - Gfx::CParticle* m_particule; + Gfx::CParticle* m_particle; Gfx::CTerrain* m_terrain; Gfx::CWater* m_water; Gfx::CCamera* m_camera; -- cgit v1.2.3-1-g7c22