Changeset 1641 for code/branches/gui/src/orxonox

Timestamp:

Jul 22, 2008, 9:16:35 PM (16 years ago)

Author:

rgrieder

Message:

some de-bugging
added enum for joy stick buttons
some more little fixes

Location:

code/branches/gui/src/orxonox

Files:

• GraphicsEngine.cc (modified) (3 diffs)
• GraphicsEngine.h (modified) (2 diffs)
• Orxonox.cc (modified) (1 diff)
• gui/GUIManager.h (modified) (1 diff)
• gui/OgreCEGUIRenderer.cpp (modified) (2 diffs)
• overlays/console/InGameConsole.cc (modified) (6 diffs)
• overlays/console/InGameConsole.h (modified) (1 diff)

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

@@ -22 +22 @@
  *   Author:
  *      Reto Grieder
+ *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
  *   Co-authors:
- *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007, Felix Schulthess
+ *      Felix Schulthess
  *
  */
@@ -89 +90 @@
         RegisterObject(GraphicsEngine);
 
+        assert(singletonRef_s == 0);
         singletonRef_s = this;
 
@@ -305 +307 @@
         //Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
 
-        // create a full screen viewport in which to render the scene and the loading screen
-        // The GUI uses its own one to be able to render on top of everything.
-        // That explains why the Z order here is only 1 and not 0 (top most)
-        this->viewport_ = this->renderWindow_->addViewport(0, 1);
+        // create a full screen viewport
+        this->viewport_ = this->renderWindow_->addViewport(0, 0);
 
         return true;

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

@@ -22 +22 @@
  *   Author:
  *      Reto Grieder
+ *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
  *   Co-authors:
- *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007, Felix Schulthess
+ *      Felix Schulthess
  *
  */
@@ -88 +89 @@
 
         static GraphicsEngine& getSingleton();
-        static GraphicsEngine* getSingletonPtr() { return &getSingleton(); }
+        static GraphicsEngine* getSingletonPtr() { return singletonRef_s; }
 
     private:

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

@@ -300 +300 @@
   }
 
-  void Orxonox::loadGame(const std::string& name)
+  /*static*/ void Orxonox::loadGame(const std::string& name)
   {
       const GameMode& mode = Settings::getGameMode(name);

code/branches/gui/src/orxonox/gui/GUIManager.h

@@ -103 +103 @@
 
         void tickInput(float dt) { }
+        void tickKey(float dt) { }
+        void tickMouse(float dt) { }
 
         void loadScenes();

code/branches/gui/src/orxonox/gui/OgreCEGUIRenderer.cpp

@@ -191 +191 @@
     // GUI (uses its own viewport to be able render on top of all viewports).
     // But since we don't use overlays in the GUI, it doesn't matter.
-    //if (d_render_sys->_getViewport()->getOverlaysEnabled() && !d_quadlist.empty())
-    if (!d_quadlist.empty())
+    // ORXONOX REVERT: Changes are not in place anymore, but might be in the future!
+    if (d_render_sys->_getViewport()->getOverlaysEnabled() && !d_quadlist.empty())
+    //if (!d_quadlist.empty())
     {
         /// Quad list needs to be sorted and thus the vertex buffer rebuilt. If not, we can
@@ -493 +494 @@
     // GUI (uses its own viewport to be able render on top of all viewports).
     // But since we don't use overlays in the GUI, it doesn't matter.
-    //if (d_render_sys->_getViewport()->getOverlaysEnabled())
-    if (true)
+    // ORXONOX REVERT: Changes are not in place anymore, but might be in the future!
+    if (d_render_sys->_getViewport()->getOverlaysEnabled())
+    //if (true)
     {
         z = -1 + z;

code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc

@@ -46 +46 @@
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
+#include "core/input/SimpleInputState.h"
+#include "core/input/InputBuffer.h"
 #include "GraphicsEngine.h"
 
@@ -66 +68 @@
         , consoleOverlayBorder_(0)
         , consoleOverlayTextAreas_(0)
-        , emptySceneManager_(0)
-        , emptyCamera_(0)
-        , viewport_(0)
     {
         RegisterObject(InGameConsole);
@@ -118 +117 @@
     void InGameConsole::initialise()
     {
+        // create the corresponding input state
+        InputManager::createSimpleInputState("console", 40)->setKeyHandler(Shell::getInstance().getInputBuffer());
+
         // create overlay and elements
         Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();
@@ -195 +197 @@
         Shell::getInstance().addOutputLevel(true);
 
-        // create a sceneManager in order to render in our own viewport
-        this->emptySceneManager_ = Ogre::Root::getSingleton()
-            .createSceneManager(Ogre::ST_GENERIC, "Console/EmptySceneManager");
-        this->emptyCamera_ = this->emptySceneManager_->createCamera("Console/EmptyCamera");
-        this->viewport_ = GraphicsEngine::getSingleton().getRenderWindow()->addViewport(emptyCamera_, 10);
-        this->viewport_->setOverlaysEnabled(true);
-        this->viewport_->setClearEveryFrame(false);
-
         COUT(4) << "Info: InGameConsole initialized" << std::endl;
     }
@@ -211 +205 @@
     void InGameConsole::destroy()
     {
+        this->deactivate();
+
+        // destroy the input state previously created
+        SimpleInputState * inputState = dynamic_cast<SimpleInputState*>(InputManager::getState("console"));
+        if (inputState)
+            InputManager::destroyState("console");
+
         Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();
         if (ovMan)
@@ -467 +468 @@
                 if (output.size() > this->maxCharsPerLine_)
                 {
-                    if (Shell::getInstance().getInputBuffer().getCursorPosition() < this->inputWindowStart_)
-                        this->inputWindowStart_ = Shell::getInstance().getInputBuffer().getCursorPosition();
-                    else if (Shell::getInstance().getInputBuffer().getCursorPosition() >= (this->inputWindowStart_ + this->maxCharsPerLine_ - 1))
-                        this->inputWindowStart_ = Shell::getInstance().getInputBuffer().getCursorPosition() - this->maxCharsPerLine_ + 1;
+                    if (Shell::getInstance().getInputBuffer()->getCursorPosition() < this->inputWindowStart_)
+                        this->inputWindowStart_ = Shell::getInstance().getInputBuffer()->getCursorPosition();
+                    else if (Shell::getInstance().getInputBuffer()->getCursorPosition() >= (this->inputWindowStart_ + this->maxCharsPerLine_ - 1))
+                        this->inputWindowStart_ = Shell::getInstance().getInputBuffer()->getCursorPosition() - this->maxCharsPerLine_ + 1;
 
                     output = output.substr(this->inputWindowStart_, this->maxCharsPerLine_);

code/branches/gui/src/orxonox/overlays/console/InGameConsole.h

@@ -100 +100 @@
         Ogre::TextAreaOverlayElement** consoleOverlayTextAreas_;
 
-        Ogre::SceneManager* emptySceneManager_;     //!< dummy SceneManager to render overlays in empty windows
-        Ogre::Camera*       emptyCamera_;           //!< dummy camera to render overlays in empty windows
-        Ogre::Viewport*     viewport_;
-
         // config values
         float relativeWidth;