Add quadtree back to the Makefile

[ipdf/code.git] / src / ipdf.h

diff --git a/src/ipdf.h b/src/ipdf.h
index cd6ef6f..633c8ef 100644 (file)
--- 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 "path.h"
 
 namespace IPDF
 {
@@ -29,6 +26,7 @@ namespace IPDF
                RECT_FILLED,
                RECT_OUTLINE,
                BEZIER,
+               PATH,
                NUMBER_OF_OBJECT_TYPES
        } ObjectType;
 
@@ -38,25 +36,8 @@ namespace IPDF
                CT_OBJTYPES,
                CT_OBJBOUNDS,
                CT_OBJINDICES,
-               CT_OBJBEZIERS
-               //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 ObjectData
-       {
-               Colour colour;
-               
+               CT_OBJBEZIERS,
+               CT_OBJPATHS
        };
 
        struct Objects
@@ -64,12 +45,12 @@ namespace IPDF
                /** 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
+               /** Used by PATH only **/
+               std::vector<Path> paths;
        };
 
        class View;