diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-13 17:53:21 +0100 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-13 17:53:21 +0100 |
| commit | e220711a0495e40491f3ba04c485602d70a1f7d0 (patch) | |
| tree | 498ae4158e4cddd2ffc9ac10ad927815202aee3c /include | |
| parent | b3d29409c0ec90a32a91243675a3f55617cf63e1 (diff) | |
| download | YAGE-e220711a0495e40491f3ba04c485602d70a1f7d0.tar.gz YAGE-e220711a0495e40491f3ba04c485602d70a1f7d0.zip | |
Removing googletest from doxygen and improving version headers
Diffstat (limited to 'include')
| -rw-r--r-- | include/YAGE/camera2d.hpp | 4 | ||||
| -rw-r--r-- | include/YAGE/picopng.hpp | 9 | ||||
| -rw-r--r-- | include/YAGE/spritebatch.hpp | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/include/YAGE/camera2d.hpp b/include/YAGE/camera2d.hpp index 077d0544..e5e4e651 100644 --- a/include/YAGE/camera2d.hpp +++ b/include/YAGE/camera2d.hpp @@ -1,8 +1,8 @@ /* ---------------------------------------------------------------------------- * camera2d.hpp * - * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License - * See file LICENSE for more details + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ diff --git a/include/YAGE/picopng.hpp b/include/YAGE/picopng.hpp index 0aa6c6d4..b1318da0 100644 --- a/include/YAGE/picopng.hpp +++ b/include/YAGE/picopng.hpp @@ -12,6 +12,11 @@ namespace yage { -extern int decodePNG(std::vector<unsigned char> &out_image, unsigned long &image_width, unsigned long &image_height, const unsigned char *in_png, size_t in_size, bool convert_to_rgba32 = true); - +extern int decodePNG(std::vector<unsigned char> &out_image, + unsigned long &image_width, + unsigned long &image_height, + const unsigned char *in_png, + size_t in_size, + bool convert_to_rgba32 = true); + } // yage diff --git a/include/YAGE/spritebatch.hpp b/include/YAGE/spritebatch.hpp index 9446c40f..1b1c8bb8 100644 --- a/include/YAGE/spritebatch.hpp +++ b/include/YAGE/spritebatch.hpp @@ -6,8 +6,8 @@ * ---------------------------------------------------------------------------- */ -#ifndef SPRITE_BATCH_HPP -#define SPRITE_BATCH_HPP +#ifndef YAGE_SPRITE_BATCH_HPP +#define YAGE_SPRITE_BATCH_HPP #include "vertex.hpp" @@ -20,6 +20,8 @@ namespace yage { class SpriteBatch; +/** Glyph with information of the texture. + */ class Glyph { // member variables private: @@ -46,24 +48,20 @@ public: class RenderBatch { friend SpriteBatch; - // member variables private: GLsizei num_vertices_; GLint offset_; GLuint texture_; - // member functions public: RenderBatch(GLint offset, GLsizei num_vertices, GLuint texture); - // getters GLint offset() const { return offset_; } GLsizei num_vertices() const { return num_vertices_; } GLuint texture() const { return texture_; } }; class SpriteBatch { - // member variables public: static const int NUM_VERTICES = 6; |