summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main_glut.c14
-rw-r--r--main_headless.c7
-rw-r--r--ray.c49
-rw-r--r--ray.h5
4 files changed, 39 insertions, 36 deletions
diff --git a/main_glut.c b/main_glut.c
index 272b17e..e24ab5e 100644
--- a/main_glut.c
+++ b/main_glut.c
@@ -31,15 +31,11 @@ display(void) {
exit(0);
float time = (float)glutGet(GLUT_ELAPSED_TIME) / 1000;
- unsigned char* buffer = calloc(4, WIDTH * HEIGHT);
- trace_scene(time, buffer, threaded);
+ unsigned char* buffer = calloc(viewport_width * viewport_height, 4);
+ trace_scene(time, viewport_width, viewport_height, buffer, threaded);
glClear(GL_COLOR_BUFFER_BIT);
- auto raster_x = -(double)WIDTH / viewport_width;
- auto raster_y = -(double)HEIGHT / viewport_height;
- if (raster_x < -1.0) raster_x = -1.0;
- if (raster_y < -1.0) raster_y = -1.0;
- glRasterPos2d(raster_x, raster_y);
- glDrawPixels(WIDTH, HEIGHT, GL_BGRA, GL_UNSIGNED_BYTE, buffer);
+ glRasterPos2d(-1.0, -1.0);
+ glDrawPixels(viewport_width, viewport_height, GL_BGRA, GL_UNSIGNED_BYTE, buffer);
free(buffer);
glutSwapBuffers();
@@ -68,7 +64,7 @@ keyboard(unsigned char key, int x, int y) {
int
main(int argc, char **argv) {
- if (init(argc, argv, WIDTH, HEIGHT))
+ if (init(argc, argv, 800, 600))
return EXIT_FAILURE;
glutDisplayFunc(display);
diff --git a/main_headless.c b/main_headless.c
index ab38414..0fd5938 100644
--- a/main_headless.c
+++ b/main_headless.c
@@ -9,15 +9,18 @@ static const size_t kFramesToRender = 100;
int
main(int argc, char** argv) {
+ const size_t kWidth = 1000;
+ const size_t kHeight = 1000;
+
fprintf(stderr, "Rendering %zu frames\n", kFramesToRender);
- unsigned char* buffer = calloc(4, WIDTH * HEIGHT);
+ unsigned char* buffer = calloc(4, kWidth * kHeight);
struct timeval start;
gettimeofday(&start, NULL);
for (size_t i = 0; i < kFramesToRender; ++i)
- trace_scene(i * 0.01f, buffer, 0);
+ trace_scene(i * 0.01f, kWidth, kHeight, buffer, 0);
struct timeval end;
gettimeofday(&end, NULL);
diff --git a/ray.c b/ray.c
index d74492a..4450eba 100644
--- a/ray.c
+++ b/ray.c
@@ -9,8 +9,6 @@
#include "3dmath.h"
-#define BUFFER_SIZE (WIDTH * HEIGHT * 4)
-
#define LENGTH(array) (sizeof(array) / sizeof(array[0]))
#define MAX(x, y) (x > y ? x : y)
#define MIN(x, y) (x < y ? x : y)
@@ -41,12 +39,13 @@ typedef struct {
typedef struct {
pthread_mutex_t mutex;
+ int width, height;
unsigned char* buffer;
long next_line;
} ThreadArg;
-static float trace_vectors[HEIGHT][WIDTH][3];
-static int trace_vectors_initialized;
+static float* trace_vectors;
+static int trace_vectors_width, trace_vectors_height;
static Object objects[] = {
{.position={-1.414, -1, -3}, .radius=1, .diffuse={.8, .0, .8}, .specular={.7, .6, .7}, .subtract=0},
@@ -126,13 +125,13 @@ trace(const float s[3], const float d[3], float pixel[3], int n) {
}
static void
-trace_line(int l, unsigned char *buf) {
+trace_line(int l, int width, unsigned char *buf) {
static const float s[3] = {0, 0, 8};
- for(int i = 0; i < WIDTH; ++i, buf += 4) {
+ for(int i = 0; i < width; ++i, buf += 4) {
float pixel[3] = { 0, 0, 0 };
- trace(s, trace_vectors[l][i], pixel, 1);
+ trace(s, &trace_vectors[(l * width + i) * 3], pixel, 1);
buf[0] = MIN(pixel[0], 1.0f) * 255;
buf[1] = MIN(pixel[1], 1.0f) * 255;
@@ -146,11 +145,11 @@ thread(void *arg) {
for (;;) {
pthread_mutex_lock(&thread_arg->mutex);
- if (thread_arg->next_line == HEIGHT) break;
+ if (thread_arg->next_line == thread_arg->height) break;
long line = thread_arg->next_line++;
pthread_mutex_unlock(&thread_arg->mutex);
- trace_line(line, thread_arg->buffer + line * 4 * WIDTH);
+ trace_line(line, thread_arg->width, thread_arg->buffer + line * 4 * thread_arg->width);
}
pthread_mutex_unlock(&thread_arg->mutex);
@@ -159,23 +158,29 @@ thread(void *arg) {
}
static void
-initialize_trace_vectors(void) {
- for(int y = 0; y < HEIGHT; ++y) {
- for(int x = 0; x < WIDTH; ++x) {
- float* d = trace_vectors[y][x];
- d[0] = ((float)x / WIDTH - 0.5f) * 0.5f;
- d[1] = ((float)y / HEIGHT - 0.5f) * 0.5f * ((float)HEIGHT / WIDTH);
+initialize_trace_vectors(int width, int height) {
+ trace_vectors = calloc(width * height, 3 * sizeof(float));
+ trace_vectors_width = width;
+ trace_vectors_height = height;
+ for(int y = 0; y < height; ++y) {
+ for(int x = 0; x < width; ++x) {
+ float* d = &trace_vectors[(y * width + x) * 3];
+ d[0] = ((float)x / width - 0.5f) * 0.5f * ((float)width / height);
+ d[1] = ((float)y / height - 0.5f) * 0.5f;
d[2] = -1;
normalize(d);
}
}
- trace_vectors_initialized = 1;
}
void
-trace_scene(float time, unsigned char *buf, int threaded) {
- if (!trace_vectors_initialized)
- initialize_trace_vectors();
+trace_scene(float time, int width, int height, unsigned char *buf, int threaded) {
+ if (trace_vectors && (trace_vectors_width != width || trace_vectors_height != height)) {
+ free(trace_vectors);
+ trace_vectors = 0;
+ }
+ if (!trace_vectors)
+ initialize_trace_vectors(width, height);
objects[0].position[0] = (1.5 + 0.35 * sin(1.1 * time + 0.0)) * cos(0.5 * time);
objects[0].position[1] = (1.5 + 0.35 * sin(1.1 * time + 2.5)) * sin(0.5 * time);
@@ -188,6 +193,8 @@ trace_scene(float time, unsigned char *buf, int threaded) {
if(threaded) {
ThreadArg arg;
memset(&arg, 0, sizeof(arg));
+ arg.width = width;
+ arg.height = height;
pthread_mutex_init(&arg.mutex, NULL);
arg.buffer = buf;
@@ -206,7 +213,7 @@ trace_scene(float time, unsigned char *buf, int threaded) {
pthread_join(threads[i], NULL);
free(threads);
} else {
- for(int i = 0; i < HEIGHT; ++i)
- trace_line(i, buf + i * 4 * WIDTH);
+ for(int i = 0; i < height; ++i)
+ trace_line(i, width, buf + i * 4 * width);
}
}
diff --git a/ray.h b/ray.h
index 83b4cf0..fb0be48 100644
--- a/ray.h
+++ b/ray.h
@@ -1,10 +1,7 @@
#ifndef RAY_H_
#define RAY_H_ 1
-#define WIDTH 1000
-#define HEIGHT 1000
-
void
-trace_scene(float time, unsigned char *buf, int threaded);
+trace_scene(float time, int width, int height, unsigned char *buf, int threaded);
#endif // !RAY_H_
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-19 02:19:06 +0000