Restructure src/

The distinction between library and driver code was super vague in the old structure, so now it's sorted into common/, lib/ and driver/. This is still just a first pass, many incorrect includes across lib/ and driver/ still exist, I marked the ones I could spot with 'FIXME: CROSS'. Huge diff, mostly just the files moving, and fixing the include paths. I also added src/lib/renderer/samplers/vec.h to separate the sampler from the shared src/common/vector.h.
vkoskiv · Dec 3, 2023 · a06e82d · a06e82d
1 parent 08d79bb
commit a06e82d
Show file tree

Hide file tree

Showing 199 changed files with 427 additions and 394 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,7 +71,7 @@ include(set_up_ccache)
 
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-configure_file("${c-ray_SOURCE_DIR}/src/utils/gitsha1.c.in" "${c-ray_BINARY_DIR}/generated/gitsha1.c" @ONLY)
+configure_file("${c-ray_SOURCE_DIR}/src/common/gitsha1.c.in" "${c-ray_BINARY_DIR}/generated/gitsha1.c" @ONLY)
 list(APPEND SOURCES "${c-ray_BINARY_DIR}/generated/gitsha1.c")
 
 add_executable(c-ray ${SOURCES})

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ $(BIN): $(OBJS) $(OBJDIR)
 # A sneaky target to run a bit of code generation
 dummy:
 	@echo "Generating gitsha1.c"
