diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-02 09:53:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 09:53:13 +0100 |
commit | 30461c89fd53e14bb9f5a83eaf6d72040931b62a (patch) | |
tree | 3303e22526d346030fa78dabcebdcfd0a3f11f1f /src | |
parent | a1fc39d49e442fcc756091ee028ff33bdd9c518a (diff) | |
parent | 489c3550c3694ffc5f67c1527a3f021a01c8bbfc (diff) | |
download | YAGE-30461c89fd53e14bb9f5a83eaf6d72040931b62a.tar.gz YAGE-30461c89fd53e14bb9f5a83eaf6d72040931b62a.zip |
Merge pull request #2 from ymherklotz/develop
Merging
Diffstat (limited to 'src')
-rw-r--r-- | src/body.cpp | 11 | ||||
-rw-r--r-- | src/camera2d.cpp | 11 | ||||
-rw-r--r-- | src/glslprogram.cpp | 11 | ||||
-rw-r--r-- | src/imageloader.cpp | 8 | ||||
-rw-r--r-- | src/inputmanager.cpp | 8 | ||||
-rw-r--r-- | src/iomanager.cpp | 8 | ||||
-rw-r--r-- | src/particlebody.cpp | 8 | ||||
-rw-r--r-- | src/rectanglecollider.cpp | 8 | ||||
-rw-r--r-- | src/resourcemanager.cpp | 8 | ||||
-rw-r--r-- | src/rigidbody.cpp | 8 | ||||
-rw-r--r-- | src/sprite.cpp | 8 | ||||
-rw-r--r-- | src/spritebatch.cpp | 8 | ||||
-rw-r--r-- | src/texturecache.cpp | 11 | ||||
-rw-r--r-- | src/window.cpp | 8 |
14 files changed, 112 insertions, 12 deletions
diff --git a/src/body.cpp b/src/body.cpp index e942d617..ad92b0ca 100644 --- a/src/body.cpp +++ b/src/body.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * body.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "Physics/body.hpp" namespace yage @@ -5,9 +13,6 @@ namespace yage const double Body::GRAVITY=-9.81; -Body::~Body() -{} - double Body::xPosition() const { return position_[0]; diff --git a/src/camera2d.cpp b/src/camera2d.cpp index 81e8d971..88b468de 100644 --- a/src/camera2d.cpp +++ b/src/camera2d.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * camera2d.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "camera2d.hpp" #include <GL/glew.h> @@ -11,9 +19,6 @@ Camera2D::Camera2D(int screen_width, int screen_height) : ortho_matrix_(glm::ortho(0.f, (float)screen_width, 0.f, (float)screen_height)) {} -Camera2D::~Camera2D() -{} - void Camera2D::update(GlslProgram &program) { if(matrix_needs_update_) diff --git a/src/glslprogram.cpp b/src/glslprogram.cpp index f9795a34..18fee54e 100644 --- a/src/glslprogram.cpp +++ b/src/glslprogram.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * glslprogram.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "glslprogram.hpp" #include <fstream> @@ -7,9 +15,6 @@ namespace yage { -GlslProgram::GlslProgram() -{} - GlslProgram::~GlslProgram() { // cleanup all the shaders and the program diff --git a/src/imageloader.cpp b/src/imageloader.cpp index cca71844..241cf588 100644 --- a/src/imageloader.cpp +++ b/src/imageloader.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * imageloader.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "imageloader.hpp" #include "iomanager.hpp" #include "picopng.hpp" diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp index 402cc420..c9c80d93 100644 --- a/src/inputmanager.cpp +++ b/src/inputmanager.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * inputmanager.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "inputmanager.hpp" namespace yage diff --git a/src/iomanager.cpp b/src/iomanager.cpp index 697273dc..bcb1dcd0 100644 --- a/src/iomanager.cpp +++ b/src/iomanager.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * iomanager.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "iomanager.hpp" #include <fstream> diff --git a/src/particlebody.cpp b/src/particlebody.cpp index 748f80cd..a66489e9 100644 --- a/src/particlebody.cpp +++ b/src/particlebody.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * particlebody.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "Physics/particlebody.hpp" #include <iostream> diff --git a/src/rectanglecollider.cpp b/src/rectanglecollider.cpp index 812b10d1..0f5ee302 100644 --- a/src/rectanglecollider.cpp +++ b/src/rectanglecollider.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * rectanglecollider.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "Physics/rectanglecollider.hpp" namespace yage diff --git a/src/resourcemanager.cpp b/src/resourcemanager.cpp index 4105f4e4..8341557c 100644 --- a/src/resourcemanager.cpp +++ b/src/resourcemanager.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * resourcemanager.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "resourcemanager.hpp" namespace yage diff --git a/src/rigidbody.cpp b/src/rigidbody.cpp index 62032b74..f2069c4a 100644 --- a/src/rigidbody.cpp +++ b/src/rigidbody.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * rigidbody.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "Physics/rigidbody.hpp" namespace yage diff --git a/src/sprite.cpp b/src/sprite.cpp index cd8f328d..2ba39e2e 100644 --- a/src/sprite.cpp +++ b/src/sprite.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * sprite.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "sprite.hpp" #include "resourcemanager.hpp" #include "vertex.hpp" diff --git a/src/spritebatch.cpp b/src/spritebatch.cpp index a530a0ac..4018b3e2 100644 --- a/src/spritebatch.cpp +++ b/src/spritebatch.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * spritebatch.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "spritebatch.hpp" #include <algorithm> diff --git a/src/texturecache.cpp b/src/texturecache.cpp index ca47217e..6d10b209 100644 --- a/src/texturecache.cpp +++ b/src/texturecache.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * texturecache.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "imageloader.hpp" #include "texturecache.hpp" @@ -7,9 +15,6 @@ namespace yage TextureCache::TextureCache() {} -TextureCache::~TextureCache() -{} - Texture TextureCache::getTexture(const std::string &texture_path) { auto itr = texture_map_.find(texture_path); diff --git a/src/window.cpp b/src/window.cpp index 37c3b16d..60cdb4ef 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1,3 +1,11 @@ +/* ---------------------------------------------------------------------------- + * window.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License + * See file LICENSE for more details + * ---------------------------------------------------------------------------- + */ + #include "window.hpp" #include <GL/glew.h> |