From 6917f25d040868fb9f8fc586af468a019338e23c Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 13 Aug 2017 17:48:33 +0100 Subject: Updating docs --- annotated.html | 2 +- body_8hpp_source.html | 2 +- camera2d_8hpp_source.html | 2 +- classes.html | 2 +- classyage_1_1Glyph-members.html | 2 +- classyage_1_1Glyph.html | 2 +- classyage_1_1Matrix-members.html | 2 +- classyage_1_1Matrix.html | 2 +- classyage_1_1Vector2-members.html | 2 +- classyage_1_1Vector2.html | 2 +- collider_8hpp_source.html | 2 +- collisionbody_8hpp_source.html | 2 +- dir_5ac3a90c14a160db9539610948ce4998.html | 2 +- dir_68267d1309a1af8e8297ef4c3efbcdba.html | 2 +- dir_b233a2caca2b45d5ef987dbbf49782d0.html | 2 +- dir_d44c64559bbebec7f509842c48db8b23.html | 2 +- dir_f562165b51c585c003877be645f219b5.html | 2 +- files.html | 2 +- functions.html | 2 +- functions_func.html | 2 +- functions_vars.html | 2 +- glslprogram_8hpp_source.html | 2 +- group__getters.html | 90 ------------------------------- hierarchy.html | 2 +- imageloader_8hpp_source.html | 2 +- index.html | 2 +- inputmanager_8hpp_source.html | 2 +- iomanager_8hpp_source.html | 2 +- math_8hpp_source.html | 2 +- matrix_8hpp.html | 2 +- matrix_8hpp_source.html | 2 +- md_README.html | 2 +- md_docs_README.html | 2 +- menudata.js | 1 - modules.html | 80 --------------------------- namespacemembers.html | 2 +- namespacemembers_func.html | 2 +- namespaces.html | 2 +- namespaceyage_1_1matrix.html | 2 +- pages.html | 2 +- particlebody_8hpp_source.html | 2 +- physics_8hpp_source.html | 2 +- picopng_8hpp_source.html | 2 +- rectanglecollider_8hpp_source.html | 2 +- resourcemanager_8hpp_source.html | 2 +- rigidbody_8hpp_source.html | 2 +- search/all_2.js | 1 - search/all_4.js | 2 +- search/all_5.js | 2 +- search/all_6.js | 4 +- search/all_7.js | 3 +- search/all_8.html | 26 --------- search/all_8.js | 6 --- search/all_9.html | 26 --------- search/all_9.js | 5 -- search/functions_4.js | 2 +- search/functions_5.js | 2 +- search/functions_6.html | 26 --------- search/functions_6.js | 4 -- search/functions_7.html | 26 --------- search/functions_7.js | 4 -- search/groups_0.html | 26 --------- search/groups_0.js | 4 -- search/searchdata.js | 13 ++--- sprite_8hpp_source.html | 2 +- spritebatch_8hpp_source.html | 6 +-- texture_8hpp_source.html | 2 +- texturecache_8hpp_source.html | 2 +- vertex_8hpp_source.html | 2 +- window_8hpp_source.html | 2 +- yage_8hpp_source.html | 2 +- 71 files changed, 65 insertions(+), 392 deletions(-) delete mode 100644 group__getters.html delete mode 100644 modules.html delete mode 100644 search/all_8.html delete mode 100644 search/all_8.js delete mode 100644 search/all_9.html delete mode 100644 search/all_9.js delete mode 100644 search/functions_6.html delete mode 100644 search/functions_6.js delete mode 100644 search/functions_7.html delete mode 100644 search/functions_7.js delete mode 100644 search/groups_0.html delete mode 100644 search/groups_0.js diff --git a/annotated.html b/annotated.html index 893a200d..3343fe52 100644 --- a/annotated.html +++ b/annotated.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/body_8hpp_source.html b/body_8hpp_source.html index 5f42c901..5c690c90 100644 --- a/body_8hpp_source.html +++ b/body_8hpp_source.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/camera2d_8hpp_source.html b/camera2d_8hpp_source.html index b8e7a9d7..fb0ba693 100644 --- a/camera2d_8hpp_source.html +++ b/camera2d_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classes.html b/classes.html index 70c2f957..50c0e04d 100644 --- a/classes.html +++ b/classes.html @@ -78,7 +78,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classyage_1_1Glyph-members.html b/classyage_1_1Glyph-members.html index b2691f04..b107c42c 100644 --- a/classyage_1_1Glyph-members.html +++ b/classyage_1_1Glyph-members.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classyage_1_1Glyph.html b/classyage_1_1Glyph.html index 081bf135..d25826d0 100644 --- a/classyage_1_1Glyph.html +++ b/classyage_1_1Glyph.html @@ -84,7 +84,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classyage_1_1Matrix-members.html b/classyage_1_1Matrix-members.html index 024c108e..b8c020ba 100644 --- a/classyage_1_1Matrix-members.html +++ b/classyage_1_1Matrix-members.html @@ -79,7 +79,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classyage_1_1Matrix.html b/classyage_1_1Matrix.html index 61f313b9..e4e7ea88 100644 --- a/classyage_1_1Matrix.html +++ b/classyage_1_1Matrix.html @@ -154,7 +154,7 @@ template<int Rows = 4, int Cols = 4, class Type = double>
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classyage_1_1Vector2-members.html b/classyage_1_1Vector2-members.html index 94f9e573..6109e940 100644 --- a/classyage_1_1Vector2-members.html +++ b/classyage_1_1Vector2-members.html @@ -79,7 +79,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/classyage_1_1Vector2.html b/classyage_1_1Vector2.html index 6d0b3233..3fb2a17e 100644 --- a/classyage_1_1Vector2.html +++ b/classyage_1_1Vector2.html @@ -89,7 +89,7 @@ class yage::Vector2< Type >
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/collider_8hpp_source.html b/collider_8hpp_source.html index 2a8e994d..55c8c165 100644 --- a/collider_8hpp_source.html +++ b/collider_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/collisionbody_8hpp_source.html b/collisionbody_8hpp_source.html index 9f3d794a..60b1197a 100644 --- a/collisionbody_8hpp_source.html +++ b/collisionbody_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/dir_5ac3a90c14a160db9539610948ce4998.html b/dir_5ac3a90c14a160db9539610948ce4998.html index a3920e52..bf6a927b 100644 --- a/dir_5ac3a90c14a160db9539610948ce4998.html +++ b/dir_5ac3a90c14a160db9539610948ce4998.html @@ -78,7 +78,7 @@ Files
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 564ddde1..0512fd74 100644 --- a/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -71,7 +71,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/dir_b233a2caca2b45d5ef987dbbf49782d0.html b/dir_b233a2caca2b45d5ef987dbbf49782d0.html index 9b7ad649..1228d2d0 100644 --- a/dir_b233a2caca2b45d5ef987dbbf49782d0.html +++ b/dir_b233a2caca2b45d5ef987dbbf49782d0.html @@ -71,7 +71,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/dir_d44c64559bbebec7f509842c48db8b23.html b/dir_d44c64559bbebec7f509842c48db8b23.html index b6c49be6..dc7dc80b 100644 --- a/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/dir_d44c64559bbebec7f509842c48db8b23.html @@ -75,7 +75,7 @@ Directories
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/dir_f562165b51c585c003877be645f219b5.html b/dir_f562165b51c585c003877be645f219b5.html index 94151350..d011e813 100644 --- a/dir_f562165b51c585c003877be645f219b5.html +++ b/dir_f562165b51c585c003877be645f219b5.html @@ -75,7 +75,7 @@ Directories
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/files.html b/files.html index 0910097b..9e8c2d32 100644 --- a/files.html +++ b/files.html @@ -98,7 +98,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/functions.html b/functions.html index 5a391033..72f8cc4f 100644 --- a/functions.html +++ b/functions.html @@ -80,7 +80,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/functions_func.html b/functions_func.html index a637980f..3680146d 100644 --- a/functions_func.html +++ b/functions_func.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/functions_vars.html b/functions_vars.html index 5ce945ba..7673bf72 100644 --- a/functions_vars.html +++ b/functions_vars.html @@ -68,7 +68,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/glslprogram_8hpp_source.html b/glslprogram_8hpp_source.html index 41c547b8..9264a1e4 100644 --- a/glslprogram_8hpp_source.html +++ b/glslprogram_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/group__getters.html b/group__getters.html deleted file mode 100644 index f5f2bd2d..00000000 --- a/group__getters.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - -YAGE: Getters - - - - - - - - - -
-
- - - - - - -
-
YAGE -  0.02 -
-
Yet Another Game Engine
-
-
- - - - - - - -
- -
-
- - -
- -
- -
-
-Functions
-
-
Getters
-
-
- - - - - - - - -

