X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fipdf.h;h=7150944278dc44a411057d577f9b3b020ce16461;hp=0264d96f550c719846cea1471bb9d02b6d3c1105;hb=5a72624d0293ca0881eea873490269cf61a5f762;hpb=b006386ab52e8a2c47c20bc21591d01c314d4d8e

diff --git a/src/ipdf.h b/src/ipdf.h
index 0264d96..7150944 100644
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -2,18 +2,30 @@
 #define _IPDF_H
 
 #include "common.h"
+#include "real.h"
 
 namespace IPDF
 {
-	typedef float Real;
-	
-	inline float RealToFloat(Real r) {return r;}
+
+	inline Real Random(Real max=1, Real min=0)
+	{
+		return min + (max-min) * ((Real)(rand() % (int)1e6) / 1e6);
+	}
 
 	typedef unsigned ObjectID;
+	typedef enum {RECT_FILLED, RECT_OUTLINE} ObjectType;
+
+	enum DocChunkTypes
+	{
+		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() 
 		{
@@ -23,8 +35,16 @@ namespace IPDF
 		}
 	};
 
+	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) {}
+	};
+
 	struct Objects
 	{
+		std::vector<ObjectType> types;		
 		std::vector<Rect> bounds;
 	};