Mercurial > ldforge / changeset

--- a/src/glRenderer.cc	Sun Apr 27 04:23:41 2014 +0300
+++ b/src/glRenderer.cc	Sun Apr 27 04:44:00 2014 +0300
@@ -1647,7 +1647,6 @@
 void GLRenderer::compileObject (LDObject* obj)
 {
 	compiler()->stageForCompilation (obj);
-	obj->setGLInit (true);
 }
 
 // =============================================================================

--- a/src/glRenderer.h	Sun Apr 27 04:23:41 2014 +0300
+++ b/src/glRenderer.h	Sun Apr 27 04:44:00 2014 +0300
@@ -182,7 +182,6 @@
 		void           updateOverlayObjects();
 		void           zoomNotch (bool inward);
 
-		static void    deleteLists (LDObject* obj);
 		static QColor  getMainColor();
 
 	protected:
@@ -245,32 +244,18 @@
 		// Clamps an angle to [0, 360]
 		void           clampAngle (double& angle) const;
 
-		// Compile one of the lists of an object
-		void           compileList (LDObject* obj, const ListType list);
-
-		// Sub-routine for object compiling
-		void           compileSubObject (LDObject* obj, const GLenum gltype);
-
-		// Compile a single vertex to a list
-		void           compileVertex (const Vertex& vrt);
-
 		// Convert a 2D point to a 3D point
 		Vertex         coordconv2_3 (const QPoint& pos2d, bool snap) const;
 
 		// Draw a VBO array
 		void           drawVBOs (EVBOSurface surface, EVBOComplement colors, GLenum type);
 
-		// Determine which color to draw text with
-		QColor         getTextPen() const;
-
 		// Convert a 3D point to a 2D point
 		QPoint         coordconv3_2 (const Vertex& pos3d) const;
 
 		// Perform object selection
 		void           pick (int mouseX, int mouseY);
 
-		// Set the color to an object list
-		void           setObjectColor (LDObject* obj, const ListType list);
 		void           zoomToFit();
 		void           zoomAllToFit();
 

--- a/src/ldObject.cc	Sun Apr 27 04:23:41 2014 +0300
+++ b/src/ldObject.cc	Sun Apr 27 04:44:00 2014 +0300
@@ -42,7 +42,6 @@
 	m_isSelected (false),
 	m_parent (null),
 	m_document (null),
-	m_isGLInit (false),
 	qObjListEntry (null)
 {
 	memset (m_coords, 0, sizeof m_coords);
@@ -846,7 +845,6 @@
 	/*
 	LDObject* copy = clone();
 	copy->setFile (null);
-	copy->setGLInit (false);
 	copy->chooseID();
 	copy->setSelected (false);
 	*/

--- a/src/ldObject.h	Sun Apr 27 04:23:41 2014 +0300
+++ b/src/ldObject.h	Sun Apr 27 04:44:00 2014 +0300
@@ -72,7 +72,6 @@
 	PROPERTY (public,		LDDocument*,	document,		setDocument,	STOCK_WRITE)
 	PROPERTY (private,		int,			id,				setID,			STOCK_WRITE)
 	PROPERTY (public,		int,			color,			setColor,		CUSTOM_WRITE)
-	PROPERTY (public,		bool,			isGLInit,		setGLInit,		STOCK_WRITE)
 	PROPERTY (private,		QColor,			randomColor,	setRandomColor,	STOCK_WRITE)
 
 	public:
@@ -176,11 +175,7 @@
 		static LDObject* fromID (int id);
 		LDPolygon* getPolygon();
 
-		// TODO: make these private!
-		// OpenGL list for this object
-		uint glLists[4];
-
-		// Object list entry for this object
+		// TODO: make this private!
 		QListWidgetItem* qObjListEntry;
 
 	protected: