Clean up includes;

CMakeLists.txt

@@ -16,6 +16,8 @@ project(lovr)
 file(GLOB_RECURSE LOVR_SRC src/*.c)
 add_executable(lovr ${LOVR_SRC})
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
+
 # LuaJIT
 if(WIN32)
   add_subdirectory(deps/luajit luajit)

src/event/event.c

@@ -1,6 +1,6 @@
-#include "event.h"
+#include "event/event.h"
-#include "../lovr.h"
+#include "lovr.h"
-#include "../glfw.h"
+#include "glfw.h"
 
 void lovrEventPoll() {
   glfwPollEvents();

src/filesystem/filesystem.c

@@ -1,5 +1,5 @@
-#include "filesystem.h"
+#include "filesystem/filesystem.h"
-#include "../util.h"
+#include "util.h"
 #include <physfs.h>
 #include <stdio.h>
 #ifdef __APPLE__

src/glfw.c

@@ -1,7 +1,7 @@
 #include "glfw.h"
+#include "util.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "util.h"
 
 void initGlfw(GLFWerrorfun onError, GLFWwindowclosefun onClose, void* userPointer) {
   glfwSetErrorCallback(onError);

src/graphics/buffer.c

@@ -1,6 +1,6 @@
-#include "buffer.h"
+#include "graphics/buffer.h"
-#include "graphics.h"
+#include "graphics/graphics.h"
-#include "shader.h"
+#include "graphics/shader.h"
 #include <stdlib.h>
 
 Buffer* lovrBufferCreate(int size, BufferFormat* format, BufferDrawMode drawMode, BufferUsage usage) {

src/graphics/buffer.h

@@ -1,6 +1,6 @@
-#include "../glfw.h"
+#include "glfw.h"
-#include "../util.h"
+#include "util.h"
-#include "texture.h"
+#include "graphics/texture.h"
 
 #ifndef LOVR_BUFFER_TYPES
 #define LOVR_BUFFER_TYPES

src/graphics/graphics.c

@@ -1,7 +1,7 @@
+#include "graphics/graphics.h"
+#include "util.h"
+#include "glfw.h"
 #define _USE_MATH_DEFINES
-#include "graphics.h"
-#include "../glfw.h"
-#include "../util.h"
 #include <stdlib.h>
 #include <math.h>
 #include <assimp/cimport.h>

src/graphics/graphics.h

@@ -1,8 +1,8 @@
-#include "buffer.h"
+#include "graphics/buffer.h"
-#include "model.h"
+#include "graphics/model.h"
-#include "shader.h"
+#include "graphics/shader.h"
-#include "skybox.h"
+#include "graphics/skybox.h"
-#include "../matrix.h"
+#include "matrix.h"
 
 #ifndef LOVR_GRAPHICS_TYPES
 #define LOVR_GRAPHICS_TYPES

src/graphics/model.c

@@ -1,5 +1,5 @@
-#include "model.h"
+#include "graphics/model.h"
-#include "graphics.h"
+#include "graphics/graphics.h"
 #include <stdlib.h>
 
 static void visitNode(ModelData* modelData, ModelNode* node, mat4 transform, vec_float_t* vertices, vec_uint_t* indices) {

src/graphics/model.h

@@ -1,7 +1,7 @@
-#include "buffer.h"
+#include "graphics/buffer.h"
-#include "texture.h"
+#include "graphics/texture.h"
-#include "../model/modelData.h"
+#include "model/modelData.h"
-#include "../glfw.h"
+#include "glfw.h"
 
 #ifndef LOVR_MODEL_TYPES
 #define LOVR_MODEL_TYPES

src/graphics/shader.c

@@ -1,5 +1,5 @@
-#include "shader.h"
+#include "graphics/shader.h"
-#include "../util.h"
+#include "util.h"
 #include <stdlib.h>
 
 const char* lovrShaderVertexPrefix = ""

src/graphics/shader.h

@@ -1,6 +1,6 @@
-#include "../glfw.h"
+#include "glfw.h"
-#include "../vendor/map/map.h"
+#include "matrix.h"
-#include "../matrix.h"
+#include "vendor/map/map.h"
 
 #ifndef LOVR_SHADER_TYPES
 #define LOVR_SHADER_TYPES

src/graphics/skybox.c

@@ -1,5 +1,5 @@
-#include "skybox.h"
+#include "graphics/skybox.h"
-#include "../util.h"
+#include "util.h"
 #include <stdlib.h>
 
 Skybox* lovrSkyboxCreate(void** data, int* size) {

src/graphics/skybox.h

@@ -1,4 +1,4 @@
-#include "../glfw.h"
+#include "glfw.h"
 
 #ifndef LOVR_SKYBOX_TYPES
 #define LOVR_SKYBOX_TYPES

src/graphics/texture.c

@@ -1,6 +1,6 @@
-#include "texture.h"
+#include "graphics/texture.h"
-#include "buffer.h"
+#include "graphics/buffer.h"
-#include "../util.h"
+#include "util.h"
 #include <stdlib.h>
 
 Texture* lovrTextureCreate(void* data, int size) {

src/graphics/texture.h

@@ -1,4 +1,4 @@
-#include "../glfw.h"
+#include "glfw.h"
 
 struct Buffer;
 

src/headset/headset.c

@@ -1,5 +1,5 @@
-#include "headset.h"
+#include "headset/headset.h"
-#include "vive.h"
+#include "headset/vive.h"
 
 static Headset* headset;
 

src/headset/vive.c

@@ -1,12 +1,12 @@
-#include "vive.h"
+#include "headset/vive.h"
+#include "graphics/graphics.h"
+#include "util.h"
 #include <stdbool.h>
 #ifndef _WIN32
 #define __stdcall
 #endif
 #include <openvr_capi.h>
 #include <stdlib.h>
-#include "../util.h"
-#include "../graphics/graphics.h"
 #include <stdint.h>
 
 static HeadsetInterface interface = {

src/headset/vive.h

@@ -1,5 +1,5 @@
-#include "headset.h"
+#include "headset/headset.h"
-#include "../glfw.h"
+#include "glfw.h"
 
 #ifndef LOVR_VIVE_TYPES
 #define LOVR_VIVE_TYPES

src/lovr.c

@@ -1,12 +1,11 @@
 #include "lovr.h"
-#include "util.h"
-#include <stdlib.h>
-
 #include "lovr/event.h"
 #include "lovr/filesystem.h"
 #include "lovr/graphics.h"
 #include "lovr/headset.h"
 #include "lovr/timer.h"
+#include "util.h"
+#include <stdlib.h>
 
 void lovrInit(lua_State* L, int argc, char** argv) {
 

src/lovr.h

@@ -1,7 +1,7 @@
+#include "glfw.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "glfw.h"
 
 void lovrInit(lua_State* L, int argc, char** argv);
 void lovrDestroy(int exitCode);

src/lovr/event.c

@@ -1,5 +1,5 @@
-#include "event.h"
+#include "lovr/event.h"
-#include "../event/event.h"
+#include "event/event.h"
 
 const luaL_Reg lovrEvent[] = {
   { "poll", l_lovrEventPoll },

src/lovr/filesystem.c

@@ -1,5 +1,5 @@
-#include "filesystem.h"
+#include "lovr/filesystem.h"
-#include "../filesystem/filesystem.h"
+#include "filesystem/filesystem.h"
 #include <stdlib.h>
 #include <string.h>
 

src/lovr/graphics.c

@@ -1,12 +1,12 @@
-#include "graphics.h"
+#include "lovr/graphics.h"
-#include "types/buffer.h"
+#include "lovr/types/buffer.h"
-#include "types/model.h"
+#include "lovr/types/model.h"
-#include "types/shader.h"
+#include "lovr/types/shader.h"
-#include "types/skybox.h"
+#include "lovr/types/skybox.h"
-#include "types/texture.h"
+#include "lovr/types/texture.h"
-#include "../graphics/graphics.h"
+#include "graphics/graphics.h"
-#include "../filesystem/filesystem.h"
+#include "filesystem/filesystem.h"
-#include "../util.h"
+#include "util.h"
 #include <math.h>
 
 static void luax_readvertices(lua_State* L, int index, vec_float_t* points) {

src/lovr/graphics.h

@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../vendor/map/map.h"
+#include "vendor/map/map.h"
 
 map_int_t BufferAttributeTypes;
 map_int_t BufferDrawModes;

src/lovr/headset.c

@@ -1,7 +1,7 @@
-#include "headset.h"
+#include "lovr/headset.h"
-#include "types/controller.h"
+#include "lovr/types/controller.h"
-#include "../headset/headset.h"
+#include "headset/headset.h"
-#include "../util.h"
+#include "util.h"
 
 void renderHelper(int eyeIndex, void* userdata) {
   lua_State* L = (lua_State*)userdata;

src/lovr/headset.h

@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../vendor/map/map.h"
+#include "vendor/map/map.h"
 
 map_int_t ControllerHands;
 map_int_t ControllerAxes;

src/lovr/timer.c

@@ -1,5 +1,5 @@
-#include "timer.h"
+#include "lovr/timer.h"
-#include "../timer/timer.h"
+#include "timer/timer.h"
 
 const luaL_Reg lovrTimer[] = {
   { "getDelta", l_lovrTimerGetDelta },

src/lovr/types/buffer.c

@@ -1,6 +1,6 @@
-#include "buffer.h"
+#include "lovr/types/buffer.h"
-#include "texture.h"
+#include "lovr/types/texture.h"
-#include "../graphics.h"
+#include "lovr/graphics.h"
 
 void luax_pushbuffer(lua_State* L, Buffer* buffer) {
   if (buffer == NULL) {

src/lovr/types/buffer.h

@@ -1,7 +1,7 @@
+#include "graphics/buffer.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../../graphics/buffer.h"
 
 void luax_pushbuffer(lua_State* L, Buffer* buffer);
 int luax_pushvertex(lua_State* L, void* vertex, BufferFormat format);

src/lovr/types/controller.c

@@ -1,6 +1,6 @@
-#include "controller.h"
+#include "lovr/types/controller.h"
-#include "../headset.h"
+#include "lovr/headset.h"
-#include "../../util.h"
+#include "util.h"
 
 void luax_pushcontroller(lua_State* L, Controller* controller) {
   if (controller == NULL) {

src/lovr/types/controller.h

@@ -1,7 +1,7 @@
+#include "headset/headset.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../../headset/headset.h"
 
 void luax_pushcontroller(lua_State* L, Controller* controller);
 Controller* luax_checkcontroller(lua_State* L, int index);

src/lovr/types/model.c

@@ -1,5 +1,5 @@
-#include "model.h"
+#include "lovr/types/model.h"
-#include "texture.h"
+#include "lovr/types/texture.h"
 
 void luax_pushmodel(lua_State* L, Model* model) {
   if (model == NULL) {

src/lovr/types/model.h

@@ -1,7 +1,7 @@
+#include "graphics/model.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../../graphics/model.h"
 
 void luax_pushmodel(lua_State* L, Model* model);
 Model* luax_checkmodel(lua_State* L, int index);

src/lovr/types/shader.c

@@ -1,4 +1,4 @@
-#include "shader.h"
+#include "lovr/types/shader.h"
 
 void luax_pushshader(lua_State* L, Shader* shader) {
   if (shader == NULL) {

src/lovr/types/shader.h

@@ -1,7 +1,7 @@
+#include "graphics/shader.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../../graphics/shader.h"
 
 void luax_pushshader(lua_State* L, Shader* shader);
 Shader* luax_checkshader(lua_State* L, int index);

src/lovr/types/skybox.c

@@ -1,4 +1,4 @@
-#include "skybox.h"
+#include "lovr/types/skybox.h"
 
 void luax_pushskybox(lua_State* L, Skybox* skybox) {
   if (skybox == NULL) {

src/lovr/types/skybox.h

@@ -1,8 +1,8 @@
+#include "graphics/skybox.h"
+#include "graphics/graphics.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../../graphics/skybox.h"
-#include "../../graphics/graphics.h"
 
 void luax_pushskybox(lua_State* L, Skybox* skybox);
 Skybox* luax_checkskybox(lua_State* L, int index);

src/lovr/types/texture.c

@@ -1,6 +1,6 @@
-#include "texture.h"
+#include "lovr/types/texture.h"
-#include "../graphics.h"
+#include "lovr/graphics.h"
-#include "../../util.h"
+#include "util.h"
 
 void luax_pushtexture(lua_State* L, Texture* texture) {
   if (texture == NULL) {

src/lovr/types/texture.h

@@ -1,7 +1,7 @@
+#include "graphics/texture.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "../../graphics/texture.h"
 
 void luax_pushtexture(lua_State* L, Texture* texture);
 Texture* luax_checktexture(lua_State* L, int index);

src/model/modelData.c

@@ -1,4 +1,4 @@
-#include "modelData.h"
+#include "model/modelData.h"
 #include <stdlib.h>
 #include <assimp/scene.h>
 #include <assimp/cimport.h>

src/model/modelData.h

@@ -1,6 +1,6 @@
-#include "../vendor/vec/vec.h"
+#include "vendor/vec/vec.h"
-#include "../util.h"
+#include "util.h"
-#include "../matrix.h"
+#include "matrix.h"
 
 #ifndef LOVR_MODEL_DATA_TYPES
 #define LOVR_MODEL_DATA_TYPES

src/timer/timer.c

@@ -1,5 +1,5 @@
-#include "timer.h"
+#include "timer/timer.h"
-#include "../glfw.h"
+#include "glfw.h"
 #ifdef _WIN32
 #include <Windows.h>
 #else

src/util.c

@@ -1,9 +1,9 @@
 #include "util.h"
+#define STB_IMAGE_IMPLEMENTATION
+#include "vendor/stb_image.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#define STB_IMAGE_IMPLEMENTATION
-#include "vendor/stb_image.h"
 
 void error(const char* format, ...) {
   va_list args;

src/util.h

@@ -1,8 +1,8 @@
+#include "vendor/vec/vec.h"
+#include "vendor/map/map.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include "vendor/vec/vec.h"
-#include "vendor/map/map.h"
 
 #ifndef UTIL_TYPES
 #define UTIL_TYPES