Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9406 in orxonox.OLD for trunk/src/lib/particles


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/lib/particles
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/particles/box_emitter.cc

    r7198 r9406  
    2525#include "stdlibincl.h"
    2626
    27 using namespace std;
     27
    2828
    2929

  • trunk/src/lib/particles/dot_emitter.cc

    r7661 r9406  
    2424#include "debug.h"
    2525
    26 using namespace std;
     26
    2727
    2828

  • trunk/src/lib/particles/dot_particles.cc

    r7198 r9406  
    3333    ->defaultValues("maps/evil-flower.png");
    3434
    35 using namespace std;
     35
    3636
    3737/**

  • trunk/src/lib/particles/engine/particle_engine.cc

    r7225 r9406  
    2424#include "util/loading/load_param.h"
    2525
    26 using namespace std;
     26
    2727
    2828/**

  • trunk/src/lib/particles/model_particles.cc

    r7221 r9406  
    3333->defaultValues("maps/evil-flower.png");
    3434
    35 using namespace std;
     35
    3636
    3737/**
    … …  
    136136    }
    137137  else
    138     PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
     138    PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getCName());
    139139  glPopAttrib();
    140140}

  • trunk/src/lib/particles/particle_emitter.cc

    r7193 r9406  
    2424#include "stdlibincl.h"
    2525
    26 using namespace std;
     26
    2727
    2828/**
    … …  
    198198void ParticleEmitter::debug() const
    199199{
    200   PRINT(0)(" ParticleEmitter %s::%s\n", this->getClassName(), this->getName());
     200  PRINT(0)(" ParticleEmitter %s::%s\n", this->getClassCName(), this->getCName());
    201201  PRINT(0)("  EmissionRate: %f, Speed: %f, SpreadAngle: %f\n", this->getEmissionRate(), this->getEmissionVelocity(), this->getSpread());
    202202}

  • trunk/src/lib/particles/particle_system.cc

    r9235 r9406  
    3232#include <algorithm>
    3333
    34 using namespace std;
     34
    3535/**
    3636 *  standard constructor
    … …  
    139139      {
    140140        PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
    141                   emitter->getClassName(), this->getClassName(), this->getName());
     141                  emitter->getClassCName(), this->getClassCName(), this->getCName());
    142142        delete emitter;
    143143      }
    … …  
    145145    else
    146146    {
    147       PRINTF(2)("Could not Generate Emitter for system %s::%s (wrong type in XML-format)\n", this->getClassName(), getName());
     147      PRINTF(2)("Could not Generate Emitter for system %s::%s (wrong type in XML-format)\n", this->getClassCName(), getCName());
    148148    }
    149149  }
    … …  
    157157{
    158158  this->maxCount = maxCount;
    159   PRINTF(4)("MAXCOUNT of %s::%s is %d\n", this->getClassName(), this->getName(),maxCount);
     159  PRINTF(4)("MAXCOUNT of %s::%s is %d\n", this->getClassCName(), this->getCName(), maxCount);
    160160}
    161161
    … …  
    170170  this->lifeSpan = lifeSpan;
    171171  this->randomLifeSpan = randomLifeSpan;
    172   PRINTF(4)("LifeTime of %s::%s is %f\n", this->getClassName(), this->getName(), lifeSpan);
     172  PRINTF(4)("LifeTime of %s::%s is %f\n", this->getClassCName(), this->getCName(), lifeSpan);
    173173}
    174174
    … …  
    188188    this->conserve = conserve;
    189189
    190   PRINTF(4)("Conserve of %s::%s is %f\n", this->getClassName(), this->getName(),conserve);
     190  PRINTF(4)("Conserve of %s::%s is %f\n", this->getClassCName(), this->getCName(), conserve);
    191191}
    192192
    … …  
    206206
    207207  PRINTF(4)("Radius of %s::%s at timeSlice %f is %f with a Random of %f\n",
    208     this->getClassName(), this->getName(),lifeCycleTime, radius, randRadius);
     208    this->getClassCName(), this->getCName(), lifeCycleTime, radius, randRadius);
    209209}
    210210
    … …  
    237237
    238238  PRINTF(4)("Color of %s::%s on timeslice %f is r:%f g:%f b:%f a:%f\n",
    239     this->getClassName(), this->getName(), lifeCycleTime, red, green, blue, alpha);
     239    this->getClassCName(), this->getCName(), lifeCycleTime, red, green, blue, alpha);
    240240}
    241241
    … …  
    278278    (*emitter)->updateNode(.1), (*emitter)->updateNode(.1);
    279279
    280   PRINTF(4)("Precaching %s::%s %d seconds %d timesPerSecond\n", this->getClassName(), this->getName(), seconds, ticksPerSecond);
     280  PRINTF(4)("Precaching %s::%s %d seconds %d timesPerSecond\n", this->getClassCName(), this->getCName(), seconds, ticksPerSecond);
    281281  for (unsigned int i = 0; i < seconds*ticksPerSecond; i++)
    282282    this->tick(1.0/(float)ticksPerSecond);
    … …  
    460460    int i = 1;
    461461    Particle* tmpPart = this->deadList;
    462     while (tmpPart = tmpPart->next) { ++i; }
     462    while ((tmpPart = tmpPart->next) != NULL) { ++i; }
    463463    PRINT(0)("count: %d\n", i);
    464464  }

  • trunk/src/lib/particles/plane_emitter.cc

    r7198 r9406  
    2525#include "stdlibincl.h"
    2626
    27 using namespace std;
     27
    2828
    2929

  • trunk/src/lib/particles/quick_animation.cc

    r7335 r9406  
    2020#include <algorithm>
    2121
    22 using namespace std;
     22
    2323
    2424/**

  • trunk/src/lib/particles/spark_particles.cc

    r7221 r9406  
    2929
    3030
    31 using namespace std;
     31
    3232
    3333CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);

  • trunk/src/lib/particles/sprite_particles.cc

    r7221 r9406  
    3333    ->defaultValues("maps/evil-flower.png");
    3434
    35 using namespace std;
     35
    3636
    3737/**
Note: See TracChangeset for help on using the changeset viewer.