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

Timestamp:

Jun 7, 2008, 3:39:48 PM (17 years ago)

Author:

landauf

Message:

• AI ships are now displayed with a point with its teamcolour on the radar.
• It's now possible to assign an arbitrary colour (and even a texture) to a RadarObject. But be aware the system has to create a new material for every colour (not for every object), so please use deterministic colours to reduce the amount of used materials to a bearable number.

Location:

code/trunk/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (4 diffs)
• SpaceShipAI.cc (modified) (1 diff)

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

@@ -151 +151 @@
                 delete this->cam_;
 
-            if (!myShip_ && &HUD::getSingleton()!=NULL)
-              HUD::getSingleton().removeRadarObject(this->getNode());
+            if (!this->myShip_)
+                HUD::getSingleton().removeRadarObject(this->getNode());
         }
     }
@@ -161 +161 @@
           myShip_=true;
         else
-          HUD::getSingleton().addRadarObject(this->getNode(), 3);
+          HUD::getSingleton().addRadarObject(this->getNode(), this->getProjectileColour());
       }
       if(Model::create())
@@ -282 +282 @@
     void SpaceShip::setCamera(const std::string& camera)
     {
+      myShip_=true; // TODO: this is only a hack
       camName_=camera;
       // change camera attributes here, if you want to ;)
@@ -353 +354 @@
         XMLPortParamLoadOnly(SpaceShip, "transDamp", setTransDamp, xmlelement, mode);
         XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode);
-        myShip_=true; // TODO: this is only a hack
 
         SpaceShip::create();

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

@@ -80 +80 @@
         SpaceShip::XMLPort(xmlelement, mode);
 
-        this->myShip_=true;
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, this, createExecutor(createFunctor(&SpaceShipAI::action)));
     }