X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fipdf.h;h=ff31533e5b452297f8f83b27698ca5c9415b8ae2;hp=c34f5ed57adea2908484cf548f24904e1ac977f3;hb=0ce8df17fae3ec986bd9570e5552aed92c080088;hpb=32cd67ec48271c176eba218e082fcf5824aa8e6c

diff --git a/src/ipdf.h b/src/ipdf.h
index c34f5ed..ff31533 100644
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -3,41 +3,75 @@
 
 #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)
+#define C_BLACK Colour(0,0,0,1);
 
 namespace IPDF
 {
 
 	inline Real Random(Real max=1, Real min=0)
 	{
-		return min + (max-min) * ((Real)(rand() % (int)1e6) / 1e6);
+		return min + (max-min) * (Real(rand() % (int)1e6) / Real(1e6));
 	}
 
 	typedef unsigned ObjectID;
-	typedef enum {RECT_FILLED, RECT_OUTLINE} ObjectType;
+	/** Type of object
+     * NOTE: Extra entry in the enum so we can use this as an array index
+	 */
+	typedef enum 
+	{
+		CIRCLE_FILLED = 0, 
+		RECT_FILLED,
+		RECT_OUTLINE,
+		BEZIER,
+		GROUP,
+		NUMBER_OF_OBJECT_TYPES
+	} ObjectType;
 
 	enum DocChunkTypes
 	{
+		CT_NUMOBJS,
 		CT_OBJTYPES,
-		CT_OBJBOUNDS
+		CT_OBJBOUNDS,
+		CT_OBJINDICES,
+		CT_OBJBEZIERS,
+		CT_OBJGROUPS
 	};
 
-	struct Rect
+
+
+	
+	
+	struct Colour
 	{
-		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() 
-		{
-			std::stringstream s;
-			s << "{" << x << ", " << y << ", " << w << ", " << h << "}";
-			return s.str();
-		}
+		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) {}
+	};
+	
+	struct Group
+	{
+		Colour shading;
 	};
 
 	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 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
+		
+		std::vector<std::pair<unsigned, unsigned> > groups;
 	};
 
 	class View;