Changeset 7090 for code/branches

Timestamp:

Jun 2, 2010, 9:44:22 PM (14 years ago)

Author:

dafrick

Message:

Merged ppspickups4 branch.

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/pickup/items/InvisiblePickup.cc (modified) (13 diffs)
• src/orxonox/controllers/AIController.cc (modified) (3 diffs)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)

code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc

@@ -43 +43 @@
 #include <sstream>
 
+#include <OgreEntity.h>
+#include <Ogre.h>
+
 namespace orxonox
 {
 
     CreateFactory(InvisiblePickup);
-    
+
     /**
     @brief
@@ -56 +59 @@
         RegisterObject(InvisiblePickup);
         //! Defines who is allowed to pick up the pickup.
-        this->initialize(); 
-    }
-    
+        this->initialize();
+    }
+
     /**
     @brief
@@ -64 +67 @@
     */
     InvisiblePickup::~InvisiblePickup()
-    {        
-    }
-    
-    
+    {
+    }
+
+
     void InvisiblePickup::initializeIdentifier(void)
     {
@@ -76 +79 @@
         this->pickupIdentifier_->addParameter(type1, val1);
     }
-    
+
     /**
     @brief
@@ -93 +96 @@
     void InvisiblePickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
     {
-        SUPER(InvisiblePickup, XMLPort, xmlelement, mode);    
+        SUPER(InvisiblePickup, XMLPort, xmlelement, mode);
         XMLPortParam(InvisiblePickup, "duration", setDuration, getDuration, xmlelement, mode);
-        
+
         this->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -106 +109 @@
     {
         SUPER(InvisiblePickup, changedUsed);
-        
+
         //! If the pickup is not picked up nothing must be done.
         if(!this->isPickedUp())
             return;
-        
+
         if (this->isUsed())
         {
@@ -121 +124 @@
                 this->startPickupTimer(this->getDuration());
             }
+
             this->setInvisible(true);
+
         }
         else
         {
             this->setInvisible(false);
-        
+
             if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
             {
@@ -136 +141 @@
             }
         }
-        
-    }
-    
+
+    }
+
     /**
     @brief
@@ -149 +154 @@
         PickupCarrier* carrier = this->getCarrier();
         Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-        
+
         if(pawn == NULL)
         {
@@ -156 +161 @@
         return pawn;
     }
-    
+
     /**
     @brief
@@ -167 +172 @@
         if(item == NULL)
             item = new InvisiblePickup(this);
-        
+
         SUPER(InvisiblePickup, clone, item);
-        
+
         InvisiblePickup* pickup = dynamic_cast<InvisiblePickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -186 +191 @@
         if(pawn == NULL)
             return false;
-        
+
         pawn->setVisible(!invisibility);
+        pawn->setRadarVisibility(!invisibility);
+
+// Test to change Material at runtime!
+
+//      Ogre::MaterialPtr mat = this->mesh_.getEntity()->getSubEntity(0)->getMaterial();
+//      mat->setDiffuse(0.4, 0.3, 0.1, 0.1);
+//      mat->setAmbient(0.3, 0.7, 0.8);
+//      mat->setSpecular(0.5, 0.5, 0.5, 0.1);
+//      Ogre::SceneBlendType sbt = Ogre::SBT_ADD;
+//
+//      mat->setSceneBlending(sbt);
+
         return true;
     }
-    
+
     /**
     @brief
@@ -209 +226 @@
         }
     }
-    
+
     void InvisiblePickup::pickupTimerCallback(void)
     {

code/branches/presentation3/src/orxonox/controllers/AIController.cc

@@ -33 +33 @@
 #include "core/Executor.h"
 #include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -210 +211 @@
             {
                 if (this->target_)
-                    this->aimAtTarget();
+                {
+                                if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
+                        this->forgetTarget();
+                else this->aimAtTarget();
+            }
 
                 if (this->bHasTargetPosition_)
@@ -239 +244 @@
         {
             if (this->target_)
-                this->aimAtTarget();
+            {
+                                if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
+                        this->forgetTarget();
+                else this->aimAtTarget();
+            }
 
             if (this->bHasTargetPosition_)

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

@@ -760 +760 @@
                 continue;
 
+            /* So AI won't choose invisible Spaceships as target */
+            if (!it->getRadarVisibility())
+                continue;
+
             if (static_cast<ControllableEntity*>(*it) != this->getControllableEntity())
             {