Changeset 2969 for code/branches

Timestamp:

May 11, 2009, 3:58:38 PM (16 years ago)

Author:

jsmely

Message:

weapon updated

Location:

code/branches/weapons/src/orxonox/objects

Files:

• weaponsystem/projectiles/BillboardProjectile.cc (modified) (1 diff)
• weaponsystem/projectiles/BillboardProjectile.h (modified) (1 diff)
• weaponsystem/projectiles/CMakeLists.txt (modified) (1 diff)
• weaponsystem/projectiles/LightningGunProjectile.cc (added)
• weaponsystem/projectiles/LightningGunProjectile.h (added)
• weaponsystem/weaponmodes/CMakeLists.txt (modified) (1 diff)
• weaponsystem/weaponmodes/LightningGun.cc (added)
• weaponsystem/weaponmodes/LightningGun.h (added)
• worldentities/Billboard.cc (modified) (5 diffs)
• worldentities/Billboard.h (modified) (2 diffs)

code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc

@@ -64 +64 @@
         this->billboard_.setColour(colour);
     }
+    
+    void BillboardProjectile::setMaterial(const std::string& material)
+    {
+        this->billboard_.setMaterial(material);
+    }
 
     void BillboardProjectile::changedVisibility()

code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h

@@ -45 +45 @@
 
             virtual void setColour(const ColourValue& colour);
+            virtual void setMaterial(const std::string& material);
             virtual void changedVisibility();
 

code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt

@@ -3 +3 @@
   ParticleProjectile.cc
   Projectile.cc
+  LightningGunProjectile.cc
 )

code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

@@ -2 +2 @@
   FusionFire.cc
   LaserFire.cc
+  LightningGun.cc
 )

code/branches/weapons/src/orxonox/objects/worldentities/Billboard.cc

@@ -47 +47 @@
         this->material_ = "";
         this->colour_ = ColourValue::White;
+//        this->rotation_ = 0;
 
         this->registerVariables();
@@ -66 +67 @@
         XMLPortParam(Billboard, "material", setMaterial, getMaterial, xmlelement, mode);
         XMLPortParam(Billboard, "colour",   setColour,   getColour,   xmlelement, mode).defaultValues(ColourValue::White);
+//        XMLPortParam(Billboard, "rotation", setRotation, getRotation, xmlelement, mode).defaultValues(0);
     }
 
@@ -72 +74 @@
         registerVariable(this->material_, variableDirection::toclient, new NetworkCallback<Billboard>(this, &Billboard::changedMaterial));
         registerVariable(this->colour_,   variableDirection::toclient, new NetworkCallback<Billboard>(this, &Billboard::changedColour));
+//        registerVariable(this->rotation_, variableDirection::toclient, new NetworkCallback<Billboard>(this, &Billboard::changedRotation));
     }
 
@@ -87 +90 @@
                      this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
+//                this->changedRotation();
             }
         }
@@ -110 +114 @@
             this->billboard_.setColour(this->colour_);
     }
+    
+/*
+    void Billboard::changedRotation()
+    {
+        if (this->billboard_.getBillboardSet())
+            this->billboard_.getBillboardSet()->setRotation(this->rotation_);
+    }
+*/
 
     void Billboard::changedVisibility()

code/branches/weapons/src/orxonox/objects/worldentities/Billboard.h

@@ -61 +61 @@
             inline const ColourValue& getColour() const
                 { return this->colour_; }
-
+/*
+            inline void setRotation(const Radian& rotation)
+                { this->rotation_ = rotation; this->changedRotation(); }
+            inline const Radian& getRotation() const
+                { return this->rotation_; }
+*/
             virtual void setTeamColour(const ColourValue& colour)
                 { this->setColour(colour); }
@@ -73 +78 @@
         private:
             void changedMaterial();
+//            void changedRotation();
 
             BillboardSet billboard_;
             std::string material_;
             ColourValue colour_;
+//            Radian rotation_;
     };
 }