ldforge: comparison ldtypes.h

-:46955613626d
+:8c93d8e38494
 #include "common.h"
 #include "types.h"
 #define IMPLEMENT_LDTYPE(T, NUMVERTS) \
-	LD##T (); \
+	LD##T () {} \
-	virtual ~LD##T (); \
+	virtual ~LD##T () {} \
 	virtual LDObjectType_e getType () const { \
 		return OBJ_##T; \
 	} \
 	virtual str getContents (); \
 	virtual LD##T* clone () { \
 		return new LD##T (*this); \
 	} \
 	virtual void move (vertex vVector); \
 	virtual short vertices () const { return NUMVERTS; } \
-#define LDOBJ_COLORED(V) virtual bool isColored () 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)
 class QListWidgetItem;
 class LDSubfile;
 // =============================================================================
 // zContent contains the contents of the unparsable line.
 // =============================================================================
 class LDGibberish : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Gibberish, 0)
-	LDOBJ_COLORED (false)
+	LDOBJ_UNCOLORED
 	LDGibberish (str _zContent, str _zReason);
 	// Content of this unknown line
 	str zContents;
 // Represents an empty line in the LDraw code file.
 // =============================================================================
 class LDEmpty : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Empty, 0)
-	LDOBJ_COLORED (false)
+	LDOBJ_UNCOLORED
 };
 // =============================================================================
 // LDComment
 //
 // the text of the comment.
 // =============================================================================
 class LDComment : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Comment, 0)
-	LDOBJ_COLORED (false)
+	LDOBJ_UNCOLORED
-	LDComment (str zText) : zText (zText) {}
+	LDComment (str zText) : text (zText) {}
-	str zText; // The text of this comment
+	str text; // The text of this comment
 };
 // =============================================================================
 // LDBFC
 //
 		InvertNext,	// Winding is inverted for next object (0 BFC INVERTNEXT)
 		NumStatements
 	};
 	IMPLEMENT_LDTYPE (BFC, 0)
-	LDOBJ_COLORED (false)
+	LDOBJ_UNCOLORED
-	LDBFC (const LDBFC::Type eType) : eStatement (eType) {}
+	LDBFC (const LDBFC::Type eType) : type (eType) {}
 	// Statement strings
-	static const char* saStatements[];
+	static const char* statements[];
-	Type eStatement;
+	Type type;
 };
 // =============================================================================
 // LDSubfile
 //
 // Represents a single code-1 subfile reference.
 // =============================================================================
 class LDSubfile : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Subfile, 0)
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
-	vertex vPosition; // Position of the subpart
+	vertex vPosition; // Position of the subpart (FIXME: should get rid of this)
 	matrix<3> mMatrix; // Transformation matrix for the subpart
 	str zFileName; // Filename of the subpart
 	OpenFile* pFile; // Pointer to opened file for this subfile. null if unopened.
-	// Gets the inlined contents of this subfile.
+	// Inlines this subfile. Note that return type is an array of heap-allocated
+	// LDObject-clones, they must be deleted one way or another.
 	std::vector<LDObject*> inlineContents (bool bDeepInline, bool bCache);
 };
 // =============================================================================
 // LDLine
 // set.
 // =============================================================================
 class LDLine : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Line, 2)
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
 	LDLine (vertex v1, vertex v2);
 };
 // =============================================================================
 // inherited from LDLine, c0 and c1 are the control points of this line.
 // =============================================================================
 class LDCondLine : public LDLine {
 public:
 	IMPLEMENT_LDTYPE (CondLine, 4)
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
 };
 // =============================================================================
 // LDTriangle
 //
 // triangle is colored with.
 // =============================================================================
 class LDTriangle : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Triangle, 3)
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
 	LDTriangle (vertex _v0, vertex _v1, vertex _v2) {
 		vaCoords[0] = _v0;
 		vaCoords[1] = _v1;
 		vaCoords[2] = _v2;
 // of the quad, dColor is the color used for the quad.
 // =============================================================================
 class LDQuad : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Quad, 4)
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
-	// Split this quad into two triangles
+	// Split this quad into two triangles (note: heap-allocated)
 	vector<LDTriangle*> splitToTriangles ();
 };
 // =============================================================================
 // LDVertex
 // finished parts.
 // =============================================================================
 class LDVertex : public LDObject {
 public:
 	IMPLEMENT_LDTYPE (Vertex, 0) // TODO: move vPosition to vaCoords[0]
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
 	vertex vPosition;
 };
 // =============================================================================
 		Cone,
 		NumTypes
 	};
 	IMPLEMENT_LDTYPE (Radial, 0)
-	LDOBJ_COLORED (true)
+	LDOBJ_COLORED
 	LDRadial::Type eRadialType;
 	vertex vPosition;
 	matrix<3> mMatrix;
 	short dDivisions, dSegments, dRingNum;
 	LDRadial (LDRadial::Type eRadialType, vertex vPosition, matrix<3> mMatrix,
 		short dDivisions, short dSegments, short dRingNum) :
 		eRadialType (eRadialType), vPosition (vPosition), mMatrix (mMatrix),
 		dDivisions (dDivisions), dSegments (dSegments), dRingNum (dRingNum) {}
+	// Returns a set of objects that provide the equivalent of this radial.
+	// Note: objects are heap-allocated.
+	std::vector<LDObject*> decompose (bool bTransform);
+	// Compose a file name for this radial.
+	str makeFileName ();
 	char const* radialTypeName ();
-	std::vector<LDObject*> decompose (bool bTransform);
-	str makeFileName ();
 	static char const* radialTypeName (const LDRadial::Type eType);
 };
 // =============================================================================
 // Object type names. Pass the return value of getType as the index to get a

Mercurial > ldforge / file comparison

comparison: ldtypes.h

ldtypes.h