diff -r 0f80a2e5e42b -r 1a9eac27698d src/gl/partrenderer.h --- a/src/gl/partrenderer.h Fri Feb 07 02:02:16 2020 +0200 +++ b/src/gl/partrenderer.h Fri Feb 07 23:59:06 2020 +0200 @@ -22,7 +22,6 @@ QWidget* parent = nullptr); ~PartRenderer() override; void setRenderPreferences(const gl::RenderPreferences& newPreferences); - void setHighlight(ldraw::Id highlightedId); protected: ldraw::Id pick(const QPoint& where); void initializeGL() override; @@ -30,21 +29,21 @@ void paintGL() override; void mouseMoveEvent(QMouseEvent* event) override; void wheelEvent(QWheelEvent* event) override; + Model* const model; + DocumentManager* const documents; + const ldraw::ColorTable& colorTable; + gl::Compiler* const compiler; + ldraw::Id highlighted = ldraw::NULL_ID; private: void setFragmentStyle(gl::FragmentStyle fragStyle); void renderAllArrays(); void renderScene(); void updateViewMatrix(); - Model* const model; - DocumentManager* const documents; - const ldraw::ColorTable& colorTable; QPointF lastMousePosition; - gl::Compiler* compiler; gl::RenderPreferences renderPreferences; glm::mat4 projectionMatrix; glm::mat4 viewMatrix; glm::quat modelQuaternion; - ldraw::Id highlighted = ldraw::NULL_ID; static constexpr double MIN_ZOOM = 0.0; static constexpr double MAX_ZOOM = 3.0; double zoom = 1.0;