From 7177295cbb98c7f0f303d205fdcad22a3aa157a7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 18 Jun 2020 13:32:44 -0400
Subject: [PATCH] CCamera: Make use of in-class initializers

Same behavior, less code.
---
 src/Core/Render/CCamera.cpp | 18 ++----------------
 src/Core/Render/CCamera.h   | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/Core/Render/CCamera.cpp b/src/Core/Render/CCamera.cpp
index b0de671d..aae5e445 100644
--- a/src/Core/Render/CCamera.cpp
+++ b/src/Core/Render/CCamera.cpp
@@ -4,17 +4,7 @@
 #include <Common/Math/MathUtil.h>
 
 CCamera::CCamera()
-    : mMode(ECameraMoveMode::Free)
-    , mPosition(0)
-    , mAspectRatio(1.7777777f)
-    , mYaw(-Math::skHalfPi)
-    , mPitch(0.f)
-    , mMoveSpeed(1.f)
-    , mLookSpeed(1.f)
-    , mTransformDirty(true)
-    , mViewDirty(true)
-    , mProjectionDirty(true)
-    , mFrustumPlanesDirty(true)
+    : mYaw(-Math::skHalfPi)
 {
     ResetOrbit();
 }
@@ -22,12 +12,8 @@ CCamera::CCamera()
 // todo: make it actually look at the target!
 // don't actually use this constructor, it's unfinished and won't work properly
 CCamera::CCamera(CVector3f Position, CVector3f /*Target*/)
-    : mMode(ECameraMoveMode::Free)
-    , mPosition(Position)
+    : mPosition(Position)
     , mYaw(-Math::skHalfPi)
-    , mPitch(0.f)
-    , mMoveSpeed(1.f)
-    , mLookSpeed(1.f)
 {
 }
 
diff --git a/src/Core/Render/CCamera.h b/src/Core/Render/CCamera.h
index bcd0de0e..4fc995c3 100644
--- a/src/Core/Render/CCamera.h
+++ b/src/Core/Render/CCamera.h
@@ -26,28 +26,28 @@ enum class ECameraMoveMode
  * const function). */
 class CCamera
 {
-    ECameraMoveMode mMode;
+    ECameraMoveMode mMode{ECameraMoveMode::Free};
     mutable CVector3f mPosition;
     mutable CVector3f mDirection;
     mutable CVector3f mRightVector;
     mutable CVector3f mUpVector;
-    float mAspectRatio;
+    float mAspectRatio = 1.7777777f;
 
     float mYaw;
-    float mPitch;
+    float mPitch = 0.0f;
     CVector3f mOrbitTarget;
-    mutable float mOrbitDistance;
-    float mMoveSpeed;
-    float mLookSpeed;
+    mutable float mOrbitDistance = 0.0f;
+    float mMoveSpeed = 1.0f;
+    float mLookSpeed = 1.0f;
 
     mutable CMatrix4f mViewMatrix;
     mutable CMatrix4f mProjectionMatrix;
     mutable CFrustumPlanes mFrustumPlanes;
 
-    mutable bool mTransformDirty;
-    mutable bool mViewDirty;
-    mutable bool mProjectionDirty;
-    mutable bool mFrustumPlanesDirty;
+    mutable bool mTransformDirty = true;
+    mutable bool mViewDirty = true;
+    mutable bool mProjectionDirty = true;
+    mutable bool mFrustumPlanesDirty = true;
 
 public:
     CCamera();