Changeset 9181 in orxonox.OLD

Timestamp:

Jul 5, 2006, 1:10:41 AM (18 years ago)

Author:

bensch

Message:

turrets rock

Location:

branches/presentation/src/world_entities

Files:

• npcs/space_turret.cc (modified) (6 diffs)
• projectiles/guided_missile.cc (modified) (2 diffs)

branches/presentation/src/world_entities/npcs/space_turret.cc

@@ -60 +60 @@
 {
   this->setClassID(CL_SPACE_TURRET, "SpaceTurret");
-  this->loadModel("models/ground_turret_#.obj", 5);
-  this->loadModel("models/comet.obj", .5, 3);
+  this->loadModel("models/ground_turret_#.obj", 7.5);
+  this->loadModel("models/comet.obj", 1.0f, 3);
   this->left = NULL;
   this->right = NULL;
@@ -100 +100 @@
     this->left->setParent(this);
     this->left->toList(this->getOMListNumber());
-    this->left->setRelCoor(0,10,-5);
+    this->left->setRelCoor(0,15,-7.5);
     this->left->requestAction( WA_ACTIVATE);
     this->left->setParent(&this->weaponHolder[0]);
@@ -112 +112 @@
     this->right->setParent(this);
     this->right->toList(this->getOMListNumber());
-    this->right->setRelCoor(0,10,5);
+    this->right->setRelCoor(0,15,7.5);
     this->left->requestAction( WA_ACTIVATE);
     this->right->setParent(&this->weaponHolder[0]);
@@ -126 +126 @@
   if(this->getHealth() > 0.0f && State::getPlayer() &&
      State::getPlayer()->getPlayable() &&
-     State::getPlayer()->getPlayable()->distance(this) < 120) // HACK
+     State::getPlayer()->getPlayable()->distance(this) < 300) // HACK
   {
   if (likely(this->left != NULL))
@@ -158 +158 @@
     this->getModel(3)->draw();
   glPopMatrix();
-
+/*
   if (this->left != NULL)
     this->left->draw();
   if (this->right != NULL)
-    this->right->draw();
+    this->right->draw();*/
 }
 
@@ -191 +191 @@
 
   this->toList(OM_DEAD);
+
+  if (this->left)
+    this->left->toList(OM_DEAD);
+  if (this->right)
+    this->right->toList(OM_DEAD);
+
 }

branches/presentation/src/world_entities/projectiles/guided_missile.cc

@@ -35 +35 @@
   this->setClassID(CL_GUIDED_MISSILE, "GuidedMissile");
 
-  this->loadModel("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", 2.0);
   this->loadExplosionSound("sound/explosions/explosion_4.wav");
 
@@ -88 +88 @@
     GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
     GuidedMissile::trailParticles->setRadius(0.0, .5);
-    GuidedMissile::trailParticles->setRadius(0.2, 2.0);
-    GuidedMissile::trailParticles->setRadius(.5, .8);
-    GuidedMissile::trailParticles->setRadius(1.0, .8);
+    GuidedMissile::trailParticles->setRadius(0.2, 4.0);
+    GuidedMissile::trailParticles->setRadius(.5, 1.5);
+    GuidedMissile::trailParticles->setRadius(1.0, 1.5);
     GuidedMissile::trailParticles->setColor(0.0, 1,0,0,.7);
     GuidedMissile::trailParticles->setColor(0.2, .8,.8,0,.5);