Changeset 3063

Timestamp:

May 25, 2009, 5:38:00 PM (16 years ago)

Author:

danielh

Message:

• Moved pickups to a seperate directory
• Added two pickups: HealthImmediate, HealthUsable

Location:

code/branches/pickups2/src/orxonox/objects/pickup

Files:

• CMakeLists.txt (modified) (2 diffs)
• Jump.cc (deleted)
• Jump.h (deleted)
• PickupSpawner.cc (modified) (2 diffs)
• items (added)
• items/CMakeLists.txt (added)
• items/HealthImmediate.cc (added)
• items/HealthImmediate.h (added)
• items/HealthUsable.cc (added)
• items/HealthUsable.h (added)
• items/Jump.cc (added)
• items/Jump.h (added)

code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt

@@ -3 +3 @@
   DroppedItem.cc
   EquipmentItem.cc
-  Jump.cc
   ModifierPickup.cc
   PassiveItem.cc
@@ -11 +10 @@
   UsableItem.cc
 )
+
+ADD_SUBDIRECTORY(items)

code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -34 +34 @@
 #include "PickupSpawner.h"
 #include "BaseItem.h"
+#include "PickupInventory.h"    // HACK; Only for hack, remove later
+#include "gui/GUIManager.h"     // HACK; see above
 
 #include "core/CoreIncludes.h"
@@ -79 +81 @@
         XMLPortParam(PickupSpawner, "triggerDistance", setTriggerDistance, getTriggerDistance, xmlelement, mode);
         XMLPortParam(PickupSpawner, "respawnTime", setRespawnTime, getRespawnTime, xmlelement, mode);
+
+        // HACKs
+        // Load the GUI image as soon as the PickupSpawner gets loaded
+        //  = less delays while running
+        BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this);
+        BaseItem* asItem = dynamic_cast<BaseItem*>(newObject);
+        if (asItem)
+        {
+            asItem->addTemplate(this->itemTemplate_);
+            PickupInventory::getImageForItem(asItem);
+            delete newObject;
+        }
+
+        //  & load the GUI itself too, along with some empty windows
+        //   = even less delays
+        GUIManager::getInstancePtr()->showGUI("PickupInventory");
+        GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
+        PickupInventory::getSingleton();
     }
     /**