X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=csgray;a=blobdiff_plain;f=src%2Fcsgimpl.h;h=90242a4f4c973a3c7dcbcfee24095d8596b3e706;hp=8b65783640a20d7aa89f3cb794d3bcfcb6eee36c;hb=976be63b2cde40482a374865e03f9fabe18b87e3;hpb=aab39eb873290ce4b268fe4ae303def6bf932bc0

diff --git a/src/csgimpl.h b/src/csgimpl.h
index 8b65783..90242a4 100644
--- 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_ */