diff --git a/src/magnum_item.cpp b/src/magnum_item.cpp index 55e99c1..087dc02 100644 --- a/src/magnum_item.cpp +++ b/src/magnum_item.cpp @@ -115,7 +115,7 @@ void MagnumItem::mouseMoveEvent(QMouseEvent *evt) { void MagnumItem::wheelEvent(QWheelEvent *evt) { if (auto& camera = m_renderer->camera()) { - const Float delta = evt->delta(); + const Float delta = evt->angleDelta().y(); if (Math::abs(delta) < 1.0e-2f) return; camera->zoom(delta*.01f); diff --git a/src/magnum_render.cpp b/src/magnum_render.cpp index 6aa5613..a2e7302 100644 --- a/src/magnum_render.cpp +++ b/src/magnum_render.cpp @@ -16,9 +16,7 @@ static const auto HUE_BG = 210.0_degf; static const auto COLOR_BG = Color4::fromHsv({HUE_BG, .3f, .9f}, 1.f); static const auto COLOR_GRID = Color4::fromHsv({HUE_BG, .3f, .7f}, 1.f); -MagnumRenderer::MagnumRenderer() : - m_init(false), - m_count(1) {} +MagnumRenderer::MagnumRenderer() : m_init(false) {} MagnumRenderer::~MagnumRenderer() { delete m_subjectObject; @@ -76,7 +74,7 @@ void MagnumRenderer::lazyInitialize() { .setLightColor(Color3{1.f}) .setLightPosition(Vector3{-100.f, 100.f, 50.f}); - m_subjectDrawable = new SubjectDrawable{*m_subjectObject, m_subjectShader, m_subject, m_drawables, m_count}; + m_subjectDrawable = new SubjectDrawable{*m_subjectObject, m_subjectShader, m_subject, m_drawables, 1, 0, 0}; } // The Grid diff --git a/src/magnum_render.h b/src/magnum_render.h index 61d4d8c..9bb7c2b 100644 --- a/src/magnum_render.h +++ b/src/magnum_render.h @@ -38,11 +38,13 @@ class SubjectDrawable : public SceneGraph::Drawable3D { public: explicit SubjectDrawable(Object3D &object, Shaders::Phong &shader, GL::Mesh &mesh, SceneGraph::DrawableGroup3D &drawables, - int count) + int count, float hue, float t) : SceneGraph::Drawable3D{object, &drawables}, m_shader(shader), m_mesh(mesh), - m_count(count) {} + m_count(count), + m_hue(hue), + m_t(t) {} void draw(const Matrix4 &transformation, SceneGraph::Camera3D &camera); @@ -92,7 +94,6 @@ private: void prepGLState(); bool m_init; - int m_count; Platform::GLContext *m_ctx{nullptr}; GL::Framebuffer m_FBO{NoCreate}; diff --git a/src/qml/main.qml b/src/qml/main.qml index 259c4c8..51f2f4b 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -108,6 +108,7 @@ ApplicationWindow { Layout.fillHeight: true Layout.fillWidth: true + t: 0 hue: hue.value count: count.value