summaryrefslogtreecommitdiffstats
path: root/libdimension/dimension/object.h
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-07-12 21:17:12 +0000
committerTavian Barnes <tavianator@gmail.com>2009-07-12 21:17:12 +0000
commitbcf65bd050d9fbe364a60ab7ec0221539ca2c2af (patch)
tree5e5196b9ec7269f57c83da9536bf1de91e92e91d /libdimension/dimension/object.h
parent249203127d1ae989785978024ef0ad25bc994384 (diff)
downloaddimension-bcf65bd050d9fbe364a60ab7ec0221539ca2c2af.tar.xz
Begin dmnsn_texture* type.
Diffstat (limited to 'libdimension/dimension/object.h')
-rw-r--r--libdimension/dimension/object.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libdimension/dimension/object.h b/libdimension/dimension/object.h
index 314a543..2da3ac7 100644
--- a/libdimension/dimension/object.h
+++ b/libdimension/dimension/object.h
@@ -35,8 +35,7 @@ typedef int dmnsn_object_inside_fn(const dmnsn_object *object,
dmnsn_vector point);
struct dmnsn_object {
- /* Generic pointer for object info */
- void *ptr;
+ dmnsn_texture *texture;
/* Transformation matrix */
dmnsn_matrix trans;
@@ -44,6 +43,9 @@ struct dmnsn_object {
/* Callback functions */
dmnsn_object_intersections_fn *intersections_fn;
dmnsn_object_inside_fn *inside_fn;
+
+ /* Generic pointer for object info */
+ void *ptr;
};
/* Allocate a dummy object */