Changeset 9371 in orxonox.OLD for branches/proxy/src/lib/particles

Timestamp:

Jul 20, 2006, 11:08:16 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ORXONOX is now completely std::stringed

Location:

branches/proxy/src/lib/particles

Files:

• model_particles.cc (modified) (1 diff)
• particle_emitter.cc (modified) (1 diff)
• particle_system.cc (modified) (8 diffs)

branches/proxy/src/lib/particles/model_particles.cc

@@ -136 +136 @@
     }
   else
-    PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
+    PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getCName());
   glPopAttrib();
 }

branches/proxy/src/lib/particles/particle_emitter.cc

@@ -198 +198 @@
 void ParticleEmitter::debug() const
 {
-  PRINT(0)(" ParticleEmitter %s::%s\n", this->getClassName(), this->getName());
+  PRINT(0)(" ParticleEmitter %s::%s\n", this->getClassCName(), this->getCName());
   PRINT(0)("  EmissionRate: %f, Speed: %f, SpreadAngle: %f\n", this->getEmissionRate(), this->getEmissionVelocity(), this->getSpread());
 }

branches/proxy/src/lib/particles/particle_system.cc

@@ -139 +139 @@
       {
         PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
-                  emitter->getClassName(), this->getClassName(), this->getName());
+                  emitter->getClassCName(), this->getClassCName(), this->getCName());
         delete emitter;
       }
@@ -145 +145 @@
     else
     {
-      PRINTF(2)("Could not Generate Emitter for system %s::%s (wrong type in XML-format)\n", this->getClassName(), getName());
+      PRINTF(2)("Could not Generate Emitter for system %s::%s (wrong type in XML-format)\n", this->getClassCName(), getCName());
     }
   }
@@ -157 +157 @@
 {
   this->maxCount = maxCount;
-  PRINTF(4)("MAXCOUNT of %s::%s is %d\n", this->getClassName(), this->getName(),maxCount);
+  PRINTF(4)("MAXCOUNT of %s::%s is %d\n", this->getClassCName(), this->getCName(), maxCount);
 }
 
@@ -170 +170 @@
   this->lifeSpan = lifeSpan;
   this->randomLifeSpan = randomLifeSpan;
-  PRINTF(4)("LifeTime of %s::%s is %f\n", this->getClassName(), this->getName(), lifeSpan);
+  PRINTF(4)("LifeTime of %s::%s is %f\n", this->getClassCName(), this->getCName(), lifeSpan);
 }
 
@@ -188 +188 @@
     this->conserve = conserve;
 
-  PRINTF(4)("Conserve of %s::%s is %f\n", this->getClassName(), this->getName(),conserve);
+  PRINTF(4)("Conserve of %s::%s is %f\n", this->getClassCName(), this->getCName(), conserve);
 }
 
@@ -206 +206 @@
 
   PRINTF(4)("Radius of %s::%s at timeSlice %f is %f with a Random of %f\n",
-    this->getClassName(), this->getName(),lifeCycleTime, radius, randRadius);
+    this->getClassCName(), this->getCName(), lifeCycleTime, radius, randRadius);
 }
 
@@ -237 +237 @@
 
   PRINTF(4)("Color of %s::%s on timeslice %f is r:%f g:%f b:%f a:%f\n",
-    this->getClassName(), this->getName(), lifeCycleTime, red, green, blue, alpha);
+    this->getClassCName(), this->getCName(), lifeCycleTime, red, green, blue, alpha);
 }
 
@@ -278 +278 @@
     (*emitter)->updateNode(.1), (*emitter)->updateNode(.1);
 
-  PRINTF(4)("Precaching %s::%s %d seconds %d timesPerSecond\n", this->getClassName(), this->getName(), seconds, ticksPerSecond);
+  PRINTF(4)("Precaching %s::%s %d seconds %d timesPerSecond\n", this->getClassCName(), this->getCName(), seconds, ticksPerSecond);
   for (unsigned int i = 0; i < seconds*ticksPerSecond; i++)
     this->tick(1.0/(float)ticksPerSecond);