diff --git a/rigidbody_8h_source.html b/rigidbody_8h_source.html
index 927d2c54..63f0fc7f 100644
--- a/rigidbody_8h_source.html
+++ b/rigidbody_8h_source.html
@@ -148,7 +148,7 @@ $(document).ready(function(){initNavTree('rigidbody_8h_source.html','');});
diff --git a/search/all_0.js b/search/all_0.js
index 3ddb5573..28bdb7fc 100644
--- a/search/all_0.js
+++ b/search/all_0.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['a',['a',['../structyage_1_1Color.html#a1df3f4a850d0e50dba19e0681d71f3a6',1,'yage::Color']]],
+ ['a',['a',['../structyage_1_1Colour.html#a5aef37a5ac37e44dc32f5f9b1ebee10c',1,'yage::Colour']]],
['acceleration_5f',['acceleration_',['../classyage_1_1Body.html#a36c0a4485bf9a704901d88c6cf212a5f',1,'yage::Body']]],
['active',['Active',['../classyage_1_1Active.html',1,'yage']]],
['active',['Active',['../classyage_1_1Active.html#a7cd7344f0b8b7aa93ac0449e2fbbf7bd',1,'yage::Active::Active(const Active &)=delete'],['../classyage_1_1Active.html#ad7b4b4cea1880d115dc5e3e1f80f404b',1,'yage::Active::Active()']]],
diff --git a/search/all_1.js b/search/all_1.js
index 22bcb977..49d05c1e 100644
--- a/search/all_1.js
+++ b/search/all_1.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['b',['b',['../structyage_1_1Color.html#a01253439ca70585948fb560ecdd3e766',1,'yage::Color']]],
+ ['b',['b',['../structyage_1_1Colour.html#a7bd3ed4a377c384af80aa8c7f55dc96f',1,'yage::Colour']]],
['begin',['begin',['../classyage_1_1SpriteBatch.html#af6293aac69e1124199297e5b921a4872',1,'yage::SpriteBatch::begin()'],['../classyage_1_1Matrix.html#a83d77d3a40ced5e2b703a6d66b6e6055',1,'yage::Matrix::begin()']]],
['body',['Body',['../classyage_1_1Body.html',1,'yage']]],
['body',['Body',['../classyage_1_1Body.html#aeca769807d9b6f6fb3c9f61deaa83b86',1,'yage::Body']]],
diff --git a/search/all_10.js b/search/all_10.js
index e2ae08bf..19f3b792 100644
--- a/search/all_10.js
+++ b/search/all_10.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['r',['r',['../structyage_1_1Color.html#a5a97b7679703c28ad0c90d1bedde5da1',1,'yage::Color']]],
+ ['r',['r',['../structyage_1_1Colour.html#a572fe7933c59ebfa6720088cd33dad99',1,'yage::Colour']]],
['readfiletobuffer',['readFileToBuffer',['../classyage_1_1IoManager.html#a75d13ca634df592e44e4152fedcd446d',1,'yage::IoManager']]],
['readme_2emd',['README.md',['../README_8md.html',1,'']]],
['readme_2emd',['README.md',['../yage_2physics_2README_8md.html',1,'']]],
diff --git a/search/all_11.js b/search/all_11.js
index 360085a4..b3ae2ccc 100644
--- a/search/all_11.js
+++ b/search/all_11.js
@@ -2,7 +2,7 @@ var searchData=
[
['scale_5f',['scale_',['../classyage_1_1Camera2D.html#abf1432e35cef0a54f35863f13a9d5448',1,'yage::Camera2D']]],
['send',['send',['../classyage_1_1Active.html#a665673b94eb5ce7c448839e5bb6e0326',1,'yage::Active']]],
- ['setcolor',['setColor',['../structyage_1_1Vertex.html#a0dc5fa6c669b4c10a8d56702f2aa9b50',1,'yage::Vertex']]],
+ ['setcolour',['setColour',['../structyage_1_1Vertex.html#aa759435739e34e2a0bfd1803c2aeeddf',1,'yage::Vertex']]],
['setposition',['setPosition',['../structyage_1_1Vertex.html#af392248f0be173221ebcc62d490fe03d',1,'yage::Vertex']]],
['setuv',['setUv',['../structyage_1_1Vertex.html#aa1fa8f5ebd883068828466cc924d4c50',1,'yage::Vertex']]],
['shouldclose',['shouldClose',['../classyage_1_1Window.html#a5e3b209289bc343609d809d5b7f23cc8',1,'yage::Window']]],
diff --git a/search/all_12.js b/search/all_12.js
index d349c988..9a2e67aa 100644
--- a/search/all_12.js
+++ b/search/all_12.js
@@ -1,7 +1,7 @@
var searchData=
[
['texture',['Texture',['../structyage_1_1Texture.html',1,'yage']]],
- ['texture',['Texture',['../structyage_1_1Texture.html#ab8ecfcc681a98f9a8654bc6b9f2c87b3',1,'yage::Texture::Texture()=default'],['../structyage_1_1Texture.html#a9af4689df9f99c5074b7aa5d5857775c',1,'yage::Texture::Texture(GLuint id_i, int width_i, int height_i)'],['../classyage_1_1Glyph.html#a0d5bfd4874a5d29c96a3d22f45543eb2',1,'yage::Glyph::texture()'],['../classyage_1_1RenderBatch.html#ad1cfc404c74ee3d838e9cd12a8c1962d',1,'yage::RenderBatch::texture()']]],
+ ['texture',['Texture',['../structyage_1_1Texture.html#a0cef080bceaaf5e702985f5494ea35d5',1,'yage::Texture::Texture()'],['../structyage_1_1Texture.html#a9af4689df9f99c5074b7aa5d5857775c',1,'yage::Texture::Texture(GLuint id_i, int width_i, int height_i)'],['../classyage_1_1Glyph.html#a0d5bfd4874a5d29c96a3d22f45543eb2',1,'yage::Glyph::texture()'],['../classyage_1_1RenderBatch.html#ad1cfc404c74ee3d838e9cd12a8c1962d',1,'yage::RenderBatch::texture()']]],
['texture_2eh',['texture.h',['../texture_8h.html',1,'']]],
['texture_5f',['texture_',['../classyage_1_1Sprite.html#ac8f6505d7b080bb346458e6d70cc60d0',1,'yage::Sprite::texture_()'],['../classyage_1_1Glyph.html#a2efbe49c2307601731416d615ac415c8',1,'yage::Glyph::texture_()'],['../classyage_1_1RenderBatch.html#a17da9d35451d55766836917699406160',1,'yage::RenderBatch::texture_()'],['../classyage_1_1SpriteSheet.html#a8094499cceedc9cb3b15bfe0520db6b8',1,'yage::SpriteSheet::texture_()']]],
['texture_5fcache_5f',['texture_cache_',['../classyage_1_1ResourceManager.html#a2799a8ff957874fbe7b7c791781255f6',1,'yage::ResourceManager']]],
diff --git a/search/all_14.js b/search/all_14.js
index 766bcf71..d5a72e1d 100644
--- a/search/all_14.js
+++ b/search/all_14.js
@@ -28,7 +28,7 @@ var searchData=
['vector_3c_204_2c_20type_20_3e',['Vector< 4, Type >',['../classyage_1_1Vector.html',1,'yage']]],
['velocity_5f',['velocity_',['../classyage_1_1Body.html#afead7edec899748eab78879e6e6c5741',1,'yage::Body']]],
['vertex',['Vertex',['../structyage_1_1Vertex.html',1,'yage']]],
- ['vertex',['Vertex',['../structyage_1_1Vertex.html#acae9697c2762e37dfa4472b85fa112c3',1,'yage::Vertex::Vertex()=default'],['../structyage_1_1Vertex.html#ab2826fb0ec9c48aad0056250dfa9cc2e',1,'yage::Vertex::Vertex(const Position &position_, const Color &color_, const UV &uv_)']]],
+ ['vertex',['Vertex',['../structyage_1_1Vertex.html#acae9697c2762e37dfa4472b85fa112c3',1,'yage::Vertex::Vertex()=default'],['../structyage_1_1Vertex.html#aac3046359c44aeabc910a81f4f41789e',1,'yage::Vertex::Vertex(const Position &position_, const Colour &colour_, const UV &uv_)']]],
['vertex_2eh',['vertex.h',['../vertex_8h.html',1,'']]],
['vertex_5fshader_5fid_5f',['vertex_shader_id_',['../classyage_1_1GlslProgram.html#afe46af121e9c0214be6f7b18660c5bc7',1,'yage::GlslProgram']]]
];
diff --git a/search/all_15.js b/search/all_15.js
index d4b01e91..b54d0dac 100644
--- a/search/all_15.js
+++ b/search/all_15.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['w',['w',['../classyage_1_1Vector4.html#acf752077d460438407ed3c84fe199f63',1,'yage::Vector4::w()'],['../classyage_1_1Vector4.html#a0ae3b6494807df896134b669923b81ee',1,'yage::Vector4::w(this->data[3])']]],
+ ['w',['w',['../classyage_1_1Vector4.html#acf752077d460438407ed3c84fe199f63',1,'yage::Vector4::w()'],['../classyage_1_1Vector4.html#a111ecbf09543e8fafaf3aedef77d168d',1,'yage::Vector4::w(this->data_[3])']]],
['width',['width',['../structyage_1_1details_1_1Coordinate.html#aed145c923c95f852a8fb3abde8e346c0',1,'yage::details::Coordinate::width()'],['../structyage_1_1Texture.html#ad42f41cc57ed7a20928382f6557dc598',1,'yage::Texture::width()']]],
['width_5f',['width_',['../classyage_1_1Sprite.html#a9699a12e74c0b78d3b4e396fed59b7a8',1,'yage::Sprite']]],
['window',['Window',['../classyage_1_1Window.html',1,'yage']]],
diff --git a/search/all_2.js b/search/all_2.js
index 9453b84f..80a3b6b8 100644
--- a/search/all_2.js
+++ b/search/all_2.js
@@ -16,8 +16,8 @@ var searchData=
['collisionbody',['CollisionBody',['../classyage_1_1CollisionBody.html#a5289e613269facc45cd451872c17a83d',1,'yage::CollisionBody']]],
['collisionbody',['CollisionBody',['../classyage_1_1CollisionBody.html',1,'yage']]],
['collisionbody_2eh',['collisionbody.h',['../collisionbody_8h.html',1,'']]],
- ['color',['Color',['../structyage_1_1Color.html',1,'yage']]],
- ['color',['Color',['../structyage_1_1Color.html#ab0262bbe3b2ec12a9933fe411034d09e',1,'yage::Color::Color()=default'],['../structyage_1_1Color.html#a2ce7b1060775f64c9b578b3f81fdd648',1,'yage::Color::Color(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)'],['../structyage_1_1Vertex.html#aaa2cdca3a1186c57f1c75cee34ec3144',1,'yage::Vertex::color()']]],
+ ['colour',['Colour',['../structyage_1_1Colour.html',1,'yage']]],
+ ['colour',['Colour',['../structyage_1_1Colour.html#a585165d5109c81b6b2de6f1116406abd',1,'yage::Colour::Colour()'],['../structyage_1_1Colour.html#a8118ad802db7e61df770f7d3b5b88aaa',1,'yage::Colour::Colour(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)'],['../structyage_1_1Vertex.html#a142db28be39f418a06fa43f75d386182',1,'yage::Vertex::colour()']]],
['colsize',['colSize',['../classyage_1_1Matrix.html#a2148cd52008892765ad90250c68afba1',1,'yage::Matrix']]],
['compileshader',['compileShader',['../classyage_1_1GlslProgram.html#a1acc7e052209fde74256c479af6d9988',1,'yage::GlslProgram']]],
['compileshaders',['compileShaders',['../classyage_1_1GlslProgram.html#acf57b56739f67ac88b0d5df3bf1d4cb1',1,'yage::GlslProgram']]],
diff --git a/search/all_3.js b/search/all_3.js
index a511b4a8..e5443595 100644
--- a/search/all_3.js
+++ b/search/all_3.js
@@ -2,10 +2,11 @@ var searchData=
[
['data_5f',['data_',['../classyage_1_1Matrix.html#a0ab11922319366f6e74f6e9e7d7abeed',1,'yage::Matrix']]],
['decodepng',['decodePNG',['../namespaceyage.html#a0cf122e98752ed702393cbe30df51356',1,'yage']]],
+ ['defaultsetup',['defaultSetup',['../classyage_1_1GlslProgram.html#a1260a2302c1434ce38c850dc18cbc04e',1,'yage::GlslProgram']]],
['deprecated_20list',['Deprecated List',['../deprecated.html',1,'']]],
['depth',['depth',['../classyage_1_1Glyph.html#a7b8b85a8044d751cfa29135690c23ff9',1,'yage::Glyph']]],
['depth_5f',['depth_',['../classyage_1_1Glyph.html#ab27b92a62dcebccae673a7d8d0c15704',1,'yage::Glyph']]],
['dot',['dot',['../namespaceyage_1_1matrix.html#ac4d2f55a5c3369ec42001776a582c30a',1,'yage::matrix']]],
- ['draw',['draw',['../classyage_1_1Sprite.html#a8eed26f4fa57b3ad47d791564233ee40',1,'yage::Sprite::draw()'],['../classyage_1_1SpriteBatch.html#a22c8bb28a72c309afeb6f78b6af19ec5',1,'yage::SpriteBatch::draw()']]],
+ ['draw',['draw',['../classyage_1_1Sprite.html#a8eed26f4fa57b3ad47d791564233ee40',1,'yage::Sprite::draw()'],['../classyage_1_1SpriteBatch.html#af06239e2779d49eb6e915980a0aac941',1,'yage::SpriteBatch::draw()']]],
['row_3c_20rows_2c_20cols_2c_20type_20_3e',['Row< Rows, Cols, Type >',['../classyage_1_1Matrix.html#a9e9cbf0fd7c768696ef909bdac1a706d',1,'yage::Matrix']]]
];
diff --git a/search/all_6.js b/search/all_6.js
index 2a615081..064bc58a 100644
--- a/search/all_6.js
+++ b/search/all_6.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['g',['g',['../structyage_1_1Color.html#ada90145192a7bc439269ab49e31a461a',1,'yage::Color']]],
+ ['g',['g',['../structyage_1_1Colour.html#a205d3a63268f4879adf27aabdf71a6dd',1,'yage::Colour']]],
['getcol',['getCol',['../classyage_1_1Matrix.html#a74475218328d6ef69701a6e261df925b',1,'yage::Matrix']]],
['getrow',['getRow',['../classyage_1_1Matrix.html#a960273d1ac46a8edb71ceee08ee639b8',1,'yage::Matrix']]],
['gettexture',['getTexture',['../classyage_1_1ResourceManager.html#a36d805924374f27aa7dbce1d47795b25',1,'yage::ResourceManager::getTexture()'],['../classyage_1_1TextureCache.html#acec85e497e3dbcded344f4bed6b4389e',1,'yage::TextureCache::getTexture()']]],
diff --git a/search/all_8.js b/search/all_8.js
index 057f5a64..a156ec81 100644
--- a/search/all_8.js
+++ b/search/all_8.js
@@ -6,7 +6,7 @@ var searchData=
['imageloader_2eh',['imageloader.h',['../imageloader_8h.html',1,'']]],
['impl',['impl',['../structyage_1_1LogSink_1_1Model.html#a99a011e95f7979baec2805df06d20c5d',1,'yage::LogSink::Model']]],
['index_5f',['index_',['../classyage_1_1details_1_1Row.html#a438164456acdb9e20c3e13ef9e43d5b3',1,'yage::details::Row']]],
- ['init',['init',['../classyage_1_1Sprite.html#a2f6294be8b2551077cf475892bcddcc1',1,'yage::Sprite::init()'],['../classyage_1_1SpriteBatch.html#a7731372a6ec1aea75d1732700fe0f4c6',1,'yage::SpriteBatch::init()'],['../namespaceyage.html#a4fc8b4d2a19d4c7f7f1bd42a788827ce',1,'yage::init()']]],
+ ['init',['init',['../classyage_1_1Sprite.html#a2f6294be8b2551077cf475892bcddcc1',1,'yage::Sprite::init()'],['../namespaceyage.html#a4fc8b4d2a19d4c7f7f1bd42a788827ce',1,'yage::init()']]],
['inputmanager',['InputManager',['../classyage_1_1InputManager.html',1,'yage']]],
['inputmanager_2ecpp',['inputmanager.cpp',['../inputmanager_8cpp.html',1,'']]],
['inputmanager_2eh',['inputmanager.h',['../inputmanager_8h.html',1,'']]],
diff --git a/search/classes_2.js b/search/classes_2.js
index 1d14bd7f..a9bc086b 100644
--- a/search/classes_2.js
+++ b/search/classes_2.js
@@ -3,7 +3,7 @@ var searchData=
['camera2d',['Camera2D',['../classyage_1_1Camera2D.html',1,'yage']]],
['collider',['Collider',['../classyage_1_1Collider.html',1,'yage']]],
['collisionbody',['CollisionBody',['../classyage_1_1CollisionBody.html',1,'yage']]],
- ['color',['Color',['../structyage_1_1Color.html',1,'yage']]],
+ ['colour',['Colour',['../structyage_1_1Colour.html',1,'yage']]],
['concept',['Concept',['../structyage_1_1LogSink_1_1Concept.html',1,'yage::LogSink']]],
['coordinate',['Coordinate',['../structyage_1_1details_1_1Coordinate.html',1,'yage::details']]]
];
diff --git a/search/functions_11.js b/search/functions_11.js
index eb021eb5..864c3144 100644
--- a/search/functions_11.js
+++ b/search/functions_11.js
@@ -1,7 +1,7 @@
var searchData=
[
['send',['send',['../classyage_1_1Active.html#a665673b94eb5ce7c448839e5bb6e0326',1,'yage::Active']]],
- ['setcolor',['setColor',['../structyage_1_1Vertex.html#a0dc5fa6c669b4c10a8d56702f2aa9b50',1,'yage::Vertex']]],
+ ['setcolour',['setColour',['../structyage_1_1Vertex.html#aa759435739e34e2a0bfd1803c2aeeddf',1,'yage::Vertex']]],
['setposition',['setPosition',['../structyage_1_1Vertex.html#af392248f0be173221ebcc62d490fe03d',1,'yage::Vertex']]],
['setuv',['setUv',['../structyage_1_1Vertex.html#aa1fa8f5ebd883068828466cc924d4c50',1,'yage::Vertex']]],
['shouldclose',['shouldClose',['../classyage_1_1Window.html#a5e3b209289bc343609d809d5b7f23cc8',1,'yage::Window']]],
diff --git a/search/functions_12.js b/search/functions_12.js
index cdc7f5d7..3add950b 100644
--- a/search/functions_12.js
+++ b/search/functions_12.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['texture',['Texture',['../structyage_1_1Texture.html#ab8ecfcc681a98f9a8654bc6b9f2c87b3',1,'yage::Texture::Texture()=default'],['../structyage_1_1Texture.html#a9af4689df9f99c5074b7aa5d5857775c',1,'yage::Texture::Texture(GLuint id_i, int width_i, int height_i)'],['../classyage_1_1Glyph.html#a0d5bfd4874a5d29c96a3d22f45543eb2',1,'yage::Glyph::texture()'],['../classyage_1_1RenderBatch.html#ad1cfc404c74ee3d838e9cd12a8c1962d',1,'yage::RenderBatch::texture()']]],
+ ['texture',['Texture',['../structyage_1_1Texture.html#a0cef080bceaaf5e702985f5494ea35d5',1,'yage::Texture::Texture()'],['../structyage_1_1Texture.html#a9af4689df9f99c5074b7aa5d5857775c',1,'yage::Texture::Texture(GLuint id_i, int width_i, int height_i)'],['../classyage_1_1Glyph.html#a0d5bfd4874a5d29c96a3d22f45543eb2',1,'yage::Glyph::texture()'],['../classyage_1_1RenderBatch.html#ad1cfc404c74ee3d838e9cd12a8c1962d',1,'yage::RenderBatch::texture()']]],
['texturecache',['TextureCache',['../classyage_1_1TextureCache.html#a5f6af0bd513dd393061b2d9d18362692',1,'yage::TextureCache']]],
['top_5fleft',['top_left',['../classyage_1_1Glyph.html#a8e54b98d17907e0088360416fe978e1f',1,'yage::Glyph']]],
['top_5fright',['top_right',['../classyage_1_1Glyph.html#a4930084a1071cd3274b2aa885f26ecec',1,'yage::Glyph']]],
diff --git a/search/functions_14.js b/search/functions_14.js
index 8d7bb553..6047403c 100644
--- a/search/functions_14.js
+++ b/search/functions_14.js
@@ -4,5 +4,5 @@ var searchData=
['vector2',['Vector2',['../classyage_1_1Vector2.html#a50c108903be424de1c41ce31fddd23ea',1,'yage::Vector2::Vector2()'],['../classyage_1_1Vector2.html#af69d534302a406bac419589e0a2f2917',1,'yage::Vector2::Vector2(const std::vector< Type > &data)'],['../classyage_1_1Vector2.html#a3ef3bc2954f387f1db2165a884765ad0',1,'yage::Vector2::Vector2(Type x, Type y)'],['../classyage_1_1Vector2.html#aacee766d18741a925a47b91fa0080822',1,'yage::Vector2::Vector2(const Matrix< 2, 1, Type > &other)']]],
['vector3',['Vector3',['../classyage_1_1Vector3.html#a745b76ba3e49f5c73f53cb065ddf337b',1,'yage::Vector3::Vector3()'],['../classyage_1_1Vector3.html#ad30c9989f25ef241c59a6c59661daf3a',1,'yage::Vector3::Vector3(std::vector< Type > data)'],['../classyage_1_1Vector3.html#a36744e7ef6c50b117e4105f1752c93c0',1,'yage::Vector3::Vector3(Type x_in, Type y_in, Type z_in)']]],
['vector4',['Vector4',['../classyage_1_1Vector4.html#ab6e8f6e88c13d3bbfa1a6591d97b7d03',1,'yage::Vector4::Vector4()'],['../classyage_1_1Vector4.html#ae40311bf406263427426a7de5108c6c1',1,'yage::Vector4::Vector4(std::vector< Type > data)'],['../classyage_1_1Vector4.html#a36537a95ca1764334fe9b9b1f001206d',1,'yage::Vector4::Vector4(Type x_in, Type y_in, Type z_in, Type w_in)']]],
- ['vertex',['Vertex',['../structyage_1_1Vertex.html#acae9697c2762e37dfa4472b85fa112c3',1,'yage::Vertex::Vertex()=default'],['../structyage_1_1Vertex.html#ab2826fb0ec9c48aad0056250dfa9cc2e',1,'yage::Vertex::Vertex(const Position &position_, const Color &color_, const UV &uv_)']]]
+ ['vertex',['Vertex',['../structyage_1_1Vertex.html#acae9697c2762e37dfa4472b85fa112c3',1,'yage::Vertex::Vertex()=default'],['../structyage_1_1Vertex.html#aac3046359c44aeabc910a81f4f41789e',1,'yage::Vertex::Vertex(const Position &position_, const Colour &colour_, const UV &uv_)']]]
];
diff --git a/search/functions_15.js b/search/functions_15.js
index 58649144..6f8433b8 100644
--- a/search/functions_15.js
+++ b/search/functions_15.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['w',['w',['../classyage_1_1Vector4.html#a0ae3b6494807df896134b669923b81ee',1,'yage::Vector4']]],
+ ['w',['w',['../classyage_1_1Vector4.html#a111ecbf09543e8fafaf3aedef77d168d',1,'yage::Vector4']]],
['window',['Window',['../classyage_1_1Window.html#a7d7bd2f22e095df387e8b5cda2bb484e',1,'yage::Window::Window()'],['../classyage_1_1Window.html#a1225a2b5eff6d44a6bce3f0f5f10e2bf',1,'yage::Window::Window(const Window &)=delete'],['../classyage_1_1Window.html#a4be115daea6c7473fca81623c547d821',1,'yage::Window::Window(Window &&)=delete']]],
['write',['write',['../classyage_1_1LogSink.html#ac41716cf03dac6311cb7287c9edf8a8d',1,'yage::LogSink::write()'],['../structyage_1_1LogSink_1_1Concept.html#a3b752fd501daae85f1b78e5d0df912ac',1,'yage::LogSink::Concept::write()'],['../structyage_1_1LogSink_1_1Model.html#ae61438d2927d21b4af8f6ff2acc38224',1,'yage::LogSink::Model::write()']]]
];
diff --git a/search/functions_2.js b/search/functions_2.js
index b3ac1085..8620c69d 100644
--- a/search/functions_2.js
+++ b/search/functions_2.js
@@ -7,7 +7,7 @@ var searchData=
['collider',['Collider',['../classyage_1_1Collider.html#ae33aeb0711409e7c3ef9e21ed99fa8a3',1,'yage::Collider']]],
['collides',['collides',['../classyage_1_1Collider.html#abbab9373c0805ffa5215c08b82eaed03',1,'yage::Collider::collides()'],['../classyage_1_1RectangleCollider.html#a81e825cf009a437bc0f61b846cac66f6',1,'yage::RectangleCollider::collides()']]],
['collisionbody',['CollisionBody',['../classyage_1_1CollisionBody.html#a5289e613269facc45cd451872c17a83d',1,'yage::CollisionBody']]],
- ['color',['Color',['../structyage_1_1Color.html#ab0262bbe3b2ec12a9933fe411034d09e',1,'yage::Color::Color()=default'],['../structyage_1_1Color.html#a2ce7b1060775f64c9b578b3f81fdd648',1,'yage::Color::Color(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)']]],
+ ['colour',['Colour',['../structyage_1_1Colour.html#a585165d5109c81b6b2de6f1116406abd',1,'yage::Colour::Colour()'],['../structyage_1_1Colour.html#a8118ad802db7e61df770f7d3b5b88aaa',1,'yage::Colour::Colour(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)']]],
['colsize',['colSize',['../classyage_1_1Matrix.html#a2148cd52008892765ad90250c68afba1',1,'yage::Matrix']]],
['compileshader',['compileShader',['../classyage_1_1GlslProgram.html#a1acc7e052209fde74256c479af6d9988',1,'yage::GlslProgram']]],
['compileshaders',['compileShaders',['../classyage_1_1GlslProgram.html#acf57b56739f67ac88b0d5df3bf1d4cb1',1,'yage::GlslProgram']]],
diff --git a/search/functions_3.js b/search/functions_3.js
index 4aee8634..aa2284e0 100644
--- a/search/functions_3.js
+++ b/search/functions_3.js
@@ -1,7 +1,8 @@
var searchData=
[
['decodepng',['decodePNG',['../namespaceyage.html#a0cf122e98752ed702393cbe30df51356',1,'yage']]],
+ ['defaultsetup',['defaultSetup',['../classyage_1_1GlslProgram.html#a1260a2302c1434ce38c850dc18cbc04e',1,'yage::GlslProgram']]],
['depth',['depth',['../classyage_1_1Glyph.html#a7b8b85a8044d751cfa29135690c23ff9',1,'yage::Glyph']]],
['dot',['dot',['../namespaceyage_1_1matrix.html#ac4d2f55a5c3369ec42001776a582c30a',1,'yage::matrix']]],
- ['draw',['draw',['../classyage_1_1Sprite.html#a8eed26f4fa57b3ad47d791564233ee40',1,'yage::Sprite::draw()'],['../classyage_1_1SpriteBatch.html#a22c8bb28a72c309afeb6f78b6af19ec5',1,'yage::SpriteBatch::draw()']]]
+ ['draw',['draw',['../classyage_1_1Sprite.html#a8eed26f4fa57b3ad47d791564233ee40',1,'yage::Sprite::draw()'],['../classyage_1_1SpriteBatch.html#af06239e2779d49eb6e915980a0aac941',1,'yage::SpriteBatch::draw()']]]
];
diff --git a/search/functions_8.js b/search/functions_8.js
index 38d0841d..2adefb82 100644
--- a/search/functions_8.js
+++ b/search/functions_8.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['init',['init',['../classyage_1_1Sprite.html#a2f6294be8b2551077cf475892bcddcc1',1,'yage::Sprite::init()'],['../classyage_1_1SpriteBatch.html#a7731372a6ec1aea75d1732700fe0f4c6',1,'yage::SpriteBatch::init()'],['../namespaceyage.html#a4fc8b4d2a19d4c7f7f1bd42a788827ce',1,'yage::init()']]],
+ ['init',['init',['../classyage_1_1Sprite.html#a2f6294be8b2551077cf475892bcddcc1',1,'yage::Sprite::init()'],['../namespaceyage.html#a4fc8b4d2a19d4c7f7f1bd42a788827ce',1,'yage::init()']]],
['inside',['inside',['../classyage_1_1Collider.html#a4a8ad9e664a0015e023a70d196302fe9',1,'yage::Collider::inside()'],['../classyage_1_1RectangleCollider.html#ac8d8e6bdb12c21be12f7d398242147c4',1,'yage::RectangleCollider::inside()']]],
['instance',['instance',['../classyage_1_1Logger.html#ad165738c5b738d80a14b0ee1319cae2e',1,'yage::Logger']]],
['iskeypressed',['isKeyPressed',['../classyage_1_1InputManager.html#ae99a13911fe80c221e83218b51a76ab0',1,'yage::InputManager']]]
diff --git a/search/variables_0.js b/search/variables_0.js
index 13bb8713..c9d903da 100644
--- a/search/variables_0.js
+++ b/search/variables_0.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['a',['a',['../structyage_1_1Color.html#a1df3f4a850d0e50dba19e0681d71f3a6',1,'yage::Color']]],
+ ['a',['a',['../structyage_1_1Colour.html#a5aef37a5ac37e44dc32f5f9b1ebee10c',1,'yage::Colour']]],
['acceleration_5f',['acceleration_',['../classyage_1_1Body.html#a36c0a4485bf9a704901d88c6cf212a5f',1,'yage::Body']]],
['active_5f',['active_',['../classyage_1_1Logger.html#a489f97b1b21ac425ebbdb063de068744',1,'yage::Logger']]],
['attribute_5findex_5f',['attribute_index_',['../classyage_1_1GlslProgram.html#a55d4f797833c688be78c00882112e486',1,'yage::GlslProgram']]]
diff --git a/search/variables_1.js b/search/variables_1.js
index 2b784f13..f221e3d2 100644
--- a/search/variables_1.js
+++ b/search/variables_1.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['b',['b',['../structyage_1_1Color.html#a01253439ca70585948fb560ecdd3e766',1,'yage::Color']]],
+ ['b',['b',['../structyage_1_1Colour.html#a7bd3ed4a377c384af80aa8c7f55dc96f',1,'yage::Colour']]],
['bottom_5fleft_5f',['bottom_left_',['../classyage_1_1Glyph.html#add70123a08d594e4cfb627a03ae8daad',1,'yage::Glyph']]],
['bottom_5fright_5f',['bottom_right_',['../classyage_1_1Glyph.html#a6240a88991e31b2fc8ed5dccfc362234',1,'yage::Glyph']]],
['buffer_5f',['buffer_',['../classyage_1_1LogMessage.html#ae34f407242db5713632181b4ce9ae3d5',1,'yage::LogMessage']]]
diff --git a/search/variables_2.js b/search/variables_2.js
index a186b9c1..863b2cee 100644
--- a/search/variables_2.js
+++ b/search/variables_2.js
@@ -1,6 +1,6 @@
var searchData=
[
['camera_5fmatrix_5f',['camera_matrix_',['../classyage_1_1Camera2D.html#a76e9d3623fd930530fbe6cdccc9b7707',1,'yage::Camera2D']]],
- ['color',['color',['../structyage_1_1Vertex.html#aaa2cdca3a1186c57f1c75cee34ec3144',1,'yage::Vertex']]],
+ ['colour',['colour',['../structyage_1_1Vertex.html#a142db28be39f418a06fa43f75d386182',1,'yage::Vertex']]],
['cond_5f',['cond_',['../classyage_1_1SyncQueue.html#af1682d934e8a71dad6718977240e83e4',1,'yage::SyncQueue']]]
];
diff --git a/search/variables_5.js b/search/variables_5.js
index 1787c882..949edabd 100644
--- a/search/variables_5.js
+++ b/search/variables_5.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['g',['g',['../structyage_1_1Color.html#ada90145192a7bc439269ab49e31a461a',1,'yage::Color']]],
+ ['g',['g',['../structyage_1_1Colour.html#a205d3a63268f4879adf27aabdf71a6dd',1,'yage::Colour']]],
['glyph_5fptrs_5f',['glyph_ptrs_',['../classyage_1_1SpriteBatch.html#a007d24cd3765e2fcea843f85dbbb475e',1,'yage::SpriteBatch']]],
['glyphs_5f',['glyphs_',['../classyage_1_1SpriteBatch.html#a0ca8f0d0df0eeb22e8fc6fceebb96200',1,'yage::SpriteBatch']]],
['gravity',['GRAVITY',['../classyage_1_1Body.html#a4f61913cf00244a6160e09cda846f766',1,'yage::Body']]],
diff --git a/search/variables_f.js b/search/variables_f.js
index 33d2019d..d36958d0 100644
--- a/search/variables_f.js
+++ b/search/variables_f.js
@@ -1,6 +1,6 @@
var searchData=
[
- ['r',['r',['../structyage_1_1Color.html#a5a97b7679703c28ad0c90d1bedde5da1',1,'yage::Color']]],
+ ['r',['r',['../structyage_1_1Colour.html#a572fe7933c59ebfa6720088cd33dad99',1,'yage::Colour']]],
['render_5fbatches_5f',['render_batches_',['../classyage_1_1SpriteBatch.html#abf057ffe5fd9b7c35256dad147391008',1,'yage::SpriteBatch']]],
['running_5f',['running_',['../classyage_1_1Active.html#ac32d54302bf084f0f7422cce5ee617db',1,'yage::Active']]]
];
diff --git a/sprite_8cpp.html b/sprite_8cpp.html
index ee1704b9..6bb7d276 100644
--- a/sprite_8cpp.html
+++ b/sprite_8cpp.html
@@ -127,7 +127,7 @@ Namespaces
diff --git a/sprite_8h.html b/sprite_8h.html
index 86cff8f1..a71ff6d1 100644
--- a/sprite_8h.html
+++ b/sprite_8h.html
@@ -134,7 +134,7 @@ Namespaces
diff --git a/sprite_8h_source.html b/sprite_8h_source.html
index 4c9a4ab7..f71e6e21 100644
--- a/sprite_8h_source.html
+++ b/sprite_8h_source.html
@@ -175,7 +175,7 @@ $(document).ready(function(){initNavTree('sprite_8h_source.html','');});
diff --git a/spritebatch_8cpp.html b/spritebatch_8cpp.html
index 36503822..37eae506 100644
--- a/spritebatch_8cpp.html
+++ b/spritebatch_8cpp.html
@@ -126,7 +126,7 @@ Namespaces
diff --git a/spritebatch_8h.html b/spritebatch_8h.html
index 3fcf19a3..f23ffb62 100644
--- a/spritebatch_8h.html
+++ b/spritebatch_8h.html
@@ -141,7 +141,7 @@ Namespaces
diff --git a/spritebatch_8h_source.html b/spritebatch_8h_source.html
index cfb5815e..d10edcbc 100644
--- a/spritebatch_8h_source.html
+++ b/spritebatch_8h_source.html
@@ -194,41 +194,38 @@ $(document).ready(function(){initNavTree('spritebatch_8h_source.html','');});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Definition: spritebatch.h:53
std::vector< Glyph * > glyph_ptrs_
Definition: spritebatch.h:79
GLuint texture_
Definition: spritebatch.h:60
Vertex bottom_left_
Definition: spritebatch.h:38
-
void end()
Definition: spritebatch.cpp:58
+
void end()
Definition: spritebatch.cpp:56
Definition: spritebatch.h:70
Vertex bottom_right() const
Definition: spritebatch.h:49
-
void init()
Definition: spritebatch.cpp:46
-
void draw(const yage::Vector4f &destination_rect, const yage::Vector4f &uv_rect, GLuint texture, const Color &color, float depth)
Definition: spritebatch.cpp:64
-
void createVertexArray()
Definition: spritebatch.cpp:105
-
void begin()
Definition: spritebatch.cpp:51
+
void createVertexArray()
Definition: spritebatch.cpp:112
+
void begin()
Definition: spritebatch.cpp:49
Vertex top_left_
Definition: spritebatch.h:35
Vertex bottom_left() const
Definition: spritebatch.h:50
-
void render()
Definition: spritebatch.cpp:95
+
void render()
Definition: spritebatch.cpp:93
SpriteBatch & operator=(const SpriteBatch &)=delete
Glyph(GLuint texture, float depth, const Vertex &top_left, const Vertex &top_right, const Vertex &bottom_right, const Vertex &bottom_left)
Definition: spritebatch.cpp:19
GLuint vbo_
Definition: spritebatch.h:76
@@ -236,37 +233,38 @@ $(document).ready(function(){initNavTree('spritebatch_8h_source.html','');});
GLint offset() const
Definition: spritebatch.h:65
friend SpriteBatch
Definition: spritebatch.h:55
-
void createRenderBatches()
Definition: spritebatch.cpp:143
+
void createRenderBatches()
Definition: spritebatch.cpp:150
GLuint texture_
Definition: spritebatch.h:33
float depth() const
Definition: spritebatch.h:46
Vertex bottom_right_
Definition: spritebatch.h:37
static const int NUM_VERTICES
Definition: spritebatch.h:73
+
void draw(const yage::Vector4f &destination_rect, const yage::Vector4f &uv_rect, GLuint texture, const Colour &colour, float depth)
Definition: spritebatch.cpp:62
GLuint vao_
Definition: spritebatch.h:77
GLuint texture() const
Definition: spritebatch.h:45
std::vector< RenderBatch > render_batches_
Definition: spritebatch.h:80
std::vector< Glyph > glyphs_
Definition: spritebatch.h:78
-
+
SpriteBatch()
Definition: spritebatch.cpp:33
GLint offset_
Definition: spritebatch.h:59
+
GLsizei num_vertices() const
Definition: spritebatch.h:66
Vertex top_right_
Definition: spritebatch.h:36
GLuint texture() const
Definition: spritebatch.h:67
-
void sortGlyphs()
Definition: spritebatch.cpp:181
+
void sortGlyphs()
Definition: spritebatch.cpp:188
4D Vector class
Definition: matrix.h:376
Glyph with information of the texture.
Definition: spritebatch.h:30
GLsizei num_vertices_
Definition: spritebatch.h:58
RenderBatch(GLint offset, GLsizei num_vertices, GLuint texture)
Definition: spritebatch.cpp:28
-
~SpriteBatch()
Definition: spritebatch.cpp:35
+
~SpriteBatch()
Definition: spritebatch.cpp:38
Vertex top_left() const
Definition: spritebatch.h:47
Vertex top_right() const
Definition: spritebatch.h:48
-
diff --git a/spritesheet_8cpp.html b/spritesheet_8cpp.html
index e914a682..991c37f1 100644
--- a/spritesheet_8cpp.html
+++ b/spritesheet_8cpp.html
@@ -130,7 +130,7 @@ Namespaces
diff --git a/spritesheet_8h.html b/spritesheet_8h.html
index 7d87be86..df9fefde 100644
--- a/spritesheet_8h.html
+++ b/spritesheet_8h.html
@@ -146,7 +146,7 @@ details::Coordinate >
diff --git a/spritesheet_8h_source.html b/spritesheet_8h_source.html
index e95e60bf..5e5d753c 100644
--- a/spritesheet_8h_source.html
+++ b/spritesheet_8h_source.html
@@ -192,7 +192,7 @@ $(document).ready(function(){initNavTree('spritesheet_8h_source.html','');});
diff --git a/structyage_1_1Color-members.html b/structyage_1_1Color-members.html
deleted file mode 100644
index 86525f39..00000000
--- a/structyage_1_1Color-members.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
-
YAGE: Member List
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- YAGE
- v0.1.1
-
- Yet Another Game Engine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
This is the complete list of members for yage::Color , including all inherited members.
-
-
-
-
-
-
diff --git a/structyage_1_1Color.html b/structyage_1_1Color.html
deleted file mode 100644
index 891b98bd..00000000
--- a/structyage_1_1Color.html
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
-
-
-
-
YAGE: yage::Color Struct Reference
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- YAGE
- v0.1.1
-
- Yet Another Game Engine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
#include <vertex.h >
-
-
- Color ()=default
-
- Color (GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)
-
-
-
-GLubyte r
-
-GLubyte g
-
-GLubyte b
-
-GLubyte a
-
-
-
-
-
-
-
-
-
-
-
- yage::Color::Color
- (
- )
-
-
-
-
-
-default
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- yage::Color::Color
- (
- GLubyte
- r_ ,
-
-
-
-
- GLubyte
- g_ ,
-
-
-
-
- GLubyte
- b_ ,
-
-
-
-
- GLubyte
- a_
-
-
-
- )
-
-
-
-
-
-inline
-
-
-
-
-
-
-
-
-
-
-
-
- GLubyte yage::Color::a
-
-
-
-
-
-
-
-
-
-
-
- GLubyte yage::Color::b
-
-
-
-
-
-
-
-
-
-
-
- GLubyte yage::Color::g
-
-
-
-
-
-
-
-
-
-
-
- GLubyte yage::Color::r
-
-
-
-
-
-
-
The documentation for this struct was generated from the following file:
-
-
-
-
-
-
diff --git a/structyage_1_1Color.js b/structyage_1_1Color.js
deleted file mode 100644
index 823d4739..00000000
--- a/structyage_1_1Color.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var structyage_1_1Color =
-[
- [ "Color", "structyage_1_1Color.html#ab0262bbe3b2ec12a9933fe411034d09e", null ],
- [ "Color", "structyage_1_1Color.html#a2ce7b1060775f64c9b578b3f81fdd648", null ],
- [ "a", "structyage_1_1Color.html#a1df3f4a850d0e50dba19e0681d71f3a6", null ],
- [ "b", "structyage_1_1Color.html#a01253439ca70585948fb560ecdd3e766", null ],
- [ "g", "structyage_1_1Color.html#ada90145192a7bc439269ab49e31a461a", null ],
- [ "r", "structyage_1_1Color.html#a5a97b7679703c28ad0c90d1bedde5da1", null ]
-];
\ No newline at end of file
diff --git a/structyage_1_1Colour-members.html b/structyage_1_1Colour-members.html
new file mode 100644
index 00000000..616ecba4
--- /dev/null
+++ b/structyage_1_1Colour-members.html
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
YAGE: Member List
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YAGE
+ v0.1.1
+
+ Yet Another Game Engine
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
This is the complete list of members for yage::Colour , including all inherited members.
+
+
+
+
+
+
diff --git a/structyage_1_1Colour.html b/structyage_1_1Colour.html
new file mode 100644
index 00000000..b67f97cd
--- /dev/null
+++ b/structyage_1_1Colour.html
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
YAGE: yage::Colour Struct Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YAGE
+ v0.1.1
+
+ Yet Another Game Engine
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#include <vertex.h >
+
+
+ Colour ()
+
+ Colour (GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)
+
+
+
+GLubyte r
+
+GLubyte g
+
+GLubyte b
+
+GLubyte a
+
+
+
+
+
+
+
+
+
+
+
+ yage::Colour::Colour
+ (
+ )
+
+
+
+
+
+inline
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ yage::Colour::Colour
+ (
+ GLubyte
+ r_ ,
+
+
+
+
+ GLubyte
+ g_ ,
+
+
+
+
+ GLubyte
+ b_ ,
+
+
+
+
+ GLubyte
+ a_
+
+
+
+ )
+
+
+
+
+
+inline
+
+
+
+
+
+
+
+
+
+
+
+
+ GLubyte yage::Colour::a
+
+
+
+
+
+
+
+
+
+
+
+ GLubyte yage::Colour::b
+
+
+
+
+
+
+
+
+
+
+
+ GLubyte yage::Colour::g
+
+
+
+
+
+
+
+
+
+
+
+ GLubyte yage::Colour::r
+
+
+
+
+
+
+
The documentation for this struct was generated from the following file:
+
+
+
+
+
+
diff --git a/structyage_1_1Colour.js b/structyage_1_1Colour.js
new file mode 100644
index 00000000..fc306acd
--- /dev/null
+++ b/structyage_1_1Colour.js
@@ -0,0 +1,9 @@
+var structyage_1_1Colour =
+[
+ [ "Colour", "structyage_1_1Colour.html#a585165d5109c81b6b2de6f1116406abd", null ],
+ [ "Colour", "structyage_1_1Colour.html#a8118ad802db7e61df770f7d3b5b88aaa", null ],
+ [ "a", "structyage_1_1Colour.html#a5aef37a5ac37e44dc32f5f9b1ebee10c", null ],
+ [ "b", "structyage_1_1Colour.html#a7bd3ed4a377c384af80aa8c7f55dc96f", null ],
+ [ "g", "structyage_1_1Colour.html#a205d3a63268f4879adf27aabdf71a6dd", null ],
+ [ "r", "structyage_1_1Colour.html#a572fe7933c59ebfa6720088cd33dad99", null ]
+];
\ No newline at end of file
diff --git a/structyage_1_1LogMessage_1_1Meta-members.html b/structyage_1_1LogMessage_1_1Meta-members.html
index 093274e8..50f149b9 100644
--- a/structyage_1_1LogMessage_1_1Meta-members.html
+++ b/structyage_1_1LogMessage_1_1Meta-members.html
@@ -120,7 +120,7 @@ $(document).ready(function(){initNavTree('structyage_1_1LogMessage_1_1Meta.html'
diff --git a/structyage_1_1LogMessage_1_1Meta.html b/structyage_1_1LogMessage_1_1Meta.html
index ae004dd2..4edaa775 100644
--- a/structyage_1_1LogMessage_1_1Meta.html
+++ b/structyage_1_1LogMessage_1_1Meta.html
@@ -157,7 +157,7 @@ Public Attributes
diff --git a/structyage_1_1LogSink_1_1Concept-members.html b/structyage_1_1LogSink_1_1Concept-members.html
index 6d1ab5de..bcd67867 100644
--- a/structyage_1_1LogSink_1_1Concept-members.html
+++ b/structyage_1_1LogSink_1_1Concept-members.html
@@ -121,7 +121,7 @@ $(document).ready(function(){initNavTree('structyage_1_1LogSink_1_1Concept.html'
diff --git a/structyage_1_1LogSink_1_1Concept.html b/structyage_1_1LogSink_1_1Concept.html
index fe02f615..ca386a48 100644
--- a/structyage_1_1LogSink_1_1Concept.html
+++ b/structyage_1_1LogSink_1_1Concept.html
@@ -227,7 +227,7 @@ Public Member Functions
diff --git a/structyage_1_1LogSink_1_1Model-members.html b/structyage_1_1LogSink_1_1Model-members.html
index 61d0cba4..ec6fb92a 100644
--- a/structyage_1_1LogSink_1_1Model-members.html
+++ b/structyage_1_1LogSink_1_1Model-members.html
@@ -123,7 +123,7 @@ $(document).ready(function(){initNavTree('structyage_1_1LogSink_1_1Model.html','
diff --git a/structyage_1_1LogSink_1_1Model.html b/structyage_1_1LogSink_1_1Model.html
index 613f7cb5..597ae0de 100644
--- a/structyage_1_1LogSink_1_1Model.html
+++ b/structyage_1_1LogSink_1_1Model.html
@@ -250,7 +250,7 @@ template<typename T >
diff --git a/structyage_1_1Position-members.html b/structyage_1_1Position-members.html
index 2a6b9eae..223b2ca3 100644
--- a/structyage_1_1Position-members.html
+++ b/structyage_1_1Position-members.html
@@ -122,7 +122,7 @@ $(document).ready(function(){initNavTree('structyage_1_1Position.html','');});
diff --git a/structyage_1_1Position.html b/structyage_1_1Position.html
index 5c416e2c..36702f19 100644
--- a/structyage_1_1Position.html
+++ b/structyage_1_1Position.html
@@ -223,7 +223,7 @@ Public Attributes
diff --git a/structyage_1_1Texture-members.html b/structyage_1_1Texture-members.html
index b43944f0..578ec4f6 100644
--- a/structyage_1_1Texture-members.html
+++ b/structyage_1_1Texture-members.html
@@ -115,7 +115,7 @@ $(document).ready(function(){initNavTree('structyage_1_1Texture.html','');});
@@ -123,7 +123,7 @@ $(document).ready(function(){initNavTree('structyage_1_1Texture.html','');});
diff --git a/structyage_1_1Texture.html b/structyage_1_1Texture.html
index 95e2c811..7ba4480c 100644
--- a/structyage_1_1Texture.html
+++ b/structyage_1_1Texture.html
@@ -119,8 +119,8 @@ $(document).ready(function(){initNavTree('structyage_1_1Texture.html','');});
@@ -134,7 +134,7 @@ Public Attributes
-
+
@@ -150,7 +150,7 @@ Public Attributes
-default
+
inline
@@ -243,7 +243,7 @@ Public Attributes
diff --git a/structyage_1_1Texture.js b/structyage_1_1Texture.js
index d20cb4d4..13dda067 100644
--- a/structyage_1_1Texture.js
+++ b/structyage_1_1Texture.js
@@ -1,6 +1,6 @@
var structyage_1_1Texture =
[
- [ "Texture", "structyage_1_1Texture.html#ab8ecfcc681a98f9a8654bc6b9f2c87b3", null ],
+ [ "Texture", "structyage_1_1Texture.html#a0cef080bceaaf5e702985f5494ea35d5", null ],
[ "Texture", "structyage_1_1Texture.html#a9af4689df9f99c5074b7aa5d5857775c", null ],
[ "height", "structyage_1_1Texture.html#a5ce16ac8ad034f7042620a418783b41e", null ],
[ "id", "structyage_1_1Texture.html#a26386c2709b906ec07c9a1bb8daf2968", null ],
diff --git a/structyage_1_1UV-members.html b/structyage_1_1UV-members.html
index ee563d89..08a04e0b 100644
--- a/structyage_1_1UV-members.html
+++ b/structyage_1_1UV-members.html
@@ -122,7 +122,7 @@ $(document).ready(function(){initNavTree('structyage_1_1UV.html','');});
diff --git a/structyage_1_1UV.html b/structyage_1_1UV.html
index bd9bccd1..57e2b646 100644
--- a/structyage_1_1UV.html
+++ b/structyage_1_1UV.html
@@ -223,7 +223,7 @@ Public Attributes
diff --git a/structyage_1_1Vertex-members.html b/structyage_1_1Vertex-members.html
index 46f280c4..78ac83f4 100644
--- a/structyage_1_1Vertex-members.html
+++ b/structyage_1_1Vertex-members.html
@@ -113,20 +113,20 @@ $(document).ready(function(){initNavTree('structyage_1_1Vertex.html','');});
This is the complete list of members for yage::Vertex , including all inherited members.
- color yage::Vertex
+ colour yage::Vertex
position yage::Vertex
- setColor (GLubyte r, GLubyte g, GLubyte b, GLubyte a)yage::Vertex inline
+ setColour (GLubyte r, GLubyte g, GLubyte b, GLubyte a)yage::Vertex inline
setPosition (float x, float y)yage::Vertex inline
setUv (float u, float v)yage::Vertex inline
uv yage::Vertex
Vertex ()=defaultyage::Vertex
- Vertex (const Position &position_, const Color &color_, const UV &uv_)yage::Vertex inline
+ Vertex (const Position &position_, const Colour &colour_, const UV &uv_)yage::Vertex inline
diff --git a/structyage_1_1Vertex.html b/structyage_1_1Vertex.html
index 3bed200f..b0d70e73 100644
--- a/structyage_1_1Vertex.html
+++ b/structyage_1_1Vertex.html
@@ -121,12 +121,12 @@ $(document).ready(function(){initNavTree('structyage_1_1Vertex.html','');});
Public Member Functions
Vertex ()=default
-
Vertex (const Position &position_, const Color &color_, const UV &uv_)
-
+
Vertex (const Position &position_, const Colour &colour_, const UV &uv_)
+
void setPosition (float x, float y)
-
void setColor (GLubyte r, GLubyte g, GLubyte b, GLubyte a)
-
+
void setColour (GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+
void setUv (float u, float v)
@@ -163,7 +163,7 @@ Public Attributes
-
+
@@ -179,8 +179,8 @@ Public Attributes
- const Color &
- color_ ,
+ const Colour &
+ colour_ ,
@@ -204,7 +204,7 @@ Public Attributes
-
+
@@ -212,7 +212,7 @@ Public Attributes
- void yage::Vertex::setColor
+ void yage::Vertex::setColour
(
GLubyte
r ,
@@ -319,12 +319,12 @@ Public Attributes
-
+
- Color yage::Vertex::color
+ Colour yage::Vertex::colour
@@ -364,7 +364,7 @@ Public Attributes
diff --git a/structyage_1_1Vertex.js b/structyage_1_1Vertex.js
index 04c6d9f2..3ff142ac 100644
--- a/structyage_1_1Vertex.js
+++ b/structyage_1_1Vertex.js
@@ -1,11 +1,11 @@
var structyage_1_1Vertex =
[
[ "Vertex", "structyage_1_1Vertex.html#acae9697c2762e37dfa4472b85fa112c3", null ],
- [ "Vertex", "structyage_1_1Vertex.html#ab2826fb0ec9c48aad0056250dfa9cc2e", null ],
- [ "setColor", "structyage_1_1Vertex.html#a0dc5fa6c669b4c10a8d56702f2aa9b50", null ],
+ [ "Vertex", "structyage_1_1Vertex.html#aac3046359c44aeabc910a81f4f41789e", null ],
+ [ "setColour", "structyage_1_1Vertex.html#aa759435739e34e2a0bfd1803c2aeeddf", null ],
[ "setPosition", "structyage_1_1Vertex.html#af392248f0be173221ebcc62d490fe03d", null ],
[ "setUv", "structyage_1_1Vertex.html#aa1fa8f5ebd883068828466cc924d4c50", null ],
- [ "color", "structyage_1_1Vertex.html#aaa2cdca3a1186c57f1c75cee34ec3144", null ],
+ [ "colour", "structyage_1_1Vertex.html#a142db28be39f418a06fa43f75d386182", null ],
[ "position", "structyage_1_1Vertex.html#abefe88d26b055655f9cc038a1dd4ff6a", null ],
[ "uv", "structyage_1_1Vertex.html#a2d1923353f0e50e7753ff1ae2d9ba84e", null ]
];
\ No newline at end of file
diff --git a/structyage_1_1details_1_1Coordinate-members.html b/structyage_1_1details_1_1Coordinate-members.html
index b54f4d67..a97216b9 100644
--- a/structyage_1_1details_1_1Coordinate-members.html
+++ b/structyage_1_1details_1_1Coordinate-members.html
@@ -124,7 +124,7 @@ $(document).ready(function(){initNavTree('structyage_1_1details_1_1Coordinate.ht
diff --git a/structyage_1_1details_1_1Coordinate.html b/structyage_1_1details_1_1Coordinate.html
index eb1be4e1..13dcc020 100644
--- a/structyage_1_1details_1_1Coordinate.html
+++ b/structyage_1_1details_1_1Coordinate.html
@@ -263,7 +263,7 @@ Public Attributes
diff --git a/syncqueue_8h.html b/syncqueue_8h.html
index 1d7d5be6..db8c75e5 100644
--- a/syncqueue_8h.html
+++ b/syncqueue_8h.html
@@ -134,7 +134,7 @@ Namespaces
diff --git a/syncqueue_8h_source.html b/syncqueue_8h_source.html
index 06ab663d..2025fd96 100644
--- a/syncqueue_8h_source.html
+++ b/syncqueue_8h_source.html
@@ -211,7 +211,7 @@ $(document).ready(function(){initNavTree('syncqueue_8h_source.html','');});
diff --git a/texture_8h.html b/texture_8h.html
index 6eeebb96..b53b945d 100644
--- a/texture_8h.html
+++ b/texture_8h.html
@@ -132,7 +132,7 @@ Namespaces
diff --git a/texture_8h_source.html b/texture_8h_source.html
index bc134ae8..71f69f0f 100644
--- a/texture_8h_source.html
+++ b/texture_8h_source.html
@@ -129,7 +129,7 @@ $(document).ready(function(){initNavTree('texture_8h_source.html','');});
-
+
24 Texture (GLuint id_i,
int width_i,
int height_i)
@@ -141,10 +141,10 @@ $(document).ready(function(){initNavTree('texture_8h_source.html','');});
int height
Definition: texture.h:20
-
Texture(GLuint id_i, int width_i, int height_i)
Definition: texture.h:24
int width
Definition: texture.h:19
+
Texture()
Definition: texture.h:22
GLuint id
Definition: texture.h:18
@@ -152,7 +152,7 @@ $(document).ready(function(){initNavTree('texture_8h_source.html','');});
diff --git a/texturecache_8cpp.html b/texturecache_8cpp.html
index 9953aeac..5f4dedb5 100644
--- a/texturecache_8cpp.html
+++ b/texturecache_8cpp.html
@@ -125,7 +125,7 @@ Namespaces
diff --git a/texturecache_8h.html b/texturecache_8h.html
index cbffecab..963bd286 100644
--- a/texturecache_8h.html
+++ b/texturecache_8h.html
@@ -133,7 +133,7 @@ Namespaces
diff --git a/texturecache_8h_source.html b/texturecache_8h_source.html
index 84beb1cf..60fb6ca4 100644
--- a/texturecache_8h_source.html
+++ b/texturecache_8h_source.html
@@ -154,7 +154,7 @@ $(document).ready(function(){initNavTree('texturecache_8h_source.html','');});
diff --git a/todo.html b/todo.html
index 0b226733..6fef18ca 100644
--- a/todo.html
+++ b/todo.html
@@ -111,7 +111,7 @@ $(document).ready(function(){initNavTree('todo.html','');});
diff --git a/todolist_8dox.html b/todolist_8dox.html
index eae26feb..3f5a044d 100644
--- a/todolist_8dox.html
+++ b/todolist_8dox.html
@@ -114,7 +114,7 @@ $(document).ready(function(){initNavTree('todolist_8dox.html','');});
diff --git a/vertex_8h.html b/vertex_8h.html
index da703ce7..ffba79e6 100644
--- a/vertex_8h.html
+++ b/vertex_8h.html
@@ -119,7 +119,7 @@ $(document).ready(function(){initNavTree('vertex_8h.html','');});
Classes
struct yage::Position
-
struct yage::Color
+
struct yage::Colour
struct yage::UV
@@ -138,7 +138,7 @@ Namespaces
diff --git a/vertex_8h_source.html b/vertex_8h_source.html
index 83ade84c..d23b08be 100644
--- a/vertex_8h_source.html
+++ b/vertex_8h_source.html
@@ -133,16 +133,16 @@ $(document).ready(function(){initNavTree('vertex_8h_source.html','');});
-
-
-
-
-
+
+
+
+
+
-
+
-
34 Color (GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)
-
35 :
r (r_),
g (g_),
b (b_),
a (a_)
+
34 Colour (GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)
+
35 :
r (r_),
g (g_),
b (b_),
a (a_)
@@ -158,13 +158,13 @@ $(document).ready(function(){initNavTree('vertex_8h_source.html','');});
-
+
-
-
+
+
@@ -174,12 +174,12 @@ $(document).ready(function(){initNavTree('vertex_8h_source.html','');});
-
67 void setColor (GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+
67 void setColour (GLubyte r, GLubyte g, GLubyte b, GLubyte a)
-
-
-
-
+
+
+
+
@@ -194,37 +194,37 @@ $(document).ready(function(){initNavTree('vertex_8h_source.html','');});
+
Colour()
Definition: vertex.h:32
+
GLubyte a
Definition: vertex.h:30
Position position
Definition: vertex.h:50
UV(float u_, float v_)
Definition: vertex.h:46
float v
Definition: vertex.h:42
-
void setColor(GLubyte r, GLubyte g, GLubyte b, GLubyte a)
Definition: vertex.h:67
+
void setColour(GLubyte r, GLubyte g, GLubyte b, GLubyte a)
Definition: vertex.h:67
+
GLubyte b
Definition: vertex.h:29
float x
Definition: vertex.h:18
-
GLubyte g
Definition: vertex.h:28
float y
Definition: vertex.h:19
-
Color color
Definition: vertex.h:51
void setUv(float u, float v)
Definition: vertex.h:75
-
Color(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)
Definition: vertex.h:34
Position(float x_, float y_)
Definition: vertex.h:23
-
GLubyte r
Definition: vertex.h:27
+
GLubyte r
Definition: vertex.h:27
void setPosition(float x, float y)
Definition: vertex.h:61
-
GLubyte b
Definition: vertex.h:29
+
+
Colour(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_)
Definition: vertex.h:34
+
Vertex(const Position &position_, const Colour &colour_, const UV &uv_)
Definition: vertex.h:56
+
GLubyte g
Definition: vertex.h:28
UV uv
Definition: vertex.h:52
-
Vertex(const Position &position_, const Color &color_, const UV &uv_)
Definition: vertex.h:56
+
Colour colour
Definition: vertex.h:51
float u
Definition: vertex.h:41
-
-
GLubyte a
Definition: vertex.h:30
-
diff --git a/window_8cpp.html b/window_8cpp.html
index 8af64039..25eedda1 100644
--- a/window_8cpp.html
+++ b/window_8cpp.html
@@ -131,7 +131,7 @@ Functions
diff --git a/window_8h.html b/window_8h.html
index 9d8677dc..fd71bd6d 100644
--- a/window_8h.html
+++ b/window_8h.html
@@ -144,7 +144,7 @@ Enumerations
diff --git a/window_8h_source.html b/window_8h_source.html
index 384abef1..6a597d9e 100644
--- a/window_8h_source.html
+++ b/window_8h_source.html
@@ -186,7 +186,7 @@ $(document).ready(function(){initNavTree('window_8h_source.html','');});
diff --git a/yage_2physics_2README_8md.html b/yage_2physics_2README_8md.html
index ff5c79d7..b83a755f 100644
--- a/yage_2physics_2README_8md.html
+++ b/yage_2physics_2README_8md.html
@@ -114,7 +114,7 @@ $(document).ready(function(){initNavTree('yage_2physics_2README_8md.html','');})
diff --git a/yage_8cpp.html b/yage_8cpp.html
index 623822c9..02ddb095 100644
--- a/yage_8cpp.html
+++ b/yage_8cpp.html
@@ -139,7 +139,7 @@ Functions
diff --git a/yage_8h.html b/yage_8h.html
index 97b84606..56f1e838 100644
--- a/yage_8h.html
+++ b/yage_8h.html
@@ -159,7 +159,7 @@ Functions
diff --git a/yage_8h_source.html b/yage_8h_source.html
index e336bf09..61e28086 100644
--- a/yage_8h_source.html
+++ b/yage_8h_source.html
@@ -188,7 +188,7 @@ $(document).ready(function(){initNavTree('yage_8h_source.html','');});