X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fipdf.h;h=f9d3a966dc8fc9752bfb43468c2f6ee2ce172966;hp=ff31533e5b452297f8f83b27698ca5c9415b8ae2;hb=85336af25da0c613460bbeda4ff7553933e13064;hpb=53579b1a949fa3e4e193f8dfba2064edbb123f57

diff --git a/src/ipdf.h b/src/ipdf.h
index ff31533..f9d3a96 100644
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -6,10 +6,7 @@
 #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);
+#include "group.h"
 
 namespace IPDF
 {
@@ -43,35 +40,17 @@ namespace IPDF
 		CT_OBJGROUPS
 	};
 
-
-
-	
-	
-	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 Group
-	{
-		Colour shading;
-	};
-
 	struct Objects
 	{
 		/** 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 **/
+		/** 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
-		
-		std::vector<std::pair<unsigned, unsigned> > groups;
+		/** Used by GROUP only **/
+		std::vector<Group> groups;
 	};
 
 	class View;