Changeset 5356 in orxonox.OLD for trunk

Timestamp:

Oct 10, 2005, 8:17:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: saver Weapon-Projectile-generation and Stuff

Location:

trunk/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• lib/graphics/spatial_separation/spatial_separation.h (modified) (1 diff)
• util/loading/factory.h (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (2 diffs)
• world_entities/weapons/turret.cc (modified) (3 diffs)
• world_entities/weapons/weapon.cc (modified) (4 diffs)
• world_entities/weapons/weapon.h (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

trunk/src/lib/coord/p_node.h

@@ -24 +24 @@
 #include "base_object.h"
 #include "vector.h"
-
-
 
 // FORWARD DEFINITION \\

trunk/src/lib/graphics/spatial_separation/spatial_separation.h

@@ -7 +7 @@
 
 #include "base_object.h"
-#include "vector.h"
 
 

trunk/src/util/loading/factory.h

@@ -84 +84 @@
 tFactory<T>::tFactory(const char* factoryName) : Factory(factoryName)
 {
-  PRINTF(1)("Class: %s loadable\n", this->getName());
+ printf("Class: %s loadable\n", this->getName());
 }
 

trunk/src/world_entities/skybox.cc

@@ -20 +20 @@
 #include "skybox.h"
 
+#include "load_param.h"
 #include "factory.h"
-
-#include "load_param.h"
-#include "material.h"
-#include "vector.h"
-#include "resource_manager.h"
-#include "model.h"
-//#include "world_entity.h"
-
+#include "list.h"
+
+using namespace std;
 CREATE_FACTORY(SkyBox);
-
-using namespace std;
 
 /**

trunk/src/world_entities/terrain.cc

@@ -17 +17 @@
 #include "terrain.h"
 
-#include "model.h"
-#include "vector.h"
-#include "glincl.h"
-
+#include "load_param.h"
 #include "factory.h"
-#include "load_param.h"
-#include "resource_manager.h"
 #include "spatial_separation.h"
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -134 +134 @@
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
 
-  this->setProjectile(CL_TEST_BULLET);
-  this->getProjectileFactory()->prepare(20);
+  this->setProjectileType(CL_TEST_BULLET);
+  this->prepareProjectiles(20);
 }
 
@@ -178 +178 @@
 void TestGun::fire()
 {
-  Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    return;
 
   pj->setParent(NullParent::getInstance());

trunk/src/world_entities/weapons/turret.cc

@@ -28 +28 @@
 
 #include "factory.h"
-#include "fast_factory.h"
 
 CREATE_FACTORY(Turret);
@@ -93 +92 @@
 
 
-  this->setProjectile(CL_TEST_BULLET);
+  this->setProjectileType(CL_TEST_BULLET);
 
 
@@ -133 +132 @@
 void Turret::fire()
 {
-  Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
+  Projectile* pj = this->getProjectile();
+  if (pj == NULL)
+    return;
 
   PNode* target = this->getWeaponManager()->getFixedTarget();

trunk/src/world_entities/weapons/weapon.cc

@@ -102 +102 @@
   static_cast<WorldEntity*>(this)->loadParams(root);
 
-  LoadParam<Weapon>(root, "projectile", this, &Weapon::setProjectile)
+  LoadParam<Weapon>(root, "projectile", this, &Weapon::setProjectileType)
       .describe("Sets the name of the Projectile to load onto the Entity");
 
@@ -122 +122 @@
  * be aware, that this function does not create Factories, as this is job of Bullet-classes.
  */
-void Weapon::setProjectile(ClassID projectile)
+void Weapon::setProjectileType(ClassID projectile)
 {
   if (projectile == CL_NULL)
@@ -148 +148 @@
  * @param projectile the Name of the Projectile.
  */
-void Weapon::setProjectile(const char* projectile)
+void Weapon::setProjectileType(const char* projectile)
 {
   if (projectile == NULL)
@@ -155 +155 @@
   if (tmpFac != NULL)
   {
-    this->setProjectile(tmpFac->getStoredID());
-  }
-  else
-  {
-    PRINTF(2)("Projectile %s does not exist for weapon %s\n", projectile, this->getName());
-  }
-}
+    this->setProjectileType(tmpFac->getStoredID());
+  }
+  else
+  {
+    PRINTF(1)("Projectile %s does not exist for weapon %s\n", projectile, this->getName());
+  }
+}
+
+/**
+ * prepares Projectiles of the Weapon
+ * @param count how many Projectiles to create
+ */
+void Weapon::prepareProjectiles(unsigned int count)
+{
+  if (this->projectileFactory != NULL)
+    projectileFactory->prepare(count);
+  else
+    PRINTF(2)("unable to create %d projectile for Weapon %s\n", count, this->getName());
+}
+
+/**
+ * resurects and returns a Projectile
+ * @returns a Projectile on success, NULL on error (ProjectileFastFactory not Found)
+ */
+Projectile* Weapon::getProjectile()
+{
+  if (this->projectileFactory)
+    return dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
+  else
+  {
+    PRINTF(2)("No projectile defined for Weapon %s cant return any\n", this->getName());
+    return NULL;
+  }
+}
+
 
 /**

trunk/src/world_entities/weapons/weapon.h

@@ -106 +106 @@
 
     // FUNCTIONS TO SET THE WEAPONS PROPERTIES.
-    void setProjectile(ClassID projectile);
-    void setProjectile(const char* projectile);
+    void setProjectileType(ClassID projectile);
+    void setProjectileType(const char* projectile);
     /** @returns The projectile's classID */
-    inline ClassID getProjectile() { return this->projectile; };
+    inline ClassID getProjectileType() { return this->projectile; };
     /** @returns the FastFactory, that creates Projectiles of type getProjectile */
     inline FastFactory* getProjectileFactory() { return this->projectileFactory; };
+    void prepareProjectiles(unsigned int count);
+    Projectile* getProjectile();
 
 

trunk/src/world_entities/world_entity.h

@@ -8 +8 @@
 
 #include "p_node.h"
-
 #include "model.h"
-
 
 // FORWARD DECLARATION