X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fipdf.h;h=633c8ef12c2dc3da64681f61f56e5738c53f2717;hp=5a4f35c3b9d8bc5f4014385caa8c3fa365e87e0e;hb=888817a67a9d840be66b52811b01eb77f10ff3e6;hpb=f8ef964f021d1d6da6ea46bbb1fe8f0250a5be8c

diff --git a/src/ipdf.h b/src/ipdf.h
index 5a4f35c..633c8ef 100644
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -3,10 +3,10 @@
 
 #include "common.h"
 #include "real.h"
+#include "bezier.h"
+#include "rect.h"
 
-#define C_RED Colour(1,0,0,1)
-#define C_GREEN Colour(0,1,0,1)
-#define C_BLUE Colour(0,0,1,1)
+#include "path.h"
 
 namespace IPDF
 {
@@ -22,9 +22,11 @@ namespace IPDF
 	 */
 	typedef enum 
 	{
-		RECT_FILLED = 0,
+		CIRCLE_FILLED = 0, 
+		RECT_FILLED,
 		RECT_OUTLINE,
-		CIRCLE_FILLED, 
+		BEZIER,
+		PATH,
 		NUMBER_OF_OBJECT_TYPES
 	} ObjectType;
 
@@ -33,33 +35,22 @@ namespace IPDF
 		CT_NUMOBJS,
 		CT_OBJTYPES,
 		CT_OBJBOUNDS,
-	};
-
-	struct Rect
-	{
-		Real x; Real y; Real w; Real h;
-		Rect() = default; // Needed so we can fread/fwrite this struct
-		Rect(Real _x, Real _y, Real _w, Real _h) : x(_x), y(_y), w(_w), h(_h) {}
-		std::string Str() const
-		{
-			std::stringstream s;
-			// float conversion needed because it is fucking impossible to get ostreams working with template classes
-			s << "{" << Float(x) << ", " << Float(y) << ", " << Float(w) << ", " << Float(h) << "}";
-			return s.str();
-		}
-	};
-
-	struct Colour
-	{
-		float r; float g; float b; float a;
-		Colour() = default;
-		Colour(float _r, float _g, float _b, float _a) : r(_r), g(_g), b(_b), a(_a) {}
+		CT_OBJINDICES,
+		CT_OBJBEZIERS,
+		CT_OBJPATHS
 	};
 
 	struct Objects
 	{
-		std::vector<ObjectType> types;		
-		std::vector<Rect> bounds;
+		/** Used by all objects **/
+		std::vector<ObjectType> types; // types of objects
+		std::vector<Rect> bounds; // rectangle bounds of objects
+		/** Used by BEZIER and GROUP to identify data position in relevant vector **/
+		std::vector<unsigned> data_indices;
+		/** Used by BEZIER only **/
+		std::vector<Bezier> beziers; // bezier curves - look up by data_indices
+		/** Used by PATH only **/
+		std::vector<Path> paths;
 	};
 
 	class View;