Changeset 9609 in orxonox.OLD for branches

Timestamp:

Jul 30, 2006, 11:17:43 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: addapted visibility of the node

Location:

branches/proxy/src/world_entities

Files:

• npcs/network_turret.cc (modified) (1 diff)
• space_ships/hover.cc (modified) (2 diffs)

branches/proxy/src/world_entities/npcs/network_turret.cc

@@ -63 +63 @@
 {
   this->setClassID(CL_NETWORK_TURRET, "NetworkTurret");
-  this->loadModel("models/network_turret_#.obj", 5);
+  this->loadModel("models/ground_turret_#.obj", 5);
+
   this->weapon = new TargetingTurret();
   this->weapon->loadModel("models/guns/turret2.obj", 10);
+  this->weapon->setParent(this);
+  this->weapon->toList(this->getOMListNumber());
+  this->weapon->setRelCoor(0,10,-5);
+  this->weapon->requestAction( WA_ACTIVATE);
+  this->weapon->setParent(&this->weaponHolder);
 
   this->setHealthMax(300);

branches/proxy/src/world_entities/space_ships/hover.cc

@@ -282 +282 @@
   this->movement(dt);
   this->rotorCycle += this->rotorSpeed * dt;
-
-  this->debugNode(1);
 }
 
@@ -332 +330 @@
   this->shiftCoor (this->velocity * dt);
 
-    // limit the maximum rotation speed.
+  // limit the maximum rotation speed.
   if (this->rotation != 0.0f)
   {