commit 1feb12cadace4707f693922eaea17b008f288f0f parent e751f348fdd6c341ea3bc1ef8a8a6db5110e7f0e Author: Christian Ermann <christianermann@gmail.com> Date: Sun, 31 Jul 2022 14:46:45 -0700 Split project into library and executable Diffstat:
47 files changed, 191 insertions(+), 176 deletions(-)
diff --git a/extern/include/GLFW/glfw3.h b/include/GLFW/glfw3.h diff --git a/extern/include/GLFW/glfw3native.h b/include/GLFW/glfw3native.h diff --git a/extern/include/KHR/khrplatform.h b/include/KHR/khrplatform.h diff --git a/include/app.h b/include/engine/app.h diff --git a/include/camera.h b/include/engine/camera.h diff --git a/include/chunk.h b/include/engine/chunk.h diff --git a/include/chunk_manager.h b/include/engine/chunk_manager.h diff --git a/include/input.h b/include/engine/input.h diff --git a/include/logger.h b/include/engine/logger.h diff --git a/include/marching_cubes.h b/include/engine/marching_cubes.h diff --git a/include/memory.h b/include/engine/memory.h diff --git a/include/mesh.h b/include/engine/mesh.h diff --git a/include/perlin.h b/include/engine/perlin.h diff --git a/include/player.h b/include/engine/player.h diff --git a/include/queue.h b/include/engine/queue.h diff --git a/include/save.h b/include/engine/save.h diff --git a/include/sdf.h b/include/engine/sdf.h diff --git a/include/shader.h b/include/engine/shader.h diff --git a/include/engine/threadpool.h b/include/engine/threadpool.h @@ -0,0 +1,16 @@ +#pragma once + +// https://nachtimwald.com/2019/04/12/thread-pool-in-c/ +#include "types.h" +#include <stdlib.h> + +typedef void (*ThreadFunc)(void *arg); + +typedef struct ThreadPool ThreadPool; + +ThreadPool *ThreadPool_make(unsigned int thread_count); +void ThreadPool_free(ThreadPool *pool); + +void ThreadPool_addWork(ThreadPool *pool, ThreadFunc func, void *arg); +void ThreadPool_wait(ThreadPool *pool); + diff --git a/include/transform.h b/include/engine/transform.h diff --git a/include/types.h b/include/engine/types.h diff --git a/include/vec.h b/include/engine/vec.h diff --git a/extern/include/glad/glad.h b/include/glad/glad.h diff --git a/include/threadpool.h b/include/threadpool.h @@ -1,16 +0,0 @@ -#ifndef THREADPOOL_H -#define THREADPOOL_H - -// https://nachtimwald.com/2019/04/12/thread-pool-in-c/ - -typedef void (*ThreadFunc)(void *arg); - -typedef struct ThreadPool ThreadPool; - -ThreadPool *ThreadPool_make(unsigned int thread_count); -void ThreadPool_free(ThreadPool *pool); - -void ThreadPool_addWork(ThreadPool *pool, ThreadFunc func, void *arg); -void ThreadPool_wait(ThreadPool *pool); - -#endif diff --git a/extern/lib/libglfw3.a b/lib/libglfw3.a Binary files differ. diff --git a/makefile b/makefile @@ -1,39 +1,53 @@ -APP_SRC_DIR := src -EXT_SRC_DIR := extern/src + +SRC_DIR := src +INC_DIR := include OBJ_DIR := obj +LIB_DIR := lib BIN_DIR := bin +ENGINE_SRC_DIR := $(SRC_DIR)/engine +ENGINE_INC_DIR := $(INC_DIR)/engine +ENGINE_OBJ_DIR := $(OBJ_DIR)/engine + +ENGINE_SRC := $(wildcard $(ENGINE_SRC_DIR)/*.c) +ENGINE_OBJ := $(ENGINE_SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) +ENGINE_LIB := $(BIN_DIR)/libengine.a + +APP_SRC_DIR := $(SRC_DIR)/app +APP_OBJ_DIR := $(OBJ_DIR)/app + +APP_SRC := $(wildcard $(APP_SRC_DIR)/*.c) +APP_OBJ := $(APP_SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) +APP_EXE := $(BIN_DIR)/app + RES_DIR := resources SHD_DIR := shaders REL_DIR := release -EXE := $(BIN_DIR)/app - -SRC := $(wildcard $(APP_SRC_DIR)/*.c) $(wildcard $(EXT_SRC_DIR)/*.c) -SRC := $(notdir $(SRC)) - SHD := $(wildcard $(SHD_DIR)/*.vs) $(wildcard $(SHD_DIR)/*.fs) -OBJ := $(SRC:%.c=$(OBJ_DIR)/%.o) - -CPPFLAGS := -Iinclude -Iextern/include -MMD -MP +CPPFLAGS := -I$(INC_DIR) -MMD -MP CFLAGS := -Wall -LDFLAGS := -Lextern/lib -LDLIBS := -lglfw3 -framework Cocoa -framework OpenGL -framework IOKit - -vpath %.c $(APP_SRC_DIR) $(EXT_SRC_DIR) +LDFLAGS := -L$(LIB_DIR) -L$(BIN_DIR) +LDLIBS := -lengine -lglfw3 -framework Cocoa -framework OpenGL -framework IOKit .PHONY: all clean -all: $(EXE) +all: $(APP_EXE) $(ENGINE_LIB) -$(EXE): $(OBJ) | $(BIN_DIR) - $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ +$(APP_EXE): $(APP_OBJ) $(ENGINE_LIB) | $(BIN_DIR) + $(CC) $(LDFLAGS) $(APP_OBJ) $(LDLIBS) -o $@ -$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR) +$(APP_OBJ_DIR)/%.o: $(APP_SRC_DIR)/%.c | $(APP_OBJ_DIR) $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ -$(BIN_DIR) $(OBJ_DIR): +$(ENGINE_LIB): $(ENGINE_OBJ) | $(BIN_DIR) + ar -r $@ $^ + +$(ENGINE_OBJ_DIR)/%.o: $(ENGINE_SRC_DIR)/%.c | $(ENGINE_OBJ_DIR) + $(CC) -I$(ENGINE_INC_DIR) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + +$(BIN_DIR) $(OBJ_DIR) $(APP_OBJ_DIR) $(ENGINE_OBJ_DIR): mkdir -p $@ release: $(EXE) $(SHD) @@ -46,4 +60,4 @@ release: $(EXE) $(SHD) clean: @$(RM) -rv $(BIN_DIR) $(OBJ_DIR) --include $(OBJ:.o=.d) +-include $(ENGINE_OBJ:.o=.d) diff --git a/src/app/main.c b/src/app/main.c @@ -0,0 +1,141 @@ +#include "engine/app.h" +#include "engine/camera.h" +#include "engine/chunk_manager.h" +#include "engine/input.h" +#include "engine/perlin.h" +#include "engine/save.h" +#include "engine/shader.h" +#include "engine/transform.h" +#include "engine/player.h" +#include "engine/logger.h" +#include "engine/types.h" + +#include "glad/glad.h" +#include "GLFW/glfw3.h" + +#include <math.h> + +int main(int argc, char** argv) +{ + LOGI("Application starting..."); + + AppInfo app_info = { + .title = "Marching Cubes Terrain", + .width = 1024, + .height = 768, + .gl_major_version = 3, + .gl_minor_version = 3 + }; + App *app = App_make(&app_info); + if (!app) return 1; + + glEnable(GL_DEPTH_TEST); + glEnable(GL_CULL_FACE); + + UserInput input = { 0 }; + UserInput_init(&input, app->window); + + Transform player_transform; + Transform_init( + &player_transform, + 0, // x + 0, // y + -3, // z + 0, // yaw + 0 // pitch + ); + load(&player_transform); + + Player player = { + .speed = 0.1f, + .sensitivity = 0.3f, + .transform = &player_transform + }; + + Camera *camera = Camera_make(&player_transform); + + ChunkManager chunk_manager = ChunkManager_create( + player_transform.position, + 5, + terrainSDF, + 0.0f + ); + ChunkManager_drawChunks(&chunk_manager, camera); + + Shader *shader = Shader_make("shaders/basic.vs", "shaders/basic.fs"); + Shader_use(shader); + Shader_setInt(shader, "shade_normals", 0); + + i32 loop_count = 0; + + while (!glfwWindowShouldClose(app->window)) + { + if (glfwGetKey(app->window, GLFW_KEY_ESCAPE) == GLFW_PRESS) + { + glfwSetInputMode(app->window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); + } + if (glfwGetKey(app->window, GLFW_KEY_ENTER) == GLFW_PRESS) + { + glfwSetInputMode(app->window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); + } + if (glfwGetKey(app->window, GLFW_KEY_R) == GLFW_PRESS) + { + Shader_reload(shader); + Shader_use(shader); + } + if (glfwGetKey(app->window, GLFW_KEY_Z) == GLFW_PRESS) + { + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + } + if (glfwGetKey(app->window, GLFW_KEY_X) == GLFW_PRESS) + { + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + } + if (glfwGetKey(app->window, GLFW_KEY_N) == GLFW_PRESS) + { + Shader_setInt(shader, "shade_normals", 1); + } + if (glfwGetKey(app->window, GLFW_KEY_M) == GLFW_PRESS) + { + Shader_setInt(shader, "shade_normals", 0); + } + if (glfwGetKey(app->window, GLFW_KEY_Q) == GLFW_PRESS) + { + glfwSetWindowShouldClose(app->window, GLFW_TRUE); + } + + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + UserInput_update(&input, app->window); + + Player_move(&player, &input); + Camera_updateMatrix(camera); + Camera_updateFrustum(camera); + + Shader_setInt(shader, "time", loop_count); + Shader_setMat4(shader, "camera", camera->matrix); + Shader_setVec3(shader, "view_pos", player_transform.position); + Shader_setVec3(shader, "pointlight_pos", player_transform.position); + + ChunkManager_recenter(&chunk_manager, player_transform.position); + ChunkManager_drawChunks(&chunk_manager, camera); + + loop_count += 1; + if (loop_count % 100000 == 0) + { + save(&player_transform); + } + + glfwSwapBuffers(app->window); + glfwPollEvents(); + } + + save(&player_transform); + + ChunkManager_free(&chunk_manager); + + App_free(app); + + LOGI("Application exiting..."); +} + diff --git a/src/app.c b/src/engine/app.c diff --git a/src/camera.c b/src/engine/camera.c diff --git a/src/chunk.c b/src/engine/chunk.c diff --git a/src/chunk_manager.c b/src/engine/chunk_manager.c diff --git a/extern/src/glad.c b/src/engine/glad.c diff --git a/src/input.c b/src/engine/input.c diff --git a/src/logger.c b/src/engine/logger.c diff --git a/src/marching_cubes.c b/src/engine/marching_cubes.c diff --git a/src/memory.c b/src/engine/memory.c diff --git a/src/mesh.c b/src/engine/mesh.c diff --git a/src/perlin.c b/src/engine/perlin.c diff --git a/src/player.c b/src/engine/player.c diff --git a/src/queue.c b/src/engine/queue.c diff --git a/src/save.c b/src/engine/save.c diff --git a/src/sdf.c b/src/engine/sdf.c diff --git a/src/shader.c b/src/engine/shader.c diff --git a/src/threadpool.c b/src/engine/threadpool.c diff --git a/src/transform.c b/src/engine/transform.c diff --git a/src/vec.c b/src/engine/vec.c diff --git a/src/main.c b/src/main.c @@ -1,140 +0,0 @@ -#include "app.h" -#include "camera.h" -#include "chunk_manager.h" -#include "input.h" -#include "perlin.h" -#include "save.h" -#include "shader.h" -#include "transform.h" -#include "player.h" -#include "logger.h" -#include "types.h" - -#include "glad/glad.h" -#include "GLFW/glfw3.h" - -#include <math.h> - -int main(int argc, char** argv) -{ - LOGI("Application starting..."); - - AppInfo app_info = { - .title = "Marching Cubes Terrain", - .width = 1024, - .height = 768, - .gl_major_version = 3, - .gl_minor_version = 3 - }; - App *app = App_make(&app_info); - if (!app) return 1; - - glEnable(GL_DEPTH_TEST); - glEnable(GL_CULL_FACE); - - UserInput input = { 0 }; - UserInput_init(&input, app->window); - - Transform player_transform; - Transform_init( - &player_transform, - 0, // x - 0, // y - -3, // z - 0, // yaw - 0 // pitch - ); - load(&player_transform); - - Player player = { - .speed = 0.1f, - .sensitivity = 0.3f, - .transform = &player_transform - }; - - Camera *camera = Camera_make(&player_transform); - - ChunkManager chunk_manager = ChunkManager_create( - player_transform.position, - 5, - terrainSDF, - 0.0f - ); - ChunkManager_drawChunks(&chunk_manager, camera); - - Shader *shader = Shader_make("shaders/basic.vs", "shaders/basic.fs"); - Shader_use(shader); - Shader_setInt(shader, "shade_normals", 0); - - i32 loop_count = 0; - - while (!glfwWindowShouldClose(app->window)) - { - if (glfwGetKey(app->window, GLFW_KEY_ESCAPE) == GLFW_PRESS) - { - glfwSetInputMode(app->window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); - } - if (glfwGetKey(app->window, GLFW_KEY_ENTER) == GLFW_PRESS) - { - glfwSetInputMode(app->window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); - } - if (glfwGetKey(app->window, GLFW_KEY_R) == GLFW_PRESS) - { - Shader_reload(shader); - Shader_use(shader); - } - if (glfwGetKey(app->window, GLFW_KEY_Z) == GLFW_PRESS) - { - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - } - if (glfwGetKey(app->window, GLFW_KEY_X) == GLFW_PRESS) - { - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - } - if (glfwGetKey(app->window, GLFW_KEY_N) == GLFW_PRESS) - { - Shader_setInt(shader, "shade_normals", 1); - } - if (glfwGetKey(app->window, GLFW_KEY_M) == GLFW_PRESS) - { - Shader_setInt(shader, "shade_normals", 0); - } - if (glfwGetKey(app->window, GLFW_KEY_Q) == GLFW_PRESS) - { - glfwSetWindowShouldClose(app->window, GLFW_TRUE); - } - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - UserInput_update(&input, app->window); - - Player_move(&player, &input); - Camera_updateMatrix(camera); - Camera_updateFrustum(camera); - - Shader_setInt(shader, "time", loop_count); - Shader_setMat4(shader, "camera", camera->matrix); - Shader_setVec3(shader, "view_pos", player_transform.position); - Shader_setVec3(shader, "pointlight_pos", player_transform.position); - - ChunkManager_recenter(&chunk_manager, player_transform.position); - ChunkManager_drawChunks(&chunk_manager, camera); - - loop_count += 1; - if (loop_count % 100000 == 0) - { - save(&player_transform); - } - - glfwSwapBuffers(app->window); - glfwPollEvents(); - } - - save(&player_transform); - - ChunkManager_free(&chunk_manager); - App_free(app); - - LOGI("Application exiting..."); -} -