diff options
Diffstat (limited to 'libdimension/dimension')
-rw-r--r-- | libdimension/dimension/object.h | 6 | ||||
-rw-r--r-- | libdimension/dimension/pattern.h | 2 | ||||
-rw-r--r-- | libdimension/dimension/scene.h | 2 | ||||
-rw-r--r-- | libdimension/dimension/sky_sphere.h | 2 | ||||
-rw-r--r-- | libdimension/dimension/texture.h | 14 |
5 files changed, 13 insertions, 13 deletions
diff --git a/libdimension/dimension/object.h b/libdimension/dimension/object.h index 2ee4b67..267a515 100644 --- a/libdimension/dimension/object.h +++ b/libdimension/dimension/object.h @@ -49,7 +49,7 @@ typedef struct dmnsn_object dmnsn_object; * Object initialization callback. * @param[in,out] object The object to initialize. */ -typedef void dmnsn_object_init_fn(dmnsn_object *object); +typedef void dmnsn_object_initialize_fn(dmnsn_object *object); /** * Ray-object intersection callback. @@ -86,7 +86,7 @@ struct dmnsn_object { sub-objects for bounding purposes (for unions and meshes, for example). */ dmnsn_array *children; - dmnsn_object_init_fn *init_fn; /**< Initialization callback. */ + dmnsn_object_initialize_fn *initialize_fn; /**< Initialization callback. */ dmnsn_object_intersection_fn *intersection_fn; /**< Intersection callback. */ dmnsn_object_inside_fn *inside_fn; /**< Inside callback. */ dmnsn_free_fn *free_fn; /**< Destruction callback. */ @@ -111,7 +111,7 @@ void dmnsn_delete_object(dmnsn_object *object); * Initialize an object and potentially its children. * @param[in,out] object The object to initialize. */ -void dmnsn_object_init(dmnsn_object *object); +void dmnsn_initialize_object(dmnsn_object *object); /** * Appropriately transform a ray, then test for an intersection. diff --git a/libdimension/dimension/pattern.h b/libdimension/dimension/pattern.h index a696f7a..4a4aa33 100644 --- a/libdimension/dimension/pattern.h +++ b/libdimension/dimension/pattern.h @@ -68,7 +68,7 @@ void dmnsn_delete_pattern(dmnsn_pattern *pattern); * initialized for you. * @param[in,out] pattern The pattern to initialize. */ -void dmnsn_pattern_init(dmnsn_pattern *pattern); +void dmnsn_initialize_pattern(dmnsn_pattern *pattern); /** * Invoke the pattern callback with the right transformation. diff --git a/libdimension/dimension/scene.h b/libdimension/dimension/scene.h index 0889359..17c5238 100644 --- a/libdimension/dimension/scene.h +++ b/libdimension/dimension/scene.h @@ -90,6 +90,6 @@ void dmnsn_delete_scene(dmnsn_scene *scene); * Initialize a scene. * @param[in,out] scene The scene to initalize. */ -void dmnsn_scene_init(dmnsn_scene *scene); +void dmnsn_initialize_scene(dmnsn_scene *scene); #endif /* DIMENSION_SCENE_H */ diff --git a/libdimension/dimension/sky_sphere.h b/libdimension/dimension/sky_sphere.h index 5edacb0..f74442e 100644 --- a/libdimension/dimension/sky_sphere.h +++ b/libdimension/dimension/sky_sphere.h @@ -49,7 +49,7 @@ void dmnsn_delete_sky_sphere(dmnsn_sky_sphere *sky_sphere); * Initialize a sky sphere. * @param[in,out] sky_sphere The sky sphere to initialize. */ -void dmnsn_sky_sphere_init(dmnsn_sky_sphere *sky_sphere); +void dmnsn_initialize_sky_sphere(dmnsn_sky_sphere *sky_sphere); /** * Evaluate the color of the sky sphere. diff --git a/libdimension/dimension/texture.h b/libdimension/dimension/texture.h index 646f4b1..0398abc 100644 --- a/libdimension/dimension/texture.h +++ b/libdimension/dimension/texture.h @@ -46,13 +46,13 @@ typedef dmnsn_color dmnsn_pigment_fn(const dmnsn_pigment *pigment, * Pigment initializer callback. * @param[in,out] pigment The pigment to initialize. */ -typedef void dmnsn_pigment_init_fn(dmnsn_pigment *pigment); +typedef void dmnsn_pigment_initialize_fn(dmnsn_pigment *pigment); /** A pigment. */ struct dmnsn_pigment { - dmnsn_pigment_fn *pigment_fn; /**< The pigment callback. */ - dmnsn_pigment_init_fn *init_fn; /**< The initializer callback. */ - dmnsn_free_fn *free_fn; /**< The destructor callback. */ + dmnsn_pigment_fn *pigment_fn; /**< The pigment callback. */ + dmnsn_pigment_initialize_fn *initialize_fn; /**< The initializer callback. */ + dmnsn_free_fn *free_fn; /**< The destructor callback. */ dmnsn_matrix trans; /**< Transformation matrix. */ dmnsn_matrix trans_inv; /**< The inverse of the transformation matrix. */ @@ -82,7 +82,7 @@ void dmnsn_delete_pigment(dmnsn_pigment *pigment); * initialized for you. * @param[in,out] pigment The pigment to initialize. */ -void dmnsn_pigment_init(dmnsn_pigment *pigment); +void dmnsn_initialize_pigment(dmnsn_pigment *pigment); /* * Finishes @@ -175,7 +175,7 @@ typedef struct { dmnsn_matrix trans_inv; /**< The inverse of the transformation matrix. */ unsigned int *refcount; /**< @internal Reference count. */ - bool should_init; /**< @internal Whether to init the texture. */ + bool should_init; /**< @internal Whether to initialize the texture. */ } dmnsn_texture; /** @@ -196,6 +196,6 @@ void dmnsn_delete_texture(dmnsn_texture *texture); * initialized for you. * @param[in,out] texture The texture to initialize. */ -void dmnsn_texture_init(dmnsn_texture *texture); +void dmnsn_initialize_texture(dmnsn_texture *texture); #endif /* DIMENSION_TEXTURE_H */ |