From b37eb0b99cb1908e54ec74cd75ba6445b98eb223 Mon Sep 17 00:00:00 2001 From: D-AIRY <admin@ds-servers.com> Date: Tue, 30 Jun 2020 06:01:54 +0300 Subject: [PATCH] Fixed build on vs2019 --- source/gcore/camera.cpp | 17 ----------------- source/gcore/camera.h | 12 +++++------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/source/gcore/camera.cpp b/source/gcore/camera.cpp index 1e672aff2..a47564de2 100644 --- a/source/gcore/camera.cpp +++ b/source/gcore/camera.cpp @@ -365,23 +365,6 @@ float3 CFrustum::getCenter() const //########################################################################## -CCamera::CCamera() -{ - m_vPosition = float3(0.0f, 0.0f, 0.0f); - m_vRight = float3(1.0f, 0.0f, 0.0f); - m_vUp = float3(0.0f, 1.0f, 0.0f); - m_vLook = float3(0.0f, 0.0f, 1.0f); - - m_oFrustum = CFrustum(); - - m_vPitchYawRoll = float3_t(0, 0, 0); -} - -CCamera::~CCamera() -{ - -} - void CCamera::posLeftRight(float units) { m_vPosition += float3(m_vRight.x, 0.0f, m_vRight.z) * units; diff --git a/source/gcore/camera.h b/source/gcore/camera.h index 11d234ca4..58dd7a9c8 100644 --- a/source/gcore/camera.h +++ b/source/gcore/camera.h @@ -53,8 +53,6 @@ private: class CCamera: public ICamera { public: - CCamera(); - ~CCamera(); void Release() { delete this; @@ -98,13 +96,13 @@ public: protected: CFrustum m_oFrustum; //!< фрустум этой камеры - float3 m_vRight; - float3 m_vUp; - float3 m_vLook; + float3 m_vRight = float3(1.0f, 0.0f, 0.0f); + float3 m_vUp = float3(0.0f, 1.0f, 0.0f); + float3 m_vLook = float3(0.0f, 0.0f, 1.0f); - float3 m_vPosition; + float3 m_vPosition = float3(0.0f, 0.0f, 0.0f); - float3_t m_vPitchYawRoll; + float3_t m_vPitchYawRoll = float3(0.0f, 0.0f, 0.0f); float4x4 m_mView; -- GitLab