Changeset 6074 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Dec 12, 2005, 11:34:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: taken out NullParent.
THE TRUNK IS NOT RUNNING FOR THE TIME BEING. DO NOT BE ALARMED, THIS IS TEMPORARY

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (2 diffs)
• cannon.cc (modified) (2 diffs)
• guided_missile.cc (modified) (2 diffs)
• projectile.cc (modified) (1 diff)
• test_gun.cc (modified) (2 diffs)
• turret.cc (modified) (2 diffs)
• weapon_manager.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -22 +22 @@
 
 #include "model.h"
-
-#include "null_parent.h"
 
 #include "animation3d.h"
@@ -145 +143 @@
 
   pj->setTarget(this->target->getParent());
-  pj->setParent(NullParent::getInstance());
+  pj->setParent(PNode::getNullParent());
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());

trunk/src/world_entities/weapons/cannon.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-
-#include "null_parent.h"
 
 #include "fast_factory.h"
@@ -161 +159 @@
     return;
 
-  pj->setParent(NullParent::getInstance());
+  pj->setParent(PNode::getNullParent());
 
   pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*15+VECTOR_RAND(5));

trunk/src/world_entities/weapons/guided_missile.cc

@@ -28 +28 @@
 #include "particle_emitter.h"
 #include "particle_system.h"
-
-
-#include "null_parent.h"
 
 using namespace std;
@@ -153 +150 @@
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  if (target.getParent() != NullParent::getInstance())
+  if (target.getParent() != PNode::getNullParent())
    {
      velocity += ((target.getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;

trunk/src/world_entities/weapons/projectile.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "weapon.h"
-#include "null_parent.h"
 #include "model.h"
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-
-#include "null_parent.h"
 
 #include "fast_factory.h"
@@ -184 +182 @@
     return;
 
-  pj->setParent(NullParent::getInstance());
+  pj->setParent(PNode::getNullParent());
 
   pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*50+VECTOR_RAND(5));

trunk/src/world_entities/weapons/turret.cc

@@ -22 +22 @@
 #include "model.h"
 
-#include "null_parent.h"
 #include "state.h"
 #include "list.h"
@@ -139 +138 @@
 
 
-  pj->setParent(NullParent::getInstance());
+  pj->setParent(PNode::getNullParent());
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -27 +27 @@
 
 #include "t_animation.h"
-#include "null_parent.h"
-
 
 using namespace std;
@@ -160 +158 @@
 {
   if (parent == NULL)
-    parent = NullParent::getInstance();
+    parent = PNode::getNullParent();
   this->parent = parent;
   if (this->parent != NULL)