summaryrefslogtreecommitdiffstats
path: root/libdimension/raytrace.c
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2011-04-03 21:30:15 -0400
committerTavian Barnes <tavianator@gmail.com>2011-04-03 21:30:15 -0400
commit5a535f9fac3f4b82f0b154b4c81fd1e2a8d62802 (patch)
tree2b642b87d97ab13b050e1ef9323725c0bbd5b5c6 /libdimension/raytrace.c
parent7bc2770af08e317b2076540050c68d2de55a11db (diff)
downloaddimension-5a535f9fac3f4b82f0b154b4c81fd1e2a8d62802.tar.xz
Don't use awkward (*fptr)() syntax.
Diffstat (limited to 'libdimension/raytrace.c')
-rw-r--r--libdimension/raytrace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libdimension/raytrace.c b/libdimension/raytrace.c
index dbd0af3..23ccd4e 100644
--- a/libdimension/raytrace.c
+++ b/libdimension/raytrace.c
@@ -61,7 +61,7 @@ dmnsn_raytrace_scene_async(dmnsn_scene *scene)
payload->progress = progress;
payload->scene = scene;
- dmnsn_new_thread(progress, &dmnsn_raytrace_scene_thread, payload);
+ dmnsn_new_thread(progress, dmnsn_raytrace_scene_thread, payload);
return progress;
}
@@ -89,7 +89,7 @@ dmnsn_raytrace_scene_thread(void *ptr)
/* Time the render itself */
payload->scene->render_timer = dmnsn_new_timer();
- int ret = dmnsn_execute_concurrently(&dmnsn_raytrace_scene_concurrent,
+ int ret = dmnsn_execute_concurrently(dmnsn_raytrace_scene_concurrent,
payload, payload->scene->nthreads);
dmnsn_complete_timer(payload->scene->render_timer);
@@ -187,9 +187,9 @@ dmnsn_raytrace_scene_concurrent(void *ptr, unsigned int thread,
/** Call the appropriate overloaded texture callback. */
#define TEXTURE_CALLBACK(state, telem, fn, def, ...) \
(CAN_CALL(ITEXTURE(state), telem, fn) \
- ? (*ITEXTURE(state)->telem->fn)(ITEXTURE(state)->telem, __VA_ARGS__) \
+ ? ITEXTURE(state)->telem->fn(ITEXTURE(state)->telem, __VA_ARGS__) \
: (CAN_CALL(DTEXTURE(state), telem, fn) \
- ? (*DTEXTURE(state)->telem->fn)(DTEXTURE(state)->telem, __VA_ARGS__) \
+ ? DTEXTURE(state)->telem->fn(DTEXTURE(state)->telem, __VA_ARGS__) \
: def));
/** Get a property from a texture element. */
@@ -250,7 +250,7 @@ dmnsn_raytrace_light_ray(const dmnsn_raytrace_state *state,
* dmnsn_vector_dot(state->viewer, state->intersection->normal) < 0.0)
return dmnsn_black;
- dmnsn_color color = (*light->light_fn)(light, state->r);
+ dmnsn_color color = light->light_fn(light, state->r);
unsigned int reclevel = state->reclevel;
while (reclevel) {