[Perceptioncrash-commit] SF.net SVN: perceptioncrash: [50] trunk/perceptioncrash/src

[<sik...@us...>]

Revision: 50
Author:   sik0fewl
Date:     2006-05-20 14:13:19 -0700 (Sat, 20 May 2006)
ViewCVS:  http://svn.sourceforge.net/perceptioncrash/?rev=50&view=rev

Log Message:
-----------
Removed KeyboardMap, as functionality is already provided by Ogre::InputReader

Modified Paths:
--------------
    trunk/perceptioncrash/src/GameManager.cpp
    trunk/perceptioncrash/src/GameManager.hpp

Removed Paths:
-------------
    trunk/perceptioncrash/src/KeyboardMap.cpp
    trunk/perceptioncrash/src/KeyboardMap.hpp
Modified: trunk/perceptioncrash/src/GameManager.cpp
===================================================================
--- trunk/perceptioncrash/src/GameManager.cpp	2006-05-20 19:15:19 UTC (rev 49)
+++ trunk/perceptioncrash/src/GameManager.cpp	2006-05-20 21:13:19 UTC (rev 50)
@@ -3,7 +3,6 @@
 
 #include "GameManager.hpp"
 #include "InputManager.hpp"
-#include "KeyboardMap.hpp"
 #include "GameState.hpp"
 
 template<> GameManager* Ogre::Singleton<GameManager>::ms_Singleton = 0;
@@ -12,7 +11,6 @@
 {
     mRoot = 0;
     mInputManager = 0;
-    mKeyboardMap = 0;
 }
 
 GameManager::~GameManager()
@@ -27,9 +25,6 @@
     if (mInputManager)
         delete mInputManager;
 
-    if (mKeyboardMap)
-        delete mKeyboardMap;
-
     if (mRoot)
         delete mRoot;
 }
@@ -46,9 +41,7 @@
 
     mRoot->addFrameListener(this);
 
-    mKeyboardMap = new KeyboardMap();
     mInputManager = new InputManager(mRoot->getAutoCreatedWindow());
-    mInputManager->getEventProcessor()->addKeyListener(mKeyboardMap);
     mInputManager->getEventProcessor()->addKeyListener(this);
     mInputManager->getEventProcessor()->addMouseMotionListener(this);
 

Modified: trunk/perceptioncrash/src/GameManager.hpp
===================================================================
--- trunk/perceptioncrash/src/GameManager.hpp	2006-05-20 19:15:19 UTC (rev 49)
+++ trunk/perceptioncrash/src/GameManager.hpp	2006-05-20 21:13:19 UTC (rev 50)
@@ -7,7 +7,6 @@
 #include <OgreSingleton.h>
 
 #include "InputManager.hpp"
-#include "KeyboardMap.hpp"
 
 class GameState;
 
@@ -32,7 +31,6 @@
     Ogre::Root* mRoot;
     Ogre::RenderWindow* mRenderWindow;
     InputManager* mInputManager;
-    KeyboardMap* mKeyboardMap;
 
     void setupResources(void);
     bool configure(void);

Deleted: trunk/perceptioncrash/src/KeyboardMap.cpp
===================================================================
--- trunk/perceptioncrash/src/KeyboardMap.cpp	2006-05-20 19:15:19 UTC (rev 49)
+++ trunk/perceptioncrash/src/KeyboardMap.cpp	2006-05-20 21:13:19 UTC (rev 50)
@@ -1,13 +0,0 @@
-#include <Ogre.h>
-#include <OgreKeyEvent.h>
-#include <OgreSingleton.h>
-
-#include "KeyboardMap.hpp"
-
-template<> KeyboardMap* Ogre::Singleton<KeyboardMap>::ms_Singleton = 0;
-
-bool
-KeyboardMap::isDown(int key)
-{
-    return keyMap[key];
-}

Deleted: trunk/perceptioncrash/src/KeyboardMap.hpp
===================================================================
--- trunk/perceptioncrash/src/KeyboardMap.hpp	2006-05-20 19:15:19 UTC (rev 49)
+++ trunk/perceptioncrash/src/KeyboardMap.hpp	2006-05-20 21:13:19 UTC (rev 50)
@@ -1,28 +0,0 @@
-#ifndef PC_KEYBOARD_MAP
-#define PC_KEYBOARD_MAP
-
-#include <map>
-
-#include <Ogre.h>
-#include <OgreKeyEvent.h>
-#include <OgreEventListeners.h>
-#include <OgreSingleton.h>
-
-class KeyboardMap : public Ogre::KeyListener,
-                    public Ogre::Singleton<KeyboardMap>
-{
-  public:
-    bool isDown(int key);
-
-  protected:
-    void keyClicked(Ogre::KeyEvent* e) { }
-    void keyPressed(Ogre::KeyEvent* e)
-        { keyMap[e->getKey()] = true; }
-    void keyReleased(Ogre::KeyEvent* e)
-        { keyMap[e->getKey()] = false; }
-
-  private:
-    std::map<int, bool> keyMap;
-};
-
-#endif /* PC_KEYBOARD_MAP */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.