-	$(shell sed "s/@GIT_SHA1@/`git rev-parse --verify HEAD || echo "NoHash" | cut -c 1-8`/g" src/utils/gitsha1.c.in > generated/gitsha1.c)
+	$(shell sed "s/@GIT_SHA1@/`git rev-parse --verify HEAD || echo "NoHash" | cut -c 1-8`/g" src/common/gitsha1.c.in > generated/gitsha1.c)
 clean:
 	rm -rf bin/*
 

diff --git a/src/utils/assert.c → src/common/assert.c b/src/utils/assert.c → src/common/assert.c
diff --git a/src/utils/assert.h → src/common/assert.h b/src/utils/assert.h → src/common/assert.h
diff --git a/src/utils/base64.c → src/common/base64.c b/src/utils/base64.c → src/common/base64.c
diff --git a/src/utils/base64.h → src/common/base64.h b/src/utils/base64.h → src/common/base64.h
diff --git a/src/datatypes/color.c → src/common/color.c b/src/datatypes/color.c → src/common/color.c
@@ -9,7 +9,7 @@
 #include "../includes.h"
 #include <stdio.h>
 #include "color.h"
-#include "../utils/assert.h"
+#include "assert.h"
 
 //Some standard colours
 const struct color g_red_color =   { 1.0f, 0.0f, 0.0f, 1.0f };

diff --git a/src/datatypes/color.h → src/common/color.h b/src/datatypes/color.h → src/common/color.h
diff --git a/src/utils/dyn_array.h → src/common/dyn_array.h b/src/utils/dyn_array.h → src/common/dyn_array.h
diff --git a/src/utils/fileio.c → src/common/fileio.c b/src/utils/fileio.c → src/common/fileio.c
@@ -8,7 +8,7 @@
 
 #include "../includes.h"
 #include "fileio.h"
-#include "../utils/logging.h"
+#include "logging.h"
 #include "assert.h"
 #ifndef WINDOWS
 #include <sys/mman.h>

diff --git a/src/utils/fileio.h → src/common/fileio.h b/src/utils/fileio.h → src/common/fileio.h
diff --git a/src/utils/gitsha1.c.in → src/common/gitsha1.c.in b/src/utils/gitsha1.c.in → src/common/gitsha1.c.in
diff --git a/src/utils/gitsha1.h → src/common/gitsha1.h b/src/utils/gitsha1.h → src/common/gitsha1.h
diff --git a/src/utils/hashtable.c → src/common/hashtable.c b/src/utils/hashtable.c → src/common/hashtable.c
@@ -11,11 +11,11 @@
 
 #include <inttypes.h>
 #include <string.h>
-#include "../datatypes/vector.h"
+#include "vector.h"
 #include "assert.h"
 #include "fileio.h"
 #include "string.h"
-#include "../utils/mempool.h"
+#include "mempool.h"
 
 #define FNV_OFFSET UINT32_C(0x811C9DC5) // Initial value for an empty hash
 #define FNV_PRIME  UINT32_C(0x01000193)

diff --git a/src/utils/hashtable.h → src/common/hashtable.h b/src/utils/hashtable.h → src/common/hashtable.h
diff --git a/src/utils/linked_list.h → src/common/linked_list.h b/src/utils/linked_list.h → src/common/linked_list.h
diff --git a/src/utils/loaders/textureloader.c → src/common/loaders/textureloader.c b/src/utils/loaders/textureloader.c → src/common/loaders/textureloader.c
@@ -8,9 +8,9 @@
 
 #include "textureloader.h"
 #include "../logging.h"
-#include "../../datatypes/image/texture.h"
-#include "../../utils/assert.h"
-#include "../../utils/mempool.h"
+#include "../texture.h"
+#include "../assert.h"
+#include "../mempool.h"
 
 #define STBI_NO_PSD
 #define STBI_NO_GIF

diff --git a/src/utils/loaders/textureloader.h → src/common/loaders/textureloader.h b/src/utils/loaders/textureloader.h → src/common/loaders/textureloader.h
diff --git a/src/utils/logging.c → src/common/logging.c b/src/utils/logging.c → src/common/logging.c
diff --git a/src/utils/logging.h → src/common/logging.h b/src/utils/logging.h → src/common/logging.h
diff --git a/src/utils/logo.h → src/common/logo.h b/src/utils/logo.h → src/common/logo.h
diff --git a/src/utils/logo_bytes.txt → src/common/logo_bytes.txt b/src/utils/logo_bytes.txt → src/common/logo_bytes.txt
diff --git a/src/utils/memory.h → src/common/memory.h b/src/utils/memory.h → src/common/memory.h
diff --git a/src/utils/mempool.c → src/common/mempool.c b/src/utils/mempool.c → src/common/mempool.c
diff --git a/src/utils/mempool.h → src/common/mempool.h b/src/utils/mempool.h → src/common/mempool.h
diff --git a/src/utils/networking.c → src/common/networking.c b/src/utils/networking.c → src/common/networking.c
@@ -10,7 +10,7 @@
 #include "networking.h"
 
 //Windows is annoying, so it's just not going to have networking. Because it is annoying and proprietary.
-#include "../utils/logging.h"
+#include "logging.h"
 #ifndef WINDOWS
 
 #include <netdb.h>
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include "../utils/assert.h"
+#include "assert.h"
 #include <errno.h>
 #include "fileio.h"
 

diff --git a/src/utils/networking.h → src/common/networking.h b/src/utils/networking.h → src/common/networking.h
diff --git a/src/utils/platform/capabilities.c → src/common/platform/capabilities.c b/src/utils/platform/capabilities.c → src/common/platform/capabilities.c
diff --git a/src/utils/platform/capabilities.h → src/common/platform/capabilities.h b/src/utils/platform/capabilities.h → src/common/platform/capabilities.h
diff --git a/src/utils/platform/dyn.c → src/common/platform/dyn.c b/src/utils/platform/dyn.c → src/common/platform/dyn.c
diff --git a/src/utils/platform/dyn.h → src/common/platform/dyn.h b/src/utils/platform/dyn.h → src/common/platform/dyn.h
diff --git a/src/utils/platform/mutex.c → src/common/platform/mutex.c b/src/utils/platform/mutex.c → src/common/platform/mutex.c
diff --git a/src/utils/platform/mutex.h → src/common/platform/mutex.h b/src/utils/platform/mutex.h → src/common/platform/mutex.h
diff --git a/src/utils/platform/signal.c → src/common/platform/signal.c b/src/utils/platform/signal.c → src/common/platform/signal.c
diff --git a/src/utils/platform/signal.h → src/common/platform/signal.h b/src/utils/platform/signal.h → src/common/platform/signal.h
diff --git a/src/utils/platform/terminal.c → src/common/platform/terminal.c b/src/utils/platform/terminal.c → src/common/platform/terminal.c
@@ -54,7 +54,7 @@ void term_init() {
 #ifndef WINDOWS
 	//Disable output buffering
 	setbuf(stdout, NULL);
-	show_cursor(false);
+	// show_cursor(false);
 #endif
 
 	//Configure Windows terminals to handle color escape codes

diff --git a/src/utils/platform/terminal.h → src/common/platform/terminal.h b/src/utils/platform/terminal.h → src/common/platform/terminal.h
diff --git a/src/utils/platform/thread.c → src/common/platform/thread.c b/src/utils/platform/thread.c → src/common/platform/thread.c
diff --git a/src/utils/platform/thread.h → src/common/platform/thread.h b/src/utils/platform/thread.h → src/common/platform/thread.h
diff --git a/src/utils/string.c → src/common/string.c b/src/utils/string.c → src/common/string.c
diff --git a/src/utils/string.h → src/common/string.h b/src/utils/string.h → src/common/string.h
diff --git a/src/utils/testrunner.c → src/common/testrunner.c b/src/utils/testrunner.c → src/common/testrunner.c
@@ -10,7 +10,7 @@
 #include "logging.h"
 #include "timer.h"
 
-#include "../utils/assert.h"
+#include "../common/assert.h"
 #include "testrunner.h"
 
 #ifdef CRAY_TESTING

diff --git a/src/utils/testrunner.h → src/common/testrunner.h b/src/utils/testrunner.h → src/common/testrunner.h
diff --git a/src/utils/textbuffer.c → src/common/textbuffer.c b/src/utils/textbuffer.c → src/common/textbuffer.c
diff --git a/src/utils/textbuffer.h → src/common/textbuffer.h b/src/utils/textbuffer.h → src/common/textbuffer.h
diff --git a/src/datatypes/image/texture.c → src/common/texture.c b/src/datatypes/image/texture.c → src/common/texture.c
@@ -6,11 +6,11 @@
 //  Copyright © 2019-2022 Valtteri Koskivuori. All rights reserved.
 //
 
-#include "../../includes.h"
+#include "../includes.h"
 
 #include "texture.h"
-#include "../../utils/logging.h"
-#include "../../utils/assert.h"
+#include "logging.h"
+#include "assert.h"
 #include <string.h>
 
 //General-purpose setPixel function

diff --git a/src/datatypes/image/texture.h → src/common/texture.h b/src/datatypes/image/texture.h → src/common/texture.h
@@ -10,8 +10,8 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "../color.h"
-#include "../../utils/dyn_array.h"
+#include "color.h"
+#include "dyn_array.h"
 
 enum colorspace {
 	linear,

diff --git a/src/utils/timer.c → src/common/timer.c b/src/utils/timer.c → src/common/timer.c
diff --git a/src/utils/timer.h → src/common/timer.h b/src/utils/timer.h → src/common/timer.h
diff --git a/src/datatypes/vector.h → src/common/vector.h b/src/datatypes/vector.h → src/common/vector.h
@@ -9,9 +9,8 @@
 #pragma once
 
 #include <math.h>
-#include "../renderer/samplers/sampler.h"
-#include "../utils/dyn_array.h"
-#include "../utils/assert.h"
+#include "dyn_array.h"
+#include "assert.h"
 #include "../includes.h"
 
 struct vector {
@@ -186,16 +185,6 @@ static inline struct vector vec_get_midpoint(struct vector v1, struct vector v2,
 	return vec_scale(vec_add(vec_add(v1, v2), v3), 1.0f/3.0f);
 }
 
-static inline float rand_in_range(float min, float max, sampler *sampler) {
-	return ((getDimension(sampler)) * (max - min)) + min;
-}
-
-static inline struct coord coord_on_unit_disc(sampler *sampler) {
-	float r = sqrtf(getDimension(sampler));
-	float theta = rand_in_range(0.0f, 2.0f * PI, sampler);
-	return (struct coord){r * cosf(theta), r * sinf(theta)};
-}
-
 static inline struct vector vec_negate(struct vector v) {
 	return (struct vector){ -v.x, -v.y, -v.z };
 }
@@ -243,14 +232,6 @@ static inline bool vec_equals(struct vector a, struct vector b) {
 	return a.x == b.x && a.y == b.y && a.z == b.z;
 }
 
-static inline struct vector vec_on_unit_sphere(sampler *sampler) {
-	const float sample_x = getDimension(sampler);
-	const float sample_y = getDimension(sampler);
-	const float a = sample_x * (2.0f * PI);
-	const float s = 2.0f * sqrtf(max(0.0f, sample_y * (1.0f - sample_y)));
-	return (struct vector){ cosf(a) * s, sinf(a) * s, 1.0f - 2.0f * sample_y };
-}
-
 //TODO: Consider moving these two to a better place.
 static inline bool vec_refract(const struct vector in, const struct vector normal, float niOverNt, struct vector *refracted) {
 	const struct vector uv = vec_normalize(in);

diff --git a/src/driver/args.c b/src/driver/args.c
@@ -13,16 +13,16 @@
 #include <stdio.h>
 #include "args.h"
 
-#include "../utils/platform/terminal.h"
-#include "../utils/platform/capabilities.h"
-#include "../utils/hashtable.h"
-#include "../utils/logging.h"
-#include "../utils/fileio.h"
-#include "../utils/assert.h"
-#include "../utils/textbuffer.h"
-#include "../utils/testrunner.h"
-#include "../utils/string.h"
-#include "../utils/protocol/server.h"
+#include "../common/platform/terminal.h"
+#include "../common/platform/capabilities.h"
+#include "../common/hashtable.h"
+#include "../common/logging.h"
+#include "../common/fileio.h"
+#include "../common/assert.h"
+#include "../common/textbuffer.h"
+#include "../common/testrunner.h"
+#include "../common/string.h"
+#include "../lib/protocol/server.h"
 
 static void printUsage(const char *progname) {
 	printf("Usage: %s [-hjsdtocv] [input_json...]\n", progname);

diff --git a/src/driver/encoders/encoder.c b/src/driver/encoders/encoder.c
@@ -8,11 +8,11 @@
 
 #include "encoder.h"
 
-#include "../../datatypes/image/texture.h"
-#include "../../datatypes/image/imagefile.h"
-#include "../../utils/logging.h"
+#include "../imagefile.h"
+#include "../../common/logging.h"
 #include "../../vendored/asprintf.h"
-#include "../../utils/assert.h"
+#include "../../common/texture.h"
+#include "../../common/assert.h"
 
 #include "formats/png.h"
 #include "formats/bmp.h"

diff --git a/src/driver/encoders/formats/bmp.c b/src/driver/encoders/formats/bmp.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include "bmp.h"
 
-#include "../../../utils/fileio.h"
+#include "../../../common/fileio.h"
 
 void encodeBMPFromArray(const char *file_name, const unsigned char *imgData, size_t width, size_t height) {
 	//Apparently BMP is BGR, whereas C-ray's internal buffer is RGB (Like it should be)

diff --git a/src/driver/encoders/formats/png.c b/src/driver/encoders/formats/png.c
@@ -6,14 +6,14 @@
 //  Copyright © 2020-2022 Valtteri Koskivuori. All rights reserved.
 //
 
-#include "../../../datatypes/image/imagefile.h"
+#include "../../imagefile.h"
 #include <stddef.h>
 #include "png.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../../../utils/fileio.h"
-#include "../../../utils/logging.h"
+#include "../../../common/fileio.h"
+#include "../../../common/logging.h"
 
 #include "../../../vendored/lodepng.h"
 

diff --git a/src/driver/encoders/formats/qoi.c b/src/driver/encoders/formats/qoi.c
@@ -8,7 +8,7 @@
 
 #include <stddef.h>
 #include "qoi.h"
-#include "../../../utils/fileio.h"
+#include "../../../common/fileio.h"
 
 #define QOI_IMPLEMENTATION
 #define QOI_NO_STDIO

diff --git a/src/datatypes/image/imagefile.h → src/driver/imagefile.h b/src/datatypes/image/imagefile.h → src/driver/imagefile.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../utils/fileio.h"
+#include "../common/fileio.h"
 
 struct renderInfo {
 	int samples;

diff --git a/src/driver/json_loader.c b/src/driver/json_loader.c
@@ -12,19 +12,19 @@
 #include "../vendored/cJSON.h"
 #include "node_parse.h"
 #include "loaders/meshloader.h"
-#include "../utils/loaders/textureloader.h"
+#include "../common/loaders/textureloader.h"
 
 #include <c-ray/c-ray.h>
 
-#include "../datatypes/transforms.h"
-#include "../datatypes/quaternion.h"
-#include "../datatypes/spline.h"
-#include "../datatypes/vector.h"
-#include "../utils/string.h"
-#include "../utils/platform/capabilities.h"
-#include "../utils/logging.h"
-#include "../utils/fileio.h"
-#include "../utils/timer.h"
+#include "../lib/datatypes/transforms.h" // FIXME: CROSS
+#include "../lib/datatypes/quaternion.h" // FIXME: CROSS
+#include "../lib/datatypes/spline.h"
+#include "../common/vector.h"
+#include "../common/string.h"
+#include "../common/platform/capabilities.h"
+#include "../common/logging.h"
+#include "../common/fileio.h"
+#include "../common/timer.h"
 
 static struct transform parse_tform(const cJSON *data) {
 	const cJSON *type = cJSON_GetObjectItem(data, "type");

diff --git a/src/driver/loaders/formats/gltf/gltf.c b/src/driver/loaders/formats/gltf/gltf.c
@@ -11,13 +11,13 @@
 #include "gltf.h"
 #include <string.h>
 #include "../../../../vendored/cJSON.h"
-#include "../../../../utils/string.h"
-#include "../../../../utils/base64.h"
-#include "../../../../datatypes/vector.h"
-#include "../../../../utils/logging.h"
-#include "../../../../utils/fileio.h"
-#include "../../../../datatypes/image/texture.h"
-#include "../../../../utils/loaders/textureloader.h"
+#include "../../../../common/string.h"
+#include "../../../../common/base64.h"
+#include "../../../../common/vector.h"
+#include "../../../../common/logging.h"
+#include "../../../../common/fileio.h"
+#include "../../../../common/texture.h"
+#include "../../../../common/loaders/textureloader.h"
 
 enum accessor_type {
 	UNKNOWN,

diff --git a/src/driver/loaders/formats/wavefront/mtlloader.c b/src/driver/loaders/formats/wavefront/mtlloader.c
@@ -11,14 +11,14 @@
 #include "../../../../includes.h"
 #include "mtlloader.h"
 
-#include "../../../../utils/logging.h"
-#include "../../../../utils/string.h"
-#include "../../../../utils/textbuffer.h"
-#include "../../../../utils/fileio.h"
-#include "../../../../utils/assert.h"
+#include "../../../../common/logging.h"
+#include "../../../../common/string.h"
+#include "../../../../common/textbuffer.h"
+#include "../../../../common/fileio.h"
+#include "../../../../common/assert.h"
 #include "../../meshloader.h"
-#include "../../../../datatypes/color.h"
-#include "../../../../nodes/textures/image.h"
+#include "../../../../common/color.h"
+#include "../../../../lib/nodes/textures/image.h" // FIXME: CROSS
 
 /*
  From: https://blenderartists.org/forum/showthread.php?71202-Material-IOR-Value-reference

diff --git a/src/driver/loaders/formats/wavefront/wavefront.c b/src/driver/loaders/formats/wavefront/wavefront.c
@@ -9,13 +9,13 @@
 #include <stdint.h>
 #include <string.h>
 #include "../../../../includes.h"
-#include "../../../../datatypes/mesh.h"
-#include "../../../../datatypes/vector.h"
-#include "../../../../datatypes/poly.h"
-#include "../../../../utils/logging.h"
-#include "../../../../utils/string.h"
-#include "../../../../utils/fileio.h"
-#include "../../../../utils/textbuffer.h"
+#include "../../mesh.h"
+#include "../../../../common/vector.h"
+#include "../../../../lib/datatypes/poly.h" // FIXME: CROSS
+#include "../../../../common/logging.h"
+#include "../../../../common/string.h"
+#include "../../../../common/fileio.h"
+#include "../../../../common/textbuffer.h"
 #include "../../../loaders/meshloader.h"
 #include <c-ray/c-ray.h>
 #include "mtlloader.h"

diff --git a/src/datatypes/mesh.c → src/driver/loaders/mesh.c b/src/datatypes/mesh.c → src/driver/loaders/mesh.c
@@ -6,13 +6,14 @@
 //  Copyright © 2017-2022 Valtteri Koskivuori. All rights reserved.
 //
 
-#include "../includes.h"
+#include "../../includes.h"
 #include "mesh.h"
 
-#include "../accelerators/bvh.h"
-#include "poly.h"
-#include "vector.h"
+#include "../../lib/accelerators/bvh.h" // FIXME: CROSS
+#include "../../lib/datatypes/poly.h" // FIXME: CROSS
+#include "../../common/vector.h"
 
+// FIXME: CROSS bvh should be built & torn down internally
 void destroyMesh(struct mesh *mesh) {
 	if (mesh) {
 		free(mesh->name);

diff --git a/src/datatypes/mesh.h → src/driver/loaders/mesh.h b/src/datatypes/mesh.h → src/driver/loaders/mesh.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../utils/dyn_array.h"
-#include "vector.h"
-#include "poly.h"
+#include "../../common/dyn_array.h"
+#include "../../common/vector.h"
+#include "../../lib/datatypes/poly.h" // FIXME: CROSS
 
 struct vertex_buffer {
 	struct vector_arr vertices;

diff --git a/src/driver/loaders/meshloader.c b/src/driver/loaders/meshloader.c
@@ -10,8 +10,8 @@
 
 #include "meshloader.h"
 #include "formats/wavefront/wavefront.h"
-#include "../../utils/fileio.h"
-#include "../../utils/logging.h"
+#include "../../common/fileio.h"
+#include "../../common/logging.h"
 
 struct mesh_parse_result load_meshes_from_file(const char *file_path) {
 	switch (guess_file_type(file_path)) {