ldforge: comparison src/ldObject.h

-:6dac2d52bd9a
+:47cde4087cc5
 class Model;
 #define LDOBJ(T)												\
 public:															\
 	static constexpr LDObjectType SubclassType = OBJ_##T;		\
-	LD##T (Model* model = nullptr);								\
 																\
 	virtual LDObjectType type() const override					\
 	{															\
 		return OBJ_##T;											\
 	}															\
 																\
 	virtual QString asText() const override;					\
 	virtual void invert() override;								\
+protected:														\
+	friend class Model;											\
+	LD##T (Model* model = nullptr);								\
 #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)
 class LDObject : public QObject
 {
 Q_OBJECT
 public:
-LDObject (Model* model = nullptr);
 	virtual QString asText() const = 0; // This object as LDraw code
 LDColor color() const;
 	virtual LDColor defaultColor() const = 0; // What color does the object default to?
 	Model* model() const;
 	LDPolygon* getPolygon();
 signals:
 	void codeChanged(int position, QString before, QString after);
 protected:
 	friend class Model;
+	LDObject (Model* model = nullptr);
 	virtual ~LDObject();
 private:
 	bool m_isHidden;
 	bool m_isSelected;
 class LDMatrixObject : public LDObject
 {
 	Vertex m_position;
 public:
-	LDMatrixObject (Model* model = nullptr);
-	LDMatrixObject (const Matrix& transformationMatrix, const Vertex& pos, Model* model = nullptr);
 	const Vertex& position() const;
 	void setCoordinate (const Axis ax, double value);
 	void setPosition (const Vertex& a);
 	void setTransformationMatrix (const Matrix& value);
 	const Matrix& transformationMatrix() const;
+protected:
+	LDMatrixObject (Model* model = nullptr);
+	LDMatrixObject (const Matrix& transformationMatrix, const Vertex& pos, Model* model = nullptr);
 private:
 	Matrix m_transformationMatrix;
 };
 //
 	LDOBJ_UNCOLORED
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
-	LDError (QString contents, QString reason, Model* model = nullptr);
 	QString reason() const;
 	QString contents() const;
 	QString fileReferenced() const;
 	void setFileReferenced (QString value);
+protected:
+	LDError (QString contents, QString reason, Model* model = nullptr);
 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
 	QString m_reason;
 };
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
-	LDComment (QString text, Model* model = nullptr);
 	QString text() const;
 	void setText (QString value);
+protected:
+	LDComment (QString text, Model* model = nullptr);
 private:
 	QString m_text;
 };
 	LDOBJ_UNCOLORED
 	LDOBJ_CUSTOM_SCEMANTIC { return (statement() == BfcStatement::InvertNext); }
 	LDOBJ_NO_MATRIX
 public:
-LDBfc (const BfcStatement type, Model* model = nullptr);
 	BfcStatement statement() const;
 	void setStatement (BfcStatement value);
 	QString statementToString() const;
 	static QString statementToString (BfcStatement statement);
+protected:
+	LDBfc (const BfcStatement type, Model* model = nullptr);
 private:
 	BfcStatement m_statement;
 };
 //
 	LDOBJ_DEFAULTCOLOR (MainColor)
 	LDOBJ_SCEMANTIC
 	LDOBJ_HAS_MATRIX
 public:
-	LDSubfileReference(LDDocument* reference, const Matrix& transformationMatrix, const Vertex& position, Model* model = nullptr);
 	// Inlines this subfile.
 	LDDocument* fileInfo() const;
 	virtual void getVertices (QSet<Vertex>& verts) const override;
 	void inlineContents(Model& model, bool deep, bool render);
 	QList<LDPolygon> inlinePolygons();
 	void setFileInfo (LDDocument* fileInfo);
 	int triangleCount() const override;
+protected:
+	LDSubfileReference(LDDocument* reference, const Matrix& transformationMatrix, const Vertex& position, Model* model = nullptr);
 private:
 	LDDocument* m_fileInfo;
 };
 //
 	LDOBJ_COLORED
 	LDOBJ_DEFAULTCOLOR (EdgeColor)
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
-public:
+protected:
 	LDLine (Vertex v1, Vertex v2, Model* model = nullptr);
 };
 //
 // LDCondLine
 	LDOBJ_DEFAULTCOLOR (EdgeColor)
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
+	LDLine* becomeEdgeLine();
+protected:
 	LDCondLine (const Vertex& v0, const Vertex& v1, const Vertex& v2, const Vertex& v3, Model* model = nullptr);
-	LDLine* becomeEdgeLine();
 };
 //
 // LDTriangle
 //
 	LDOBJ_DEFAULTCOLOR (MainColor)
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
+	int triangleCount() const override;
+protected:
 	LDTriangle (Vertex const& v1, Vertex const& v2, Vertex const& v3, Model* model = nullptr);
-	int triangleCount() const override;
 };
 //
 // LDQuad
 //
 	LDOBJ_DEFAULTCOLOR (MainColor)
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
+	int triangleCount() const override;
+protected:
 	LDQuad (const Vertex& v1, const Vertex& v2, const Vertex& v3, const Vertex& v4, Model* model = nullptr);
-	int triangleCount() const override;
 };
 //
 // LDOverlay
 //
 	LDOBJ_DEFAULTCOLOR (EdgeColor)
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
-	LDBezierCurve (const Vertex& v0, const Vertex& v1, const Vertex& v2, const Vertex& v3, Model* model = nullptr);
 	Vertex pointAt (qreal t) const;
 	void rasterize(Model& model, int segments);
 	QVector<LDPolygon> rasterizePolygons (int segments);
+protected:
+	LDBezierCurve (const Vertex& v0, const Vertex& v1, const Vertex& v2, const Vertex& v3, Model* model = nullptr);
 };
 enum
 {
 	LowResolution = 16,

Mercurial > ldforge / file comparison

comparison: src/ldObject.h

src/ldObject.h