Changeset 969 for code/branches/input

Timestamp:

Mar 31, 2008, 10:43:58 PM (17 years ago)

Author:

rgrieder

Message:

• removed some unnecessary forward declarations
• renamed destroy() —> destroySingleton()

Location:

code/branches/input/src/orxonox

Files:

• GraphicsEngine.cc (modified) (1 diff)
• GraphicsEngine.h (modified) (1 diff)
• InputHandler.cc (modified) (3 diffs)
• InputHandler.h (modified) (1 diff)
• Main.cc (modified) (1 diff)
• Orxonox.cc (modified) (2 diffs)
• Orxonox.h (modified) (1 diff)
• OrxonoxPlatform.h (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (1 diff)
• core/Factory.h (modified) (1 diff)
• core/Identifier.h (modified) (2 diffs)
• core/Tickable.h (modified) (1 diff)
• objects/Fighter.h (modified) (1 diff)
• objects/Model.h (modified) (1 diff)
• objects/NPC.h (modified) (1 diff)
• objects/Projectile.h (modified) (1 diff)
• objects/Skybox.h (modified) (1 diff)
• objects/SpaceShip.h (modified) (1 diff)

code/branches/input/src/orxonox/GraphicsEngine.cc

@@ -63 +63 @@
   GraphicsEngine::~GraphicsEngine()
   {
-    if (!this->root_)
+    if (this->root_)
       delete this->root_;
+    // delete the ogre log and the logManager (sine we have created it).
+    if (LogManager::getSingletonPtr() != 0)
+    {
+      LogManager::getSingleton().getDefaultLog()->removeListener(this);
+      LogManager::getSingleton().destroyLog(LogManager::getSingleton().getDefaultLog());
+      delete LogManager::getSingletonPtr();
+    }
   }
 

code/branches/input/src/orxonox/GraphicsEngine.h

@@ -28 +28 @@
     public:
       GraphicsEngine();
-      inline void setConfigPath(std::string path) { this->configPath_ = path; };
+      void setConfigPath(std::string path) { this->configPath_ = path; };
       // find a better way for this
       //inline Ogre::Root* getRoot() { return root_; };

code/branches/input/src/orxonox/InputHandler.cc

@@ -166 +166 @@
     @brief Destroys the singleton.
   */
-  void InputHandler::destroy()
+  void InputHandler::destroySingleton()
   {
     if (singletonRef_s)
@@ -179 +179 @@
   void InputHandler::tick(float dt)
   {
+    //this->mouse_->setEventCallback(this);
     // capture all the input. That calls the event handlers.
     if (mouse_)
@@ -251 +252 @@
   bool InputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {
+    COUT(1) << "asdf" << std::endl;
     return true;
   }

code/branches/input/src/orxonox/InputHandler.h

@@ -63 +63 @@
 
     static InputHandler* getSingleton();
-    static void destroy();
+    static void destroySingleton();
 
   private:

code/branches/input/src/orxonox/Main.cc

@@ -84 +84 @@
 
     orx->start();
-    orx->destroy();
+    orx->destroySingleton();
   }
   catch (std::exception &ex)

code/branches/input/src/orxonox/Orxonox.cc

@@ -108 +108 @@
       delete this->orxonoxHUD_;
     Loader::close();
-    InputHandler::destroy();
+    InputHandler::destroySingleton();
     if (this->auMan_)
       delete this->auMan_;
@@ -154 +154 @@
     @brief Destroys the Orxonox singleton.
   */
-  void Orxonox::destroy()
+  void Orxonox::destroySingleton()
   {
     if (singletonRef_s)

code/branches/input/src/orxonox/Orxonox.h

@@ -44 +44 @@
 
       static Orxonox* getSingleton();
-      static void destroy();
+      static void destroySingleton();
 
    private:

code/branches/input/src/orxonox/OrxonoxPlatform.h

@@ -270 +270 @@
 } /* namespace orxonox */
 
+// include visual leak detector to search for memory links
+// #include <vld.h>
+
 #endif /* _OrxonoxPlatform_H__ */

code/branches/input/src/orxonox/OrxonoxStableHeaders.h

@@ -40 +40 @@
 // including std headers here is useless since they're already precompiled
 
-// not including the entire Ogre.h doesn't exceed the default heap size for pch
 #ifndef WIN32_LEAN_AND_MEAN
 // prevent Ogre from including winsock.h that messes with winsock2.h from enet
 #  define WIN32_LEAN_AND_MEAN
 #endif
+// not including the entire Ogre.h doesn't exceed the default heap size for pch
 //#include <Ogre.h>
 #include <OgreBillboardSet.h>

code/branches/input/src/orxonox/core/Factory.h

@@ -51 +51 @@
 namespace orxonox
 {
-    class BaseObject; // Forward declaration
-
     // ###############################
     // ###         Factory         ###

code/branches/input/src/orxonox/core/Identifier.h

@@ -33 +33 @@
      - the name
      - a list with all objects
-     - parents and childs
+     - parents and children
      - the factory (if available)
      - the networkID that can be synchronised with the server
@@ -65 +65 @@
 namespace orxonox
 {
-    class BaseFactory; // Forward declaration
-    class BaseObject;  // Forward declaration
-
     // ###############################
     // ###       Identifier        ###

code/branches/input/src/orxonox/core/Tickable.h

@@ -46 +46 @@
 namespace orxonox
 {
-    //class TickFrameListener; // Forward declaration
-
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
     class _CoreExport Tickable : virtual public OrxonoxClass

code/branches/input/src/orxonox/objects/Fighter.h

@@ -7 +7 @@
 
 #include "Model.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox

code/branches/input/src/orxonox/objects/Model.h

@@ -6 +6 @@
 #include "WorldEntity.h"
 #include "../tools/Mesh.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox

code/branches/input/src/orxonox/objects/NPC.h

@@ -11 +11 @@
 
 #include "Model.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox {

code/branches/input/src/orxonox/objects/Projectile.h

@@ -10 +10 @@
 namespace orxonox
 {
-    class SpaceShip; // Forward declaration
-
     class _OrxonoxExport Projectile : public WorldEntity
     {

code/branches/input/src/orxonox/objects/Skybox.h

@@ -5 +5 @@
 
 #include "core/BaseObject.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox

code/branches/input/src/orxonox/objects/SpaceShip.h

@@ -10 +10 @@
 #include "../tools/BillboardSet.h"
 
-class TiXmlElement;          // Forward declaration
-
 namespace orxonox
 {
-    class ParticleInterface; // Forward declaration
-
     class _OrxonoxExport SpaceShip : public Model, public OIS::MouseListener
     {