git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Because merging is going to be fun.
[ipdf/code.git]
/
src
/
ipdf.h
diff --git
a/src/ipdf.h
b/src/ipdf.h
index
968a3ed
..
633c8ef
100644
(file)
--- a/
src/ipdf.h
+++ b/
src/ipdf.h
@@
-6,10
+6,7
@@
#include "bezier.h"
#include "rect.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);
+#include "path.h"
namespace IPDF
{
namespace IPDF
{
@@
-29,7
+26,7
@@
namespace IPDF
RECT_FILLED,
RECT_OUTLINE,
BEZIER,
RECT_FILLED,
RECT_OUTLINE,
BEZIER,
-
GROUP
,
+
PATH
,
NUMBER_OF_OBJECT_TYPES
} ObjectType;
NUMBER_OF_OBJECT_TYPES
} ObjectType;
@@
-40,25
+37,7
@@
namespace IPDF
CT_OBJBOUNDS,
CT_OBJINDICES,
CT_OBJBEZIERS,
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 Group
- {
- unsigned start;
- unsigned end;
- Colour shading;
+ CT_OBJPATHS
};
struct Objects
};
struct Objects
@@
-70,8
+49,8
@@
namespace IPDF
std::vector<unsigned> data_indices;
/** Used by BEZIER only **/
std::vector<Bezier> beziers; // bezier curves - look up by data_indices
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> group
s;
+ /** Used by
PATH
only **/
+ std::vector<
Path> path
s;
};
class View;
};
class View;
UCC
git Repository :: git.ucc.asn.au