diff --git a/App/GameLayer.cpp b/App/GameLayer.cpp index c7a867724c27550b602a2eff5fc5e088e7913209..295ee0bc1f958266e34a5c702c4a13d1c43c2eb4 100644 --- a/App/GameLayer.cpp +++ b/App/GameLayer.cpp @@ -29,12 +29,12 @@ const QPong::Particle::Properties initialParticleSettings = { .size = 512, .position = {0.0, 0.0, 0.0}, .momentum = {0.0, 0.0, 0.0}, - .pointUnsharpness = 64.0, + .sharpness = 64.0, .startValue = 0.01, .hbar = 0.000125 }; -const QPong::Particle::GameOptions intialOptions = { +const QPong::Particle::GameOptions initialOptions = { .potentialsEnabled = true, .absorbtionEnabled = true, .momentumEnabled = false @@ -46,7 +46,7 @@ QPong::GameLayer::GameLayer(int resolution, int threads) , m_propagate{false} , m_leftBat(-0.8, 0.0, Key::W, Key::S) , m_rightBat(0.8, 0.0, Key::Up, Key::Down) - , m_options{intialOptions} + , m_options{initialOptions} , m_properties {initialParticleSettings} , m_speedScale{5.0f} , m_randomMomentum {true} @@ -245,14 +245,14 @@ void QPong::GameLayer::onGuiRender() ImGui::DragFloat2("Momentum [x,y]", glm::value_ptr(m_properties.momentum), 0.01f, -3.0f, 3.0f); ImGui::Checkbox("Random Momentum", &m_randomMomentum); - float pointUnsharpness = m_properties.pointUnsharpness; - if (ImGui::DragFloat("Sharpness", &pointUnsharpness, 1.0f, 5.0f, 1000.0f)) + float sharpness = m_properties.sharpness; + if (ImGui::DragFloat("Sharpness", &sharpness, 1.0f, 5.0f, 1000.0f)) { - m_properties.pointUnsharpness = pointUnsharpness; + m_properties.sharpness = sharpness; } // Select hbar, changes apply on the fly. float hbar = m_properties.hbar; - if (ImGui::DragFloat("hbar", &hbar, 0.000001f, 0.000001f, 1.0f, "%.6f")) + if (ImGui::DragFloat("hbar", &hbar, 0.0000001f, 0.0000001f, 1.0f, "%.7f")) { m_properties.hbar = hbar; } diff --git a/QPong/Particle.cpp b/QPong/Particle.cpp index 0feee44127fe83f56b9e7a8f973f0b4016f84df6..3d036b5daca4b144bc42fcc12e38214754370add 100644 --- a/QPong/Particle.cpp +++ b/QPong/Particle.cpp @@ -154,7 +154,7 @@ void Particle::initialiseParticleMomentum() const double py0 = m_properties.momentum.y / 20.0; const double x0 = m_properties.position.x; const double y0 = m_properties.position.y; - const double lambda = m_properties.pointUnsharpness; + const double lambda = m_properties.sharpness; double sum{0.0}; double m_particleAbsoluteSumStart = 0.0; diff --git a/QPong/Particle.hpp b/QPong/Particle.hpp index 9c7c8c806b00512375fbccad5cd0e3ff453b36bd..ce14cadbe337dbc6c499ad805a7dd5d66b1c6e0b 100644 --- a/QPong/Particle.hpp +++ b/QPong/Particle.hpp @@ -33,7 +33,7 @@ namespace QPong int size; glm::vec3 position; glm::vec3 momentum; - double pointUnsharpness; + double sharpness; double startValue; double hbar; int threads;