Changeset 3089 for code/trunk/src/orxonox/overlays

Timestamp:

May 27, 2009, 4:11:31 PM (15 years ago)

Author:

landauf

Message:

merged map branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/map (copied) (copied from code/branches/map/src/orxonox/overlays/map)
• src/orxonox/overlays/map/CMakeLists.txt (copied) (copied from code/branches/map/src/orxonox/overlays/map/CMakeLists.txt) (1 prop)
• src/orxonox/overlays/map/Map.cc (copied) (copied from code/branches/map/src/orxonox/overlays/map/Map.cc) (16 diffs, 1 prop)
• src/orxonox/overlays/map/Map.h (copied) (copied from code/branches/map/src/orxonox/overlays/map/Map.h) (3 diffs, 1 prop)

code/trunk/src/orxonox/overlays/CMakeLists.txt

@@ -9 +9 @@
 ADD_SUBDIRECTORY(debug)
 ADD_SUBDIRECTORY(hud)
+ADD_SUBDIRECTORY(map)
 ADD_SUBDIRECTORY(notifications)
 ADD_SUBDIRECTORY(stats)

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

@@ -26 +26 @@
 #include "OrxonoxStableHeaders.h"
 #include "Map.h"
- 
+
 #include <string>
 #include "util/String.h"
@@ -57 +57 @@
 #include "objects/RadarViewable.h"
 #include "objects/controllers/HumanController.h"
- 
+
  namespace orxonox
  {
@@ -79 +79 @@
         RegisterObject(Map);
         Map::singletonMap_s=this;
-        
+
         //Getting Scene Manager (Hack)
         if( !sManager_ )
@@ -90 +90 @@
             Map::setMapSceneManager( Ogre::Root::getSingletonPtr()->createSceneManager( Ogre::ST_GENERIC,"MapScene" ) );
         }
-        
+
         this->playerShipNode_ = 0;
         //this->sNode_ = new Ogre::SceneNode(sManager_);
@@ -96 +96 @@
         //overlay_ = oManager_->create("Map");
         //overlay_ is member of OrxonoxOverlay
-        
+
         //Not Showing the map as default
         //this->isVisible_=false;
@@ -104 +104 @@
         //TestEntity
         //Ogre::Entity * ent = mapSceneM_s->createEntity("ent", "drone.mesh");
-        
+
         //Map::getMapSceneManager()->getRootSceneNode()->attachObject( ent );
         /*sNode_->setPosition(0,0,-50);
         overlay_->add3D(sNode_);
         */
-        
-        
-        
-
-        
+
+
+
+
+
         // Alter the camera aspect ratio to match the viewport
         //mCamera->setAspectRatio(Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
@@ -122 +122 @@
         //Cam_->setRenderingDistance(0);
         CamNode_ = Map::getMapSceneManager()->getRootSceneNode()->createChildSceneNode();
-        
+
 
         //Create overlay material
