ldforge: comparison src/gldraw.cpp

-:51cca3ce540d
+:b230ae09c8e5
 		return;
 	}
 	if ((list == BFCFrontList || list == BFCBackList) &&
 		obj->getType() != LDObject::Line &&
-		obj->getType() != LDObject::CondLine) {
+		obj->getType() != LDObject::CndLine) {
 		if (list == GL::BFCFrontList)
 			qcol = QColor (40, 192, 0);
 		else
 			qcol = QColor (224, 0, 0);
 // =============================================================================
 // -----------------------------------------------------------------------------
 void GLRenderer::compileSubObject (LDObject* obj, const GLenum gltype) {
 	glBegin (gltype);
-	const short numverts = (obj->getType() != LDObject::CondLine) ? obj->vertices() : 2;
+	const short numverts = (obj->getType() != LDObject::CndLine) ? obj->vertices() : 2;
 	if (g_glInvert == false)
 		for (short i = 0; i < numverts; ++i)
 			compileVertex (obj->m_coords[i]);
 	else
 	switch (obj->getType()) {
 	case LDObject::Line:
 		compileSubObject (obj, GL_LINES);
 		break;
-	case LDObject::CondLine:
+	case LDObject::CndLine:
 		// Draw conditional lines with a dash pattern - however, use a full
 		// line when drawing a pick list to make selecting them easier.
 		if (list != GL::PickList) {
 			glLineStipple (1, 0x6666);
 			glEnable (GL_LINE_STIPPLE);
 	case LDObject::Quad:
 		compileSubObject (obj, GL_QUADS);
 		break;
 	case LDObject::Subfile: {
-			LDSubfileObject* ref = static_cast<LDSubfileObject*> (obj);
+			LDSubfile* ref = static_cast<LDSubfile*> (obj);
 			List<LDObject*> objs;
 			objs = ref->inlineContents (
-				LDSubfileObject::DeepInline |
+				LDSubfile::DeepInline |
-				LDSubfileObject::CacheInline |
+				LDSubfile::CacheInline |
-				LDSubfileObject::RendererInline);
+				LDSubfile::RendererInline);
 			bool oldinvert = g_glInvert;
 			if (ref->transform().determinant() < 0)
 				g_glInvert = !g_glInvert;
 			LDObject* prev = ref->prev();
-			if (prev && prev->getType() == LDObject::BFC && static_cast<LDBFCObject*> (prev)->type == LDBFCObject::InvertNext)
+			if (prev && prev->getType() == LDObject::BFC && static_cast<LDBFC*> (prev)->type == LDBFC::InvertNext)
 				g_glInvert = !g_glInvert;
 			for (LDObject* obj : objs) {
 				compileList (obj, list);
 				delete obj;
 	// Clean the selection and create the object
 	List<vertex>& verts = m_drawedVerts;
 	LDObject* obj = null;
 	if (m_rectdraw) {
-		LDQuadObject* quad = new LDQuadObject;
+		LDQuad* quad = new LDQuad;
 		// Copy the vertices from m_rectverts
 		updateRectVerts();
 		for (int i = 0; i < quad->vertices(); ++i)
 		obj = quad;
 	} else {
 		switch (verts.size()) {
 		case 1:
 			// 1 vertex - add a vertex object
-			obj = new LDVertexObject;
+			obj = new LDVertex;
-			static_cast<LDVertexObject*> (obj)->pos = verts[0];
+			static_cast<LDVertex*> (obj)->pos = verts[0];
 			obj->setColor (maincolor);
 			break;
 		case 2:
 			// 2 verts - make a line
-			obj = new LDLineObject (verts[0], verts[1]);
+			obj = new LDLine (verts[0], verts[1]);
 			obj->setColor (edgecolor);
 			break;
 		case 3:
 		case 4:
 			obj = (verts.size() == 3) ?
-				static_cast<LDObject*> (new LDTriangleObject) :
+				static_cast<LDObject*> (new LDTriangle) :
-				static_cast<LDObject*> (new LDQuadObject);
+				static_cast<LDObject*> (new LDQuad);
 			obj->setColor (maincolor);
 			for (ushort i = 0; i < obj->vertices(); ++i)
 				obj->setVertex (i, verts[i]);
 			break;
 	if (obj->vertices() >= 2) {
 		for (int i = 0; i < obj->vertices(); ++i)
 			verts << obj->getVertex (i);
 	} elif (obj->getType() == LDObject::Subfile) {
-		LDSubfileObject* ref = static_cast<LDSubfileObject*> (obj);
+		LDSubfile* ref = static_cast<LDSubfile*> (obj);
-		List<LDObject*> objs = ref->inlineContents (LDSubfileObject::DeepCacheInline);
+		List<LDObject*> objs = ref->inlineContents (LDSubfile::DeepCacheInline);
 		for(LDObject* obj : objs) {
 			verts << getVertices (obj);
 			delete obj;
 		}
 	ev->accept();
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-LDOverlayObject* GLRenderer::findOverlayObject (GLRenderer::Camera cam) {
+LDOverlay* GLRenderer::findOverlayObject (GLRenderer::Camera cam) {
-	LDOverlayObject* ovlobj = null;
+	LDOverlay* ovlobj = null;
 	for (LDObject * obj : *file()) {
-		if (obj->getType() == LDObject::Overlay && static_cast<LDOverlayObject*> (obj)->camera() == cam) {
+		if (obj->getType() == LDObject::Overlay && static_cast<LDOverlay*> (obj)->camera() == cam) {
-			ovlobj = static_cast<LDOverlayObject*> (obj);
+			ovlobj = static_cast<LDOverlay*> (obj);
 			break;
 		}
 	}
 	return ovlobj;
 	for (Camera cam : g_Cameras) {
 		if (cam == Free)
 			continue;
 		overlayMeta& meta = m_overlays[cam];
-		LDOverlayObject* ovlobj = findOverlayObject (cam);
+		LDOverlay* ovlobj = findOverlayObject (cam);
 		if (!ovlobj && meta.img) {
 			delete meta.img;
 			meta.img = null;
 		} elif (ovlobj && (!meta.img || meta.fname != ovlobj->filename()))
 	for (Camera cam : g_Cameras) {
 		if (cam == Free)
 			continue;
 		overlayMeta& meta = m_overlays[cam];
-		LDOverlayObject* ovlobj = findOverlayObject (cam);
+		LDOverlay* ovlobj = findOverlayObject (cam);
 		if (!meta.img && ovlobj) {
 			// If this is the last overlay image, we need to remove the empty space after it as well.
 			LDObject* nextobj = ovlobj->next();
 			m_file->forgetObject (ovlobj);
 			delete ovlobj;
 		} elif (meta.img && !ovlobj) {
 			// Inverse case: image is there but the overlay object is
 			// not, thus create the object.
-			ovlobj = new LDOverlayObject;
+			ovlobj = new LDOverlay;
 			// Find a suitable position to place this object. We want to place
 			// this into the header, which is everything up to the first scemantic
 			// object. If we find another overlay object, place this object after
 			// the last one found. Otherwise, place it before the first schemantic
 				file()->insertObj (lastOverlay + 1, ovlobj);
 			else {
 				file()->insertObj (i, ovlobj);
 				if (found)
-					file()->insertObj (i + 1, new LDEmptyObject);
+					file()->insertObj (i + 1, new LDEmpty);
 			}
 		}
 		if (meta.img && ovlobj) {
 			ovlobj->setCamera (cam);

Mercurial > ldforge / file comparison

comparison: src/gldraw.cpp

src/gldraw.cpp