ldforge: comparison src/ldObject.h

-:7986584e7498
+:9ecc878c7dea
 																\
 	virtual QString asText() const override;					\
 	virtual void invert() override;								\
 #define LDOBJ_NAME(N)          public: virtual QString typeName() const override { return #N; }
-#define LDOBJ_VERTICES(V)      public: virtual int numVertices() const override { return V; }
 #define LDOBJ_SETCOLORED(V)    public: virtual bool isColored() const override { return V; }
 #define LDOBJ_COLORED          LDOBJ_SETCOLORED (true)
 #define LDOBJ_UNCOLORED        LDOBJ_SETCOLORED (false) LDOBJ_DEFAULTCOLOR (MainColor)
 #define LDOBJ_DEFAULTCOLOR(V)  public: virtual LDColor defaultColor() const override { return (V); }
 #define LDOBJ_NO_MATRIX        LDOBJ_SETMATRIX (false)
 class QListWidgetItem;
 class LDSubfile;
 class LDDocument;
 class LDBfc;
 //
 // Object type codes.
 //
 	LDObject* createCopy() const;
 	virtual LDColor defaultColor() const = 0; // What color does the object default to?
 	void deselect();
 	void destroy();
 	LDDocument* document() const;
-	LDPolygon* getPolygon();
 	virtual void getVertices (QVector<Vertex>& verts) const;
-	virtual bool hasMatrix() const = 0; // Does this object have a matrix and position? (see LDMatrixObject)
+	virtual bool hasMatrix() const { return false; }
+	virtual bool hasVertices() const { return false; }
 	qint32 id() const;
 	virtual void invert() = 0; // Inverts this object (winding is reversed)
 	virtual bool isColored() const = 0;
 	bool isDestroyed() const;
 	bool isHidden() const;
 	virtual bool isScemantic() const = 0; // Does this object have meaning in the part model?
 	bool isSelected() const;
 	int lineNumber() const;
 	void move (Vertex vect);
 	LDObject* next() const;
-	virtual int numVertices() const = 0;
 	LDObject* previous() const;
 	bool previousIsInvertnext (LDBfc*& ptr);
 	QColor randomColor() const;
 	void replace (LDObject* other);
 	void select();
 	void setColor (LDColor color);
 	void setDocument (LDDocument* document);
 	void setHidden (bool value);
-	void setVertex (int i, const Vertex& vert);
 	void swap (LDObject* other);
-	LDObject* topLevelParent();
+	virtual void transform (const Matrix& transformationMatrix, const Vertex& position);
 	virtual LDObjectType type() const = 0;
 	virtual QString typeName() const = 0;
-	const Vertex& vertex (int i) const;
 	static QString describeObjects (const LDObjectList& objs);
 	static LDObject* fromID (int id);
 	static LDObject* getDefault (const LDObjectType type);
 	static void moveObjects (LDObjectList objs, const bool up); // TODO: move this to LDDocument?
 private:
 	bool m_isHidden;
 	bool m_isSelected;
 	bool m_isDestroyed;
-	LDObject* m_parent;
 	LDDocument* m_document;
 	qint32 m_id;
 	LDColor m_color;
 	QColor m_randomColor;
