Rename loaders to data;

CMakeLists.txt

@@ -237,6 +237,12 @@ set(LOVR_SRC
   src/api/types/world.c
   src/audio/audio.c
   src/audio/source.c
+  src/data/animation.c
+  src/data/font.c
+  src/data/material.c
+  src/data/model.c
+  src/data/source.c
+  src/data/texture.c
   src/event/event.c
   src/filesystem/blob.c
   src/filesystem/file.c
@@ -261,12 +267,6 @@ set(LOVR_SRC
   src/lib/stb/stb_image.c
   src/lib/stb/stb_vorbis.c
   src/lib/vec/vec.c
-  src/loaders/animation.c
-  src/loaders/font.c
-  src/loaders/material.c
-  src/loaders/model.c
-  src/loaders/source.c
-  src/loaders/texture.c
   src/lovr.c
   src/luax.c
   src/main.c

CONTRIBUTING.md

@@ -49,5 +49,5 @@ in the `src/lib` folder.
 - `src/api` contains Lua bindings.  There's a file for each module in there, and a `types` folder
 with a file for each type of object.
 - `src/resources` contains embedded resources.  These are compiled to binary headers using `xxd`.
-- `src/loaders` has stuff for loading various file formats into LÖVR data structures.
+- `src/data` has stuff for loading various file formats into LÖVR data structures.
 - Each module has a folder in `src`.

src/api/audio.c

@@ -1,7 +1,7 @@
 #include "api/lovr.h"
 #include "audio/audio.h"
 #include "audio/source.h"
-#include "loaders/source.h"
+#include "data/source.h"
 
 map_int_t TimeUnits;
 

src/api/graphics.c

@@ -5,10 +5,10 @@
 #include "graphics/material.h"
 #include "graphics/mesh.h"
 #include "graphics/model.h"
-#include "loaders/font.h"
-#include "loaders/material.h"
-#include "loaders/model.h"
-#include "loaders/texture.h"
+#include "data/font.h"
+#include "data/material.h"
+#include "data/model.h"
+#include "data/texture.h"
 #include "filesystem/filesystem.h"
 #include <math.h>
 #include <stdbool.h>

src/api/types/controller.c

@@ -1,7 +1,6 @@
 #include "api/lovr.h"
 #include "headset/headset.h"
-#include "loaders/model.h"
-#include "loaders/texture.h"
+#include "data/model.h"
 #include "graphics/model.h"
 
 int l_lovrControllerIsPresent(lua_State* L) {

src/audio/source.c

@@ -1,5 +1,5 @@
 #include "audio/source.h"
-#include "loaders/source.h"
+#include "data/source.h"
 #define _USE_MATH_DEFINES
 #include <math.h>
 #include <stdlib.h>

src/audio/source.h

@@ -1,4 +1,4 @@
-#include "loaders/source.h"
+#include "data/source.h"
 #include "util.h"
 #include <AL/al.h>
 #include <AL/alc.h>

src/data/animation.c

@@ -1,4 +1,4 @@
-#include "loaders/animation.h"
+#include "data/animation.h"
 #include <stdlib.h>
 
 AnimationData* lovrAnimationDataCreate() {

src/data/font.c

@@ -1,4 +1,4 @@
-#include "loaders/font.h"
+#include "data/font.h"
 #include "resources/Cabin.ttf.h"
 #include "util.h"
 #include "msdfgen-c.h"

src/data/material.c

@@ -1,4 +1,4 @@
-#include "loaders/material.h"
+#include "data/material.h"
 
 MaterialData* lovrMaterialDataCreateEmpty() {
   MaterialData* materialData = malloc(sizeof(MaterialData));

src/data/material.h

@@ -1,4 +1,4 @@
-#include "loaders/texture.h"
+#include "data/texture.h"
 
 #pragma once
 

src/data/model.c

@@ -1,4 +1,4 @@
-#include "loaders/model.h"
+#include "data/model.h"
 #include "filesystem/filesystem.h"
 #include "filesystem/file.h"
 #include "math/math.h"

src/data/model.h

@@ -1,6 +1,6 @@
 #include "filesystem/blob.h"
-#include "loaders/animation.h"
-#include "loaders/material.h"
+#include "data/animation.h"
+#include "data/material.h"
 #include "util.h"
 #include "lib/vec/vec.h"
 

src/data/source.c

@@ -1,4 +1,4 @@
-#include "loaders/source.h"
+#include "data/source.h"
 #include "lib/stb/stb_vorbis.h"
 #include "util.h"
 #include <stdlib.h>

src/data/texture.c

@@ -1,4 +1,4 @@
-#include "loaders/texture.h"
+#include "data/texture.h"
 #include "math/math.h"
 #include "lib/dds.h"
 #include "lib/stb/stb_image.h"

src/graphics/animator.h

@@ -1,4 +1,4 @@
-#include "loaders/animation.h"
+#include "data/animation.h"
 #include "math/mat4.h"
 #include "util.h"
 #include "lib/map/map.h"

src/graphics/font.c

@@ -1,8 +1,8 @@
 #include "graphics/font.h"
 #include "graphics/graphics.h"
 #include "graphics/texture.h"
-#include "loaders/font.h"
-#include "loaders/texture.h"
+#include "data/font.h"
+#include "data/texture.h"
 #include "util.h"
 #include <string.h>
 #include <stdlib.h>

src/graphics/font.h

@@ -1,4 +1,4 @@
-#include "loaders/font.h"
+#include "data/font.h"
 #include "util.h"
 #include "graphics/texture.h"
 #include "math/math.h"

src/graphics/graphics.c

@@ -1,6 +1,6 @@
 #include "graphics/graphics.h"
-#include "loaders/texture.h"
-#include "loaders/font.h"
+#include "data/texture.h"
+#include "data/font.h"
 #include "resources/shaders.h"
 #include "event/event.h"
 #include "filesystem/filesystem.h"

src/graphics/material.h

@@ -1,6 +1,6 @@
 #include "util.h"
 #include "graphics/texture.h"
-#include "loaders/material.h"
+#include "data/material.h"
 #include <stdbool.h>
 
 #pragma once

src/graphics/model.h

@@ -1,5 +1,5 @@
-#include "loaders/model.h"
-#include "loaders/animation.h"
+#include "data/model.h"
+#include "data/animation.h"
 #include "graphics/animator.h"
 #include "graphics/material.h"
 #include "graphics/mesh.h"

src/graphics/texture.h

@@ -1,4 +1,4 @@
-#include "loaders/texture.h"
+#include "data/texture.h"
 #include "lib/glfw.h"
 #include "util.h"
 

src/headset/headset.h

@@ -1,5 +1,4 @@
-#include "loaders/model.h"
-#include "loaders/texture.h"
+#include "data/model.h"
 #include "lib/vec/vec.h"
 #include "util.h"
 #include <stdbool.h>