Changeset 1625 for code/trunk/src/orxonox/objects

Timestamp:

Jun 26, 2008, 2:13:17 PM (17 years ago)

Author:

rgrieder

Message:

merged hud branch back to trunk

Location:

code/trunk/src/orxonox/objects

Files:

• Ambient.cc (modified) (1 diff)
• Ambient.h (modified) (1 diff)
• NPC.cc (modified) (1 diff)
• NPC.h (modified) (1 diff)
• SpaceShip.cc (modified) (6 diffs)
• SpaceShip.h (modified) (2 diffs)
• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (3 diffs)
• weapon (deleted)

code/trunk/src/orxonox/objects/Ambient.cc

@@ -73 +73 @@
       
     }
-    
-    void Ambient::loadParams(TiXmlElement* xmlElem)
+
+    void Ambient::setAmbientLight(const ColourValue& colour)
     {
-        if (xmlElem->Attribute("colourvalue"))
-        {
-        SubString colourvalues(xmlElem->Attribute("colourvalue"), ',');
-
-                float r, g, b;
-        convertValue<std::string, float>(&r, colourvalues[0]);
-        convertValue<std::string, float>(&g, colourvalues[1]);
-        convertValue<std::string, float>(&b, colourvalues[2]);
-
-                this->setAmbientLight(ColourValue(r, g, b));
-
-                COUT(4) << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
-        }
-   }
-
-   void Ambient::setAmbientLight(const ColourValue& colour)
-   {
-        GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
+            GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
       ambientLight_=colour;     
-   }
+    }
 
     /**

code/trunk/src/orxonox/objects/Ambient.h

@@ -44 +44 @@
             virtual ~Ambient();
 
-            void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setAmbientLight(const ColourValue& colour);

code/trunk/src/orxonox/objects/NPC.cc

@@ -45 +45 @@
   NPC::~NPC()
   {
-  }
-
-  void NPC::loadParams(TiXmlElement* xmlElem)
-  {
-    Model::loadParams(xmlElem);
   }
 

code/trunk/src/orxonox/objects/NPC.h

@@ -48 +48 @@
       NPC();
       virtual ~NPC();
-      virtual void loadParams(TiXmlElement* xmlElem);
       void tick(float dt);
       void update();

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -43 +43 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
-#include "core/input/InputManager.h"
 
 #include "network/Client.h"
 
-#include "hud/HUD.h"
 #include "tools/ParticleInterface.h"
 
@@ -118 +116 @@
         this->timeToReload_ = 0;
 
-        this->setMouseEventCallback_ = false;
         this->bLMousePressed_ = false;
         this->bRMousePressed_ = false;
         this->mouseXRotation_ = 0;
         this->mouseYRotation_ = 0;
-        this->mouseX_ = 0;
-        this->mouseY_ = 0;
         this->myShip_ = false;
 
@@ -142 +137 @@
         this->teamNr_ = 0;
         this->health_ = 100;
+
+        this->radarObject_ = static_cast<WorldEntity*>(this);
     }
 
@@ -161 +158 @@
                 delete this->backlight_;
 
-            if (this->setMouseEventCallback_)
-                InputManager::removeMouseHandler("SpaceShip");
-
             if (this->cam_)
                 delete this->cam_;
-
-            if (!this->myShip_)
-                HUD::getSingleton().removeRadarObject(this);
         }
     }
@@ -177 +168 @@
           myShip_=true;
         else
-          HUD::getSingleton().addRadarObject(this, this->getProjectileColour());
+          this->setRadarObjectColour(this->getProjectileColour());
       }
       if(Model::create())
@@ -418 +409 @@
 
         currentDir_ = getOrientation()*initialDir_;
-                currentOrth_ = getOrientation()*initialOrth_;
+        currentOrth_ = getOrientation()*initialOrth_;
 
         if (this->cam_)

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -36 +36 @@
 #include "Camera.h"
 #include "Model.h"
+#include "RadarViewable.h"
 #include "tools/BillboardSet.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport SpaceShip : public Model
+    class _OrxonoxExport SpaceShip : public Model, public RadarViewable
     {
         public:
@@ -131 +132 @@
             Vector3 currentOrth_;
             bool bInvertYAxis_;
-            bool setMouseEventCallback_;
             bool bLMousePressed_;
             bool bRMousePressed_;

code/trunk/src/orxonox/objects/WorldEntity.cc

@@ -95 +95 @@
     }
 
-    void WorldEntity::loadParams(TiXmlElement* xmlElem)
-    {
-
-        BaseObject::loadParams(xmlElem);
-        create();
-    }
-
 
     void WorldEntity::setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll)

code/trunk/src/orxonox/objects/WorldEntity.h

@@ -51 +51 @@
 
             virtual void tick(float dt);
-            virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual inline bool create(){ return Synchronisable::create(); }
@@ -74 +73 @@
             inline const Vector3& getPosition() const
                 { return this->node_->getPosition(); }
+            inline const Vector3& getWorldPosition() const
+                { return this->node_->getWorldPosition(); }
 
             inline void translate(const Vector3& d, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
@@ -101 +102 @@
             inline const Ogre::Quaternion& getOrientation()
               { return this->node_->getOrientation(); }
+            inline const Ogre::Quaternion& getWorldOrientation()
+              { return this->node_->getWorldOrientation(); }
             inline void setOrientation(const Ogre::Quaternion& quat)
               { this->node_->setOrientation(quat); }