diff -r 6988973515d2 -r ca23936b455b src/gl/partrenderer.h --- a/src/gl/partrenderer.h Wed May 25 20:36:34 2022 +0300 +++ b/src/gl/partrenderer.h Mon Jun 06 22:01:22 2022 +0300 @@ -1,15 +1,10 @@ #pragma once #include -#include -#include -#include -#include -#include -#include -#include #include "main.h" #include "gl/common.h" #include "gl/compiler.h" +#include "documentmanager.h" +#include "types/boundingbox.h" class PartRenderer : public QOpenGLWidget { @@ -22,9 +17,9 @@ QWidget* parent = nullptr); ~PartRenderer() override; void setRenderPreferences(const gl::RenderPreferences& newPreferences); - ldraw::id_t getHighlightedObject() const; + ModelId getHighlightedObject() const; protected: - ldraw::id_t pick(QPoint where); + ModelId pick(QPoint where); void initializeGL() override; void resizeGL(int width, int height) override; void paintGL() override; @@ -35,7 +30,7 @@ const ldraw::ColorTable& colorTable; BoundingBox boundingBox; gl::ModelShaders shaders; - ldraw::id_t highlighted = ldraw::NULL_ID; + ModelId highlighted = {0}; std::optional screenToModelCoordinates(const QPoint& point, const geom::Plane& plane) const; QPointF modelToScreenCoordinates(const glm::vec3& point) const; geom::Line<3> cameraLine(const QPoint& point) const;