@@ -148 +148 @@
 /*
         Ogre::Overlay* pOverlay = Ogre::OverlayManager::getSingleton().create("Overlay1");
-        
+
         // Create a panel with RenderToTexture texture
         Ogre::OverlayContainer* m_pOverlayPanel = static_cast<Ogre::OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel","OverlayPanelName%d"));
@@ -155 +155 @@
         m_pOverlayPanel->setDimensions(500, 300);
         // Give overlay a texture
-        m_pOverlayPanel->setMaterialName(camMat_id); 
+        m_pOverlayPanel->setMaterialName(camMat_id);
         pOverlay->add2D(m_pOverlayPanel);
         pOverlay->show();
@@ -165 +165 @@
         m_pOverlayPanel->setDimensions(600, 400);
         // Give overlay a texture
-        m_pOverlayPanel->setMaterialName(camMat_id); 
+        m_pOverlayPanel->setMaterialName(camMat_id);
         overlay_->add2D(m_pOverlayPanel);
 
         //Add Borders
-        Ogre::BorderPanelOverlayElement* oBorder = static_cast<Ogre::BorderPanelOverlayElement*>(Ogre::OverlayManager::getSingletonPtr()->createOverlayElement("BorderPanel", "MapBorderPanel" + getUniqueNumberString()));
+//        Ogre::BorderPanelOverlayElement* oBorder = static_cast<Ogre::BorderPanelOverlayElement*>(Ogre::OverlayManager::getSingletonPtr()->createOverlayElement("BorderPanel", "MapBorderPanel" + getUniqueNumberString()));
 /*
 //TODO border size
@@ -201 +201 @@
         plane_ent->setMaterialName("Map/Grid");
         planeNode_->attachObject(plane_ent);
-        
+
         planeNode_->scale(10,1,10);
 //        planeNode_->attachObject(movablePlane_);
         //Ogre::Material plane_mat = Ogre::MaterialManager::getSingletonPtr()->getByName("rock");
-        
+
 
         //ToDo create material script
-        Ogre::MaterialPtr myManualObjectMaterial = Ogre::MaterialManager::getSingleton().create("Map/Line","General"); 
-        myManualObjectMaterial->setReceiveShadows(false); 
-        myManualObjectMaterial->getTechnique(0)->setLightingEnabled(true); 
-        myManualObjectMaterial->getTechnique(0)->getPass(0)->setDiffuse(1,1,0,0); 
-        myManualObjectMaterial->getTechnique(0)->getPass(0)->setAmbient(1,1,0); 
+        Ogre::MaterialPtr myManualObjectMaterial = Ogre::MaterialManager::getSingleton().create("Map/Line","General");
+        myManualObjectMaterial->setReceiveShadows(false);
+        myManualObjectMaterial->getTechnique(0)->setLightingEnabled(true);
+        myManualObjectMaterial->getTechnique(0)->getPass(0)->setDiffuse(1,1,0,0);
+        myManualObjectMaterial->getTechnique(0)->getPass(0)->setAmbient(1,1,0);
         myManualObjectMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1,1,0);
 
@@ -306 +306 @@
             }
             it->updateMapPosition();
-            
-
-
-
-            
-            
-        }
-    }
-    
-
-    
+
+
+
+
+
+
+        }
+    }
+
+
+
     void Map::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
         SUPER(Map, XMLPort, xmlElement, mode);
-    }   
+    }
 
     void Map::changedOwner()
     {
+        SUPER(Map, changedOwner);
         //COUT(0) << "shipptr" << this->getOwner()->getReverseCamera() << std::endl;
-        if(this->getOwner()->getReverseCamera())
+
+        ControllableEntity* entity = dynamic_cast<ControllableEntity*>(this->getOwner());
+        if(entity && entity->getReverseCamera())
         {
             //COUT(0) << "foo";
-            this->getOwner()->getReverseCamera()->attachCamera(this->Cam_);
+            entity->getReverseCamera()->attachCamera(this->Cam_);
         }
     }
@@ -351 +354 @@
         }
     }
-    
+
     //Static function to toggle visibility of the map
     void Map::openMap()
@@ -365 +368 @@
         }
     }
-    
+
     void Map::tick(float dt)
     {
@@ -375 +378 @@
             updatePositions();
         //Cam_->roll(Degree(1));
-        
+
     }
 
@@ -403 +406 @@
 */
         singletonMap_s->CamNode_->pitch( (Degree)(value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
-        
-    }
-    
+
+    }
+
     void Map::Zoom(const Vector2& value)
     {

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

@@ -62 +62 @@
 
         static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, std::string matName);
-        
+
         static void openMap();
 
@@ -92 +92 @@
 
 
-        
+
     private: // functions
 
@@ -118 +118 @@
         int mouseLookSpeed_;
         bool isVisible_;
-     
+
     friend class RadarViewable;
     };