summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/julia/julia.c4
-rw-r--r--src/modules/plasma/plasma.c4
-rw-r--r--src/modules/ray/ray.c4
-rw-r--r--src/modules/roto/roto.c8
-rw-r--r--src/modules/sparkler/sparkler.c4
-rw-r--r--src/modules/stars/stars.c4
-rw-r--r--src/rototiller.c2
-rw-r--r--src/rototiller.h2
8 files changed, 16 insertions, 16 deletions
diff --git a/src/modules/julia/julia.c b/src/modules/julia/julia.c
index f8072a8..9e3dba2 100644
--- a/src/modules/julia/julia.c
+++ b/src/modules/julia/julia.c
@@ -35,7 +35,7 @@ static inline unsigned julia_iter(float real, float imag, float creal, float cim
}
/* Draw a morphing Julia set */
-static void julia(fb_fragment_t *fragment)
+static void julia_render_fragment(fb_fragment_t *fragment)
{
static uint32_t colors[] = {
/* this palette is just something I slapped together, definitely needs improvement. TODO */
@@ -109,7 +109,7 @@ static void julia(fb_fragment_t *fragment)
}
rototiller_module_t julia_module = {
- .render = julia,
+ .render_fragment = julia_render_fragment,
.name = "julia",
.description = "Julia set fractal morpher",
.author = "Vito Caputo <vcaputo@pengaru.com>",
diff --git a/src/modules/plasma/plasma.c b/src/modules/plasma/plasma.c
index 211a032..26b38c2 100644
--- a/src/modules/plasma/plasma.c
+++ b/src/modules/plasma/plasma.c
@@ -41,7 +41,7 @@ static void init_plasma(int32_t *costab, int32_t *sintab)
/* Draw a plasma effect */
-static void plasma(fb_fragment_t *fragment)
+static void plasma_render_fragment(fb_fragment_t *fragment)
{
static int32_t costab[FIXED_TRIG_LUT_SIZE], sintab[FIXED_TRIG_LUT_SIZE];
static int initialized;
@@ -118,7 +118,7 @@ static void plasma(fb_fragment_t *fragment)
}
rototiller_module_t plasma_module = {
- .render = plasma,
+ .render_fragment = plasma_render_fragment,
.name = "plasma",
.description = "Oldskool plasma effect",
.author = "Vito Caputo <vcaputo@pengaru.com>",
diff --git a/src/modules/ray/ray.c b/src/modules/ray/ray.c
index 1652aa2..a0613e8 100644
--- a/src/modules/ray/ray.c
+++ b/src/modules/ray/ray.c
@@ -14,7 +14,7 @@
/* Copyright (C) 2016-2017 Vito Caputo <vcaputo@pengaru.com> */
/* ray trace a simple scene into the fragment */
-static void ray(fb_fragment_t *fragment)
+static void ray_render_fragment(fb_fragment_t *fragment)
{
static ray_object_t objects[] = {
{
@@ -167,7 +167,7 @@ static void ray(fb_fragment_t *fragment)
rototiller_module_t ray_module = {
- .render = ray,
+ .render_fragment = ray_render_fragment,
.name = "ray",
.description = "Multi-threaded ray tracer",
.author = "Vito Caputo <vcaputo@pengaru.com>",
diff --git a/src/modules/roto/roto.c b/src/modules/roto/roto.c
index c44d624..45b8700 100644
--- a/src/modules/roto/roto.c
+++ b/src/modules/roto/roto.c
@@ -149,7 +149,7 @@ static void init_roto(uint8_t texture[256][256], int32_t *costab, int32_t *sinta
/* Draw a rotating checkered 256x256 texture into fragment. (32-bit version) */
-static void roto32(fb_fragment_t *fragment)
+static void roto32_render_fragment(fb_fragment_t *fragment)
{
static int32_t costab[FIXED_TRIG_LUT_SIZE], sintab[FIXED_TRIG_LUT_SIZE];
static uint8_t texture[256][256];
@@ -213,7 +213,7 @@ static void roto32(fb_fragment_t *fragment)
/* Draw a rotating checkered 256x256 texture into fragment. (64-bit version) */
-static void roto64(fb_fragment_t *fragment)
+static void roto64_render_fragment(fb_fragment_t *fragment)
{
static int32_t costab[FIXED_TRIG_LUT_SIZE], sintab[FIXED_TRIG_LUT_SIZE];
static uint8_t texture[256][256];
@@ -288,7 +288,7 @@ static void roto64(fb_fragment_t *fragment)
rototiller_module_t roto32_module = {
- .render = roto32,
+ .render_fragment = roto32_render_fragment,
.name = "roto32",
.description = "Anti-aliased tiled texture rotation (32-bit)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
@@ -297,7 +297,7 @@ rototiller_module_t roto32_module = {
rototiller_module_t roto64_module = {
- .render = roto64,
+ .render_fragment = roto64_render_fragment,
.name = "roto64",
.description = "Anti-aliased tiled texture rotation (64-bit)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
diff --git a/src/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c
index 36aabff..67d68cf 100644
--- a/src/modules/sparkler/sparkler.c
+++ b/src/modules/sparkler/sparkler.c
@@ -20,7 +20,7 @@ extern particle_ops_t simple_ops;
/* Render a 3D particle system */
-static void sparkler(fb_fragment_t *fragment)
+static void sparkler_render_fragment(fb_fragment_t *fragment)
{
static particles_t *particles;
static int initialized;
@@ -45,7 +45,7 @@ static void sparkler(fb_fragment_t *fragment)
rototiller_module_t sparkler_module = {
- .render = sparkler,
+ .render_fragment = sparkler_render_fragment,
.name = "sparkler",
.description = "Particle system with spatial interactions",
.author = "Vito Caputo <vcaputo@pengaru.com>",
diff --git a/src/modules/stars/stars.c b/src/modules/stars/stars.c
index 61f652e..f624a62 100644
--- a/src/modules/stars/stars.c
+++ b/src/modules/stars/stars.c
@@ -13,7 +13,7 @@
/* Copyright (C) 2017 Philip J. Freeman <elektron@halo.nu> */
-static void stars(fb_fragment_t *fragment)
+static void stars_render_fragment(fb_fragment_t *fragment)
{
static int initialized, z;
static struct universe* u;
@@ -55,7 +55,7 @@ static void stars(fb_fragment_t *fragment)
}
rototiller_module_t stars_module = {
- .render = stars,
+ .render_fragment = stars_render_fragment,
.name = "stars",
.description = "basic starfield",
.author = "Philip J Freeman <elektron@halo.nu>",
diff --git a/src/rototiller.c b/src/rototiller.c
index 372ab7d..50df52e 100644
--- a/src/rototiller.c
+++ b/src/rototiller.c
@@ -80,7 +80,7 @@ int main(int argc, const char *argv[])
fps_print(fb);
page = fb_page_get(fb);
- modules[module]->render(&page->fragment);
+ modules[module]->render_fragment(&page->fragment);
fb_page_put(fb, page);
}
diff --git a/src/rototiller.h b/src/rototiller.h
index f75ca11..77113de 100644
--- a/src/rototiller.h
+++ b/src/rototiller.h
@@ -2,7 +2,7 @@
#define _ROTOTILLER_H
typedef struct rototiller_module_t {
- void (*render)(fb_fragment_t *);
+ void (*render_fragment)(fb_fragment_t *);
char *name;
char *description;
char *author;
© All Rights Reserved