projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
62526b3
)
move a color #define out of the public api
author
Dana Jansens
<danakj@orodu.net>
Tue, 3 Jun 2003 20:27:52 +0000
(20:27 +0000)
committer
Dana Jansens
<danakj@orodu.net>
Tue, 3 Jun 2003 20:27:52 +0000
(20:27 +0000)
render2/color.h
patch
|
blob
|
history
render2/render.h
patch
|
blob
|
history
diff --git
a/render2/color.h
b/render2/color.h
index 667ab37b9f33424707711b28db93c0bd9fa189b4..7893239a69ddc60ff8dfda432fbfac9f1a192126 100644
(file)
--- a/
render2/color.h
+++ b/
render2/color.h
@@
-3,6
+3,9
@@
#include "render.h"
+/*! Returns if an RrColor is non-opaque */
+#define RrColorHasAlpha(c) ((c).a < 0.999999999)
+
#define RrColor3f(c) glColor3f((c)->r, (c)->g, (c)->b)
#define RrColor4f(c) glColor4f((c)->r, (c)->g, (c)->b, (c)->a)
diff --git
a/render2/render.h
b/render2/render.h
index 57def775e03d923098cc7e45f850dc2e8bbcd8d6..274395d8629c6a16a6f3362375e23078f0fa3cad 100644
(file)
--- a/
render2/render.h
+++ b/
render2/render.h
@@
-42,9
+42,6
@@
struct RrColor {
float a;
};
-/*! Returns if an RrColor is non-opaque */
-#define RrColorHasAlpha(c) ((c).a > 0.0000001)
-
/*! Sets the values of all components for an RrColor */
#define RrColorSet(c, w, x, y, z) (c)->r = (w), (c)->g = (x), \
(c)->b = (y), (c)->a = z