Changeset 4969 in orxonox.OLD for orxonox

Timestamp:

Aug 4, 2005, 11:19:29 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ability to set a Slots Direction

Location:

orxonox/trunk/src

Files:

• lib/sound/ogg_player.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• util/fast_factory.h (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (3 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)
• world_entities/weapons/weapon_manager.h (modified) (1 diff)

orxonox/trunk/src/lib/sound/ogg_player.h

@@ -19 +19 @@
 
 
-#define BUFFER_SIZE (4096 * 4)
+#define BUFFER_SIZE (16384 * 4)
 
 

orxonox/trunk/src/story_entities/world.cc

@@ -440 +440 @@
   // bind camera
   //this->localCamera->bind (localPlayer);
-  this->localPlayer->addChild (this->localCamera);
+ // this->localPlayer->addChild (this->localCamera);
 
 
@@ -963 +963 @@
 
   SoundEngine::getInstance()->update();
- // music->update();
+  music->update();
 }
 

orxonox/trunk/src/util/fast_factory.h

@@ -22 +22 @@
 
 #include "base_object.h"
-
 /**
  * Creates a FastFactory to a Createable FastFactory.

orxonox/trunk/src/world_entities/player.cc

@@ -87 +87 @@
 
   Weapon* turret = new Turret(this->weaponMan);
+  Weapon* turret2 = new Turret(this->weaponMan);
   this->weaponMan->addWeapon(wpLeft, 1, 0);
   this->weaponMan->addWeapon(wpRight,1 ,1);
   this->weaponMan->addWeapon(turret, 2, 2);
-  this->weaponMan->addWeapon(turret, 3, 2);
+  this->weaponMan->addWeapon(turret2, 2, 3);
   this->weaponMan->addWeapon(wpLeft, 3, 0);
   this->weaponMan->addWeapon(wpRight,3 ,1);
@@ -113 +114 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(3);
+  this->weaponMan->setSlotCount(4);
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
   this->weaponMan->setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, 0));
+  this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, -.5));
+  this->weaponMan->setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+  this->weaponMan->setSlotPosition(3, Vector(-1.5, .5, .5));
+  this->weaponMan->setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
 }
 

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

@@ -40 +40 @@
   this->energyMin = 1;
   this->energyMax = 10;
+  this->remove();
 }
 

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -42 +42 @@
   this->setClassID(CL_TURRET, "Turret");
 
-  this->model = (Model*)ResourceManager::getInstance()->load("models/turret1.obj", OBJ, RP_CAMPAIGN);
+  this->loadModel("models/turret1.obj");
 
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
@@ -95 +95 @@
   Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
   direction.normalize();
-  Quaternion quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
-
-  this->setAbsDir(quat);
+  if (likely (this->getParent() != NULL))
+  {
+    Quaternion quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    this->setAbsDir(quat);
+  }
+  else
+  {
+    Quaternion quat = Quaternion(direction, this->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    this->setAbsDir(quat);
+  }
 }
 
-/**
- *  fires the weapon
-
-   this is called from the player.cc, when fire-button is been pushed
-*/
 void Turret::fire()
 {
@@ -126 +128 @@
 
 
-/**
- *  is called, when the weapon is destroyed
-
-   this is in conjunction with the hit function, so when a weapon is able to get
-   hit, it can also be destoryed.
-*/
 void Turret::destroy ()
 {}
 
 /**
- *  this will draw the weapon
+ * draws the Turret
 */
 void Turret::draw ()

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -161 +161 @@
     this->currentSlotConfig[slot].position.setRelCoor(position);
 }
+
+void WeaponManager::setSlotDirection(int slot, const Quaternion& rotation)
+{
+  if (slot < this->slotCount)
+    this->currentSlotConfig[slot].position.setRelDir(rotation);
+}
+
 
 /**

orxonox/trunk/src/world_entities/weapons/weapon_manager.h

@@ -57 +57 @@
     // setting up the WeaponManager with the following functions
     void setSlotPosition(int slot, const Vector& position);
+    void setSlotDirection(int slot, const Quaternion& rotation);
     /** @param slot the slot to get the relative position from @returns the relative position of the Carrier to the Slot */
     const Vector& getSlotPosition(int slot) const { return this->currentSlotConfig[slot].position.getRelCoor(); };