ldforge: comparison src/ldtypes.h

-:58a3cbb49374
+:8d35e631bef3
 #include "common.h"
 #include "types.h"
 class HistoryEntry;
-#define IMPLEMENT_LDTYPE(T, NUMVERTS) \
+#define LDOBJ(T) \
 	LD##T () {} \
 	virtual ~LD##T () {} \
 	virtual LDObject::Type getType () const { \
 		return LDObject::T; \
 	} \
 	virtual str getContents (); \
 	virtual LD##T* clone () { \
 		return new LD##T (*this); \
 	} \
 	virtual void move (vertex vVector); \
-	virtual short vertices () const { return NUMVERTS; } \
 	virtual HistoryEntry* invert ();
+#define LDOBJ_VERTICES(V) virtual short vertices () const { return V; }
 #define LDOBJ_SETCOLORED(V) virtual bool isColored () const { return V; }
 #define LDOBJ_COLORED LDOBJ_SETCOLORED (true)
 #define LDOBJ_UNCOLORED LDOBJ_SETCOLORED (false)
 #define LDOBJ_CUSTOM_SCHEMANTIC virtual bool isSchemantic () const
 #define LDOBJ_SCHEMANTIC LDOBJ_CUSTOM_SCHEMANTIC { return true; }
 #define LDOBJ_NON_SCHEMANTIC LDOBJ_CUSTOM_SCHEMANTIC { return false; }
+#define LDOBJ_SETMATRIX(V) virtual bool hasMatrix () const { return V; }
+#define LDOBJ_HAS_MATRIX LDOBJ_SETMATRIX (true)
+#define LDOBJ_NO_MATRIX LDOBJ_SETMATRIX (false)
 class QListWidgetItem;
 class LDSubfile;
+// =============================================================================
+// LDMatrixObject
+//
+// Common code for objects with matrices
+// =============================================================================
+class LDMatrixObject {
+public:
+	LDMatrixObject () {}
+	LDMatrixObject (const matrix& transform, const vertex& pos) :
+		transform (transform), pos (pos) {}
+	matrix transform;
+	vertex pos;
+};
 // =============================================================================
 // LDObject
 //
 // Base class object for all LD* types. Each LDObject represents a single line
 	// Object list entry for this object
 	QListWidgetItem* qObjListEntry;
 	bool					hidden			() const { return m_hidden; }
+	virtual bool			hasMatrix		() const { return false; }
 	virtual HistoryEntry*	invert			();
 	LDObject*				next			() const;
 	LDObject*				prev			() const;
 	void					setHidden		(const bool hidden) { m_hidden = hidden; }
 	bool					selected		() const { return m_selected; }
 // allowing garbage lines be debugged and corrected within LDForge. The member
 // zContent contains the contents of the unparsable line.
 // =============================================================================
 class LDGibberish : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Gibberish, 0)
+	LDOBJ (Gibberish)
+	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 	LDGibberish (str _zContent, str _zReason);
 	// Content of this unknown line
 	str contents;
 //
 // Represents an empty line in the LDraw code file.
 // =============================================================================
 class LDEmpty : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Empty, 0)
+	LDOBJ (Empty)
+	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 };
 // =============================================================================
 // LDComment
 //
 // Represents a code-0 comment in the LDraw code file. Member zText contains
 // the text of the comment.
 // =============================================================================
 class LDComment : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Comment, 0)
