Changeset 7038

Timestamp:

May 31, 2010, 9:24:33 AM (14 years ago)

Author:

dafrick

Message:

Updated pickups level and template and include file to properly include the DronePickup.
Additionally adjusted the level of output generated by the PickupSpawner.

Location:

code/branches/presentation3

Files:

• data/levels/includes/pickups.oxi (modified) (2 diffs)
• data/levels/pickups.oxw (modified) (2 diffs)
• data/levels/templates/pickup_representation_templates.oxt (modified) (3 diffs)
• src/modules/pickup/PickupSpawner.cc (modified) (6 diffs)
• src/orxonox/controllers/DroneController.cc (modified) (1 diff)

code/branches/presentation3/data/levels/includes/pickups.oxi

@@ +1 @@
+
 <!-- Shield pickups -->
 
 <PickupRepresentation
     pickupName = "Small Shield Pickup"
-    pickupDescription = "Gives you a small shield for 10 seconds."
+    pickupDescription = "Gives you a small-sized shield for 30 seconds."
     inventoryRepresentation = "SmallShield"
     spawnerTemplate = "smallshieldpickupRepresentation"
@@ -197 +198 @@
 </PickupRepresentation>
 
+<!-- Drone Pickup -->
+
+<PickupRepresentation
+    pickupName = "Drone Pickup"
+    pickupDescription = "Adds a Drone to the Players Spaceship"
+    spawnerTemplate = "dronepickupRepresentation"
+>
+    <pickup>
+        <DronePickup template=dronepickup />
+    </pickup>
+</PickupRepresentation>
+

code/branches/presentation3/data/levels/pickups.oxw

@@ -29 +29 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
     <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <!-- Drone pickup -->
-
-    <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-        <pickup>
-            <DronePickup droneTemplate=droneTemplate />
-        </pickup>
-    </PickupSpawner>
 
     <!-- Shield pickups -->
@@ -151 +143 @@
       </pickup>
     </PickupSpawner>
+    
+    <!-- Drone pickup -->
+    
+    <PickupSpawner position="-50,50,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+      <pickup>
+        <DronePickup template=dronepickup />
+      </pickup>
+    </PickupSpawner>
+    
+    <!-- Other pickups -->
 
     <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->

code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt

@@ -26 +26 @@
   />
 </Template>
-
 
 <Template name=mediumshieldpickupRepresentation>
@@ -426 +425 @@
     </PickupCollection>
 </Template>
+
+<!-- Drone Pickup -->
 
 <Template name=droneTemplate>
@@ -458 +459 @@
     </Drone>
 </Template>
+
+<Template name=dronepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.96,0.35,0.02" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Model scale="5" mesh="drone.mesh"/>
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=dronepickup>
+    <DronePickup droneTemplate=droneTemplate />
+</Template>
+

code/branches/presentation3/src/modules/pickup/PickupSpawner.cc

@@ -223 +223 @@
         else
         {
-            COUT(3) << "PickupSpawner empty, selfdestruct initialized." << std::endl;
+            COUT(4) << "PickupSpawner (&" << this << ") empty, selfdestruct initialized." << std::endl;
             this->setActive(false);
             this->destroy();
@@ -248 +248 @@
         if(this->pickup_ != NULL)
         {
-            COUT(1) << "In PickupSpawner: setPickupable called, with this->pickup_ already set." << std::endl;
+            COUT(1) << "In PickupSpawner (&" << this << "): setPickupable called, with this->pickup_ already set." << std::endl;
             return;
         }
         if(pickup == NULL)
         {
-            COUT(1) << "In PickupSpawner: Argument of setPickupable is NULL." << std::endl;
+            COUT(1) << "In PickupSpawner (&" << this << "): Argument of setPickupable is NULL." << std::endl;
             return;
         }
@@ -282 +282 @@
         if (this->isActive()) //!< Checks whether PickupSpawner is active.
         {
-            COUT(3) << "PickupSpawner triggered and active." << std::endl;
+            COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
             
             PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
@@ -293 +293 @@
             if(!carrier->isTarget(this->pickup_))
             {
-                COUT(4) << "PickupSpawner triggered but Pawn wasn't a target of the Pickupable." << std::endl;
+                COUT(4) << "PickupSpawner (&" << this << ") triggered but Pawn wasn't a target of the Pickupable." << std::endl;
                 return;
             }
@@ -314 +314 @@
             {
                 if(target == NULL)
-                    COUT(1) << "PickupSpawner: Pickupable has no target." << std::endl;
+                    COUT(1) << "PickupSpawner (&" << this << "): Pickupable has no target." << std::endl;
                 
                 if(pickup == NULL)
                 {
-                    COUT(1) << "PickupSpawner: getPickup produced an error, no Pickupable created." << std::endl;
+                    COUT(1) << "PickupSpawner (&" << this << "): getPickup produced an error, no Pickupable created." << std::endl;
                 }
                 else
@@ -352 +352 @@
     void PickupSpawner::respawnTimerCallback()
     {
-        COUT(3) << "PickupSpawner reactivated." << std::endl;
+        COUT(4) << "PickupSpawner (&" << this << ") reactivated." << std::endl;
 
         this->setActive(true);

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

@@ -97 +97 @@
     }
 
-    /*
+    /**
     @brief
         The controlling happens here. This method defines what the controller has to do each tick.