From 72aa7e858ab0cd8e0723cf687ff1014e75466b2c Mon Sep 17 00:00:00 2001 From: bjorn Date: Sun, 10 Dec 2017 12:36:22 -0800 Subject: [PATCH] Rename loaders to data; --- CMakeLists.txt | 12 ++++++------ CONTRIBUTING.md | 2 +- src/api/audio.c | 2 +- src/api/graphics.c | 8 ++++---- src/api/types/controller.c | 3 +-- src/audio/source.c | 2 +- src/audio/source.h | 2 +- src/{loaders => data}/animation.c | 2 +- src/{loaders => data}/animation.h | 0 src/{loaders => data}/font.c | 2 +- src/{loaders => data}/font.h | 0 src/{loaders => data}/material.c | 2 +- src/{loaders => data}/material.h | 2 +- src/{loaders => data}/model.c | 2 +- src/{loaders => data}/model.h | 4 ++-- src/{loaders => data}/source.c | 2 +- src/{loaders => data}/source.h | 0 src/{loaders => data}/texture.c | 2 +- src/{loaders => data}/texture.h | 0 src/graphics/animator.h | 2 +- src/graphics/font.c | 4 ++-- src/graphics/font.h | 2 +- src/graphics/graphics.c | 4 ++-- src/graphics/material.h | 2 +- src/graphics/model.h | 4 ++-- src/graphics/texture.h | 2 +- src/headset/headset.h | 3 +-- 27 files changed, 35 insertions(+), 37 deletions(-) rename src/{loaders => data}/animation.c (92%) rename src/{loaders => data}/animation.h (100%) rename src/{loaders => data}/font.c (99%) rename src/{loaders => data}/font.h (100%) rename src/{loaders => data}/material.c (93%) rename src/{loaders => data}/material.h (93%) rename src/{loaders => data}/model.c (99%) rename src/{loaders => data}/model.h (95%) rename src/{loaders => data}/source.c (98%) rename src/{loaders => data}/source.h (100%) rename src/{loaders => data}/texture.c (99%) rename src/{loaders => data}/texture.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ccc0f07..0c449ca0 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4ca6665..18cafb8d 100644 --- a/CONTRIBUTING.md +++ b/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`. diff --git a/src/api/audio.c b/src/api/audio.c index 5b21dbad..2edd7267 100644 --- a/src/api/audio.c +++ b/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; diff --git a/src/api/graphics.c b/src/api/graphics.c index f2b1c294..41b8fb9a 100644 --- a/src/api/graphics.c +++ b/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 #include diff --git a/src/api/types/controller.c b/src/api/types/controller.c index e032ca22..5ed077da 100644 --- a/src/api/types/controller.c +++ b/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) { diff --git a/src/audio/source.c b/src/audio/source.c index 193cbbc5..45bd1cb3 100644 --- a/src/audio/source.c +++ b/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 #include diff --git a/src/audio/source.h b/src/audio/source.h index f1f2e10e..b5bdcce4 100644 --- a/src/audio/source.h +++ b/src/audio/source.h @@ -1,4 +1,4 @@ -#include "loaders/source.h" +#include "data/source.h" #include "util.h" #include #include diff --git a/src/loaders/animation.c b/src/data/animation.c similarity index 92% rename from src/loaders/animation.c rename to src/data/animation.c index 033aca56..50efdab4 100644 --- a/src/loaders/animation.c +++ b/src/data/animation.c @@ -1,4 +1,4 @@ -#include "loaders/animation.h" +#include "data/animation.h" #include AnimationData* lovrAnimationDataCreate() { diff --git a/src/loaders/animation.h b/src/data/animation.h similarity index 100% rename from src/loaders/animation.h rename to src/data/animation.h diff --git a/src/loaders/font.c b/src/data/font.c similarity index 99% rename from src/loaders/font.c rename to src/data/font.c index e9de68c5..3ac4b068 100644 --- a/src/loaders/font.c +++ b/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" diff --git a/src/loaders/font.h b/src/data/font.h similarity index 100% rename from src/loaders/font.h rename to src/data/font.h diff --git a/src/loaders/material.c b/src/data/material.c similarity index 93% rename from src/loaders/material.c rename to src/data/material.c index 1e835348..717afaf3 100644 --- a/src/loaders/material.c +++ b/src/data/material.c @@ -1,4 +1,4 @@ -#include "loaders/material.h" +#include "data/material.h" MaterialData* lovrMaterialDataCreateEmpty() { MaterialData* materialData = malloc(sizeof(MaterialData)); diff --git a/src/loaders/material.h b/src/data/material.h similarity index 93% rename from src/loaders/material.h rename to src/data/material.h index 911a0b7b..c128842a 100644 --- a/src/loaders/material.h +++ b/src/data/material.h @@ -1,4 +1,4 @@ -#include "loaders/texture.h" +#include "data/texture.h" #pragma once diff --git a/src/loaders/model.c b/src/data/model.c similarity index 99% rename from src/loaders/model.c rename to src/data/model.c index 1e20068a..afcfd00d 100644 --- a/src/loaders/model.c +++ b/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" diff --git a/src/loaders/model.h b/src/data/model.h similarity index 95% rename from src/loaders/model.h rename to src/data/model.h index 851d1d08..9ca16b4b 100644 --- a/src/loaders/model.h +++ b/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" diff --git a/src/loaders/source.c b/src/data/source.c similarity index 98% rename from src/loaders/source.c rename to src/data/source.c index b69acfbb..5644b0a1 100644 --- a/src/loaders/source.c +++ b/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 diff --git a/src/loaders/source.h b/src/data/source.h similarity index 100% rename from src/loaders/source.h rename to src/data/source.h diff --git a/src/loaders/texture.c b/src/data/texture.c similarity index 99% rename from src/loaders/texture.c rename to src/data/texture.c index cbb76a31..1debb6c4 100644 --- a/src/loaders/texture.c +++ b/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" diff --git a/src/loaders/texture.h b/src/data/texture.h similarity index 100% rename from src/loaders/texture.h rename to src/data/texture.h diff --git a/src/graphics/animator.h b/src/graphics/animator.h index fe84f1ef..5b4a2358 100644 --- a/src/graphics/animator.h +++ b/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" diff --git a/src/graphics/font.c b/src/graphics/font.c index bd40520d..4dcf4a13 100644 --- a/src/graphics/font.c +++ b/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 #include diff --git a/src/graphics/font.h b/src/graphics/font.h index 7d99e4d9..4b9c9cc2 100644 --- a/src/graphics/font.h +++ b/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" diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c index d5a59e38..1ec48e5a 100644 --- a/src/graphics/graphics.c +++ b/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" diff --git a/src/graphics/material.h b/src/graphics/material.h index af7ca4f7..53b80f54 100644 --- a/src/graphics/material.h +++ b/src/graphics/material.h @@ -1,6 +1,6 @@ #include "util.h" #include "graphics/texture.h" -#include "loaders/material.h" +#include "data/material.h" #include #pragma once diff --git a/src/graphics/model.h b/src/graphics/model.h index cf6f5c42..a28b5922 100644 --- a/src/graphics/model.h +++ b/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" diff --git a/src/graphics/texture.h b/src/graphics/texture.h index 5cb55214..fe75f291 100644 --- a/src/graphics/texture.h +++ b/src/graphics/texture.h @@ -1,4 +1,4 @@ -#include "loaders/texture.h" +#include "data/texture.h" #include "lib/glfw.h" #include "util.h" diff --git a/src/headset/headset.h b/src/headset/headset.h index 681a22fc..5cd84050 100644 --- a/src/headset/headset.h +++ b/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