diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-01 23:47:35 +0100 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-01 23:47:35 +0100 |
commit | 31317175d72c62994b98a93e1b827633b4de9cb2 (patch) | |
tree | 91e9f1068da03a7a5419c44a927a30ff7d29235c /include/YAGE/spritebatch.hpp | |
parent | 67770ad6b1fcbc6730c140b0d3edd3fc9efbdc7b (diff) | |
download | YAGE-31317175d72c62994b98a93e1b827633b4de9cb2.tar.gz YAGE-31317175d72c62994b98a93e1b827633b4de9cb2.zip |
Fixing constructors and destructors
Diffstat (limited to 'include/YAGE/spritebatch.hpp')
-rw-r--r-- | include/YAGE/spritebatch.hpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/include/YAGE/spritebatch.hpp b/include/YAGE/spritebatch.hpp index 61efd0aa..a3007bbf 100644 --- a/include/YAGE/spritebatch.hpp +++ b/include/YAGE/spritebatch.hpp @@ -36,12 +36,12 @@ private: public: Glyph(GLuint texture, float depth, const Vertex &top_left, const Vertex &top_right, const Vertex &bottom_right, const Vertex &bottom_left); - inline GLuint texture() const { return texture_; } - inline float depth() const { return depth_; } - inline Vertex top_left() const { return top_left_; } - inline Vertex top_right() const { return top_right_; } - inline Vertex bottom_right() const { return bottom_right_; } - inline Vertex bottom_left() const { return bottom_left_; } + GLuint texture() const { return texture_; } + float depth() const { return depth_; } + Vertex top_left() const { return top_left_; } + Vertex top_right() const { return top_right_; } + Vertex bottom_right() const { return bottom_right_; } + Vertex bottom_left() const { return bottom_left_; } }; class RenderBatch @@ -58,9 +58,9 @@ public: RenderBatch(GLint offset, GLsizei num_vertices, GLuint texture); // getters - inline GLint offset() const { return offset_; } - inline GLsizei num_vertices() const { return num_vertices_; } - inline GLuint texture() const { return texture_; } + GLint offset() const { return offset_; } + GLsizei num_vertices() const { return num_vertices_; } + GLuint texture() const { return texture_; } }; class SpriteBatch @@ -78,8 +78,13 @@ private: // member functions public: SpriteBatch(); + SpriteBatch(const SpriteBatch&)=delete; + SpriteBatch(SpriteBatch&&)=delete; ~SpriteBatch(); + SpriteBatch& operator=(const SpriteBatch&)=delete; + SpriteBatch& operator=(SpriteBatch&&)=delete; + // initialize vaos and vbos void init(); void begin(); |