ldforge: comparison ldtypes.h

-:b93a64f5ee67
+:607301744394
 #define __LDTYPES_H__
 #include "common.h"
 #include "types.h"
-#define IMPLEMENT_LDTYPE(N) \
+#define IMPLEMENT_LDTYPE(T, NUMVERTS) \
-	LD##N (); \
+	LD##T (); \
-	virtual ~LD##N (); \
+	virtual ~LD##T (); \
 	virtual LDObjectType_e getType () const { \
-		return OBJ_##N; \
+		return OBJ_##T; \
 	} \
 	virtual str getContents (); \
-	virtual LD##N* clone () { \
+	virtual LD##T* clone () { \
-		return new LD##N (*this); \
+		return new LD##T (*this); \
 	} \
-	virtual void move (vertex vVector);
+	virtual void move (vertex vVector); \
+	virtual short vertices () const { return NUMVERTS; }
 class QTreeWidgetItem;
 class LDSubfile;
 // =============================================================================
 	short dColor;
 	// OpenGL list for this object
 	uint uGLList, uGLPickList;
+	// Vertices of this object
+	vertex vaCoords[4];
 	// Object this object was referenced from, if any
 	LDObject* parent;
 	// Type enumerator of this object
 	virtual LDObjectType_e getType () const {
 	virtual void move (vertex vVector);
 	// What object in the current file ultimately references this?
 	LDObject* topLevelParent ();
+	// Number of vertices this object has
+	virtual short vertices () const { return 0; }
 	static void moveObjects (std::vector<LDObject*> objs, const bool bUp);
 	static str objectListContents (const std::vector<LDObject*>& objs);
 	QTreeWidgetItem* qObjListEntry;
 };
 // 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)
+	IMPLEMENT_LDTYPE (Gibberish, 0)
 	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)
+	IMPLEMENT_LDTYPE (Empty, 0)
 };
 // =============================================================================
 // 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)
+	IMPLEMENT_LDTYPE (Comment, 0)
 	LDComment (str zText) : zText (zText) {}
 	str zText; // The text of this comment
 };
 		NoCertify,	// Winding becomes disabled (0 BFC NOCERTIFY)
 		InvertNext,	// Winding is inverted for next object (0 BFC INVERTNEXT)
 		NumStatements
 	};
-	IMPLEMENT_LDTYPE (BFC)
+	IMPLEMENT_LDTYPE (BFC, 0)
 	LDBFC (const LDBFC::Type eType) : eStatement (eType) {}
 	// Statement strings
 	static const char* saStatements[];
 //
 // Represents a single code-1 subfile reference.
 // =============================================================================
 class LDSubfile : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Subfile)
+	IMPLEMENT_LDTYPE (Subfile, 0)
 	vertex vPosition; // Position of the subpart
 	matrix mMatrix; // Transformation matrix for the subpart
 	str zFileName; // Filename of the subpart
 	OpenFile* pFile; // Pointer to opened file for this subfile. null if unopened.
 // points of the line. The line is colored with dColor unless uncolored mode is
 // set.
 // =============================================================================
 class LDLine : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Line)
+	IMPLEMENT_LDTYPE (Line, 2)
 	LDLine (vertex v1, vertex v2);
-	vertex vaCoords[2]; // End points of this line
 };
 // =============================================================================
 // LDCondLine
 //
 // 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)
+	IMPLEMENT_LDTYPE (CondLine, 4)
-	vertex vaCoords[4]; // End points + control points of this line
 };
 // =============================================================================
 // 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)
+	IMPLEMENT_LDTYPE (Triangle, 3)
-	vertex vaCoords[3];
 	LDTriangle (vertex _v0, vertex _v1, vertex _v2) {
 		vaCoords[0] = _v0;
 		vaCoords[1] = _v1;
 		vaCoords[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)
+	IMPLEMENT_LDTYPE (Quad, 4)
-	vertex vaCoords[4];
 	// Split this quad into two triangles
 	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)
+	IMPLEMENT_LDTYPE (Vertex, 0) // TODO: move vPosition to vaCoords[0]
 	vertex vPosition;
 };
 // =============================================================================
 		Ring,
 		Cone,
 		NumTypes
 	};
-	IMPLEMENT_LDTYPE (Radial)
+	IMPLEMENT_LDTYPE (Radial, 0)
 	LDRadial::Type eRadialType;
 	vertex vPosition;
 	matrix mMatrix;
 	short dDivisions, dSegments, dRingNum;

Mercurial > ldforge / file comparison

comparison: ldtypes.h

ldtypes.h