Changeset 9869 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/world_entities/power_ups

Files:

• laser_power_up.cc (modified) (2 diffs)
• laser_power_up.h (modified) (2 diffs)
• param_power_up.cc (modified) (2 diffs)
• param_power_up.h (modified) (1 diff)
• power_up.cc (modified) (6 diffs)
• power_up.h (modified) (2 diffs)
• turret_power_up.cc (modified) (2 diffs)
• turret_power_up.h (modified) (2 diffs)
• weapon_power_up.cc (modified) (3 diffs)
• weapon_power_up.h (modified) (1 diff)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -24 +24 @@
 
 
-
-CREATE_FACTORY(LaserPowerUp, CL_LASER_POWER_UP);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
+CREATE_FACTORY(LaserPowerUp);
 
 LaserPowerUp::LaserPowerUp () : PowerUp(0.0, 1.0, 0.0)
@@ -49 +50 @@
 void LaserPowerUp::init()
 {
-  this->setClassID(CL_LASER_POWER_UP, "LaserPowerUp");
+  this->registerObject(this, LaserPowerUp::_objectList);
   this->loadModel("models/guns/test_gun.obj", 2.0);
 

trunk/src/world_entities/power_ups/laser_power_up.h

@@ -13 +13 @@
 
 class LaserPowerUp : public PowerUp {
+  ObjectListDeclaration(LaserPowerUp);
 
  public:
@@ -22 +23 @@
 
 
-  virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
   virtual void draw() const;

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -27 +27 @@
 
 
-
-CREATE_FACTORY(ParamPowerUp, CL_PARAM_POWER_UP);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
+CREATE_FACTORY(ParamPowerUp);
 
 const char* ParamPowerUp::paramTypes[] = {
@@ -58 +59 @@
 void ParamPowerUp::init()
 {
-  this->setClassID(CL_PARAM_POWER_UP, "ParamPowerUp");
+  this->registerObject(this, ParamPowerUp::_objectList);
   this->value = 0;
   this->max_value = 0;

trunk/src/world_entities/power_ups/param_power_up.h

@@ -20 +20 @@
 
 class ParamPowerUp : public PowerUp {
+  ObjectListDeclaration(ParamPowerUp);
 
 public:

trunk/src/world_entities/power_ups/power_up.cc

@@ -21 +21 @@
 #include "primitive_model.h"
 
-#include "util/loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 #include "util/loading/load_param.h"
 
+#include "debug.h"
 
+ObjectListDefinition(PowerUp);
 
 PowerUp::PowerUp(float r, float g, float b)
 {
-  this->setClassID(CL_POWER_UP, "PowerUp");
+  this->registerObject(this, PowerUp::_objectList);
 
   this->respawnType = RESPAWN_TIME;
@@ -45 +47 @@
 
   this->soundSource.setSourceNode(this);
-  this->pickupBuffer = NULL;
-  this->respawnBuffer = NULL;
 
   this->collider = NULL;
@@ -54 +54 @@
 {
   delete this->sphereMaterial;
-  if (this->pickupBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->pickupBuffer);
-  if (this->respawnBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->respawnBuffer);
 }
 
@@ -77 +73 @@
 void PowerUp::loadPickupSound(const std::string& pickupSound)
 {
-  if (this->pickupBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->pickupBuffer);
-
-  else if (!pickupSound.empty())
-  {
-    this->pickupBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
-    if (this->pickupBuffer != NULL)
-    {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound.c_str(), this->getCName());
-    }
-    else
-    {
-      PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound.c_str(), this->getCName());
-    }
-  }
+  if (!pickupSound.empty())
+    this->pickupBuffer = OrxSound::ResourceSoundBuffer(pickupSound);
   else
-    this->pickupBuffer = NULL;
+    this->pickupBuffer = OrxSound::SoundBuffer();
 }
 
 void PowerUp::loadRespawnSound(const std::string& respawnSound)
 {
-  if (this->respawnBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->respawnBuffer);
-
-  else if (!respawnSound.empty())
-  {
-    this->respawnBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
-    if (this->respawnBuffer != NULL)
-    {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound.c_str(), this->getCName());
-    }
-    else
-    {
-      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound.c_str(), this->getCName());
-    }
-  }
+  if (!respawnSound.empty())
+    this->respawnBuffer = OrxSound::ResourceSoundBuffer(respawnSound);
   else
-    this->respawnBuffer = NULL;
+    this->respawnBuffer = OrxSound::SoundBuffer();
 }
 
@@ -120 +90 @@
 void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if(this->collider != entity && entity->isA(CL_EXTENDABLE))
+  if(this->collider != entity && entity->isA(Extendable::staticClassID()))
   {
     this->collider = entity;
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
-      if(pickupBuffer != NULL)
+      if(pickupBuffer.loaded())
         this->soundSource.play(this->pickupBuffer);
 
@@ -154 +124 @@
       this->toList(OM_COMMON);
       this->collider = NULL;
-      if (likely(this->respawnBuffer != NULL))
+      if (likely(this->respawnBuffer.loaded()))
         this->soundSource.play(this->respawnBuffer);
 

trunk/src/world_entities/power_ups/power_up.h

@@ -21 +21 @@
 
 class PowerUp : public WorldEntity {
+  ObjectListDeclaration(PowerUp);
 
 public:
@@ -43 +44 @@
 private:
   OrxSound::SoundSource  soundSource;
-  OrxSound::SoundBuffer* pickupBuffer;
-  OrxSound::SoundBuffer* respawnBuffer;
+  OrxSound::SoundBuffer  pickupBuffer;
+  OrxSound::SoundBuffer  respawnBuffer;
   Material*              sphereMaterial;
   PowerUpRespawn         respawnType;

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -24 +24 @@
 
 
-
-CREATE_FACTORY(TurretPowerUp, CL_TURRET_POWER_UP);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
+CREATE_FACTORY(TurretPowerUp);
 
 TurretPowerUp::TurretPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
@@ -45 +46 @@
 void TurretPowerUp::init()
 {
-  this->setClassID(CL_TURRET_POWER_UP, "TurretPowerUp");
+  this->registerObject(this, TurretPowerUp::_objectList);
   this->loadModel("models/guns/turret1.obj", 2.0);
 

trunk/src/world_entities/power_ups/turret_power_up.h

@@ -13 +13 @@
 
 class TurretPowerUp : public PowerUp {
+  ObjectListDeclaration(TurretPowerUp);
 
  public:
@@ -20 +21 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
   virtual void draw() const;

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -25 +25 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
+#include "debug.h"
 
-
-
-CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+CREATE_FACTORY(WeaponPowerUp);
 
 WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root) : PowerUp(1.0, 1.0, 0.0)
@@ -45 +46 @@
 void WeaponPowerUp::init()
 {
-  this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
+  this->registerObject(this, WeaponPowerUp::_objectList);
   this->loadPickupSound("sound/powerups/whats this2.wav");
 
@@ -87 +88 @@
 {
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
-      ? Factory::fabricate(static_cast<ClassID>(this->weapon->getLeafClassID()))
+      ? Factory::fabricate((this->weapon->getClassID()))
       : Factory::fabricate((const TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
   this->model = this->weapon->getModel(0);

trunk/src/world_entities/power_ups/weapon_power_up.h

@@ -14 +14 @@
 
 class WeaponPowerUp : public PowerUp {
-
+ObjectListDeclaration(WeaponPowerUp);
 public:
   WeaponPowerUp(const TiXmlElement* root = NULL);