Browse Source

move scalar initializers to TrailPoint declaration; make TrailPoint's default constructor explicitly-defaulted

Ricardo Abreu 8 years ago
parent
commit
29dce85939
2 changed files with 6 additions and 16 deletions
  1. 1 11
      Source/Urho3D/Graphics/RibbonTrail.cpp
  2. 5 5
      Source/Urho3D/Graphics/RibbonTrail.h

+ 1 - 11
Source/Urho3D/Graphics/RibbonTrail.cpp

@@ -53,19 +53,9 @@ inline bool CompareTails(TrailPoint* lhs, TrailPoint* rhs)
     return lhs->sortDistance_ > rhs->sortDistance_;
 }
 
-TrailPoint::TrailPoint() :
-    TrailPoint{Vector3::ZERO, Vector3::ZERO}
-{
-}
-
 TrailPoint::TrailPoint(const Vector3& position, const Vector3& forward) :
     position_{position},
-    forward_{forward},
-    parentPos_{Vector3::ZERO},
-    elapsedLength_{0.0f},
-    next_{nullptr},
-    lifetime_{0.0f},
-    sortDistance_{0.0f}
+    forward_{forward}
 {
 }
 

+ 5 - 5
Source/Urho3D/Graphics/RibbonTrail.h

@@ -40,7 +40,7 @@ class VertexBuffer;
 struct URHO3D_API TrailPoint
 {
     /// Construct a zero-initialized TrailPoint
-    TrailPoint();
+    TrailPoint() = default;
     /// Construct a TrailPoint with the given position and forward vector
     TrailPoint(const Vector3& position, const Vector3& forward);
     /// Position.
@@ -50,13 +50,13 @@ struct URHO3D_API TrailPoint
     /// Parent position. Trail bone type uses this.
     Vector3 parentPos_;
     /// Elapsed length inside the trail.
-    float elapsedLength_;
+    float elapsedLength_ = 0.0f;
     /// Next point to make a tail.
-    TrailPoint* next_;
+    TrailPoint* next_ = nullptr;
     /// Tail time to live.
-    float lifetime_;
+    float lifetime_ = 0.0f;
     /// Distance for sorting.
-    float sortDistance_;
+    float sortDistance_ = 0.0f;
 };
 
 /// Drawable component that creates a tail.