+	LDOBJ (Comment)
+	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 	LDComment (str text) : text (text) {}
 	str text; // The text of this comment
 };
 // Represents a 0 BFC statement in the LDraw code. eStatement contains the type
 // of this statement.
 // =============================================================================
 class LDBFC : public LDComment {
 public:
-	enum Type {
+	enum Type { CertifyCCW, CCW, CertifyCW, CW, NoCertify, InvertNext, NumStatements };
-		CertifyCCW,
-		CCW,
+	LDOBJ (BFC)
-		CertifyCW,
+	LDOBJ_VERTICES (0)
-		CW,
-		NoCertify,	// Winding becomes disabled (0 BFC NOCERTIFY)
-		InvertNext,	// Winding is inverted for next object (0 BFC INVERTNEXT)
-		NumStatements
-	};
-	IMPLEMENT_LDTYPE (BFC, 0)
 	LDOBJ_UNCOLORED
 	LDOBJ_CUSTOM_SCHEMANTIC { return (type == InvertNext); }
+	LDOBJ_NO_MATRIX
 	LDBFC (const LDBFC::Type type) : type (type) {}
 	// Statement strings
 	static const char* statements[];
 // =============================================================================
 // LDSubfile
 //
 // Represents a single code-1 subfile reference.
 // =============================================================================
-class LDSubfile : public LDObject {
+class LDSubfile : public LDObject, public LDMatrixObject {
 public:
-	IMPLEMENT_LDTYPE (Subfile, 0)
+	LDOBJ (Subfile)
-	LDOBJ_COLORED
+	LDOBJ_VERTICES (0)
-	LDOBJ_SCHEMANTIC
+	LDOBJ_COLORED
+	LDOBJ_SCHEMANTIC
-	vertex pos; // Position of the subpart (TODO: should get rid of this)
+	LDOBJ_HAS_MATRIX
-	matrix transform; // Transformation matrix for the subpart
 	str fileName; // Filename of the subpart (TODO: rid this too - use fileInfo->fileName instead)
 	OpenFile* fileInfo; // Pointer to opened file for this subfile. null if unopened.
 	// Inlines this subfile. Note that return type is an array of heap-allocated
 	// LDObject-clones, they must be deleted one way or another.
 // points of the line. The line is colored with dColor unless uncolored mode is
 // set.
 // =============================================================================
 class LDLine : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Line, 2)
+	LDOBJ (Line)
-	LDOBJ_COLORED
+	LDOBJ_VERTICES (2)
-	LDOBJ_SCHEMANTIC
+	LDOBJ_COLORED
+	LDOBJ_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 	LDLine (vertex v1, vertex v2);
 };
 // =============================================================================
 // Represents a single code-5 conditional line. The end-points v0 and v1 are
 // inherited from LDLine, c0 and c1 are the control points of this line.
 // =============================================================================
 class LDCondLine : public LDLine {
 public:
-	IMPLEMENT_LDTYPE (CondLine, 4)
+	LDOBJ (CondLine)
-	LDOBJ_COLORED
+	LDOBJ_VERTICES (4)
-	LDOBJ_SCHEMANTIC
+	LDOBJ_COLORED
+	LDOBJ_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 };
 // =============================================================================
 // LDTriangle
 //
 // and v2 contain the end-points of this triangle. dColor is the color the
 // triangle is colored with.
 // =============================================================================
 class LDTriangle : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Triangle, 3)
+	LDOBJ (Triangle)
-	LDOBJ_COLORED
+	LDOBJ_VERTICES (3)
-	LDOBJ_SCHEMANTIC
+	LDOBJ_COLORED
+	LDOBJ_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 	LDTriangle (vertex _v0, vertex _v1, vertex _v2) {
 		coords[0] = _v0;
 		coords[1] = _v1;
 		coords[2] = _v2;
 // Represents a single code-4 quadrilateral. v0, v1, v2 and v3 are the end points
 // of the quad, dColor is the color used for the quad.
 // =============================================================================
 class LDQuad : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Quad, 4)
+	LDOBJ (Quad)
-	LDOBJ_COLORED
+	LDOBJ_VERTICES (4)
-	LDOBJ_SCHEMANTIC
+	LDOBJ_COLORED
+	LDOBJ_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 	// Split this quad into two triangles (note: heap-allocated)
 	vector<LDTriangle*> splitToTriangles ();
 };
 // with. Vertices are a part authoring tool and they should not appear in
 // finished parts.
 // =============================================================================
 class LDVertex : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Vertex, 0) // TODO: move pos to vaCoords[0]
+	LDOBJ (Vertex)
+	LDOBJ_VERTICES (0) // TODO: move pos to vaCoords[0]
 	LDOBJ_COLORED
 	LDOBJ_NON_SCHEMANTIC
+	LDOBJ_NO_MATRIX
 	vertex pos;
 };
 // =============================================================================
 // extension which represents an arbitrary circular primitive. Radials can appear
 // as circles, cylinders, rings, cones, discs and disc negatives; the point is to
 // allow part authors to add radial primitives to parts without much hassle about
 // non-existant primitive parts.
 // =============================================================================
-class LDRadial : public LDObject {
+class LDRadial : public LDObject, public LDMatrixObject {
 public:
 	enum Type {
 		Circle,
 		Cylinder,
 		Disc,
 		Ring,
 		Cone,
 		NumTypes
 	};
-	IMPLEMENT_LDTYPE (Radial, 0)
+	LDOBJ (Radial)
-	LDOBJ_COLORED
+	LDOBJ_VERTICES (0)
-	LDOBJ_SCHEMANTIC
+	LDOBJ_COLORED
+	LDOBJ_SCHEMANTIC
+	LDOBJ_HAS_MATRIX
 	LDRadial::Type radType;
-	vertex pos;
-	matrix transform;
 	short divs, segs, ringNum;
 	LDRadial (LDRadial::Type radType, vertex pos, matrix transform, short divs, short segs, short ringNum) :
-		radType (radType), pos (pos), transform (transform), divs (divs), segs (segs), ringNum (ringNum) {}
+		LDMatrixObject (transform, pos), radType (radType), divs (divs), segs (segs), ringNum (ringNum) {}
 	// Returns a set of objects that provide the equivalent of this radial.
 	// Note: objects are heap-allocated.
 	std::vector<LDObject*> decompose (bool applyTransform);

Mercurial > ldforge / file comparison

comparison: src/ldtypes.h

src/ldtypes.h