mirror of https://github.com/bjornbytes/lovr.git
Rename loaders to data;
This commit is contained in:
parent
4a2cc56fef
commit
72aa7e858a
|
@ -237,6 +237,12 @@ set(LOVR_SRC
|
||||||
src/api/types/world.c
|
src/api/types/world.c
|
||||||
src/audio/audio.c
|
src/audio/audio.c
|
||||||
src/audio/source.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/event/event.c
|
||||||
src/filesystem/blob.c
|
src/filesystem/blob.c
|
||||||
src/filesystem/file.c
|
src/filesystem/file.c
|
||||||
|
@ -261,12 +267,6 @@ set(LOVR_SRC
|
||||||
src/lib/stb/stb_image.c
|
src/lib/stb/stb_image.c
|
||||||
src/lib/stb/stb_vorbis.c
|
src/lib/stb/stb_vorbis.c
|
||||||
src/lib/vec/vec.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/lovr.c
|
||||||
src/luax.c
|
src/luax.c
|
||||||
src/main.c
|
src/main.c
|
||||||
|
|
|
@ -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
|
- `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.
|
with a file for each type of object.
|
||||||
- `src/resources` contains embedded resources. These are compiled to binary headers using `xxd`.
|
- `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`.
|
- Each module has a folder in `src`.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "api/lovr.h"
|
#include "api/lovr.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "audio/source.h"
|
#include "audio/source.h"
|
||||||
#include "loaders/source.h"
|
#include "data/source.h"
|
||||||
|
|
||||||
map_int_t TimeUnits;
|
map_int_t TimeUnits;
|
||||||
|
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
#include "graphics/material.h"
|
#include "graphics/material.h"
|
||||||
#include "graphics/mesh.h"
|
#include "graphics/mesh.h"
|
||||||
#include "graphics/model.h"
|
#include "graphics/model.h"
|
||||||
#include "loaders/font.h"
|
#include "data/font.h"
|
||||||
#include "loaders/material.h"
|
#include "data/material.h"
|
||||||
#include "loaders/model.h"
|
#include "data/model.h"
|
||||||
#include "loaders/texture.h"
|
#include "data/texture.h"
|
||||||
#include "filesystem/filesystem.h"
|
#include "filesystem/filesystem.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "api/lovr.h"
|
#include "api/lovr.h"
|
||||||
#include "headset/headset.h"
|
#include "headset/headset.h"
|
||||||
#include "loaders/model.h"
|
#include "data/model.h"
|
||||||
#include "loaders/texture.h"
|
|
||||||
#include "graphics/model.h"
|
#include "graphics/model.h"
|
||||||
|
|
||||||
int l_lovrControllerIsPresent(lua_State* L) {
|
int l_lovrControllerIsPresent(lua_State* L) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "audio/source.h"
|
#include "audio/source.h"
|
||||||
#include "loaders/source.h"
|
#include "data/source.h"
|
||||||
#define _USE_MATH_DEFINES
|
#define _USE_MATH_DEFINES
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/source.h"
|
#include "data/source.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
#include <AL/alc.h>
|
#include <AL/alc.h>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/animation.h"
|
#include "data/animation.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
AnimationData* lovrAnimationDataCreate() {
|
AnimationData* lovrAnimationDataCreate() {
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/font.h"
|
#include "data/font.h"
|
||||||
#include "resources/Cabin.ttf.h"
|
#include "resources/Cabin.ttf.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "msdfgen-c.h"
|
#include "msdfgen-c.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/material.h"
|
#include "data/material.h"
|
||||||
|
|
||||||
MaterialData* lovrMaterialDataCreateEmpty() {
|
MaterialData* lovrMaterialDataCreateEmpty() {
|
||||||
MaterialData* materialData = malloc(sizeof(MaterialData));
|
MaterialData* materialData = malloc(sizeof(MaterialData));
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/texture.h"
|
#include "data/texture.h"
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/model.h"
|
#include "data/model.h"
|
||||||
#include "filesystem/filesystem.h"
|
#include "filesystem/filesystem.h"
|
||||||
#include "filesystem/file.h"
|
#include "filesystem/file.h"
|
||||||
#include "math/math.h"
|
#include "math/math.h"
|
|
@ -1,6 +1,6 @@
|
||||||
#include "filesystem/blob.h"
|
#include "filesystem/blob.h"
|
||||||
#include "loaders/animation.h"
|
#include "data/animation.h"
|
||||||
#include "loaders/material.h"
|
#include "data/material.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "lib/vec/vec.h"
|
#include "lib/vec/vec.h"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/source.h"
|
#include "data/source.h"
|
||||||
#include "lib/stb/stb_vorbis.h"
|
#include "lib/stb/stb_vorbis.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/texture.h"
|
#include "data/texture.h"
|
||||||
#include "math/math.h"
|
#include "math/math.h"
|
||||||
#include "lib/dds.h"
|
#include "lib/dds.h"
|
||||||
#include "lib/stb/stb_image.h"
|
#include "lib/stb/stb_image.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/animation.h"
|
#include "data/animation.h"
|
||||||
#include "math/mat4.h"
|
#include "math/mat4.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "lib/map/map.h"
|
#include "lib/map/map.h"
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#include "graphics/font.h"
|
#include "graphics/font.h"
|
||||||
#include "graphics/graphics.h"
|
#include "graphics/graphics.h"
|
||||||
#include "graphics/texture.h"
|
#include "graphics/texture.h"
|
||||||
#include "loaders/font.h"
|
#include "data/font.h"
|
||||||
#include "loaders/texture.h"
|
#include "data/texture.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/font.h"
|
#include "data/font.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "graphics/texture.h"
|
#include "graphics/texture.h"
|
||||||
#include "math/math.h"
|
#include "math/math.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "graphics/graphics.h"
|
#include "graphics/graphics.h"
|
||||||
#include "loaders/texture.h"
|
#include "data/texture.h"
|
||||||
#include "loaders/font.h"
|
#include "data/font.h"
|
||||||
#include "resources/shaders.h"
|
#include "resources/shaders.h"
|
||||||
#include "event/event.h"
|
#include "event/event.h"
|
||||||
#include "filesystem/filesystem.h"
|
#include "filesystem/filesystem.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "graphics/texture.h"
|
#include "graphics/texture.h"
|
||||||
#include "loaders/material.h"
|
#include "data/material.h"
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "loaders/model.h"
|
#include "data/model.h"
|
||||||
#include "loaders/animation.h"
|
#include "data/animation.h"
|
||||||
#include "graphics/animator.h"
|
#include "graphics/animator.h"
|
||||||
#include "graphics/material.h"
|
#include "graphics/material.h"
|
||||||
#include "graphics/mesh.h"
|
#include "graphics/mesh.h"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "loaders/texture.h"
|
#include "data/texture.h"
|
||||||
#include "lib/glfw.h"
|
#include "lib/glfw.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include "loaders/model.h"
|
#include "data/model.h"
|
||||||
#include "loaders/texture.h"
|
|
||||||
#include "lib/vec/vec.h"
|
#include "lib/vec/vec.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
Loading…
Reference in New Issue