aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-09-04 00:59:32 +0100
committerYann Herklotz <ymherklotz@gmail.com>2017-09-04 00:59:32 +0100
commit81b2d1591d348ee7972d174a2ba2dee8dc7cea96 (patch)
tree078dc35034b2dfdfdc7d849bad136b210390de87 /include
parentd4eae8dfc1fcf68e198205b9bab7574b4c17cc66 (diff)
downloadYAGE-81b2d1591d348ee7972d174a2ba2dee8dc7cea96.tar.gz
YAGE-81b2d1591d348ee7972d174a2ba2dee8dc7cea96.zip
Adding rapidjson
Diffstat (limited to 'include')
-rw-r--r--include/YAGE/camera2d.h6
-rw-r--r--include/YAGE/imageloader.h1
2 files changed, 2 insertions, 5 deletions
diff --git a/include/YAGE/camera2d.h b/include/YAGE/camera2d.h
index a50544a4..a60893ac 100644
--- a/include/YAGE/camera2d.h
+++ b/include/YAGE/camera2d.h
@@ -6,8 +6,8 @@
* ----------------------------------------------------------------------------
*/
-#ifndef CAMERA_2D_H
-#define CAMERA_2D_H
+#ifndef YAGE_CAMERA2D_H
+#define YAGE_CAMERA2D_H
#include "glslprogram.h"
@@ -29,9 +29,7 @@ private:
public:
Camera2D(int screen_width = 1280, int screen_height = 720);
- // update camera location
void update(GlslProgram &program);
- // camera movement
void move(const glm::vec2 &direction);
};
diff --git a/include/YAGE/imageloader.h b/include/YAGE/imageloader.h
index ab6a3569..8d5c5cd1 100644
--- a/include/YAGE/imageloader.h
+++ b/include/YAGE/imageloader.h
@@ -20,7 +20,6 @@ class ImageLoader
{
public:
static Texture loadPng(const std::string &file_path);
- static Texture loadSpriteSheet(const std::string &file_path);
};
} // namespace yage