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 --- scripts/add_version_headers | 12 +++++++----- tests/activetest.cpp | 4 ++-- tests/logtest.cpp | 6 ++---- tests/matrixtest.cpp | 6 ++---- tests/particlebodytest.cpp | 6 ++---- tests/rendertest.cpp | 14 ++++---------- tests/rendertest.h | 6 ++---- tests/simplegame.cpp | 4 ++-- tests/spritesheettest.cpp | 6 ++---- tests/structtest.cpp | 14 +++++++++++--- tests/syncqueuetest.cpp | 4 ++-- tests/threadtest.cpp | 8 +++----- tests/vector3test.cpp | 38 ++++++++++++++++++++++++++++++-------- tests/vector4test.cpp | 32 ++++++++++++++++++++++++++++---- tests/windowtest.cpp | 8 +++----- tests/yagetest.cpp | 12 +++++------- 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 ++-- yage/math/matrix.h | 4 ++-- yage/physics/body.cpp | 4 ++-- yage/physics/body.h | 4 ++-- yage/physics/collider.h | 4 ++-- yage/physics/collisionbody.h | 4 ++-- yage/physics/particlebody.cpp | 4 ++-- yage/physics/particlebody.h | 4 ++-- yage/physics/physics.h | 4 ++-- yage/physics/rectanglecollider.cpp | 4 ++-- yage/physics/rectanglecollider.h | 4 ++-- yage/physics/rigidbody.cpp | 4 ++-- yage/physics/rigidbody.h | 4 ++-- yage/util/active.cpp | 4 ++-- yage/util/active.h | 4 ++-- yage/util/syncqueue.h | 4 ++-- yage/yage.cpp | 4 ++-- yage/yage.h | 4 ++-- 65 files changed, 214 insertions(+), 190 deletions(-) diff --git a/scripts/add_version_headers b/scripts/add_version_headers index c3b26566..cf1531b0 100755 --- a/scripts/add_version_headers +++ b/scripts/add_version_headers @@ -40,7 +40,7 @@ header = """/** ---------------------------------------------------------------\ lic_regex = re.compile( - "\/(?:\*|\*\*) -+\n \* ((?:@file: )?[a-z]+\.(?:cpp|h)|\{0\})\n(?: \*[ a-zA-Z0-9_.,\-()<>@]*\n)+ \* -+\n \*/", re.MULTILINE) + "\/(?:\*|\*\*) -+\n \* ((?:@file: )?[a-z0-9]+\.(?:cpp|h)|\{0\})\n(?: \*[ a-zA-Z0-9_.,\-()<>@]*\n)+ \* -+\n \*/\n\n", re.MULTILINE) class HeaderUpdate(object): @@ -77,11 +77,13 @@ class HeaderUpdate(object): src = f.read() f.seek(0) if lic_regex.match(src): - print("Updating {}: ".format( - os.path.basename(filePath)), end="") - src = lic_regex.sub(header.format( + other_src = lic_regex.sub(header.format( os.path.basename(filePath)), src) - print("done") + if other_src != src: + print("Updating {}: ".format( + os.path.basename(filePath)), end="") + src = other_src + print("done") else: print("Adding {}: ".format( os.path.basename(filePath)), end="") diff --git a/tests/activetest.cpp b/tests/activetest.cpp index cebf90d3..3d561283 100644 --- a/tests/activetest.cpp +++ b/tests/activetest.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * activetest.cpp +/** --------------------------------------------------------------------------- + * @file: activetest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/tests/logtest.cpp b/tests/logtest.cpp index 74a71057..e1010754 100644 --- a/tests/logtest.cpp +++ b/tests/logtest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * logtest.cpp +/** --------------------------------------------------------------------------- + * @file: logtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include #include diff --git a/tests/matrixtest.cpp b/tests/matrixtest.cpp index be2ca186..1e316502 100644 --- a/tests/matrixtest.cpp +++ b/tests/matrixtest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * matrixtest.cpp +/** --------------------------------------------------------------------------- + * @file: matrixtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include #include diff --git a/tests/particlebodytest.cpp b/tests/particlebodytest.cpp index 511e3ef5..09277826 100644 --- a/tests/particlebodytest.cpp +++ b/tests/particlebodytest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * particlebodytest.cpp +/** --------------------------------------------------------------------------- + * @file: particlebodytest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include #include diff --git a/tests/rendertest.cpp b/tests/rendertest.cpp index a0452ab4..74476ef8 100644 --- a/tests/rendertest.cpp +++ b/tests/rendertest.cpp @@ -1,19 +1,13 @@ -/* ---------------------------------------------------------------------------- - * rendertest.cpp +/** --------------------------------------------------------------------------- + * @file: rendertest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include "rendertest.h" -RenderTest::RenderTest(std::string sprite) : sprite_(sprite) -{ -} +RenderTest::RenderTest(std::string sprite) : sprite_(sprite) {} -void RenderTest::render() -{ -} +void RenderTest::render() {} diff --git a/tests/rendertest.h b/tests/rendertest.h index f6ed36c6..db0e06e2 100644 --- a/tests/rendertest.h +++ b/tests/rendertest.h @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * rendertest.h +/** --------------------------------------------------------------------------- + * @file: rendertest.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include class RenderTest diff --git a/tests/simplegame.cpp b/tests/simplegame.cpp index 99796f08..08f9f8c5 100644 --- a/tests/simplegame.cpp +++ b/tests/simplegame.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * simplegame.cpp +/** --------------------------------------------------------------------------- + * @file: simplegame.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/tests/spritesheettest.cpp b/tests/spritesheettest.cpp index 2ece61bf..fcfc842c 100644 --- a/tests/spritesheettest.cpp +++ b/tests/spritesheettest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * spritesheettest.cpp +/** --------------------------------------------------------------------------- + * @file: spritesheettest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - /** @file */ #include diff --git a/tests/structtest.cpp b/tests/structtest.cpp index 13a2c591..99752abb 100644 --- a/tests/structtest.cpp +++ b/tests/structtest.cpp @@ -1,8 +1,16 @@ -#include +/** --------------------------------------------------------------------------- + * @file: structtest.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #include +#include -#include #include +#include TEST(StructTest, ColourDefault) { @@ -15,7 +23,7 @@ TEST(StructTest, ColourDefault) TEST(StructTest, ColourConstructor) { - int r = rand()%255, g = rand()%255, b = rand() % 255, a = rand() % 255; + int r = rand() % 255, g = rand() % 255, b = rand() % 255, a = rand() % 255; yage::Colour c(r, g, b, a); ASSERT_EQ(c.r, r); diff --git a/tests/syncqueuetest.cpp b/tests/syncqueuetest.cpp index db347854..1d7d8037 100644 --- a/tests/syncqueuetest.cpp +++ b/tests/syncqueuetest.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * syncqueuetest.cpp +/** --------------------------------------------------------------------------- + * @file: syncqueuetest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/tests/threadtest.cpp b/tests/threadtest.cpp index 9ea46e62..0527665a 100644 --- a/tests/threadtest.cpp +++ b/tests/threadtest.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * threadtest.cpp +/** --------------------------------------------------------------------------- + * @file: threadtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. @@ -17,9 +17,7 @@ int main() std::cout << "n before: " << n << "\n"; - auto f = [&] () { - n = 8; - }; + auto f = [&]() { n = 8; }; std::thread t1(f); diff --git a/tests/vector3test.cpp b/tests/vector3test.cpp index daab02af..570a5c10 100644 --- a/tests/vector3test.cpp +++ b/tests/vector3test.cpp @@ -1,13 +1,37 @@ -/* ---------------------------------------------------------------------------- - * vector3test.cpp +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ -/* ---------------------------------------------------------------------------- - * vector3test.cpp +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. @@ -17,8 +41,8 @@ #include #include -#include #include +#include using namespace yage; @@ -60,9 +84,7 @@ TEST(Vector3, Assigning_z) ASSERT_EQ(vec.z, vec[2]); } -TEST(Vector3, Addition) -{ -} +TEST(Vector3, Addition) {} int main(int argc, char **argv) { diff --git a/tests/vector4test.cpp b/tests/vector4test.cpp index fd67d802..53554a25 100644 --- a/tests/vector4test.cpp +++ b/tests/vector4test.cpp @@ -1,13 +1,37 @@ -/* ---------------------------------------------------------------------------- - * vector4test.cpp +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ -/* ---------------------------------------------------------------------------- - * vector4test.cpp +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/tests/windowtest.cpp b/tests/windowtest.cpp index 53ff3e9c..40b7e664 100644 --- a/tests/windowtest.cpp +++ b/tests/windowtest.cpp @@ -1,15 +1,13 @@ -/* ---------------------------------------------------------------------------- - * windowtest.cpp +/** --------------------------------------------------------------------------- + * @file: windowtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - -#include #include +#include TEST(Window, Open) { diff --git a/tests/yagetest.cpp b/tests/yagetest.cpp index 2e961327..a599eba2 100644 --- a/tests/yagetest.cpp +++ b/tests/yagetest.cpp @@ -1,23 +1,21 @@ -/* ---------------------------------------------------------------------------- - * yagetest.cpp +/** --------------------------------------------------------------------------- + * @file: yagetest.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - -#include #include +#include TEST(YAGE, InitQuit) { try { yage::init(); yage::quit(); - } catch(std::runtime_error e) { -// ASSERT_TRUE(false); + } catch (std::runtime_error e) { + // ASSERT_TRUE(false); } } 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. diff --git a/yage/math/matrix.h b/yage/math/matrix.h index 90a763cf..ac612385 100644 --- a/yage/math/matrix.h +++ b/yage/math/matrix.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * matrix.h +/** --------------------------------------------------------------------------- + * @file: matrix.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/body.cpp b/yage/physics/body.cpp index b5283d76..d04eecfd 100644 --- a/yage/physics/body.cpp +++ b/yage/physics/body.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * body.cpp +/** --------------------------------------------------------------------------- + * @file: body.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/body.h b/yage/physics/body.h index 312ceb58..0a6bbe42 100644 --- a/yage/physics/body.h +++ b/yage/physics/body.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * body.h +/** --------------------------------------------------------------------------- + * @file: body.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/collider.h b/yage/physics/collider.h index fe070fa6..220c785d 100644 --- a/yage/physics/collider.h +++ b/yage/physics/collider.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * collider.h +/** --------------------------------------------------------------------------- + * @file: collider.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/collisionbody.h b/yage/physics/collisionbody.h index 62f12ade..c779feae 100644 --- a/yage/physics/collisionbody.h +++ b/yage/physics/collisionbody.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * collisionbody.h +/** --------------------------------------------------------------------------- + * @file: collisionbody.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/particlebody.cpp b/yage/physics/particlebody.cpp index 91078d45..dc950ae6 100644 --- a/yage/physics/particlebody.cpp +++ b/yage/physics/particlebody.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * particlebody.cpp +/** --------------------------------------------------------------------------- + * @file: particlebody.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/particlebody.h b/yage/physics/particlebody.h index 336c0bd0..2e7a4f88 100644 --- a/yage/physics/particlebody.h +++ b/yage/physics/particlebody.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * particlebody.h +/** --------------------------------------------------------------------------- + * @file: particlebody.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/physics.h b/yage/physics/physics.h index fb42b257..64dcd95f 100644 --- a/yage/physics/physics.h +++ b/yage/physics/physics.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * physics.h +/** --------------------------------------------------------------------------- + * @file: physics.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/rectanglecollider.cpp b/yage/physics/rectanglecollider.cpp index ea70611f..e1b3adff 100644 --- a/yage/physics/rectanglecollider.cpp +++ b/yage/physics/rectanglecollider.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * rectanglecollider.cpp +/** --------------------------------------------------------------------------- + * @file: rectanglecollider.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/rectanglecollider.h b/yage/physics/rectanglecollider.h index 62d1033c..ba3bdead 100644 --- a/yage/physics/rectanglecollider.h +++ b/yage/physics/rectanglecollider.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * rectanglecollider.h +/** --------------------------------------------------------------------------- + * @file: rectanglecollider.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/rigidbody.cpp b/yage/physics/rigidbody.cpp index ea58efeb..1a7ae2ec 100644 --- a/yage/physics/rigidbody.cpp +++ b/yage/physics/rigidbody.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * rigidbody.cpp +/** --------------------------------------------------------------------------- + * @file: rigidbody.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/physics/rigidbody.h b/yage/physics/rigidbody.h index cbf01109..dae9f8e5 100644 --- a/yage/physics/rigidbody.h +++ b/yage/physics/rigidbody.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * rigidbody.h +/** --------------------------------------------------------------------------- + * @file: rigidbody.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/util/active.cpp b/yage/util/active.cpp index 1516b7d3..0eaeeb80 100644 --- a/yage/util/active.cpp +++ b/yage/util/active.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * active.cpp +/** --------------------------------------------------------------------------- + * @file: active.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/util/active.h b/yage/util/active.h index b7137a47..d1d9ba4c 100644 --- a/yage/util/active.h +++ b/yage/util/active.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * active.h +/** --------------------------------------------------------------------------- + * @file: active.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/util/syncqueue.h b/yage/util/syncqueue.h index ab9204e3..f1c7d65d 100644 --- a/yage/util/syncqueue.h +++ b/yage/util/syncqueue.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * syncqueue.h +/** --------------------------------------------------------------------------- + * @file: syncqueue.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/yage.cpp b/yage/yage.cpp index 80333766..597a4613 100644 --- a/yage/yage.cpp +++ b/yage/yage.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * yage.cpp +/** --------------------------------------------------------------------------- + * @file: yage.cpp * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. diff --git a/yage/yage.h b/yage/yage.h index f15b9ad0..36729214 100644 --- a/yage/yage.h +++ b/yage/yage.h @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * yage.h +/** --------------------------------------------------------------------------- + * @file: yage.h * * Copyright (c) 2017 Yann Herklotz Grave * MIT License, see LICENSE file for more details. -- cgit