grab and drop, also refactor of metaobject callbacks

[metatoy] / src / metaobj.h

diff --git a/src/metaobj.h b/src/metaobj.h
index cd73e8a..7dbee8a 100644 (file)
--- a/src/metaobj.h
+++ b/src/metaobj.h
@@ -1,6 +1,12 @@
 #ifndef METAOBJ_H_
 #define METAOBJ_H_
 
+enum {
+       MOBJ_IDLE,
+       MOBJ_GRABING,
+       MOBJ_HELD,
+       MOBJ_DROPPING
+};
 
 struct mball {
        float energy;
@@ -14,12 +20,20 @@ struct mcapsule {
 };
 
 struct mobject {
-       cgm_vec3 pos;
+       cgm_vec3 pos, mouse;
+       int state;
        struct mball *balls;
        struct mcapsule *caps;
        int num_balls, num_caps;
+       cgm_vec3 *idlepos;
+       cgm_vec4 *mot;
+       float tstart;
+       float xform[16];
 
-       void (*update)(struct mobject *mobj, float t);
+       void (*swstate)(struct mobject *mobj, int newst);
+       void (*update)(struct mobject *mobj, float tsec);
+       void (*upd_ball)(struct mobject *mobj, struct mball *ball, float tsec, float t);
+       void (*upd_caps)(struct mobject *mobj, struct mcapsule *caps, float tsec, float t);
        float (*eval)(struct mobject *mobj, cgm_vec3 *pos);
 };