X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscene.h;h=7d4cd227b3d3124e35638fdbffe6c8c12a39ab9e;hb=8b26b033e3709d820996a23008435632fa7922bf;hp=a1e81c29f5bfdd0af1c1e6550f718fdae6430d31;hpb=f0f09a5f3f76fd4207e4d2d71f29f876b2b379f7;p=retroray

diff --git a/src/scene.h b/src/scene.h
index a1e81c2..7d4cd22 100644
--- a/src/scene.h
+++ b/src/scene.h
@@ -22,7 +22,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 enum {
 	OBJ_NULL,
-	OBJ_SPHERE
+	OBJ_SPHERE,
+	OBJ_CSG
 };
 
 #define OBJ_COMMON_ATTR \
@@ -30,7 +31,8 @@ enum {
 	char *name; \
 	cgm_vec3 pos, scale, pivot; \
 	cgm_quat rot; \
-	float xform[16]
+	float xform[16], inv_xform[16]; \
+	int xform_valid
 
 struct object {
 	OBJ_COMMON_ATTR;
@@ -41,15 +43,27 @@ struct sphere {
 	float rad;
 };
 
+struct csgnode {
+	OBJ_COMMON_ATTR;
+	int op;
+	struct object *subobj;	/* darr */
+};
+
 struct scene {
 	struct object **objects;	/* darr */
 };
 
+struct rayhit;	/* declared in rt.h */
+
 struct scene *create_scene(void);
 void free_scene(struct scene *scn);
 
 int scn_add_object(struct scene *scn, struct object *obj);
-int scn_num_objects(struct scene *scn);
+int scn_rm_object(struct scene *scn, int idx);
+int scn_num_objects(const struct scene *scn);
+int scn_object_index(const struct scene *scn, const struct object *obj);
+
+int scn_intersect(const struct scene *scn, const cgm_ray *ray, struct rayhit *hit);
 
 struct object *create_object(int type);
 void free_object(struct object *obj);