Totally FITH everything

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

diff --git a/src/ipdf.h b/src/ipdf.h
index 8ee30c3..20e47c0 100644 (file)
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -2,45 +2,66 @@
 #define _IPDF_H
 
 #include "common.h"
+#include "real.h"
+#include "bezier.h"
+#include "rect.h"
+
+#include "path.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);
+               return min + (max-min) * (Real(rand() % (int)100) / Real(100));
        }
 
        typedef unsigned ObjectID;
-       typedef enum {RECT_FILLED, RECT_OUTLINE} ObjectType;
+       /** 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,
+               PATH,
+               NUMBER_OF_OBJECT_TYPES
+       } ObjectType;
 
        enum DocChunkTypes
        {
+               CT_NUMOBJS,
                CT_OBJTYPES,
-               CT_OBJBOUNDS
+               CT_OBJBOUNDS,
+               CT_OBJINDICES,
+               CT_OBJBEZIERS,
+               CT_OBJPATHS
        };
 
-       struct Rect
+       struct Objects
        {
-               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() 
+               /** Used by all objects **/
+               std::vector<ObjectType> types; // types of objects
+               std::vector<Rect> bounds; // rectangle bounds of objects
+               /** 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;
+               
+               void Clear()
                {
-                       std::stringstream s;
-                       s << "{" << x << ", " << y << ", " << w << ", " << h << "}";
-                       return s.str();
+                       types.clear();
+                       bounds.clear();
+                       data_indices.clear();
+                       beziers.clear();
+                       paths.clear();
                }
        };
 
-       struct Objects
-       {
-               std::vector<ObjectType> types;          
-               std::vector<Rect> bounds;
-       };
-
        class View;
 }