Changeset 3685 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 30, 2005, 11:04:39 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed a gc issue and implemented firing-frequency. still got some speed problems…

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• garbage_collector.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/projectile.cc (modified) (3 diffs)
• world_entities/test_gun.cc (modified) (4 diffs)
• world_entities/weapon.cc (modified) (3 diffs)
• world_entities/weapon.h (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -58 +58 @@
 // DEFINE MODULES \\
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              2
+#define DEBUG_MODULE_WORLD              3
 #define DEBUG_MODULE_PNODE              0
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
 #define DEBUG_MODULE_GRAPHICS           0
-#define DEBUG_MODULE_LOAD               1
+#define DEBUG_MODULE_LOAD               0
 
 #define DEBUG_MODULE_IMPORTER           0

orxonox/trunk/src/garbage_collector.cc

@@ -39 +39 @@
    this->setClassName ("GarbageCollection");
    this->time = 0;
-   this->delay = 3.0f; /* clean up all 5.0 seconds */
+   this->delay = 1.5f; /* clean up all 5.0 seconds */
 }
 

orxonox/trunk/src/world_entities/player.cc

@@ -156 +156 @@
 void Player::tick (float time)
 {
+  /* link tick to weapon */
+  this->activeWeapon->tick(time);
   // player controlled movement
   this->move(time);

orxonox/trunk/src/world_entities/projectile.cc

@@ -37 +37 @@
   this->flightDirection = NULL;
   this->currentLifeTime = 0.0f;
-  this->ttl = 1.0f;
+  this->ttl = 0.75f; /* sec */
   this->speed = 2.0f;
 }
@@ -89 +89 @@
 void Projectile::setSpeed(float speed)
 {
-  this->speed = speed * 5;
-  printf("Projectile::setting speed to: %f\n", this->speed);
+  this->speed = speed * 3;
+  PRINTF(4)("Projectile::setting speed to: %f\n", this->speed);
 }
 
@@ -99 +99 @@
 void Projectile::tick (float time) 
 {
-  this->speed = this->weapon->getSpeed() * 5;  
+  this->speed = this->weapon->getSpeed() * 3;  
   this->shiftCoor(*this->flightDirection * this->speed * time);
-  printf("current speed is: %f\n", this->speed);
+  //printf("current speed is: %f\n", this->speed);
 
   this->currentLifeTime += time;
-  if( this->ttl > this->currentLifeTime)
-    this->finalize();
+  if( this->ttl < this->currentLifeTime)
+    {
+      PRINTF(5)("FINALIZE=============================================================\n");
+      PRINTF(5)("current life time is: %f/%f\n", this->currentLifeTime, this->ttl);
+      PRINTF(5)("FINALIZE=============================================================\n");
+      this->finalize();
+    }
 }
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -42 +42 @@
   :  Weapon (parent, coordinate, direction) 
 {
+  this->idleTime = 0.2f;
 }
 
@@ -83 +84 @@
 void TestGun::fire()
 {
-  //printf("TestGun::fire() - firing weapon now ---------------------------\n");
+  if( this->localTime < this->idleTime)
+    return;
+
   Projectile* pj = new Projectile(this);
 
@@ -96 +99 @@
   pj->setSpeed(this->getSpeed());
 
-
-
   this->worldEntities->add(pj);
+  this->localTime = 0;
 }
 
@@ -128 +130 @@
 */
 void TestGun::tick (float time) 
-{}
+{
+  this->localTime += time;
+}
 
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -154 +154 @@
 */
 void Weapon::setWeaponIdleTime(float time)
-{}
+{
+  this->idleTime = time;
+}
 
 /**
@@ -164 +166 @@
 */
 float Weapon::getWeaponIdleTime(void)
-{}
+{
+  return this->idleTime;
+}
 
 /**
@@ -174 +178 @@
 */
 bool Weapon::hasWeaponIdleTimeElapsed(void)
-{}
+{
+  return (this->localTime>this->idleTime)?true:false;
+}
 
 

orxonox/trunk/src/world_entities/weapon.h

@@ -71 +71 @@
  protected:
   tList<WorldEntity>* worldEntities;
+  float localTime;
+  float idleTime;
+  float slowDownFactor;
 
  private:
   bool enabled;
-  float localTime;
-  float slowDownFactor;
   Projectile* projectile;
   //WeaponSound sound;