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/mainmovie.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/object/mainmovie.h') diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h index 23721fb..0c8d51c 100644 --- a/src/object/mainmovie.h +++ b/src/object/mainmovie.h @@ -25,13 +25,15 @@ class CInstanceManager; class CEvent; -class CD3DEngine; class CInterface; class CRobotMain; class CCamera; -class CSound; - +class CSoundInterface; +namespace Gfx +{ + class CEngine; +} /* Gfx */ enum MainMovieType @@ -61,17 +63,17 @@ protected: protected: CInstanceManager* m_iMan; - CEvent* m_event; - CD3DEngine* m_engine; - CInterface* m_interface; - CRobotMain* m_main; - CCamera* m_camera; - CSound* m_sound; - - MainMovieType m_type; - MainMovieType m_stopType; - float m_speed; - float m_progress; + CEvent* m_event; + Gfx::CEngine* m_engine; + CInterface* m_interface; + CRobotMain* m_main; + CCamera* m_camera; + CSoundInterface* m_sound; + + MainMovieType m_type; + MainMovieType m_stopType; + float m_speed; + float m_progress; Math::Vector m_initialEye; Math::Vector m_initialLookat; Math::Vector m_finalEye[2]; -- cgit v1.2.3-1-g7c22 From 8b9954fff4f865cb0e078c4e7f7c2a4c1d1caa77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Thu, 13 Sep 2012 22:14:40 +0200 Subject: brain.* mainmovie.* : Partially rewritten The remaining part will be revised and rewritten after merge with dev and dev-ui branches --- src/object/mainmovie.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/object/mainmovie.h') diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h index 0c8d51c..a42bd50 100644 --- a/src/object/mainmovie.h +++ b/src/object/mainmovie.h @@ -27,11 +27,11 @@ class CInstanceManager; class CEvent; class CInterface; class CRobotMain; -class CCamera; class CSoundInterface; namespace Gfx { + class CCamera; class CEngine; } /* Gfx */ @@ -56,8 +56,8 @@ public: bool Stop(); bool IsExist(); bool EventProcess(const Event &event); - MainMovieType RetType(); - MainMovieType RetStopType(); + MainMovieType GetType(); + MainMovieType GetStopType(); protected: @@ -67,7 +67,7 @@ protected: Gfx::CEngine* m_engine; CInterface* m_interface; CRobotMain* m_main; - CCamera* m_camera; + Gfx::CCamera* m_camera; CSoundInterface* m_sound; MainMovieType m_type; -- cgit v1.2.3-1-g7c22 From a1400f496bbe9f78f71736dce43863b6833be669 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 15 Sep 2012 15:33:08 +0200 Subject: CRobotMain rewrite - rewritten CRobotMain - won't compile yet because of dependencies to CMainDialog --- src/object/mainmovie.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/object/mainmovie.h') diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h index a42bd50..27e4df3 100644 --- a/src/object/mainmovie.h +++ b/src/object/mainmovie.h @@ -24,8 +24,6 @@ class CInstanceManager; -class CEvent; -class CInterface; class CRobotMain; class CSoundInterface; @@ -33,8 +31,7 @@ namespace Gfx { class CCamera; class CEngine; -} /* Gfx */ - +}; enum MainMovieType { @@ -62,10 +59,8 @@ public: protected: protected: - CInstanceManager* m_iMan; - CEvent* m_event; + CInstanceManager* m_iMan; Gfx::CEngine* m_engine; - CInterface* m_interface; CRobotMain* m_main; Gfx::CCamera* m_camera; CSoundInterface* m_sound; -- cgit v1.2.3-1-g7c22