summaryrefslogtreecommitdiffstats
path: root/libdimension/object.c
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2011-10-19 13:59:24 -0400
committerTavian Barnes <tavianator@gmail.com>2011-10-30 18:11:22 -0400
commit8e3a7158ecae541692826e7b5998c8ffc810173a (patch)
treebeda4f9f8604f77d0513d5fb02b7ddf53d203d09 /libdimension/object.c
parente9810a7b1aae15320e58371b657a2f963562834d (diff)
downloaddimension-8e3a7158ecae541692826e7b5998c8ffc810173a.tar.xz
Make API more consistent.
Object methods should be dmnsn_<object>_<fn>().
Diffstat (limited to 'libdimension/object.c')
-rw-r--r--libdimension/object.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libdimension/object.c b/libdimension/object.c
index 66c5166..b1b5fe3 100644
--- a/libdimension/object.c
+++ b/libdimension/object.c
@@ -23,7 +23,7 @@
* Objects.
*/
-#include "dimension.h"
+#include "dimension-internal.h"
#include <stdlib.h>
/* Allocate a dummy object */
@@ -66,7 +66,7 @@ dmnsn_delete_object(dmnsn_object *object)
/** Recursively initialize objects. */
static void
-dmnsn_initialize_object_recursive(dmnsn_object *object,
+dmnsn_object_initialize_recursive(dmnsn_object *object,
dmnsn_matrix pigment_trans)
{
dmnsn_assert(!object->initialized, "Object double-initialized.");
@@ -74,7 +74,7 @@ dmnsn_initialize_object_recursive(dmnsn_object *object,
/* Initialize the texture */
if (!object->texture->initialized) {
- dmnsn_initialize_texture(object->texture);
+ dmnsn_texture_initialize(object->texture);
}
/* Precalculate object values */
@@ -95,7 +95,7 @@ dmnsn_initialize_object_recursive(dmnsn_object *object,
dmnsn_texture_cascade(object->texture, &(*child)->texture);
dmnsn_interior_cascade(object->interior, &(*child)->interior);
- dmnsn_initialize_object_recursive(*child, child_pigment_trans);
+ dmnsn_object_initialize_recursive(*child, child_pigment_trans);
}
/* Initialization callback */
@@ -111,8 +111,8 @@ dmnsn_initialize_object_recursive(dmnsn_object *object,
/* Precompute object properties */
void
-dmnsn_initialize_object(dmnsn_object *object)
+dmnsn_object_initialize(dmnsn_object *object)
{
dmnsn_matrix pigment_trans = dmnsn_matrix_inverse(object->trans);
- dmnsn_initialize_object_recursive(object, pigment_trans);
+ dmnsn_object_initialize_recursive(object, pigment_trans);
}