diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-06 11:30:24 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-06 11:30:24 +0000 |
commit | c7090180503f263c60ec34844992e0e8d4bea85a (patch) | |
tree | 6ecc5b2e16856db49de056738b36e1ba103d3049 /yage/yage.h | |
parent | cf4c73f2a75b470a4d4c4167105f92bc46f1926c (diff) | |
parent | 07012cf0982d3f86aebe83b5bdc4a67332c635da (diff) | |
download | YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.tar.gz YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.zip |
Merge branch 'develop'
Diffstat (limited to 'yage/yage.h')
-rw-r--r-- | yage/yage.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/yage/yage.h b/yage/yage.h index de6864eb..0f75adb3 100644 --- a/yage/yage.h +++ b/yage/yage.h @@ -10,30 +10,22 @@ #define YAGE_YAGE_H #include "core/camera.h" -#include "core/glslprogram.h" -#include "core/imageloader.h" -#include "core/input.h" #include "core/iomanager.h" #include "core/logger.h" -#include "core/logmessage.h" -#include "core/logsink.h" -#include "core/picopng.h" #include "core/resourcemanager.h" -#include "core/spritebatch.h" #include "core/spritesheet.h" -#include "core/texture.h" -#include "core/vertex.h" #include "core/window.h" - +#include "data/input.h" +#include "data/texture.h" +#include "data/vertex.h" +#include "math/matrix.h" #include "physics/body.h" #include "physics/particlebody.h" #include "physics/rectanglecollider.h" #include "physics/rigidbody.h" - -#include "math/matrix.h" - -#include "util/active.h" -#include "util/syncqueue.h" +#include "render/shader.h" +#include "render/spritebatch.h" +#include "render/drawable.h" /** Project namespace. * |