Changeset 7357 in orxonox.OLD for trunk/src/world_entities/spawning_point.cc

Timestamp:

Apr 21, 2006, 11:45:52 AM (19 years ago)

Author:

patrick

Message:

spawning point reviewed

File:

• trunk/src/world_entities/spawning_point.cc (modified) (6 diffs)

trunk/src/world_entities/spawning_point.cc

@@ -24 +24 @@
 
 /**
- *  standard constructor
+ *  constructor
  */
-SpawningPoint::SpawningPoint (World* world, const Vector& absCoordinate)
+SpawningPoint::SpawningPoint (ClassID classID, const Vector& position)
 {
-  this->world = world;
-  this->frequency = 0.5f;
-  this->seed = 0.0f;
+  this->setAbsCoor(position);
+  this->classID = classID;
+  this->mode = SPT_ALL_AT_ONCE;
+  this->delay = 0;
 
   this->init();
@@ -37 +38 @@
 
 /**
- *  constructor
+ *  standard constructor
  */
-SpawningPoint::SpawningPoint (const Vector& position, float frequency,
-                              float seed, ClassID classID, World* world)
+SpawningPoint::SpawningPoint (const Vector& position, ClassID classID, SpawningPointMode mode, float delay)
 {
-  this->frequency = frequency;
-  this->seed = seed;
+  this->setAbsCoor(position);
   this->classID = classID;
-  this->world = world;
+  this->mode = mode;
+  this->delay = delay;
 
   this->init();
@@ -51 +51 @@
 
 
+
 void SpawningPoint::init()
 {
-  this->countDown = 0.0f;
+  this->setClassID(CL_SPAWNING_POINT, "SpawningPoint");
 }
 
@@ -74 +75 @@
 
   /* now load the frequency */
-  LoadParam(root, "frequency", this, SpawningPoint, setSpawningFrequency)
-  .describe("sets the frequency of the spawning point")
-  .defaultValues(1.0f);
+  LoadParam(root, "delay", this, SpawningPoint, setSpawningDelay)
+      .describe("sets the delay of the spawning point");
 
 
   /* now load the seed */
-  LoadParam(root, "randomseed", this, SpawningPoint, setPositionSeed)
-      .describe("sets the random position seed (variance in the spawning location around the position)")
-      .defaultValues(0.0f);
+//   LoadParam(root, "entity", this, SpawningPoint, setSpawningEntity)
+//       .describe("sets the spawning entity");
 
   /* now load the seed */
@@ -96 +95 @@
 void SpawningPoint::spawn()
 {
-  PRINTF(5)("Spangingpoint creates a new Entity (id: %i, frequency: %f, seed: %f)\n", this->classID,
-            this->frequency, this->seed);
-  BaseObject* spawningEntity = Factory::fabricate(this->classID);
+  PRINTF(5)("Spangingpoint creates a new Entity (id: %i, delay: %f, mode: %f)\n", this->classID,
+            this->delay, this->mode);
+
+  //BaseObject* spawningEntity = Factory::fabricate(this->classID);
 
 //   if( likely(this->world != NULL))
@@ -113 +113 @@
 void SpawningPoint::tick(float dt)
 {
-  this->countDown += dt;
-  if( this->countDown > this->frequency)
+  this->localTimer += dt;
+  if( this->localTimer > this->delay)
   {
     this->spawn();
-    this->countDown = 0.0f;
+    this->localTimer = 0.0f;
   }
 }