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
Fix colour in ScreenShot
[ipdf/code.git]
/
src
/
ipdf.h
diff --git
a/src/ipdf.h
b/src/ipdf.h
index
8ee30c3
..
7150944
100644
(file)
--- a/
src/ipdf.h
+++ b/
src/ipdf.h
@@
-2,12
+2,11
@@
#define _IPDF_H
#include "common.h"
#define _IPDF_H
#include "common.h"
+#include "real.h"
namespace IPDF
{
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);
inline Real Random(Real max=1, Real min=0)
{
return min + (max-min) * ((Real)(rand() % (int)1e6) / 1e6);
@@
-18,6
+17,7
@@
namespace IPDF
enum DocChunkTypes
{
enum DocChunkTypes
{
+ CT_NUMOBJS,
CT_OBJTYPES,
CT_OBJBOUNDS
};
CT_OBJTYPES,
CT_OBJBOUNDS
};
@@
-35,6
+35,13
@@
namespace IPDF
}
};
}
};
+ 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 Objects
{
std::vector<ObjectType> types;
struct Objects
{
std::vector<ObjectType> types;
UCC
git Repository :: git.ucc.asn.au