Changeset 2856

Timestamp:

Mar 26, 2009, 5:06:25 PM (16 years ago)

Author:

Naaduun

Message:

implemented Map::openMap()

Location:

code/branches/map/src/orxonox/overlays/map

Files:

• Map.cc (modified) (3 diffs)
• Map.h (modified) (2 diffs)

code/branches/map/src/orxonox/overlays/map/Map.cc

@@ -28 +28 @@
  
 #include <string>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
 #include <OgreOverlay.h>
 #include <OgreOverlayElement.h>
@@ -46 +49 @@
         RegisterObject(Map);
         
-        //COUT(0) << "Map loaded\n" << this->getScene();
-        Ogre::SceneManager* sm = this->getScene()->getSceneManager();
-        Ogre::SceneNode* sn = new Ogre::SceneNode(sm);
-        COUT(0) << "Map loaded\n" << sm << " / " << sn << std::endl;
+        //Getting Scene Manager (Hack)
+        ObjectList<Scene>::iterator it = ObjectList<Scene>::begin();
+        this->sManager_ = it->getSceneManager();
+        
+        this->sNode_ = new Ogre::SceneNode(sManager_);
+        oManager_ = Ogre::OverlayManager::getSingletonPtr();
+        overlay_ = oManager_->create("Map");
+        //overlay_ is member of OrxonoxOverlay
+        
+        //Not Showing the map as default
+        this->isVisible_=false;
+        overlay_->hide();
+        
+        //TestEntity
+        Ogre::Entity * ent = sManager_->createEntity("ent", "drone.mesh");
+        sNode_->attachObject( ent );
+        sNode_->setPosition(0,0,-50);
+        overlay_->add3D(sNode_);
     }
     
@@ -56 +73 @@
         SUPER(Map, XMLPort, xmlElement, mode);
     }
+
+    void Map::toggleVisibility()
+    {
+        if (!(this->isVisible_))
+        {
+            this->overlay_->show();
+            this->isVisible_=1;
+        }
+        else
+        {
+            this->overlay_->hide();
+            this->isVisible_=0;
+        }
+    }
     
-    void Map::changedVisibility()
+    //Static function to toggle visibility of the map
+    void Map::openMap()
     {
-        SUPER(Map, changedVisibility);
-        
+        for(ObjectList<orxonox::Map>::iterator it = ObjectList<orxonox::Map>::begin();
+            it!=ObjectList<orxonox::Map>::end();
+            it++)
+        {
+        //Map * m = it->getMap();
+        COUT(0) << it->isVisible_ << std::endl;
+        it->toggleVisibility();
+        }
     }
     
     void Map::tick(float dt)
     {
+        sNode_->lookAt(Vector3::NEGATIVE_UNIT_Z, Ogre::Node::TS_WORLD, Vector3::NEGATIVE_UNIT_Z);
+        
     }
     

code/branches/map/src/orxonox/overlays/map/Map.h

@@ -31 +31 @@
 #include "OrxonoxPrereqs.h"
 #include <OgrePrerequisites.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
+#include <OgreOverlay.h>
+#include <OgreOverlayElement.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayContainer.h>
 
 #include <OgreBorderPanelOverlayElement.h>
@@ -51 +58 @@
         virtual void tick(float dt);
 
-        virtual void changedVisibility();
         
-        inline static void openMap()
-            {
-                COUT(0) << "Opening Map";
-            }
+        
+        static void openMap();
         
     private: // functions
+        void toggleVisibility();
 
 
     private: // variables
-
-
+        Ogre::SceneManager* sManager_;
+        Ogre::SceneNode* sNode_;
+        Ogre::OverlayManager * oManager_;
+        
+        bool isVisible_;
     };
 }