Totally FITH everything

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

diff --git a/src/ipdf.h b/src/ipdf.h
index f9d3a96..20e47c0 100644 (file)
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -6,14 +6,14 @@
 #include "bezier.h"
 #include "rect.h"
 
-#include "group.h"
+#include "path.h"
 
 namespace IPDF
 {
 
        inline Real Random(Real max=1, Real min=0)
        {
-               return min + (max-min) * (Real(rand() % (int)1e6) / Real(1e6));
+               return min + (max-min) * (Real(rand() % (int)100) / Real(100));
        }
 
        typedef unsigned ObjectID;
@@ -26,7 +26,7 @@ namespace IPDF
                RECT_FILLED,
                RECT_OUTLINE,
                BEZIER,
-               GROUP,
+               PATH,
                NUMBER_OF_OBJECT_TYPES
        } ObjectType;
 
@@ -37,7 +37,7 @@ namespace IPDF
                CT_OBJBOUNDS,
                CT_OBJINDICES,
                CT_OBJBEZIERS,
-               CT_OBJGROUPS
+               CT_OBJPATHS
        };
 
        struct Objects
@@ -49,8 +49,17 @@ namespace IPDF
                std::vector<unsigned> data_indices;
                /** Used by BEZIER only **/
                std::vector<Bezier> beziers; // bezier curves - look up by data_indices
-               /** Used by GROUP only **/
-               std::vector<Group> groups;
+               /** Used by PATH only **/
+               std::vector<Path> paths;
+               
+               void Clear()
+               {
+                       types.clear();
+                       bounds.clear();
+                       data_indices.clear();
+                       beziers.clear();
+                       paths.clear();
+               }
        };
 
        class View;