Changeset 1564 for code/trunk/src/orxonox/objects

Timestamp:

Jun 8, 2008, 5:46:52 AM (17 years ago)

Author:

landauf

Message:

• several small changes in most of the HUD classes (code cleanup): removed obsolete variables, privatized all member variables, removed resizing functioncalls from tick, destroying overlayelements, added some const qualifiers.
• moved calculation functions for RadarObject-position to Math.h and changed the phi/right/radius format to Vector2. the functions are used too by SpaceShipAI.
• cycleNavigationFocus takes the nearest object if focus was NULL
• BarOverlayElement works in both directions (left to right and right to left)
• fixed bug causing SpaceShipAI to not stop shooting when losing target - this also speeds up orxonox a lot, because there are less projectiles

####################################

!! UPDATE YOUR MEDIA REPOSITORY !!

####################################
…or the BarOverlayElement will look strange

Location:

code/trunk/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (3 diffs)
• SpaceShipAI.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -152 +152 @@
 
             if (!this->myShip_)
-                HUD::getSingleton().removeRadarObject(this->getNode());
+                HUD::getSingleton().removeRadarObject(this);
         }
     }
@@ -161 +161 @@
           myShip_=true;
         else
-          HUD::getSingleton().addRadarObject(this->getNode(), this->getProjectileColour());
+          HUD::getSingleton().addRadarObject(this, this->getProjectileColour());
       }
       if(Model::create())
@@ -508 +508 @@
           this->mouseXRotation_ = Radian(0);
           this->mouseYRotation_ = Radian(0);
-          this->bLMousePressed_ = false;
         }/*else
           COUT(4) << "not steering ship: " << objectID << " our ship: " << network::Client::getSingleton()->getShipID() << std::endl;*/
+
+          this->bLMousePressed_ = false;
     }
 

code/trunk/src/orxonox/objects/SpaceShipAI.cc

@@ -226 +226 @@
             this->moveToTargetPosition(dt);
 
-        if (this->bShooting_ && this->isCloseAtTarget(2500) && this->isLookingAtTarget(Ogre::Math::PI / 10))
+        if (this->bShooting_ && this->isCloseAtTarget(2500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
             this->doFire();
 
@@ -234 +234 @@
     void SpaceShipAI::moveToTargetPosition(float dt)
     {
-        Vector3 proj = Ogre::Plane(this->getDir(), this->getPosition()).projectVector(this->targetPosition_ - this->getPosition());
-        float angle = acos((this->getOrth().dotProduct(proj)) / (this->getOrth().length()*proj.length()));
-
-        if ((this->getDir().crossProduct(this->getOrth())).dotProduct(this->targetPosition_ - this->getPosition()) > 0)
-            this->setMoveYaw(sgn(sin(angle)));
-        else
-            this->setMoveYaw(-sgn(sin(angle)));
-        this->setMovePitch(sgn(cos(angle)));
+        Vector2 coord = get2DViewdirection(this->getPosition(), this->getDir(), this->getOrth(), this->targetPosition_);
+        this->setMoveYaw(0.8 * sgn(coord.x));
+        this->setMovePitch(0.8 * sgn(coord.y));
 
         if ((this->targetPosition_ - this->getPosition()).length() > 300)
-            this->setMoveLongitudinal(1);
+            this->setMoveLongitudinal(0.8);
 
         if (this->isCloseAtTarget(300) && this->target_)
         {
             if (this->getVelocity().length() > this->target_->getVelocity().length())
-                this->setMoveLongitudinal(-1);
+                this->setMoveLongitudinal(-0.5);
         }
     }
@@ -319 +314 @@
     bool SpaceShipAI::isLookingAtTarget(float angle)
     {
-        Vector3 dist = this->targetPosition_ - this->getPosition();
-        return (acos((this->getDir().dotProduct(dist)) / (dist.length() * this->getDir().length())) < angle);
+        return (getAngle(this->getPosition(), this->getDir(), this->targetPosition_) < angle);
     }