-	Vertex m_coords[4];
 };
 template<typename T, typename... Args>
 T* LDSpawn (Args... args)
 {
 // matrix as well. Even though right now only LDSubfile uses this, I'm keeping
 // this class distinct in case I get new extension ideas. :)
 //
 class LDMatrixObject : public LDObject
 {
-	Vertex m_position;
 public:
 	LDMatrixObject (LDDocument* document = nullptr);
-	LDMatrixObject (const Matrix& transform, const Vertex& pos, LDDocument* document = nullptr);
+	LDMatrixObject (const Matrix& transformationMatrix, const Vertex& position, LDDocument* document = nullptr);
+	virtual bool hasMatrix() const { return true; }
 	const Vertex& position() const;
 	void setCoordinate (const Axis ax, double value);
 	void setPosition (const Vertex& a);
-	const Matrix& transform() const;
+	void setTransformationMatrix (const Matrix& value);
-	void setTransform (const Matrix& value);
+	virtual void transform (const Matrix& transformationMatrix, const Vertex& position);
+	const Matrix& transformationMatrix() const;
-private:
-	Matrix m_transform;
+private:
+	Vertex m_position;
+	Matrix m_transformationMatrix;
+};
+class LDVertexObject : public LDObject
+{
+public:
+	LDVertexObject (LDDocument* document = nullptr);
+	LDPolygon* getPolygon();
+	virtual void getVertices (QVector<Vertex>& verts) const;
+	virtual bool hasVertices() const { return true; }
+	virtual int numVertices() const = 0;
+	void setVertex (int i, const Vertex& vert);
+	virtual void transform (const Matrix& transformationMatrix, const Vertex& position);
+	const Vertex& vertex (int i) const;
+	QSet<Vertex> vertexSet() const;
+private:
+	Vertex m_coordinates[4];
 };
 //
 //
 // Represents a line in the LDraw file that could not be properly parsed. It is
 //
 class LDError : public LDObject
 {
 	LDOBJ (Error)
 	LDOBJ_NAME (error)
-	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	LDError (QString contents, QString reason, LDDocument* document = nullptr);
-	QString reason() const;
 	QString contents() const;
 	QString fileReferenced() const;
+	QString reason() const;
 	void setFileReferenced (QString value);
 private:
 	QString m_fileReferenced; // If this error was caused by inability to open a file, what file was that?
 	QString m_contents; // The LDraw code that was being parsed
 //
 class LDEmpty : public LDObject
 {
 	LDOBJ (Empty)
 	LDOBJ_NAME (empty)
-	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCEMANTIC
-	LDOBJ_NO_MATRIX
 };
 //
 //
 // Represents a code-0 comment in the LDraw code file.
 //
 class LDComment : public LDObject
 {
 	LDOBJ (Comment)
 	LDOBJ_NAME (comment)
-	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	LDComment (QString text, LDDocument* document = nullptr);
 	QString text() const;
 	void setText (QString value);
 class LDBfc : public LDObject
 {
 public:
 	LDOBJ (Bfc)
 	LDOBJ_NAME (bfc)
-	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_CUSTOM_SCEMANTIC { return (statement() == BfcStatement::InvertNext); }
-	LDOBJ_NO_MATRIX
 public:
 	LDBfc (const BfcStatement type, LDDocument* document = nullptr);
+	void setStatement (BfcStatement value);
 	BfcStatement statement() const;
-	void setStatement (BfcStatement value);
 	QString statementToString() const;
 	static QString statementToString (BfcStatement statement);
 private:
 //
 class LDSubfile : public LDMatrixObject
 {
 	LDOBJ (Subfile)
 	LDOBJ_NAME (subfile)
-	LDOBJ_VERTICES (0)
 	LDOBJ_COLORED
 	LDOBJ_DEFAULTCOLOR (MainColor)
 	LDOBJ_SCEMANTIC
-	LDOBJ_HAS_MATRIX
 public:
 	// Inlines this subfile.
 	LDDocument* fileInfo() const;
 	virtual void getVertices (QVector<Vertex>& verts) const override;
 //
 // LDLine
 //
 // Represents a single code-2 line in the LDraw code file.
 //
-class LDLine : public LDObject
+class LDLine : public LDVertexObject
 {
 	LDOBJ (Line)
 	LDOBJ_NAME (line)
-	LDOBJ_VERTICES (2)
 	LDOBJ_COLORED
 	LDOBJ_DEFAULTCOLOR (EdgeColor)
 	LDOBJ_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	LDLine (Vertex v1, Vertex v2, LDDocument* document = nullptr);
+	int numVertices() const override { return 2; }
 };
 //
 // LDCondLine
 //
 //
 class LDCondLine : public LDLine
 {
 	LDOBJ (CondLine)
 	LDOBJ_NAME (condline)
-	LDOBJ_VERTICES (4)
 	LDOBJ_COLORED
 	LDOBJ_DEFAULTCOLOR (EdgeColor)
 	LDOBJ_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	LDCondLine (const Vertex& v0, const Vertex& v1, const Vertex& v2, const Vertex& v3, LDDocument* document = nullptr);
 	LDLine* toEdgeLine();
+	int numVertices() const override { return 4; }
 };
 //
 // LDTriangle
 //
 // Represents a single code-3 triangle in the LDraw code file. Vertices v0, v1
 // and v2 contain the end-points of this triangle. dColor is the color the
 // triangle is colored with.
 //
-class LDTriangle : public LDObject
+class LDTriangle : public LDVertexObject
 {
 	LDOBJ (Triangle)
 	LDOBJ_NAME (triangle)
-	LDOBJ_VERTICES (3)
 	LDOBJ_COLORED
 	LDOBJ_DEFAULTCOLOR (MainColor)
 	LDOBJ_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	LDTriangle (Vertex const& v1, Vertex const& v2, Vertex const& v3, LDDocument* document = nullptr);
+	int numVertices() const override { return 3; }
 };
 //
 // LDQuad
 //
 // 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
+class LDQuad : public LDVertexObject
 {
 	LDOBJ (Quad)
 	LDOBJ_NAME (quad)
-	LDOBJ_VERTICES (4)
 	LDOBJ_COLORED
 	LDOBJ_DEFAULTCOLOR (MainColor)
 	LDOBJ_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	LDQuad (const Vertex& v1, const Vertex& v2, const Vertex& v3, const Vertex& v4, LDDocument* document = nullptr);
 	// Split this quad into two triangles
 	QList<LDTriangle*> splitToTriangles();
+	int numVertices() const override { return 4; }
 };
 //
 // LDOverlay
 //
 //
 class LDOverlay : public LDObject
 {
 	LDOBJ (Overlay)
 	LDOBJ_NAME (overlay)
-	LDOBJ_VERTICES (0)
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCEMANTIC
-	LDOBJ_NO_MATRIX
 public:
 	int camera() const;
 	QString fileName() const;
 	int height() const;

Mercurial > ldforge / file comparison

comparison: src/ldObject.h

src/ldObject.h