ldforge: comparison src/ldObject.h

-:a496e72af069
+:83426c5fa732
 #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_UNCOLORED        LDOBJ_SETCOLORED (false) LDOBJ_DEFAULTCOLOR (MainColor())
 #define LDOBJ_DEFAULTCOLOR(V)  public: virtual LDColor defaultColor() const override { return (V); }
 #define LDOBJ_CUSTOM_SCEMANTIC public: virtual bool isScemantic() const override
 #define LDOBJ_SCEMANTIC        LDOBJ_CUSTOM_SCEMANTIC { return true; }
 #define LDOBJ_NON_SCEMANTIC    LDOBJ_CUSTOM_SCEMANTIC { return false; }
 //
 // Makes a new LDObject. This makes the shared pointer always use the custom
 // deleter so that all deletions go through finalDelete();
 //
 template<typename T, typename... Args>
-inline QSharedPointer<T> spawn (Args... args)
+inline QSharedPointer<T> LDSpawn (Args... args)
 {
-	static_assert (std::is_base_of<LDObject, T>::value, "spawn may only be used with LDObject-derivatives");
+	static_assert (std::is_base_of<LDObject, T>::value,
+		"spawn may only be used with LDObject-derivatives");
 	LDObjectPtr ptr;
 	new T (&ptr, args...);
-	// Set default color. This cannot be done in the c-tor.
+	// Set default color. Relying on virtual functions, this cannot be done in the c-tor.
 	if (ptr->isColored())
 		ptr->setColor (ptr->defaultColor());
 	return ptr.staticCast<T>();
 }
 	Vertex m_position;
 public:
 	LDMatrixObject (LDObjectPtr* selfptr) :
 		LDObject (selfptr),
-		m_position (g_origin) {}
+		m_position (Origin) {}
 	LDMatrixObject (LDObjectPtr* selfptr, const Matrix& transform, const Vertex& pos) :
 		LDObject (selfptr),
 		m_transform (transform),
 		m_position (pos) {}
 {
 	LDOBJ (Subfile)
 	LDOBJ_NAME (subfile)
 	LDOBJ_VERTICES (0)
 	LDOBJ_COLORED
-	LDOBJ_DEFAULTCOLOR (maincolor())
+	LDOBJ_DEFAULTCOLOR (MainColor())
 	LDOBJ_SCEMANTIC
 	LDOBJ_HAS_MATRIX
 	PROPERTY (public, LDDocumentPtr, fileInfo, setFileInfo, CUSTOM_WRITE)
 public:
 {
 	LDOBJ (Line)
 	LDOBJ_NAME (line)
 	LDOBJ_VERTICES (2)
 	LDOBJ_COLORED
-	LDOBJ_DEFAULTCOLOR (edgecolor())
+	LDOBJ_DEFAULTCOLOR (EdgeColor())
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
 	LDLine (LDObjectPtr* selfptr, Vertex v1, Vertex v2);
 {
 	LDOBJ (CondLine)
 	LDOBJ_NAME (condline)
 	LDOBJ_VERTICES (4)
 	LDOBJ_COLORED
-	LDOBJ_DEFAULTCOLOR (edgecolor())
+	LDOBJ_DEFAULTCOLOR (EdgeColor())
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
 	LDCondLine (LDObjectPtr* selfptr, const Vertex& v0, const Vertex& v1,
 {
 	LDOBJ (Triangle)
 	LDOBJ_NAME (triangle)
 	LDOBJ_VERTICES (3)
 	LDOBJ_COLORED
-	LDOBJ_DEFAULTCOLOR (maincolor())
+	LDOBJ_DEFAULTCOLOR (MainColor())
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
 	LDTriangle (LDObjectPtr* selfptr, Vertex const& v1,
 {
 	LDOBJ (Quad)
 	LDOBJ_NAME (quad)
 	LDOBJ_VERTICES (4)
 	LDOBJ_COLORED
-	LDOBJ_DEFAULTCOLOR (maincolor())
+	LDOBJ_DEFAULTCOLOR (MainColor())
 	LDOBJ_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
 	LDQuad (LDObjectPtr* selfptr, const Vertex& v1, const Vertex& v2,
 {
 	LDOBJ (Vertex)
 	LDOBJ_NAME (vertex)
 	LDOBJ_VERTICES (0) // TODO: move pos to m_vertices[0]
 	LDOBJ_COLORED
-	LDOBJ_DEFAULTCOLOR (maincolor())
+	LDOBJ_DEFAULTCOLOR (MainColor())
 	LDOBJ_NON_SCEMANTIC
 	LDOBJ_NO_MATRIX
 public:
 	Vertex pos;
 	PROPERTY (public,	int,		camera,		setCamera,		STOCK_WRITE)
 	PROPERTY (public,	int,		x,			setX,			STOCK_WRITE)
 	PROPERTY (public,	int,		y,			setY,			STOCK_WRITE)
 	PROPERTY (public,	int,		width,		setWidth,		STOCK_WRITE)
 	PROPERTY (public,	int,		height,		setHeight,		STOCK_WRITE)
-	PROPERTY (public,	QString,		fileName,	setFileName,	STOCK_WRITE)
+	PROPERTY (public,	QString,	fileName,	setFileName,	STOCK_WRITE)
 };
 using LDOverlayPtr = QSharedPointer<LDOverlay>;
 using LDOverlayWeakPtr = QWeakPointer<LDOverlay>;
 // Other common LDraw stuff
 static const QString CALicenseText ("!LICENSE Redistributable under CCAL version 2.0 : "
 	"see CAreadme.txt");
-static const int LowResolution = 16;
-static const int HighResolution = 48;
+enum
+{
+	LowResolution = 16,
+	HighResolution = 48
+};
 QString PreferredLicenseText();
 template<typename T>
 inline void DynamicExecute (LDObjectPtr obj, std::function<void (QSharedPointer<T> const&)> func)

Mercurial > ldforge / file comparison

comparison: src/ldObject.h

src/ldObject.h