Changeset 2049 for code/branches/weapon

Timestamp:

Oct 29, 2008, 2:40:02 PM (16 years ago)

Author:

polakma

Message:

Objekte erstellt.

Location:

code/branches/weapon/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (3 diffs)
• objects/WeaponSystem.cc (added)
• objects/WeaponSystem.h (added)
• objects/weaponSystem (added)
• objects/weaponSystem/Munition.cc (added)
• objects/weaponSystem/Munition.h (added)
• objects/weaponSystem/Weapon.cc (added)
• objects/weaponSystem/Weapon.h (added)
• objects/weaponSystem/WeaponSet.cc (added)
• objects/weaponSystem/WeaponSet.h (added)
• objects/weaponSystem/WeaponSlot.cc (added)
• objects/weaponSystem/WeaponSlot.h (added)
• objects/weaponSystem/munitions (added)
• objects/weaponSystem/munitions/LaserGunMunition.cc (added)
• objects/weaponSystem/munitions/LaserGunMunition.h (added)
• objects/weaponSystem/weapons (added)
• objects/weaponSystem/weapons/LaserGun.cc (added)
• objects/weaponSystem/weapons/LaserGun.h (added)
• objects/weaponSystem/weapons/Missile.cc (added)
• objects/weaponSystem/weapons/Missile.h (added)

code/branches/weapon/src/orxonox/CMakeLists.txt

@@ -63 +63 @@
   objects/ParticleProjectile.cc
 
+  objects/WeaponSystem.cc
+  objects/weaponSystem/WeaponSet.cc
+  objects/weaponSystem/WeaponSlot.cc
+  objects/weaponSystem/Weapon.cc
+  objects/weaponSystem/Munition.cc
+
+
   tolua/tolua_bind.cc
 )

code/branches/weapon/src/orxonox/OrxonoxPrereqs.h

@@ -97 +97 @@
     class ParticleProjectile;
 
+    class WeaponSystem;
+    class WeaponSet;
+    class WeaponSlot;
+    class Weapon;
+    class Munition;
+
     // tools
     class BillboardSet;

code/branches/weapon/src/orxonox/objects/SpaceShip.cc

@@ -148 +148 @@
         for (ObjectList<SpaceShipAI>::iterator it = ObjectList<SpaceShipAI>::begin(); it; ++it)
             it->shipDied(this);
-      
+
         if (this->isInitialized())
         {
@@ -262 +262 @@
               this->backlight_->setPosition(-2.35, 0, 0.2);
               this->backlight_->setColour(this->getProjectileColour());
-  
+
               this->smoke_ = new ParticleSpawner();
               this->smoke_->setParticle("Orxonox/smoke5", LODParticle::normal, 0, 0, 3);
               this->attachObject(this->smoke_);
-  
+
               this->fire_ = new ParticleSpawner();
               this->fire_->setParticle("Orxonox/fire3", LODParticle::normal, 0, 0, 1);
               this->attachObject(this->fire_);
             }
-            
+
             // END CREATING ADDITIONAL EFFECTS
 
@@ -300 +300 @@
     void SpaceShip::setConfigValues()
     {
-        SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
+        SetConfigValue(bInvertYAxis_, false).description("Set this to true for joys-like mouse behaviour (mouse up = ship down).");
         SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
         SetConfigValue(testvector_, Vector3()).description("asdfblah");