Changeset 10181 for code/branches/presentationHS14/src/orxonox

Timestamp:

Dec 15, 2014, 3:58:14 PM (10 years ago)

Author:

maxima

Message:

towerdefenseHS14 merged.

Location:

code/branches/presentationHS14

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)
• src/orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/presentationHS14/src/orxonox/controllers/ArtificialController.cc

@@ -94 +94 @@
         static const float hardcoded_projectile_speed = 1250;
 
-        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getPosition(), hardcoded_projectile_speed, this->target_->getPosition(), this->target_->getVelocity());
+        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity());
         this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);
 

code/branches/presentationHS14/src/orxonox/worldentities/WorldEntity.cc

@@ -414 +414 @@
             else if (this->isDynamic())
             {
-                orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
-                return false;
+                //***HACKY HACK (to allow turrets to be attached)***
+                //orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
+                //return false;
             }
             else if (this->isKinematic() && newParent->isDynamic())