|
From: <xs...@us...> - 2006-05-18 20:03:00
|
Revision: 30 Author: xsdwx Date: 2006-05-18 13:02:52 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/perceptioncrash/?rev=30&view=rev Log Message: ----------- Modified Paths: -------------- trunk/perceptioncrash/src/GameManager.hpp trunk/perceptioncrash/src/GameState.hpp trunk/perceptioncrash/src/InputManager.cpp trunk/perceptioncrash/src/InputManager.hpp trunk/perceptioncrash/src/IntroState.cpp trunk/perceptioncrash/src/IntroState.hpp trunk/perceptioncrash/src/main.cpp Modified: trunk/perceptioncrash/src/GameManager.hpp =================================================================== --- trunk/perceptioncrash/src/GameManager.hpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/GameManager.hpp 2006-05-18 20:02:52 UTC (rev 30) @@ -45,4 +45,4 @@ std::vector<GameState*> mStates; }; -#endif /*PC_GAME_MANAGER */ +#endif /* PC_GAME_MANAGER */ Modified: trunk/perceptioncrash/src/GameState.hpp =================================================================== --- trunk/perceptioncrash/src/GameState.hpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/GameState.hpp 2006-05-18 20:02:52 UTC (rev 30) @@ -40,4 +40,4 @@ GameState() { } }; -#endif /*PC_GAME_STATE_HPP */ +#endif /* PC_GAME_STATE_HPP */ Modified: trunk/perceptioncrash/src/InputManager.cpp =================================================================== --- trunk/perceptioncrash/src/InputManager.cpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/InputManager.cpp 2006-05-18 20:02:52 UTC (rev 30) @@ -1,4 +1,5 @@ #include <OgreEventProcessor.h> +#include <OgrePlatformManager.h> #include "InputManager.hpp" @@ -9,7 +10,9 @@ mEventProcessor = new Ogre::EventProcessor(); mEventProcessor->initialise(window); mEventProcessor->startProcessingEvents(); - mInputDevice = mEventProcessor->getInputReader(); + + mInputDevice = Ogre::PlatformManager::getSingleton().createInputReader(); + mInputDevice->initialise(window, true, true); } InputManager::~InputManager() Modified: trunk/perceptioncrash/src/InputManager.hpp =================================================================== --- trunk/perceptioncrash/src/InputManager.hpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/InputManager.hpp 2006-05-18 20:02:52 UTC (rev 30) @@ -23,4 +23,4 @@ Ogre::InputReader* mInputDevice; }; -#endif /*PC_INPUT_MANAGER_HPP */ +#endif /* PC_INPUT_MANAGER_HPP */ Modified: trunk/perceptioncrash/src/IntroState.cpp =================================================================== --- trunk/perceptioncrash/src/IntroState.cpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/IntroState.cpp 2006-05-18 20:02:52 UTC (rev 30) @@ -2,7 +2,7 @@ #include <OgreKeyEvent.h> #include "IntroState.hpp" -//#include "PlayState.hpp" +#include "PlayState.hpp" using namespace Ogre; @@ -17,7 +17,7 @@ mSceneMgr = mRoot->createSceneManager(ST_GENERIC); mCamera = mSceneMgr->createCamera("IntroCamera"); mViewport = mRoot->getAutoCreatedWindow()->addViewport(mCamera); - mViewport->setBackgroundColour(ColourValue(1.0, 0.0, 0.0)); + mViewport->setBackgroundColour(ColourValue(1.0, 1.0, 1.0)); mLogoOverlay = OverlayManager::getSingleton().getByName("Core/DebugOverlay"); if (mLogoOverlay) @@ -54,7 +54,7 @@ { if (e->getKey() == KC_SPACE) { - //changeState(PlayState::getInstance()); + changeState(PlayState::getInstance()); } if (e->getKey() == KC_ESCAPE) Modified: trunk/perceptioncrash/src/IntroState.hpp =================================================================== --- trunk/perceptioncrash/src/IntroState.hpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/IntroState.hpp 2006-05-18 20:02:52 UTC (rev 30) @@ -42,4 +42,4 @@ static IntroState mIntroState; }; -#endif /*PC_INTRO_STATE*/ +#endif /* PC_INTRO_STATE_HPP */ Modified: trunk/perceptioncrash/src/main.cpp =================================================================== --- trunk/perceptioncrash/src/main.cpp 2006-05-18 19:04:28 UTC (rev 29) +++ trunk/perceptioncrash/src/main.cpp 2006-05-18 20:02:52 UTC (rev 30) @@ -3,8 +3,6 @@ #include <Ogre.h> #include <OgreErrorDialog.h> -#include "Game.hpp" - #include "GameManager.hpp" #include "IntroState.hpp" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |