ldforge: comparison src/ldtypes.cpp

-:51cca3ce540d
+:b230ae09c8e5
 	vertex v = getVertex (i);
 	v[ax] = value;
 	setVertex (i, v);
 }
-LDErrorObject::LDErrorObject() {}
+LDError::LDError() {}
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDCommentObject::raw() {
+str LDComment::raw() {
 	return fmt ("0 %1", text);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDSubfileObject::raw() {
+str LDSubfile::raw() {
 	str val = fmt ("1 %1 %2 ", color(), position());
 	val += transform().stringRep();
 	val += ' ';
 	val += fileInfo()->name();
 	return val;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDLineObject::raw() {
+str LDLine::raw() {
 	str val = fmt ("2 %1", color());
 	for (ushort i = 0; i < 2; ++i)
 		val += fmt (" %1", getVertex (i));
 	return val;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDTriangleObject::raw() {
+str LDTriangle::raw() {
 	str val = fmt ("3 %1", color());
 	for (ushort i = 0; i < 3; ++i)
 		val += fmt (" %1", getVertex (i));
 	return val;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDQuadObject::raw() {
+str LDQuad::raw() {
 	str val = fmt ("4 %1", color());
 	for (ushort i = 0; i < 4; ++i)
 		val += fmt (" %1", getVertex (i));
 	return val;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDCondLineObject::raw() {
+str LDCndLine::raw() {
 	str val = fmt ("5 %1", color());
 	// Add the coordinates
 	for (ushort i = 0; i < 4; ++i)
 		val += fmt (" %1", getVertex (i));
 	return val;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDErrorObject::raw() {
+str LDError::raw() {
 	return contents;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDVertexObject::raw() {
+str LDVertex::raw() {
 	return fmt ("0 !LDFORGE VERTEX %1 %2", color(), pos);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDEmptyObject::raw() {
+str LDEmpty::raw() {
 	return "";
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-const char* LDBFCObject::statements[] = {
+const char* LDBFC::statements[] = {
 	"CERTIFY CCW",
 	"CCW",
 	"CERTIFY CW",
 	"CW",
 	"NOCERTIFY",
 	"CLIP CCW",
 	"CLIP CW",
 	"NOCLIP",
 };
-str LDBFCObject::raw() {
+str LDBFC::raw() {
-	return fmt ("0 BFC %1", LDBFCObject::statements[type]);
+	return fmt ("0 BFC %1", LDBFC::statements[type]);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-List<LDTriangleObject*> LDQuadObject::splitToTriangles() {
+List<LDTriangle*> LDQuad::splitToTriangles() {
 	// Create the two triangles based on this quadrilateral:
 	// 0---3       0---3    3
 	// |   |       |  /    /|
 	// |   |  ==>  | /    / |
 	// |   |       |/    /  |
 	// 1---2       1    1---2
-	LDTriangleObject* tri1 = new LDTriangleObject (getVertex (0), getVertex (1), getVertex (3));
+	LDTriangle* tri1 = new LDTriangle (getVertex (0), getVertex (1), getVertex (3));
-	LDTriangleObject* tri2 = new LDTriangleObject (getVertex (1), getVertex (2), getVertex (3));
+	LDTriangle* tri2 = new LDTriangle (getVertex (1), getVertex (2), getVertex (3));
 	// The triangles also inherit the quad's color
 	tri1->setColor (color());
 	tri2->setColor (color());
-	List<LDTriangleObject*> triangles;
+	List<LDTriangle*> triangles;
 	triangles << tri1;
 	triangles << tri2;
 	return triangles;
 }
 	file()->addToHistory (new SwapHistory (id(), other->id()));
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-LDLineObject::LDLineObject (vertex v1, vertex v2) {
+LDLine::LDLine (vertex v1, vertex v2) {
 	setVertex (0, v1);
 	setVertex (1, v2);
 }
 // =============================================================================
 // =============================================================================
 // -----------------------------------------------------------------------------
 static void transformObject (LDObject* obj, matrix transform, vertex pos, short parentcolor) {
 	switch (obj->getType()) {
 	case LDObject::Line:
-	case LDObject::CondLine:
+	case LDObject::CndLine:
 	case LDObject::Triangle:
 	case LDObject::Quad:
 		for (short i = 0; i < obj->vertices(); ++i) {
 			vertex v = obj->getVertex (i);
 			v.transform (transform, pos);
 		break;
 	case LDObject::Subfile:
 		{
-			LDSubfileObject* ref = static_cast<LDSubfileObject*> (obj);
+			LDSubfile* ref = static_cast<LDSubfile*> (obj);
 			matrix newMatrix = transform * ref->transform();
 			vertex newpos = ref->position();
 			newpos.transform (transform, pos);
 			ref->setPosition (newpos);
 		obj->setColor (parentcolor);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-List<LDObject*> LDSubfileObject::inlineContents (InlineFlags flags) {
+List<LDObject*> LDSubfile::inlineContents (InlineFlags flags) {
 	List<LDObject*> objs = fileInfo()->inlineContents (flags);
 	// Transform the objects
 	for (LDObject* obj : objs) {
 		// Set the parent now so we know what inlined this.
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void LDObject::move (vertex vect)    { (void) vect; }
-void LDEmptyObject::move (vertex vect)     { (void) vect; }
+void LDEmpty::move (vertex vect)     { (void) vect; }
-void LDBFCObject::move (vertex vect)       { (void) vect; }
+void LDBFC::move (vertex vect)       { (void) vect; }
-void LDCommentObject::move (vertex vect)   { (void) vect; }
+void LDComment::move (vertex vect)   { (void) vect; }
-void LDErrorObject::move (vertex vect) { (void) vect; }
+void LDError::move (vertex vect) { (void) vect; }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDVertexObject::move (vertex vect) {
+void LDVertex::move (vertex vect) {
 	pos += vect;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDSubfileObject::move (vertex vect) {
+void LDSubfile::move (vertex vect) {
 	setPosition (position() + vect);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDLineObject::move (vertex vect) {
+void LDLine::move (vertex vect) {
 	for (short i = 0; i < 2; ++i)
 		setVertex (i, getVertex (i) + vect);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDTriangleObject::move (vertex vect) {
+void LDTriangle::move (vertex vect) {
 	for (short i = 0; i < 3; ++i)
 		setVertex (i, getVertex (i) + vect);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDQuadObject::move (vertex vect) {
+void LDQuad::move (vertex vect) {
 	for (short i = 0; i < 4; ++i)
 		setVertex (i, getVertex (i) + vect);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDCondLineObject::move (vertex vect) {
+void LDCndLine::move (vertex vect) {
 	for (short i = 0; i < 4; ++i)
 		setVertex (i, getVertex (i) + vect);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 #define CHECK_FOR_OBJ(N) \
 	if (type == LDObject::N) \
-		return new LD##N##Object;
+		return new LD##N;
 LDObject* LDObject::getDefault (const LDObject::Type type) {
 	CHECK_FOR_OBJ (Comment)
 	CHECK_FOR_OBJ (BFC)
 	CHECK_FOR_OBJ (Line)
-	CHECK_FOR_OBJ (CondLine)
+	CHECK_FOR_OBJ (CndLine)
 	CHECK_FOR_OBJ (Subfile)
 	CHECK_FOR_OBJ (Triangle)
 	CHECK_FOR_OBJ (Quad)
 	CHECK_FOR_OBJ (Empty)
 	CHECK_FOR_OBJ (BFC)
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void LDObject::invert() {}
-void LDBFCObject::invert() {}
+void LDBFC::invert() {}
-void LDEmptyObject::invert() {}
+void LDEmpty::invert() {}
-void LDCommentObject::invert() {}
+void LDComment::invert() {}
-void LDErrorObject::invert() {}
+void LDError::invert() {}
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDTriangleObject::invert() {
+void LDTriangle::invert() {
 	// Triangle goes 0 -> 1 -> 2, reversed: 0 -> 2 -> 1.
 	// Thus, we swap 1 and 2.
 	vertex tmp = getVertex (1);
 	setVertex (1, getVertex (2));
 	setVertex (2, tmp);
 	return;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDQuadObject::invert() {
+void LDQuad::invert() {
 	// Quad: 0 -> 1 -> 2 -> 3
 	// rev:  0 -> 3 -> 2 -> 1
 	// Thus, we swap 1 and 3.
 	vertex tmp = getVertex (1);
 	setVertex (1, getVertex (3));
 	setVertex (3, tmp);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void LDSubfileObject::invert() {
+void LDSubfile::invert() {
 	// Subfiles are inverted when they're prefixed with
 	// a BFC INVERTNEXT statement. Thus we need to toggle this status.
 	// For flat primitives it's sufficient that the determinant is
 	// flipped but I don't have a method for checking flatness yet.
 	// Food for thought...
 	ulong idx = getIndex();
 	if (idx > 0) {
-		LDBFCObject* bfc = dynamic_cast<LDBFCObject*> (prev());
+		LDBFC* bfc = dynamic_cast<LDBFC*> (prev());
-		if (bfc && bfc->type == LDBFCObject::InvertNext) {
+		if (bfc && bfc->type == LDBFC::InvertNext) {
 			// This is prefixed with an invertnext, thus remove it.
 			file()->forgetObject (bfc);
 			delete bfc;
 			return;
 		}
 	}
 	// Not inverted, thus prefix it with a new invertnext.
-	LDBFCObject* bfc = new LDBFCObject (LDBFCObject::InvertNext);
+	LDBFC* bfc = new LDBFC (LDBFC::InvertNext);
 	file()->insertObj (idx, bfc);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 	vertex tmp = line->getVertex (0);
 	line->setVertex (0, line->getVertex (1));
 	line->setVertex (1, tmp);
 }
-void LDLineObject::invert() {
+void LDLine::invert() {
 	invertLine (this);
 }
-void LDCondLineObject::invert() {
+void LDCndLine::invert() {
 	invertLine (this);
 }
-void LDVertexObject::invert() {}
+void LDVertex::invert() {}
 // =============================================================================
 // -----------------------------------------------------------------------------
-LDLineObject* LDCondLineObject::demote() {
+LDLine* LDCndLine::demote() {
-	LDLineObject* repl = new LDLineObject;
+	LDLine* repl = new LDLine;
 	for (int i = 0; i < repl->vertices(); ++i)
 		repl->setVertex (i, getVertex (i));
 	repl->setColor (color());
 	return null;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str LDOverlayObject::raw() {
+str LDOverlay::raw() {
 	return fmt ("0 !LDFORGE OVERLAY %1 %2 %3 %4 %5 %6",
 		filename(), camera(), x(), y(), width(), height());
 }
-void LDOverlayObject::move (vertex vect) {
+void LDOverlay::move (vertex vect) {
 	Q_UNUSED (vect)
 }
-void LDOverlayObject::invert() {}
+void LDOverlay::invert() {}
 // =============================================================================
 // Hook the set accessors of certain properties to this changeProperty function.
 // It takes care of history management so we can capture low-level changes, this
 // makes history stuff work out of the box.

Mercurial > ldforge / file comparison

comparison: src/ldtypes.cpp

src/ldtypes.cpp