projects
/
csgray
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added cylinder primitive
[csgray]
/
src
/
csgimpl.h
diff --git
a/src/csgimpl.h
b/src/csgimpl.h
index
ab92f1e
..
90242a4
100644
(file)
--- a/
src/csgimpl.h
+++ b/
src/csgimpl.h
@@
-21,6
+21,7
@@
struct object {
float emr, emg, emb;
float roughness;
float opacity;
float emr, emg, emb;
float roughness;
float opacity;
+ int metallic;
float xform[16], inv_xform[16];
float xform[16], inv_xform[16];
@@
-37,7
+38,7
@@
struct sphere {
struct cylinder {
struct object ob;
struct cylinder {
struct object ob;
- float rad;
+ float rad, height;
};
struct plane {
};
struct plane {
@@
-46,6
+47,11
@@
struct plane {
float d;
};
float d;
};
+struct box {
+ struct object ob;
+ float xsz, ysz, zsz;
+};
+
struct csgop {
struct object ob;
csg_object *a, *b;
struct csgop {
struct object ob;
csg_object *a, *b;
@@
-56,13
+62,19
@@
union csg_object {
struct sphere sph;
struct cylinder cyl;
struct plane plane;
struct sphere sph;
struct cylinder cyl;
struct plane plane;
+ struct box box;
struct csgop un, isect, sub;
};
struct camera {
float x, y, z;
float tx, ty, tz;
struct csgop un, isect, sub;
};
struct camera {
float x, y, z;
float tx, ty, tz;
+ float ux, uy, uz;
float fov;
float fov;
+
+ float xform[16];
};
};
+int csg_dbg_pixel;
+
#endif /* CSGIMPL_H_ */
#endif /* CSGIMPL_H_ */