Changeset 10768 for code/branches/cpp11_v2/src/orxonox/graphics

Timestamp:

Nov 6, 2015, 10:54:34 PM (10 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/graphics

Files:

• Backlight.cc (modified) (1 diff)
• Light.cc (modified) (1 diff)
• Model.cc (modified) (1 diff)
• ParticleEmitter.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc

@@ -51 +51 @@
         RegisterObject(Backlight);
 
-        this->ribbonTrail_ = 0;
-        this->ribbonTrailNode_ = 0;
+        this->ribbonTrail_ = nullptr;
+        this->ribbonTrailNode_ = nullptr;
 
         this->width_ = 0;

code/branches/cpp11_v2/src/orxonox/graphics/Light.cc

@@ -53 +53 @@
         RegisterObject(Light);
 
-        this->light_ = 0;
+        this->light_ = nullptr;
         this->diffuse_ = ColourValue::White;
         this->specular_ = ColourValue::White;

code/branches/cpp11_v2/src/orxonox/graphics/Model.cc

@@ -134 +134 @@
             Level* level = this->getLevel();
 
-            assert( level != 0 );
+            assert( level != nullptr );
 
             MeshLodInformation* lodInfo = level->getLodInfo(this->meshSrc_);

code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc

@@ -52 +52 @@
             ThrowException(AbortLoading, "Can't create ParticleEmitter, no scene or no scene manager given.");
 
-        this->particles_ = 0;
+        this->particles_ = nullptr;
         this->LOD_ = LODParticle::Normal;
 
@@ -102 +102 @@
         {
             delete this->particles_;
-            this->particles_ = 0;
+            this->particles_ = nullptr;
         }