Changeset 1558 for code/trunk/src/orxonox

Timestamp:

Jun 7, 2008, 2:06:41 AM (16 years ago)

Author:

landauf

Message:

added support for isVisible() and isActive() to all objects.
those functions are provided by BaseObject, combined with virtual functions changedVisibility and changedActivity respectively.
use them, to make orxonox scriptable, say: to change the state of objects with 2 simple functions instead of changing all meshes and emitters and billboards of an object. don't forget to pass calls to changedVisibility and changedActivity to the parent class.

additionally there is a new function, isInitialized(), provided by BaseObject too. this returns true if the constructor of BaseObject passed the object registration. this allows you, to check whether an object was properly initialized or if the constructor returned (as this is the case while creating the class hierarchy). use isInitialized() in your destructor before deleting something.

Location:

code/trunk/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/BillboardProjectile.cc (modified) (1 diff)
• objects/BillboardProjectile.h (modified) (1 diff)
• objects/Model.cc (modified) (1 diff)
• objects/Model.h (modified) (1 diff)
• objects/ParticleProjectile.cc (modified) (1 diff)
• objects/ParticleProjectile.h (modified) (1 diff)
• objects/Projectile.cc (modified) (1 diff)
• objects/RotatingProjectile.cc (modified) (1 diff)
• objects/RotatingProjectile.h (modified) (1 diff)
• objects/Skybox.cc (modified) (2 diffs)
• objects/Skybox.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (2 diffs)
• objects/SpaceShip.h (modified) (1 diff)
• objects/SpaceShipAI.cc (modified) (1 diff)
• objects/WorldEntity.cc (modified) (2 diffs)
• tools/BillboardSet.h (modified) (2 diffs)
• tools/Mesh.h (modified) (1 diff)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -66 +66 @@
   // objects
   class Ambient;
+  class Backlight;
   class Camera;
   class Fighter;

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

@@ -60 +60 @@
         this->billboard_.getBillboardSet()->getBillboard(0)->setColour(colour);
     }
+
+    void BillboardProjectile::changedVisibility()
+    {
+        Projectile::changedVisibility();
+        this->billboard_.setVisible(this->isVisible());
+    }
 }

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

@@ -43 +43 @@
             BillboardProjectile(SpaceShip* owner = 0);
             virtual ~BillboardProjectile();
+
             virtual void setColour(const ColourValue& colour);
+            virtual void changedVisibility();
 
         private:

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

@@ -96 +96 @@
       registerVar(&meshSrc_, meshSrc_.length() + 1, network::STRING);
     }
+
+    void Model::changedVisibility()
+    {
+        WorldEntity::changedVisibility();
+        this->mesh_.setVisible(this->isVisible());
+    }
 }

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

@@ -44 +44 @@
             virtual ~Model();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void changedVisibility();
             void setMesh(const std::string& meshname);
             virtual bool create();

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

@@ -55 +55 @@
             delete this->particles_;
     }
+
+    void ParticleProjectile::changedVisibility()
+    {
+        BillboardProjectile::changedVisibility();
+        this->particles_->setEnabled(this->isVisible());
+    }
 }

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

@@ -43 +43 @@
             ParticleProjectile(SpaceShip* owner = 0);
             virtual ~ParticleProjectile();
+            virtual void changedVisibility();
 
         private:

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

@@ -82 +82 @@
         WorldEntity::tick(dt);
 
+        if (!this->isActive())
+            return;
+
         float radius;
         for (Iterator<Model> it = ObjectList<Model>::start(); it; ++it)

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

@@ -73 +73 @@
     void RotatingProjectile::tick(float dt)
     {
-        this->time_ += dt;
+        if (this->isActive())
+        {
+            this->time_ += dt;
 
-        this->rotatingNode1_->setPosition(0, 50 * sin(this->time_ * 20), 50 * cos(this->time_ * 20));
-        this->rotatingNode2_->setPosition(0, -50 * sin(this->time_ * 20), -50 * cos(this->time_ * 20));
+            this->rotatingNode1_->setPosition(0, 50 * sin(this->time_ * 20), 50 * cos(this->time_ * 20));
+            this->rotatingNode2_->setPosition(0, -50 * sin(this->time_ * 20), -50 * cos(this->time_ * 20));
+        }
 
         Projectile::tick(dt);
     }
+
+    void RotatingProjectile::changedVisibility()
+    {
+        BillboardProjectile::changedVisibility();
+        this->rotatingBillboard1_.setVisible(this->isVisible());
+        this->rotatingBillboard2_.setVisible(this->isVisible());
+    }
 }

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

@@ -15 +15 @@
             void setConfigValues();
             virtual void tick(float dt);
+            virtual void changedVisibility();
 
         private:

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

@@ -54 +54 @@
     }
 