-Functions

-GLint yage::RenderBatch::offset () const
 Offset.
 
-GLsizei yage::RenderBatch::num_vertices () const
 num_vertices
 
-

Detailed Description

-
- -
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   -doxygen - 1.8.13 -
- - diff --git a/hierarchy.html b/hierarchy.html index b236a810..1f803a1a 100644 --- a/hierarchy.html +++ b/hierarchy.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/imageloader_8hpp_source.html b/imageloader_8hpp_source.html index 06aceb8f..cec7b450 100644 --- a/imageloader_8hpp_source.html +++ b/imageloader_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/index.html b/index.html index 00b57ca8..931c473f 100644 --- a/index.html +++ b/index.html @@ -67,7 +67,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/inputmanager_8hpp_source.html b/inputmanager_8hpp_source.html index e5c554e9..80a300de 100644 --- a/inputmanager_8hpp_source.html +++ b/inputmanager_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/iomanager_8hpp_source.html b/iomanager_8hpp_source.html index 75ab4a03..caefa921 100644 --- a/iomanager_8hpp_source.html +++ b/iomanager_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/math_8hpp_source.html b/math_8hpp_source.html index 55a1f897..a0dcb1f6 100644 --- a/math_8hpp_source.html +++ b/math_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/matrix_8hpp.html b/matrix_8hpp.html index 8fb497b5..ee3eca83 100644 --- a/matrix_8hpp.html +++ b/matrix_8hpp.html @@ -132,7 +132,7 @@ Functions
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/matrix_8hpp_source.html b/matrix_8hpp_source.html index d81bed91..3cacf5e6 100644 --- a/matrix_8hpp_source.html +++ b/matrix_8hpp_source.html @@ -81,7 +81,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/md_README.html b/md_README.html index 986f42f1..a3def9bc 100644 --- a/md_README.html +++ b/md_README.html @@ -70,7 +70,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/md_docs_README.html b/md_docs_README.html index c46d3de2..0151bbcd 100644 --- a/md_docs_README.html +++ b/md_docs_README.html @@ -68,7 +68,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/menudata.js b/menudata.js index 81377f49..bc91e661 100644 --- a/menudata.js +++ b/menudata.js @@ -1,7 +1,6 @@ var menudata={children:[ {text:"Main Page",url:"index.html"}, {text:"Related Pages",url:"pages.html"}, -{text:"Modules",url:"modules.html"}, {text:"Namespaces",url:"namespaces.html",children:[ {text:"Namespace List",url:"namespaces.html"}, {text:"Namespace Members",url:"namespacemembers.html",children:[ diff --git a/modules.html b/modules.html deleted file mode 100644 index 7459ec3c..00000000 --- a/modules.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - -YAGE: Modules - - - - - - - - - -
-
- - - - - - -
-
YAGE -  0.02 -
-
Yet Another Game Engine
-
-
- - - - - - - -
- -
-
- - -
- -
- -
-
-
Modules
-
-
-
Here is a list of all modules:
- - -
 Getters
-
-
- -
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   -doxygen - 1.8.13 -
- - diff --git a/namespacemembers.html b/namespacemembers.html index 412153bb..d77aa2c4 100644 --- a/namespacemembers.html +++ b/namespacemembers.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/namespacemembers_func.html b/namespacemembers_func.html index 1aa0a336..ce1c0e4e 100644 --- a/namespacemembers_func.html +++ b/namespacemembers_func.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/namespaces.html b/namespaces.html index 9dadfa22..eb950963 100644 --- a/namespaces.html +++ b/namespaces.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/namespaceyage_1_1matrix.html b/namespaceyage_1_1matrix.html index e90f6ca2..cb3af0fc 100644 --- a/namespaceyage_1_1matrix.html +++ b/namespaceyage_1_1matrix.html @@ -200,7 +200,7 @@ template<int M, int N, class T >
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/pages.html b/pages.html index e69d6402..bdcfda79 100644 --- a/pages.html +++ b/pages.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/particlebody_8hpp_source.html b/particlebody_8hpp_source.html index b90bae33..dfb8f070 100644 --- a/particlebody_8hpp_source.html +++ b/particlebody_8hpp_source.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/physics_8hpp_source.html b/physics_8hpp_source.html index 957976fa..97b791c0 100644 --- a/physics_8hpp_source.html +++ b/physics_8hpp_source.html @@ -71,7 +71,7 @@ $(function() {
1 /* ----------------------------------------------------------------------------
2  * physics.hpp
3  *
4  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
5  * See file LICENSE for more details
6  * ----------------------------------------------------------------------------
7  */
8 
9 #ifndef YAGE_PHYSICS_HPP
10 #define YAGE_PHYSICS_HPP
11 
12 #include "body.hpp"
13 #include "collider.hpp"
14 #include "collisionbody.hpp"
15 #include "particlebody.hpp"
16 #include "rectanglecollider.hpp"
17 #include "rigidbody.hpp"
18 
19 #endif
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/picopng_8hpp_source.html b/picopng_8hpp_source.html index 54bfc519..4e748532 100644 --- a/picopng_8hpp_source.html +++ b/picopng_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/rectanglecollider_8hpp_source.html b/rectanglecollider_8hpp_source.html index 837008df..fccd48bb 100644 --- a/rectanglecollider_8hpp_source.html +++ b/rectanglecollider_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/resourcemanager_8hpp_source.html b/resourcemanager_8hpp_source.html index 36871686..d8334b45 100644 --- a/resourcemanager_8hpp_source.html +++ b/resourcemanager_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/rigidbody_8hpp_source.html b/rigidbody_8hpp_source.html index 9110be13..bff3c0c7 100644 --- a/rigidbody_8hpp_source.html +++ b/rigidbody_8hpp_source.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/search/all_2.js b/search/all_2.js index 30f36c7e..a2c9e4ea 100644 --- a/search/all_2.js +++ b/search/all_2.js @@ -1,6 +1,5 @@ var searchData= [ ['getrow',['getRow',['../classyage_1_1Matrix.html#adffb22a99417271958621ff1f51b7f08',1,'yage::Matrix']]], - ['getters',['Getters',['../group__getters.html',1,'']]], ['glyph',['Glyph',['../classyage_1_1Glyph.html',1,'yage']]] ]; diff --git a/search/all_4.js b/search/all_4.js index 9fc65c8b..a2780bef 100644 --- a/search/all_4.js +++ b/search/all_4.js @@ -1,4 +1,4 @@ var searchData= [ - ['num_5fvertices',['num_vertices',['../group__getters.html#gad5edaded9e6257aa2f3a3b7cae276307',1,'yage::RenderBatch']]] + ['rowsize',['rowSize',['../classyage_1_1Matrix.html#acaf0837fade0cb4179603b97ac224965',1,'yage::Matrix']]] ]; diff --git a/search/all_5.js b/search/all_5.js index 3a8e6d91..20f93422 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -1,4 +1,4 @@ var searchData= [ - ['offset',['offset',['../group__getters.html#ga6bedb60b10b6d47b7b198d3cb53eea2a',1,'yage::RenderBatch']]] + ['transpose',['transpose',['../namespaceyage_1_1matrix.html#a62de4b4b6bab23717d957c370f2e41c7',1,'yage::matrix']]] ]; diff --git a/search/all_6.js b/search/all_6.js index a2780bef..e583272e 100644 --- a/search/all_6.js +++ b/search/all_6.js @@ -1,4 +1,6 @@ var searchData= [ - ['rowsize',['rowSize',['../classyage_1_1Matrix.html#acaf0837fade0cb4179603b97ac224965',1,'yage::Matrix']]] + ['vector2',['Vector2',['../classyage_1_1Vector2.html',1,'yage']]], + ['vector2_3c_20double_20_3e',['Vector2< double >',['../classyage_1_1Vector2.html',1,'yage']]], + ['vector2d',['Vector2d',['../matrix_8hpp.html#a6cdcf60e5d3972cac5e8a6be40403078',1,'yage']]] ]; diff --git a/search/all_7.js b/search/all_7.js index 20f93422..a2bef0db 100644 --- a/search/all_7.js +++ b/search/all_7.js @@ -1,4 +1,5 @@ var searchData= [ - ['transpose',['transpose',['../namespaceyage_1_1matrix.html#a62de4b4b6bab23717d957c370f2e41c7',1,'yage::matrix']]] + ['matrix',['matrix',['../namespaceyage_1_1matrix.html',1,'yage']]], + ['yage',['YAGE',['../md_README.html',1,'']]] ]; diff --git a/search/all_8.html b/search/all_8.html deleted file mode 100644 index 11e27cdb..00000000 --- a/search/all_8.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/search/all_8.js b/search/all_8.js deleted file mode 100644 index e583272e..00000000 --- a/search/all_8.js +++ /dev/null @@ -1,6 +0,0 @@ -var searchData= -[ - ['vector2',['Vector2',['../classyage_1_1Vector2.html',1,'yage']]], - ['vector2_3c_20double_20_3e',['Vector2< double >',['../classyage_1_1Vector2.html',1,'yage']]], - ['vector2d',['Vector2d',['../matrix_8hpp.html#a6cdcf60e5d3972cac5e8a6be40403078',1,'yage']]] -]; diff --git a/search/all_9.html b/search/all_9.html deleted file mode 100644 index f8abbbe5..00000000 --- a/search/all_9.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/search/all_9.js b/search/all_9.js deleted file mode 100644 index a2bef0db..00000000 --- a/search/all_9.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['matrix',['matrix',['../namespaceyage_1_1matrix.html',1,'yage']]], - ['yage',['YAGE',['../md_README.html',1,'']]] -]; diff --git a/search/functions_4.js b/search/functions_4.js index 9fc65c8b..a2780bef 100644 --- a/search/functions_4.js +++ b/search/functions_4.js @@ -1,4 +1,4 @@ var searchData= [ - ['num_5fvertices',['num_vertices',['../group__getters.html#gad5edaded9e6257aa2f3a3b7cae276307',1,'yage::RenderBatch']]] + ['rowsize',['rowSize',['../classyage_1_1Matrix.html#acaf0837fade0cb4179603b97ac224965',1,'yage::Matrix']]] ]; diff --git a/search/functions_5.js b/search/functions_5.js index 3a8e6d91..20f93422 100644 --- a/search/functions_5.js +++ b/search/functions_5.js @@ -1,4 +1,4 @@ var searchData= [ - ['offset',['offset',['../group__getters.html#ga6bedb60b10b6d47b7b198d3cb53eea2a',1,'yage::RenderBatch']]] + ['transpose',['transpose',['../namespaceyage_1_1matrix.html#a62de4b4b6bab23717d957c370f2e41c7',1,'yage::matrix']]] ]; diff --git a/search/functions_6.html b/search/functions_6.html deleted file mode 100644 index c5061236..00000000 --- a/search/functions_6.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/search/functions_6.js b/search/functions_6.js deleted file mode 100644 index a2780bef..00000000 --- a/search/functions_6.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['rowsize',['rowSize',['../classyage_1_1Matrix.html#acaf0837fade0cb4179603b97ac224965',1,'yage::Matrix']]] -]; diff --git a/search/functions_7.html b/search/functions_7.html deleted file mode 100644 index 83a7b84b..00000000 --- a/search/functions_7.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/search/functions_7.js b/search/functions_7.js deleted file mode 100644 index 20f93422..00000000 --- a/search/functions_7.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['transpose',['transpose',['../namespaceyage_1_1matrix.html#a62de4b4b6bab23717d957c370f2e41c7',1,'yage::matrix']]] -]; diff --git a/search/groups_0.html b/search/groups_0.html deleted file mode 100644 index 1ede28df..00000000 --- a/search/groups_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/search/groups_0.js b/search/groups_0.js deleted file mode 100644 index d99cb612..00000000 --- a/search/groups_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['getters',['Getters',['../group__getters.html',1,'']]] -]; diff --git a/search/searchdata.js b/search/searchdata.js index 269a1ceb..b9f3d40a 100644 --- a/search/searchdata.js +++ b/search/searchdata.js @@ -1,14 +1,13 @@ var indexSectionsWithContent = { - 0: "cdgmnortvy", + 0: "cdgmrtvy", 1: "gmv", 2: "y", 3: "m", - 4: "cdgmnort", + 4: "cdgmrt", 5: "d", 6: "v", - 7: "g", - 8: "dy" + 7: "dy" }; var indexSectionNames = @@ -20,8 +19,7 @@ var indexSectionNames = 4: "functions", 5: "variables", 6: "typedefs", - 7: "groups", - 8: "pages" + 7: "pages" }; var indexSectionLabels = @@ -33,7 +31,6 @@ var indexSectionLabels = 4: "Functions", 5: "Variables", 6: "Typedefs", - 7: "Modules", - 8: "Pages" + 7: "Pages" }; diff --git a/sprite_8hpp_source.html b/sprite_8hpp_source.html index 79ebd2d9..b24937d0 100644 --- a/sprite_8hpp_source.html +++ b/sprite_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/spritebatch_8hpp_source.html b/spritebatch_8hpp_source.html index 4cc7be0c..f111d3c5 100644 --- a/spritebatch_8hpp_source.html +++ b/spritebatch_8hpp_source.html @@ -68,14 +68,12 @@ $(function() {
spritebatch.hpp
-
1 /* ----------------------------------------------------------------------------
2  * spritebatch.hpp
3  *
4  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
5  * See file LICENSE for more details
6  * ----------------------------------------------------------------------------
7  */
8 
9 #ifndef YAGE_SPRITE_BATCH_HPP
10 #define YAGE_SPRITE_BATCH_HPP
11 
12 #include "vertex.hpp"
13 
14 #include <GL/glew.h>
15 #include <glm/glm.hpp>
16 
17 #include <vector>
18 
19 namespace yage {
20 
21 class SpriteBatch;
22 
25 class Glyph {
26  // member variables
27 private:
28  GLuint texture_;
29  float depth_;
30  Vertex top_left_;
31  Vertex top_right_;
32  Vertex bottom_right_;
33  Vertex bottom_left_;
34 
35  // member functions
36 public:
37  Glyph(GLuint texture, float depth, const Vertex& top_left,
38  const Vertex& top_right, const Vertex& bottom_right,
39  const Vertex& bottom_left);
40 
41  GLuint texture() const { return texture_; }
42  float depth() const { return depth_; }
43  Vertex top_left() const { return top_left_; }
44  Vertex top_right() const { return top_right_; }
45  Vertex bottom_right() const { return bottom_right_; }
46  Vertex bottom_left() const { return bottom_left_; }
47 };
48 
49 class RenderBatch {
50  friend SpriteBatch;
51  // member variables
52 private:
53  GLsizei num_vertices_;
54  GLint offset_;
55  GLuint texture_;
56 
57  // member functions
58 public:
59  RenderBatch(GLint offset, GLsizei num_vertices, GLuint texture);
60 
66  GLint offset() const { return offset_; }
68  GLsizei num_vertices() const { return num_vertices_; }
69  GLuint texture() const { return texture_; }
71 };
72 
73 class SpriteBatch {
74  // member variables
75 public:
76  static const int NUM_VERTICES = 6;
77 
78 private:
79  GLuint vbo_ = 0;
80  GLuint vao_ = 0;
81  std::vector<Glyph> glyphs_;
82  std::vector<Glyph*> glyph_ptrs_;
83  std::vector<RenderBatch> render_batches_;
84 
85  // member functions
86 public:
87  SpriteBatch();
88  SpriteBatch(const SpriteBatch&) = delete;
89  SpriteBatch(SpriteBatch&&) = delete;
90  ~SpriteBatch();
91 
92  SpriteBatch& operator=(const SpriteBatch&) = delete;
93  SpriteBatch& operator=(SpriteBatch&&) = delete;
94 
95  // initialize vaos and vbos
96  void init();
97  void begin();
98  void end();
99  // adds a sprite to the sprite batch to be rendered later
100  void draw(const glm::vec4& destination_rect, const glm::vec4& uv_rect,
101  GLuint texture, const Color& color, float depth);
102  // render the batch
103  void render();
104 
105 private:
106  void createVertexArray();
107  void createRenderBatches();
108  void sortGlyphs();
109 };
110 
111 } // yage
112 
113 #endif
yage::RenderBatch::num_vertices
GLsizei num_vertices() const
num_vertices
Definition: spritebatch.hpp:68
-
yage::Glyph
Glyph with information of the texture.
Definition: spritebatch.hpp:25
+
1 /* ----------------------------------------------------------------------------
2  * spritebatch.hpp
3  *
4  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
5  * See file LICENSE for more details
6  * ----------------------------------------------------------------------------
7  */
8 
9 #ifndef YAGE_SPRITE_BATCH_HPP
10 #define YAGE_SPRITE_BATCH_HPP
11 
12 #include "vertex.hpp"
13 
14 #include <GL/glew.h>
15 #include <glm/glm.hpp>
16 
17 #include <vector>
18 
19 namespace yage {
20 
21 class SpriteBatch;
22 
25 class Glyph {
26  // member variables
27 private:
28  GLuint texture_;
29  float depth_;
30  Vertex top_left_;
31  Vertex top_right_;
32  Vertex bottom_right_;
33  Vertex bottom_left_;
34 
35  // member functions
36 public:
37  Glyph(GLuint texture, float depth, const Vertex& top_left,
38  const Vertex& top_right, const Vertex& bottom_right,
39  const Vertex& bottom_left);
40 
41  GLuint texture() const { return texture_; }
42  float depth() const { return depth_; }
43  Vertex top_left() const { return top_left_; }
44  Vertex top_right() const { return top_right_; }
45  Vertex bottom_right() const { return bottom_right_; }
46  Vertex bottom_left() const { return bottom_left_; }
47 };
48 
49 class RenderBatch {
50  friend SpriteBatch;
51 private:
52  GLsizei num_vertices_;
53  GLint offset_;
54  GLuint texture_;
55 
56 public:
57  RenderBatch(GLint offset, GLsizei num_vertices, GLuint texture);
58 
59  GLint offset() const { return offset_; }
60  GLsizei num_vertices() const { return num_vertices_; }
61  GLuint texture() const { return texture_; }
62 };
63 
64 class SpriteBatch {
65 public:
66  static const int NUM_VERTICES = 6;
67 
68 private:
69  GLuint vbo_ = 0;
70  GLuint vao_ = 0;
71  std::vector<Glyph> glyphs_;
72  std::vector<Glyph*> glyph_ptrs_;
73  std::vector<RenderBatch> render_batches_;
74 
75  // member functions
76 public:
77  SpriteBatch();
78  SpriteBatch(const SpriteBatch&) = delete;
79  SpriteBatch(SpriteBatch&&) = delete;
80  ~SpriteBatch();
81 
82  SpriteBatch& operator=(const SpriteBatch&) = delete;
83  SpriteBatch& operator=(SpriteBatch&&) = delete;
84 
85  // initialize vaos and vbos
86  void init();
87  void begin();
88  void end();
89  // adds a sprite to the sprite batch to be rendered later
90  void draw(const glm::vec4& destination_rect, const glm::vec4& uv_rect,
91  GLuint texture, const Color& color, float depth);
92  // render the batch
93  void render();
94 
95 private:
96  void createVertexArray();
97  void createRenderBatches();
98  void sortGlyphs();
99 };
100 
101 } // yage
102 
103 #endif
yage::Glyph
Glyph with information of the texture.
Definition: spritebatch.hpp:25
yage
Definition: camera2d.hpp:17
-
yage::RenderBatch::offset
GLint offset() const
Offset.
Definition: spritebatch.hpp:66
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/texture_8hpp_source.html b/texture_8hpp_source.html index e2528ec9..28a57d87 100644 --- a/texture_8hpp_source.html +++ b/texture_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/texturecache_8hpp_source.html b/texturecache_8hpp_source.html index 456bf01e..1aef8d26 100644 --- a/texturecache_8hpp_source.html +++ b/texturecache_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/vertex_8hpp_source.html b/vertex_8hpp_source.html index ebd24808..d8dbd763 100644 --- a/vertex_8hpp_source.html +++ b/vertex_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/window_8hpp_source.html b/window_8hpp_source.html index a03873e9..edc5459b 100644 --- a/window_8hpp_source.html +++ b/window_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
diff --git a/yage_8hpp_source.html b/yage_8hpp_source.html index 6db6631b..1f99d4c5 100644 --- a/yage_8hpp_source.html +++ b/yage_8hpp_source.html @@ -72,7 +72,7 @@ $(function() {
-Generated on Sun Aug 13 2017 17:42:24 for YAGE by   +Generated on Sun Aug 13 2017 17:48:31 for YAGE by   doxygen 1.8.13
-- cgit