added cylinder primitive

[csgray] / src / csgimpl.h

diff --git a/src/csgimpl.h b/src/csgimpl.h
index 8b65783..90242a4 100644 (file)
--- a/src/csgimpl.h
+++ b/src/csgimpl.h
@@ -38,7 +38,7 @@ struct sphere {
 
 struct cylinder {
        struct object ob;
-       float rad;
+       float rad, height;
 };
 
 struct plane {
@@ -47,6 +47,11 @@ struct plane {
        float d;
 };
 
+struct box {
+       struct object ob;
+       float xsz, ysz, zsz;
+};
+
 struct csgop {
        struct object ob;
        csg_object *a, *b;
@@ -57,6 +62,7 @@ union csg_object {
        struct sphere sph;
        struct cylinder cyl;
        struct plane plane;
+       struct box box;
        struct csgop un, isect, sub;
 };
 
@@ -69,4 +75,6 @@ struct camera {
        float xform[16];
 };
 
+int csg_dbg_pixel;
+
 #endif /* CSGIMPL_H_ */