ldforge: comparison src/glRenderer.cc

-:af81220741d9
+:1a6f1997fcbe
 	if (not additive)
 	{
 		LDObjectList oldsel = Selection();
 		CurrentDocument()->clearSelection();
-		for (LDObjectPtr obj : oldsel)
+		for (LDObject* obj : oldsel)
 			compileObject (obj);
 	}
 	// Paint the picking scene
 	setPicking (true);
 	uchar* pixelptr = &pixeldata[0];
 	// Read pixels from the color buffer.
 	glReadPixels (x0, m_height - y1, areawidth, areaheight, GL_RGBA, GL_UNSIGNED_BYTE, pixeldata);
-	LDObjectPtr removedObj;
+	LDObject* removedObj;
 	QList<qint32> indices;
 	// Go through each pixel read and add them to the selection.
 	// Note: black is background, those indices are skipped.
 	for (qint32 i = 0; i < numpixels; ++i)
 	RemoveDuplicates (indices);
 	for (qint32 idx : indices)
 	{
-		LDObjectPtr obj = LDObject::fromID (idx);
+		LDObject* obj = LDObject::fromID (idx);
 		assert (obj != null);
 		// If this is an additive single pick and the object is currently selected,
 		// we remove it from selection instead.
 		if (additive)
 	// Update everything now.
 	g_win->updateSelection();
 	// Recompile the objects now to update their color
-	for (LDObjectPtr obj : Selection())
+	for (LDObject* obj : Selection())
 		compileObject (obj);
 	if (removedObj)
 		compileObject (removedObj);
 }
 //
 // Simpler version of GLRenderer::pick which simply picks whatever object on the screen
 //
-LDObjectPtr GLRenderer::pickOneObject (int mouseX, int mouseY)
+LDObject* GLRenderer::pickOneObject (int mouseX, int mouseY)
 {
 	uchar pixel[4];
 	doMakeCurrent();
 	setPicking (true);
 	drawGLScene();
 	glReadPixels (mouseX, m_height - mouseY, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
-	LDObjectPtr obj = LDObject::fromID ((pixel[0] * 0x10000) + (pixel[1] * 0x100) + pixel[2]);
+	LDObject* obj = LDObject::fromID ((pixel[0] * 0x10000) + (pixel[1] * 0x100) + pixel[2]);
 	setPicking (false);
 	repaint();
 	return obj;
 }
 	return (Axis) (3 - cam->axisX - cam->axisY);
 }
 // =============================================================================
 //
-static QList<Vertex> GetVerticesOf (LDObjectPtr obj)
+static QList<Vertex> GetVerticesOf (LDObject* obj)
 {
 	QList<Vertex> verts;
 	if (obj->numVertices() >= 2)
 	{
 		for (int i = 0; i < obj->numVertices(); ++i)
 			verts << obj->vertex (i);
 	}
-	elif (obj->type() == OBJ_Subfile)
+	else if (obj->type() == OBJ_Subfile)
 	{
-		LDSubfilePtr ref = obj.staticCast<LDSubfile>();
+		for (LDObject* obj : static_cast<LDSubfile*> (obj)->inlineContents (true, false))
-		LDObjectList objs = ref->inlineContents (true, false);
-		for (LDObjectPtr obj : objs)
 		{
 			verts << GetVerticesOf (obj);
 			obj->destroy();
 		}
 	}
 	return verts;
 }
 // =============================================================================
 //
-void GLRenderer::compileObject (LDObjectPtr obj)
+void GLRenderer::compileObject (LDObject* obj)
 {
 	compiler()->stageForCompilation (obj);
 }
 // =============================================================================
 //
-void GLRenderer::forgetObject (LDObjectPtr obj)
+void GLRenderer::forgetObject (LDObject* obj)
 {
 	if (compiler() != null)
 		compiler()->dropObject (obj);
 }
 // =============================================================================
 //
 LDOverlayPtr GLRenderer::findOverlayObject (ECamera cam)
 {
-	for (LDObjectPtr obj : document()->objects())
+	for (LDObject* obj : document()->objects())
 	{
-		LDOverlayPtr ovlobj = obj.dynamicCast<LDOverlay>();
+		LDOverlayPtr overlay = dynamic_cast<LDOverlay*> (obj);
-		if (ovlobj != null and obj.staticCast<LDOverlay>()->camera() == cam)
+		if (overlay and overlay->camera() == cam)
-			return ovlobj;
+			return overlay;
 	}
-	return LDOverlayPtr();
+	return nullptr;
 }
 // =============================================================================
 //
 // Read in overlays from the current file and update overlay info accordingly.
 		LDOverlayPtr ovlobj = findOverlayObject (cam);
 		if (meta.img == null and ovlobj != null)
 		{
 			// If this is the last overlay image, we need to remove the empty space after it as well.
-			LDObjectPtr nextobj = ovlobj->next();
+			LDObject* nextobj = ovlobj->next();
 			if (nextobj and nextobj->type() == OBJ_Empty)
 				nextobj->destroy();
 			// If the overlay object was there and the overlay itself is
 			int i, lastOverlay = -1;
 			bool found = false;
 			for (i = 0; i < document()->getObjectCount(); ++i)
 			{
-				LDObjectPtr obj = document()->getObject (i);
+				LDObject* obj = document()->getObject (i);
 				if (obj->isScemantic())
 				{
 					found = true;
 					break;

Mercurial > ldforge / file comparison

comparison: src/glRenderer.cc

src/glRenderer.cc