Changeset 2913 for code/branches/map/src/orxonox/objects

Timestamp:

Apr 9, 2009, 4:52:36 PM (15 years ago)

Author:

Naaduun

Message:

Added own scenemanager to map, added 2 pointer to contain mapentity and mapscenenod to radarviewable

Location:

code/branches/map/src/orxonox/objects

Files:

• RadarViewable.cc (modified) (1 diff)
• RadarViewable.h (modified) (3 diffs)
• worldentities/CameraPosition.cc (modified) (4 diffs)
• worldentities/CameraPosition.h (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (2 diffs)
• worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/map/src/orxonox/objects/RadarViewable.cc

@@ -45 +45 @@
         , radarObjectShape_(Dot)
         , radarObjectDescription_("staticObject")
+        , MapNode_(NULL)
+        , MapEntity_(NULL)
     {
         RegisterRootObject(RadarViewable);

code/branches/map/src/orxonox/objects/RadarViewable.h

@@ -36 +36 @@
 #include "util/Debug.h"
 #include "core/OrxonoxClass.h"
+
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
 
 namespace orxonox
@@ -80 +83 @@
             { return this->radarObjectShape_; }
 
+/*
+        inline void setMapNode(Ogre::SceneNode * node)
+            { this->MapNode_ = node; }
+        inline Ogre::SceneNode * getMapNode() const
+            { return this->MapNode_; }
+        inline void setMapEntity(Ogre::Entity * ent)
+            { this->MapEntity_ = ent; }
+        inline Ogre::Entity * getMapEntity() const
+            { return this->MapEntity_; }
+*/
+        //Used for Map
+        Ogre::SceneNode * MapNode_;
+        Ogre::Entity * MapEntity_;
+
     private:
         void validate(const WorldEntity* object) const
@@ -94 +111 @@
         std::string radarObjectDescription_;
         ColourValue radarObjectColour_;
+        
     };
 }

code/branches/map/src/orxonox/objects/worldentities/CameraPosition.cc

@@ -30 +30 @@
 #include "CameraPosition.h"
 
+#include <OgreCamera.h>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -44 +46 @@
         this->bDrag_ = false;
         this->bAllowMouseLook_ = false;
+        this->bRenderCamera_ = false;
 
         this->setObjectMode(0x0);
@@ -58 +61 @@
         XMLPortParam(CameraPosition, "drag", setDrag, getDrag, xmlelement, mode).defaultValues(false);
         XMLPortParam(CameraPosition, "mouselook", setAllowMouseLook, getAllowMouseLook, xmlelement, mode).defaultValues(false);
+        XMLPortParam(CameraPosition, "rendercamera", setRenderCamera, getRenderCamera, xmlelement, mode).defaultValues(false);
     }
 
@@ -70 +74 @@
             camera->setDrag(true);
     }
+
+    void CameraPosition::attachCamera(Ogre::Camera* camera)
+    {
+        this->attachOgreObject(camera);
+    }
 }

code/branches/map/src/orxonox/objects/worldentities/CameraPosition.h

@@ -54 +54 @@
                 { return this->bAllowMouseLook_; }
 
+            inline void setRenderCamera(bool bRenderCamera)
+                { this->bRenderCamera_ = bRenderCamera; }
+            inline bool getRenderCamera() const
+                { return this->bRenderCamera_; }
+
             void attachCamera(Camera* camera);
+            void attachCamera(Ogre::Camera* camera);
 
         private:
             bool bDrag_;
             bool bAllowMouseLook_;
+            bool bRenderCamera_;
     };
 }

code/branches/map/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -62 +62 @@
         this->hud_ = 0;
         this->camera_ = 0;
+        this->reverseCamera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;
         this->cameraPositionRootNode_ = this->node_->createChildSceneNode();
@@ -148 +149 @@
         else
             this->attach(position);
-        this->cameraPositions_.push_back(position);
+
+        if (!position->getRenderCamera())
+            this->cameraPositions_.push_back(position);
+        else
+            this->setReverseCamera(position);
     }
 

code/branches/map/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -109 +109 @@
             inline const std::string& getCameraPositionTemkplate() const
                 { return this->cameraPositionTemplate_; }
+
+            inline void setReverseCamera(CameraPosition* camera)
+                { this->reverseCamera_ = camera; }
+            inline CameraPosition* getReverseCamera() const
+                { return this->reverseCamera_; }
 
             using WorldEntity::setPosition;
@@ -188 +193 @@
             std::list<CameraPosition*> cameraPositions_;
             std::string cameraPositionTemplate_;
+            CameraPosition* reverseCamera_;
 
             const GametypeInfo* gtinfo_;