Changeset 3280 for code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc

Timestamp:

Jul 12, 2009, 11:58:01 PM (15 years ago)

Author:

rgrieder

Message:

Merged most of the core4 revisions back to the trunk except for:

• orxonox_cast
• all the radical changes in the input library

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -53 +53 @@
 
         this->particles_ = 0;
-        this->LOD_ = LODParticle::normal;
+        this->LOD_ = LODParticle::Normal;
 
         this->registerVariables();
@@ -71 +71 @@
         SUPER(ParticleEmitter, XMLPort, xmlelement, mode);
 
-        XMLPortParam(ParticleEmitter, "lod",    setLODxml, getLODxml, xmlelement, mode).defaultValues(LODParticle::normal);
+        XMLPortParam(ParticleEmitter, "lod",    setLODxml, getLODxml, xmlelement, mode).defaultValues(LODParticle::Normal);
         XMLPortParam(ParticleEmitter, "source", setSource, getSource, xmlelement, mode);
     }
@@ -77 +77 @@
     void ParticleEmitter::registerVariables()
     {
-        registerVariable(this->source_, variableDirection::toclient, new NetworkCallback<ParticleEmitter>(this, &ParticleEmitter::sourceChanged));
-        registerVariable((int&)(this->LOD_),    variableDirection::toclient, new NetworkCallback<ParticleEmitter>(this, &ParticleEmitter::LODchanged));
+        registerVariable(this->source_, VariableDirection::ToClient, new NetworkCallback<ParticleEmitter>(this, &ParticleEmitter::sourceChanged));
+        registerVariable((int&)(this->LOD_),    VariableDirection::ToClient, new NetworkCallback<ParticleEmitter>(this, &ParticleEmitter::LODchanged));
     }