From d5a1928b3dc40f9f9f7eea22af62c62e9a1d74b7 Mon Sep 17 00:00:00 2001 From: bjorn Date: Sun, 11 Feb 2018 15:22:04 -0800 Subject: [PATCH] Rename a bunch of files; --- CMakeLists.txt | 4 ++-- src/api/data.c | 4 ++-- src/api/graphics.c | 4 ++-- src/api/types/controller.c | 2 +- src/api/types/modelData.c | 2 +- src/data/{model.c => modelData.c} | 4 ++-- src/data/{model.h => modelData.h} | 0 src/data/{texture.c => textureData.c} | 2 +- src/data/{texture.h => textureData.h} | 0 src/graphics/animator.h | 2 +- src/graphics/font.c | 2 +- src/graphics/graphics.c | 2 +- src/graphics/model.h | 2 +- src/graphics/texture.h | 2 +- src/headset/headset.h | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) rename src/data/{model.c => modelData.c} (99%) rename src/data/{model.h => modelData.h} (100%) rename src/data/{texture.c => textureData.c} (99%) rename src/data/{texture.h => textureData.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 565159fb..c3f59aec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,9 +249,9 @@ set(LOVR_SRC src/audio/source.c src/data/audioStream.c src/data/data.c - src/data/model.c + src/data/modelData.c src/data/rasterizer.c - src/data/texture.c + src/data/textureData.c src/data/vertexData.c src/event/event.c src/filesystem/blob.c diff --git a/src/api/data.c b/src/api/data.c index 70ab7725..cc3af818 100644 --- a/src/api/data.c +++ b/src/api/data.c @@ -1,9 +1,9 @@ #include "api.h" #include "data/data.h" #include "data/audioStream.h" -#include "data/model.h" +#include "data/modelData.h" #include "data/rasterizer.h" -#include "data/texture.h" +#include "data/textureData.h" int l_lovrDataInit(lua_State* L) { lua_newtable(L); diff --git a/src/api/graphics.c b/src/api/graphics.c index a768dbbf..083c85c9 100644 --- a/src/api/graphics.c +++ b/src/api/graphics.c @@ -5,9 +5,9 @@ #include "graphics/material.h" #include "graphics/mesh.h" #include "graphics/model.h" -#include "data/model.h" +#include "data/modelData.h" #include "data/rasterizer.h" -#include "data/texture.h" +#include "data/textureData.h" #include "data/vertexData.h" #include "filesystem/filesystem.h" #include diff --git a/src/api/types/controller.c b/src/api/types/controller.c index 6db06865..8a0dcdef 100644 --- a/src/api/types/controller.c +++ b/src/api/types/controller.c @@ -1,6 +1,6 @@ #include "api.h" #include "headset/headset.h" -#include "data/model.h" +#include "data/modelData.h" #include "graphics/model.h" int l_lovrControllerIsPresent(lua_State* L) { diff --git a/src/api/types/modelData.c b/src/api/types/modelData.c index cfca79e2..570e6310 100644 --- a/src/api/types/modelData.c +++ b/src/api/types/modelData.c @@ -1,5 +1,5 @@ #include "api.h" -#include "data/model.h" +#include "data/modelData.h" #include "math/transform.h" #include "math/mat4.h" #include "math/quat.h" diff --git a/src/data/model.c b/src/data/modelData.c similarity index 99% rename from src/data/model.c rename to src/data/modelData.c index 72547ac8..f3d405ab 100644 --- a/src/data/model.c +++ b/src/data/modelData.c @@ -1,5 +1,5 @@ -#include "data/model.h" -#include "data/texture.h" +#include "data/modelData.h" +#include "data/textureData.h" #include "filesystem/filesystem.h" #include "filesystem/file.h" #include "math/math.h" diff --git a/src/data/model.h b/src/data/modelData.h similarity index 100% rename from src/data/model.h rename to src/data/modelData.h diff --git a/src/data/texture.c b/src/data/textureData.c similarity index 99% rename from src/data/texture.c rename to src/data/textureData.c index c86dea4e..75abf7bc 100644 --- a/src/data/texture.c +++ b/src/data/textureData.c @@ -1,4 +1,4 @@ -#include "data/texture.h" +#include "data/textureData.h" #include "filesystem/file.h" #include "math/math.h" #include "lib/dds.h" diff --git a/src/data/texture.h b/src/data/textureData.h similarity index 100% rename from src/data/texture.h rename to src/data/textureData.h diff --git a/src/graphics/animator.h b/src/graphics/animator.h index 5ce3d0d5..a13f68ca 100644 --- a/src/graphics/animator.h +++ b/src/graphics/animator.h @@ -1,4 +1,4 @@ -#include "data/model.h" +#include "data/modelData.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 08d77a55..4ebba33d 100644 --- a/src/graphics/font.c +++ b/src/graphics/font.c @@ -2,7 +2,7 @@ #include "graphics/graphics.h" #include "graphics/texture.h" #include "data/rasterizer.h" -#include "data/texture.h" +#include "data/textureData.h" #include "util.h" #include #include diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c index 6ed5f92f..3908123f 100644 --- a/src/graphics/graphics.c +++ b/src/graphics/graphics.c @@ -1,5 +1,5 @@ #include "graphics/graphics.h" -#include "data/texture.h" +#include "data/textureData.h" #include "data/rasterizer.h" #include "resources/shaders.h" #include "event/event.h" diff --git a/src/graphics/model.h b/src/graphics/model.h index 4bf8289d..6cbf7699 100644 --- a/src/graphics/model.h +++ b/src/graphics/model.h @@ -1,4 +1,4 @@ -#include "data/model.h" +#include "data/modelData.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 8e1502b8..e7d1d32a 100644 --- a/src/graphics/texture.h +++ b/src/graphics/texture.h @@ -1,4 +1,4 @@ -#include "data/texture.h" +#include "data/textureData.h" #include "lib/glfw.h" #include "util.h" diff --git a/src/headset/headset.h b/src/headset/headset.h index 6841bfd6..96df01ff 100644 --- a/src/headset/headset.h +++ b/src/headset/headset.h @@ -1,4 +1,4 @@ -#include "data/model.h" +#include "data/modelData.h" #include "lib/vec/vec.h" #include "util.h" #include