diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-10-31 22:18:25 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-10-31 22:18:25 +0000 |
| commit | f49044c9886accc91dfd29056241da3b48324640 (patch) | |
| tree | 8dfdcde8753fdd926a812430c98970282fa22bbc /yage/core | |
| parent | f776df6076725d14679b31168e3ede53c966182e (diff) | |
| download | YAGE-f49044c9886accc91dfd29056241da3b48324640.tar.gz YAGE-f49044c9886accc91dfd29056241da3b48324640.zip | |
Moving to core, fixing errors
Diffstat (limited to 'yage/core')
| -rw-r--r-- | yage/core/imageloader.cpp | 4 | ||||
| -rw-r--r-- | yage/core/inputmanager.cpp | 2 | ||||
| -rw-r--r-- | yage/core/iomanager.cpp | 2 | ||||
| -rw-r--r-- | yage/core/resourcemanager.cpp | 2 | ||||
| -rw-r--r-- | yage/core/sprite.cpp | 6 | ||||
| -rw-r--r-- | yage/core/spritebatch.cpp | 2 | ||||
| -rw-r--r-- | yage/core/spritesheet.cpp | 2 | ||||
| -rw-r--r-- | yage/core/texturecache.cpp | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/yage/core/imageloader.cpp b/yage/core/imageloader.cpp index e1d54dc1..89aeb067 100644 --- a/yage/core/imageloader.cpp +++ b/yage/core/imageloader.cpp @@ -12,8 +12,8 @@ #include <glad/glad.h> #endif -#include <yage/base/iomanager.h> -#include <yage/base/picopng.h> +#include <yage/core/iomanager.h> +#include <yage/core/picopng.h> #include <iostream> #include <stdexcept> diff --git a/yage/core/inputmanager.cpp b/yage/core/inputmanager.cpp index 15ff374b..391c9931 100644 --- a/yage/core/inputmanager.cpp +++ b/yage/core/inputmanager.cpp @@ -6,7 +6,7 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/inputmanager.h> +#include <yage/core/inputmanager.h> namespace yage { diff --git a/yage/core/iomanager.cpp b/yage/core/iomanager.cpp index d5b950d6..6bb083ab 100644 --- a/yage/core/iomanager.cpp +++ b/yage/core/iomanager.cpp @@ -6,7 +6,7 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/iomanager.h> +#include <yage/core/iomanager.h> #include <fstream> #include <stdexcept> diff --git a/yage/core/resourcemanager.cpp b/yage/core/resourcemanager.cpp index f3f9aa20..cf70eae8 100644 --- a/yage/core/resourcemanager.cpp +++ b/yage/core/resourcemanager.cpp @@ -6,7 +6,7 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/resourcemanager.h> +#include <yage/core/resourcemanager.h> namespace yage { diff --git a/yage/core/sprite.cpp b/yage/core/sprite.cpp index 9ac4dc55..769c8b81 100644 --- a/yage/core/sprite.cpp +++ b/yage/core/sprite.cpp @@ -6,9 +6,9 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/sprite.h> -#include <yage/base/resourcemanager.h> -#include <yage/base/vertex.h> +#include <yage/core/sprite.h> +#include <yage/core/resourcemanager.h> +#include <yage/core/vertex.h> #include <cstddef> diff --git a/yage/core/spritebatch.cpp b/yage/core/spritebatch.cpp index aaeec32f..ad6feeab 100644 --- a/yage/core/spritebatch.cpp +++ b/yage/core/spritebatch.cpp @@ -6,7 +6,7 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/spritebatch.h> +#include <yage/core/spritebatch.h> #include <algorithm> #include <stdexcept> diff --git a/yage/core/spritesheet.cpp b/yage/core/spritesheet.cpp index 5c3499cc..09c344e3 100644 --- a/yage/core/spritesheet.cpp +++ b/yage/core/spritesheet.cpp @@ -17,7 +17,7 @@ #include <stdexcept> #include <rapidjson/document.h> -#include <yage/base/imageloader.h> +#include <yage/core/imageloader.h> using namespace std; using namespace rapidjson; diff --git a/yage/core/texturecache.cpp b/yage/core/texturecache.cpp index 628f3604..af22c93e 100644 --- a/yage/core/texturecache.cpp +++ b/yage/core/texturecache.cpp @@ -6,8 +6,8 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/texturecache.h> -#include <yage/base/imageloader.h> +#include <yage/core/texturecache.h> +#include <yage/core/imageloader.h> namespace yage { |