From c60164953dd6a4ee485c42211a3bcf8ee9eba06f Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 20 Dec 2017 14:38:14 +0000 Subject: Fixed license headers --- yage/core/camera2d.cpp | 4 ++-- yage/core/camera2d.h | 12 ++---------- yage/core/glslprogram.cpp | 8 +++----- yage/core/glslprogram.h | 4 ++-- yage/core/imageloader.cpp | 4 ++-- yage/core/imageloader.h | 4 ++-- yage/core/inputmanager.cpp | 4 ++-- yage/core/inputmanager.h | 4 ++-- yage/core/iomanager.cpp | 4 ++-- yage/core/iomanager.h | 4 ++-- yage/core/logger.cpp | 4 ++-- yage/core/logger.h | 4 ++-- yage/core/loglevel.h | 4 ++-- yage/core/logmessage.cpp | 4 ++-- yage/core/logmessage.h | 4 ++-- yage/core/logsink.cpp | 4 ++-- yage/core/logsink.h | 4 ++-- yage/core/picopng.h | 4 ++-- yage/core/resourcemanager.cpp | 4 ++-- yage/core/resourcemanager.h | 12 ++++++------ yage/core/sprite.cpp | 4 ++-- yage/core/sprite.h | 4 ++-- yage/core/spritebatch.cpp | 4 ++-- yage/core/spritebatch.h | 8 ++++---- yage/core/spritesheet.cpp | 4 ++-- yage/core/spritesheet.h | 8 ++++---- yage/core/texture.h | 4 ++-- yage/core/texturecache.cpp | 4 ++-- yage/core/texturecache.h | 4 ++-- yage/core/vertex.h | 4 ++-- yage/core/window.cpp | 4 ++-- yage/core/window.h | 4 ++-- 32 files changed, 73 insertions(+), 83 deletions(-) (limited to 'yage/core') diff --git a/yage/core/camera2d.cpp b/yage/core/camera2d.cpp index a2d40a78..89d41ab5 100644 --- a/yage/core/camera2d.cpp +++ b/yage/core/camera2d.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * camera2d.cpp +/** --------------------------------------------------------------------------- + * @file: camera2d.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/camera2d.h b/yage/core/camera2d.h index 5d2fc8a2..db941aee 100644 --- a/yage/core/camera2d.h +++ b/yage/core/camera2d.h @@ -1,13 +1,5 @@ -/* ---------------------------------------------------------------------------- - * camera2d.h - * - * Copyright (c) 2017 Yann Herklotz Grave - * MIT License, see LICENSE file for more details. - * ---------------------------------------------------------------------------- - */ - -/* ---------------------------------------------------------------------------- - * camera2d.h +/** --------------------------------------------------------------------------- + * @file: camera2d.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/glslprogram.cpp b/yage/core/glslprogram.cpp index 4772d50e..769eb4eb 100644 --- a/yage/core/glslprogram.cpp +++ b/yage/core/glslprogram.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * glslprogram.cpp +/** --------------------------------------------------------------------------- + * @file: glslprogram.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. @@ -159,8 +159,6 @@ void GlslProgram::unuse() glUseProgram(0); } -void GlslProgram::defaultSetup() -{ -} +void GlslProgram::defaultSetup() {} } // namespace yage diff --git a/yage/core/glslprogram.h b/yage/core/glslprogram.h index 50b2a7de..729ed427 100644 --- a/yage/core/glslprogram.h +++ b/yage/core/glslprogram.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * glslprogram.h +/** --------------------------------------------------------------------------- + * @file: glslprogram.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/imageloader.cpp b/yage/core/imageloader.cpp index 45424799..fb4d1e44 100644 --- a/yage/core/imageloader.cpp +++ b/yage/core/imageloader.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * imageloader.cpp +/** --------------------------------------------------------------------------- + * @file: imageloader.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/imageloader.h b/yage/core/imageloader.h index ca68bd58..bc041dc6 100644 --- a/yage/core/imageloader.h +++ b/yage/core/imageloader.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * imageloader.h +/** --------------------------------------------------------------------------- + * @file: imageloader.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/inputmanager.cpp b/yage/core/inputmanager.cpp index 7f4e121a..1f324b9e 100644 --- a/yage/core/inputmanager.cpp +++ b/yage/core/inputmanager.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * inputmanager.cpp +/** --------------------------------------------------------------------------- + * @file: inputmanager.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/inputmanager.h b/yage/core/inputmanager.h index 4b74ed90..e8dd153a 100644 --- a/yage/core/inputmanager.h +++ b/yage/core/inputmanager.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * inputmanager.h +/** --------------------------------------------------------------------------- + * @file: inputmanager.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/iomanager.cpp b/yage/core/iomanager.cpp index 33286d5d..3d9ea7cb 100644 --- a/yage/core/iomanager.cpp +++ b/yage/core/iomanager.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * iomanager.cpp +/** --------------------------------------------------------------------------- + * @file: iomanager.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/iomanager.h b/yage/core/iomanager.h index 14ad2d16..6c623adf 100644 --- a/yage/core/iomanager.h +++ b/yage/core/iomanager.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * iomanager.h +/** --------------------------------------------------------------------------- + * @file: iomanager.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/logger.cpp b/yage/core/logger.cpp index 355de5bc..4690fadc 100644 --- a/yage/core/logger.cpp +++ b/yage/core/logger.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * logger.cpp +/** --------------------------------------------------------------------------- + * @file: logger.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/logger.h b/yage/core/logger.h index 44c35227..95af73b0 100644 --- a/yage/core/logger.h +++ b/yage/core/logger.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * logger.h +/** --------------------------------------------------------------------------- + * @file: logger.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/loglevel.h b/yage/core/loglevel.h index ca763321..eb9ff5f8 100644 --- a/yage/core/loglevel.h +++ b/yage/core/loglevel.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * loglevel.h +/** --------------------------------------------------------------------------- + * @file: loglevel.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/logmessage.cpp b/yage/core/logmessage.cpp index 172cef4b..1ae16fba 100644 --- a/yage/core/logmessage.cpp +++ b/yage/core/logmessage.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * logmessage.cpp +/** --------------------------------------------------------------------------- + * @file: logmessage.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/logmessage.h b/yage/core/logmessage.h index 75a8cf47..ef7fd8a5 100644 --- a/yage/core/logmessage.h +++ b/yage/core/logmessage.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * logmessage.h +/** --------------------------------------------------------------------------- + * @file: logmessage.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/logsink.cpp b/yage/core/logsink.cpp index 2f59d620..36d7038b 100644 --- a/yage/core/logsink.cpp +++ b/yage/core/logsink.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * logsink.cpp +/** --------------------------------------------------------------------------- + * @file: logsink.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/logsink.h b/yage/core/logsink.h index b597fc24..63f95655 100644 --- a/yage/core/logsink.h +++ b/yage/core/logsink.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * logsink.h +/** --------------------------------------------------------------------------- + * @file: logsink.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/picopng.h b/yage/core/picopng.h index 9b2cb081..d868fa43 100644 --- a/yage/core/picopng.h +++ b/yage/core/picopng.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * picopng.h +/** --------------------------------------------------------------------------- + * @file: picopng.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/resourcemanager.cpp b/yage/core/resourcemanager.cpp index 3fefc4f5..f841222b 100644 --- a/yage/core/resourcemanager.cpp +++ b/yage/core/resourcemanager.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * resourcemanager.cpp +/** --------------------------------------------------------------------------- + * @file: resourcemanager.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/resourcemanager.h b/yage/core/resourcemanager.h index 8fc6a16e..369bf40f 100644 --- a/yage/core/resourcemanager.h +++ b/yage/core/resourcemanager.h @@ -1,16 +1,16 @@ -/* ---------------------------------------------------------------------------- - * resourcemanager.h +/** --------------------------------------------------------------------------- + * @file: resourcemanager.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ -/* ---------------------------------------------------------------------------- - * resourcemanager.h +/** --------------------------------------------------------------------------- + * @file: resourcemanager.h * - * Copyright (c) 2017 Yann Herklotz Grave -- MIT License - * See file LICENSE for more details + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ diff --git a/yage/core/sprite.cpp b/yage/core/sprite.cpp index 041281d3..a663c379 100644 --- a/yage/core/sprite.cpp +++ b/yage/core/sprite.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * sprite.cpp +/** --------------------------------------------------------------------------- + * @file: sprite.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/sprite.h b/yage/core/sprite.h index 9cba1daf..0287fe10 100644 --- a/yage/core/sprite.h +++ b/yage/core/sprite.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * sprite.h +/** --------------------------------------------------------------------------- + * @file: sprite.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/spritebatch.cpp b/yage/core/spritebatch.cpp index 98213467..2159aeec 100644 --- a/yage/core/spritebatch.cpp +++ b/yage/core/spritebatch.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * spritebatch.cpp +/** --------------------------------------------------------------------------- + * @file: spritebatch.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/spritebatch.h b/yage/core/spritebatch.h index d90d6d05..fa93c5cb 100644 --- a/yage/core/spritebatch.h +++ b/yage/core/spritebatch.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * spritebatch.h +/** --------------------------------------------------------------------------- + * @file: spritebatch.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. @@ -94,8 +94,8 @@ public: // adds a sprite to the sprite batch to be rendered later void draw(const yage::Vector4f &destination_rect, - const yage::Vector4f &uv_rect, GLuint texture, const Colour &colour, - float depth); + const yage::Vector4f &uv_rect, GLuint texture, + const Colour &colour, float depth); // render the batch void render(); diff --git a/yage/core/spritesheet.cpp b/yage/core/spritesheet.cpp index f61b668a..7fbd19e9 100644 --- a/yage/core/spritesheet.cpp +++ b/yage/core/spritesheet.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * spritesheet.cpp +/** --------------------------------------------------------------------------- + * @file: spritesheet.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/spritesheet.h b/yage/core/spritesheet.h index 6ae8d266..7d7c2fcf 100644 --- a/yage/core/spritesheet.h +++ b/yage/core/spritesheet.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * spritesheet.h +/** --------------------------------------------------------------------------- + * @file: spritesheet.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. @@ -11,8 +11,8 @@ #ifndef YAGE_SPRITESHEET_H #define YAGE_SPRITESHEET_H -/** @todo think of removing this, by, for example, using a pointer - * This could be more efficient when copying the texture out of the +/** @todo think of removing this, by, for example, using a pointer + * This could be more efficient when copying the texture out of the * spritesheet. */ #include "texture.h" diff --git a/yage/core/texture.h b/yage/core/texture.h index 85f74647..2eae8bf4 100644 --- a/yage/core/texture.h +++ b/yage/core/texture.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * texture.h +/** --------------------------------------------------------------------------- + * @file: texture.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/texturecache.cpp b/yage/core/texturecache.cpp index d94340ff..f9468dbb 100644 --- a/yage/core/texturecache.cpp +++ b/yage/core/texturecache.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * texturecache.cpp +/** --------------------------------------------------------------------------- + * @file: texturecache.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/texturecache.h b/yage/core/texturecache.h index a9a18693..58dcd4eb 100644 --- a/yage/core/texturecache.h +++ b/yage/core/texturecache.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * texturecache.h +/** --------------------------------------------------------------------------- + * @file: texturecache.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/vertex.h b/yage/core/vertex.h index f81b4f42..4cd095a9 100644 --- a/yage/core/vertex.h +++ b/yage/core/vertex.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * vertex.h +/** --------------------------------------------------------------------------- + * @file: vertex.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/window.cpp b/yage/core/window.cpp index 3508e835..9696f2bb 100644 --- a/yage/core/window.cpp +++ b/yage/core/window.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * window.cpp +/** --------------------------------------------------------------------------- + * @file: window.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/core/window.h b/yage/core/window.h index 57e21ae4..c350955e 100644 --- a/yage/core/window.h +++ b/yage/core/window.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * window.h +/** --------------------------------------------------------------------------- + * @file: window.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. -- cgit