Maybe don't use all of the lines. Or maybe do.

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

diff --git a/src/ipdf.h b/src/ipdf.h
index e150088..cd6ef6f 100644 (file)
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -2,35 +2,74 @@
 #define _IPDF_H
 
 #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
 {
-       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);
+               return min + (max-min) * (Real(rand() % (int)1e6) / Real(1e6));
        }
 
        typedef unsigned ObjectID;
+       /** 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,
+               NUMBER_OF_OBJECT_TYPES
+       } ObjectType;
 
-       struct Rect
+       enum DocChunkTypes
        {
-               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();
-               }
+               CT_NUMOBJS,
+               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;
+               
        };
 
        struct Objects
        {
-               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
        };
 
        class View;