src/gl/partrenderer.h

changeset 51
1a9eac27698d
parent 48
3c10f0e2fbe0
child 53
3af627f7a40f
--- 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;

mercurial