diff options
Diffstat (limited to 'src/Engine')
| -rw-r--r-- | src/Engine/Engine.cpp | 2 | ||||
| -rw-r--r-- | src/Engine/Engine.h | 1 | ||||
| -rw-r--r-- | src/Engine/Object.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Engine/Engine.cpp b/src/Engine/Engine.cpp index 799a516..f6c594c 100644 --- a/src/Engine/Engine.cpp +++ b/src/Engine/Engine.cpp @@ -24,8 +24,6 @@ namespace Donut m_Objects = { - { glm::vec4(4e11f, 0.00f, 0.00f, 4e10f), glm::vec4(1, 1, 0, 1), static_cast<float>(1.98892e30) }, - { glm::vec4(0.00f, 0.00f, 4e11f, 4e10f), glm::vec4(1, 0, 0, 1), static_cast<float>(1.98892e30) }, { glm::vec4(0.00f, 0.00f, 0.00f, m_SagA.m_Rs), glm::vec4(0, 0, 0, 1), static_cast<float>(m_SagA.m_Mass) } }; diff --git a/src/Engine/Engine.h b/src/Engine/Engine.h index 7b4ced4..05bd96f 100644 --- a/src/Engine/Engine.h +++ b/src/Engine/Engine.h @@ -91,7 +91,6 @@ namespace Donut int GetComputeWidth() const { return (m_Width * m_ComputeHeight) / m_Height; } void UpdateComputeDimensions(); - // Simulation parameters int GetMaxStepsMoving() const { return m_MaxStepsMoving; } int GetMaxStepsStatic() const { return m_MaxStepsStatic; } float GetEarlyExitDistance() const { return m_EarlyExitDistance; } diff --git a/src/Engine/Object.h b/src/Engine/Object.h index 7e620c4..842708e 100644 --- a/src/Engine/Object.h +++ b/src/Engine/Object.h @@ -22,6 +22,7 @@ namespace Donut float m_Specular; float m_Emission; + Material() : m_Color(1.0f, 1.0f, 1.0f), m_Specular(0.5f), m_Emission(0.0f) { } Material(glm::vec3 c, float s, float e) : m_Color(c), m_Specular(s), @@ -35,6 +36,7 @@ namespace Donut float m_Radius; Material m_Material; + Object() : m_Centre(0.0f, 0.0f, 0.0f), m_Radius(1.0f), m_Material() { } Object(glm::vec3 c, float r, Material m) : m_Centre(c), m_Radius(r), |