ldforge: comparison src/ldtypes.h

-:ee42f4442566
+:4e686b771996
 	// Index (i.e. line number) of this object
 	long getIndex (OpenFile* pFile);
 	// Color used by this object. Comments, gibberish and empty entries
 	// do not use this field.
-	short dColor;
+	short color;
 	// OpenGL list for this object
 	uint glLists[3];
 	// Vertices of this object
-	vertex vaCoords[4];
+	vertex coords[4];
 	// Object this object was referenced from, if any
 	LDObject* parent;
 	// Type enumerator of this object
 	// Swap this object with another.
 	void swap (LDObject* other);
 	// Moves this object using the given vertex as a movement vector
-	virtual void move (vertex vVector);
+	virtual void move (vertex vect);
 	// What object in the current file ultimately references this?
 	LDObject* topLevelParent ();
 	// Number of vertices this object has
 	LDOBJ_SCHEMANTIC
 	LDGibberish (str _zContent, str _zReason);
 	// Content of this unknown line
-	str zContents;
+	str contents;
 	// Why is this gibberish?
-	str zReason;
+	str reason;
 };
 // =============================================================================
 // LDEmptyLine
 //
 public:
 	IMPLEMENT_LDTYPE (Comment, 0)
 	LDOBJ_UNCOLORED
 	LDOBJ_NON_SCHEMANTIC
-	LDComment (str zText) : text (zText) {}
+	LDComment (str text) : text (text) {}
 	str text; // The text of this comment
 };
 // =============================================================================
 	IMPLEMENT_LDTYPE (BFC, 0)
 	LDOBJ_UNCOLORED
 	LDOBJ_CUSTOM_SCHEMANTIC { return (type == InvertNext); }
-	LDBFC (const LDBFC::Type eType) : type (eType) {}
+	LDBFC (const LDBFC::Type type) : type (type) {}
 	// Statement strings
 	static const char* statements[];
 	Type type;
 public:
 	IMPLEMENT_LDTYPE (Subfile, 0)
 	LDOBJ_COLORED
 	LDOBJ_SCHEMANTIC
-	vertex vPosition; // Position of the subpart (FIXME: should get rid of this)
+	vertex pos; // Position of the subpart (TODO: should get rid of this)
-	matrix<3> mMatrix; // Transformation matrix for the subpart
+	matrix<3> transform; // Transformation matrix for the subpart
-	str zFileName; // Filename of the subpart
+	str fileName; // Filename of the subpart (TODO: rid this too - use fileInfo->fileName instead)
-	OpenFile* pFile; // Pointer to opened file for this subfile. null if unopened.
+	OpenFile* fileInfo; // Pointer to opened file for this subfile. null if unopened.
 	// 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);
+	std::vector<LDObject*> inlineContents (bool deep, bool cache);
 };
 // =============================================================================
 // LDLine
 //
 	IMPLEMENT_LDTYPE (Triangle, 3)
 	LDOBJ_COLORED
 	LDOBJ_SCHEMANTIC
 	LDTriangle (vertex _v0, vertex _v1, vertex _v2) {
-		vaCoords[0] = _v0;
+		coords[0] = _v0;
-		vaCoords[1] = _v1;
+		coords[1] = _v1;
-		vaCoords[2] = _v2;
+		coords[2] = _v2;
 	}
 };
 // =============================================================================
 // LDQuad
 // with. Vertices are a part authoring tool and they should not appear in
 // finished parts.
 // =============================================================================
 class LDVertex : public LDObject {
 public:
-	IMPLEMENT_LDTYPE (Vertex, 0) // TODO: move vPosition to vaCoords[0]
+	IMPLEMENT_LDTYPE (Vertex, 0) // TODO: move pos to vaCoords[0]
 	LDOBJ_COLORED
 	LDOBJ_NON_SCHEMANTIC
-	vertex vPosition;
+	vertex pos;
 };
 // =============================================================================
 // LDRadial
 //
 	IMPLEMENT_LDTYPE (Radial, 0)
 	LDOBJ_COLORED
 	LDOBJ_SCHEMANTIC
-	LDRadial::Type eRadialType;
+	LDRadial::Type radType;
-	vertex vPosition;
+	vertex pos;
-	matrix<3> mMatrix;
+	matrix<3> transform;
-	short dDivisions, dSegments, dRingNum;
+	short divs, segs, ringNum;
-	LDRadial (LDRadial::Type eRadialType, vertex vPosition, matrix<3> mMatrix,
+	LDRadial (LDRadial::Type radType, vertex pos, matrix<3> transform, short divs, short segs, short ringNum) :
-		short dDivisions, short dSegments, short dRingNum) :
+		radType (radType), pos (pos), transform (transform), divs (divs), segs (segs), ringNum (ringNum) {}
-		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);
+	std::vector<LDObject*> decompose (bool applyTransform);
 	// Compose a file name for this radial.
 	str makeFileName ();
 	char const* radialTypeName ();
-	static char const* radialTypeName (const LDRadial::Type eType);
+	static char const* radialTypeName (const LDRadial::Type type);
 };
 // =============================================================================
 // Object type names. Pass the return value of getType as the index to get a
 // string representation of the object's type.

Mercurial > ldforge / file comparison

comparison: src/ldtypes.h

src/ldtypes.h