-    void Skybox::loadParams(TiXmlElement* xmlElem)
+    void Skybox::setSkybox(const std::string& skyboxname)
     {
-        if (xmlElem->Attribute("src"))
-        {
-                skyboxSrc_ = xmlElem->Attribute("src");
-        this->create();
+        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(true, skyboxname);
+    }
 
-                COUT(4) << "Loader: Set skybox: "<< skyboxSrc_ << std::endl << std::endl;
-        }
-   }
+    void Skybox::setSkyboxSrc(const std::string& src)
+    {
+        this->skyboxSrc_ = src;
+    }
 
-   void Skybox::setSkybox(const std::string& skyboxname)
-   {
-        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(true, skyboxname);
-   }
-
-   void Skybox::setSkyboxSrc(const std::string& src){
-     skyboxSrc_ = src;
-   }
-   
     /**
         @brief XML loading and saving.
@@ -87 +77 @@
         create();
     }
-    
-    bool Skybox::create(){
-      this->setSkybox(skyboxSrc_);
-      return Synchronisable::create();
+
+    bool Skybox::create()
+    {
+        this->setSkybox(this->skyboxSrc_);
+        return Synchronisable::create();
     }
-    
-    void Skybox::registerAllVariables(){
-      registerVar(&skyboxSrc_, skyboxSrc_.length()+1 ,network::STRING);
+
+    void Skybox::registerAllVariables()
+    {
+        registerVar(&skyboxSrc_, skyboxSrc_.length()+1 ,network::STRING);
     }
-    
+
+    void Skybox::changedVisibility()
+    {
+        BaseObject::changedVisibility();
+        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(this->isVisible(), this->skyboxSrc_);
+    }
 }

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

@@ -43 +43 @@
             virtual ~Skybox();
 
-            void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void changedVisibility();
             void setSkybox(const std::string& skyboxname);
-            
+
             virtual bool create();
             void registerAllVariables();

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

@@ -251 +251 @@
     }
 
+    void SpaceShip::changedVisibility()
+    {
+        Model::changedVisibility();
+
+        this->tt1_->setEnabled(this->isVisible());
+        this->tt2_->setEnabled(this->isVisible());
+        this->redBillboard_.setVisible(this->isVisible());
+        this->greenBillboard_.setVisible(this->isVisible());
+        this->crosshairNear_.setVisible(this->isVisible());
+        this->crosshairFar_.setVisible(this->isVisible());
+    }
+
+    void SpaceShip::changedActivity()
+    {
+        Model::changedActivity();
+
+        this->tt1_->setEnabled(this->isVisible());
+        this->tt2_->setEnabled(this->isVisible());
+        this->redBillboard_.setVisible(this->isVisible());
+        this->greenBillboard_.setVisible(this->isVisible());
+        this->crosshairNear_.setVisible(this->isVisible());
+        this->crosshairFar_.setVisible(this->isVisible());
+    }
+
     void SpaceShip::setCamera(const std::string& camera)
     {
@@ -347 +371 @@
     void SpaceShip::tick(float dt)
     {
+        if (!this->isActive())
+            return;
+
         currentDir_ = getOrientation()*initialDir_;
                 currentOrth_ = getOrientation()*initialOrth_;

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

@@ -53 +53 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
+            virtual void changedVisibility();
+            virtual void changedActivity();
 
             void setCamera(const std::string& camera = "");

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

@@ -208 +208 @@
     void SpaceShipAI::tick(float dt)
     {
+        if (!this->isActive())
+            return;
+
         if (this->target_)
             this->aimAtTarget();

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

@@ -80 +80 @@
     void WorldEntity::tick(float dt)
     {
-        if (!this->bStatic_)
+        if (!this->bStatic_ && this->isActive())
         {
 //             COUT(4) << "acceleration: " << this->acceleration_ << " velocity: " << this->velocity_ << std::endl;
@@ -132 +132 @@
     void WorldEntity::registerAllVariables()
     {
+      // register inheritec variables from BaseObject
+      registerVar( (void*) &(this->bActive_), sizeof(this->bActive_), network::DATA, 0x3);
+      registerVar( (void*) &(this->bVisible_), sizeof(this->bVisible_), network::DATA, 0x3);
       // register coordinates
       registerVar( (void*) &(this->getPosition().x), sizeof(this->getPosition().x), network::DATA, 0x3);

code/trunk/src/orxonox/tools/BillboardSet.h

@@ -33 +33 @@
 
 #include <string>
+#include <OgreBillboardSet.h>
 
-#include <OgreBillboardSet.h>
 #include "util/Math.h"
 
@@ -52 +52 @@
                 { return this->billboardSet_->getName(); }
 
+            inline void setVisible(bool visible)
+                { this->billboardSet_->setVisible(visible); }
+            inline bool getVisible() const
+                { return this->billboardSet_->getVisible(); }
+
         private:
             static unsigned int billboardSetCounter_s;

code/trunk/src/orxonox/tools/Mesh.h

@@ -51 +51 @@
                 { return this->entity_->getName(); }
 
+            inline void setVisible(bool visible)
+                { this->entity_->setVisible(visible); }
+            inline bool getVisible() const
+                { return this->entity_->getVisible(); }
+
         private:
             static unsigned int meshCounter_s;