X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fipdf.h;h=ff31533e5b452297f8f83b27698ca5c9415b8ae2;hp=cd6ef6f9ea7a32441701d6962c040e5784136dbf;hb=d9c0c3792133f87cd224dc22be428be8ddc016d8;hpb=f59f24dff392428d7219ba2d6be5e1e81c344ee0

diff --git a/src/ipdf.h b/src/ipdf.h
index cd6ef6f..ff31533 100644
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -29,6 +29,7 @@ namespace IPDF
 		RECT_FILLED,
 		RECT_OUTLINE,
 		BEZIER,
+		GROUP,
 		NUMBER_OF_OBJECT_TYPES
 	} ObjectType;
 
@@ -38,8 +39,8 @@ namespace IPDF
 		CT_OBJTYPES,
 		CT_OBJBOUNDS,
 		CT_OBJINDICES,
-		CT_OBJBEZIERS
-		//CT_OBJGROUPS
+		CT_OBJBEZIERS,
+		CT_OBJGROUPS
 	};
 
 
@@ -52,11 +53,10 @@ namespace IPDF
 		Colour() = default;
 		Colour(float _r, float _g, float _b, float _a) : r(_r), g(_g), b(_b), a(_a) {}
 	};
-
-	struct ObjectData
+	
+	struct Group
 	{
-		Colour colour;
-		
+		Colour shading;
 	};
 
 	struct Objects
@@ -70,6 +70,8 @@ namespace IPDF
 
 		/** Used by BEZIER only **/
 		std::vector<Bezier> beziers; // bezier curves - look up by data_indices
+		
+		std::vector<std::pair<unsigned, unsigned> > groups;
 	};
 
 	class View;