summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-02-18 12:54:27 +0100
committerStanislaw Halik <sthalik@misaki.pl>2022-02-18 12:54:27 +0100
commit3e588414970c69985cf5197e10d4996af29bd7a6 (patch)
tree989a914a0bbf91b46907004428aad614bdf29980
parente7be11bc19f9880f99a944debc2786208bf1483d (diff)
remove magnum copyright headers
-rw-r--r--tile-shader.cpp35
-rw-r--r--tile-shader.hpp34
2 files changed, 7 insertions, 62 deletions
diff --git a/tile-shader.cpp b/tile-shader.cpp
index 22cad2fa..cff3d7f6 100644
--- a/tile-shader.cpp
+++ b/tile-shader.cpp
@@ -1,32 +1,3 @@
-/*
- This file is part of Magnum.
-
- Original authors — credit is appreciated but not required:
-
- 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
- 2020, 2021, 2022 — Vladimír Vondruš <mosra@centrum.cz>
-
- This is free and unencumbered software released into the public domain.
-
- Anyone is free to copy, modify, publish, use, compile, sell, or distribute
- this software, either in source code form or as a compiled binary, for any
- purpose, commercial or non-commercial, and by any means.
-
- In jurisdictions that recognize copyright laws, the author or authors of
- this software dedicate any and all copyright interest in the software to
- the public domain. We make this dedication for the benefit of the public
- at large and to the detriment of our heirs and successors. We intend this
- dedication to be an overt act of relinquishment in perpetuity of all
- present and future rights to this software under copyright law.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
#include "tile-shader.hpp"
#include <Corrade/Containers/Reference.h>
@@ -61,4 +32,10 @@ tile_shader::tile_shader()
setUniform(uniformLocation("textureData"), TextureUnit);
}
+tile_shader& tile_shader::bindTexture(GL::Texture2D& texture)
+{
+ texture.bind(TextureUnit);
+ return *this;
+}
+
} // namespace Magnum::Examples
diff --git a/tile-shader.hpp b/tile-shader.hpp
index 03c32cc5..ea3c57ce 100644
--- a/tile-shader.hpp
+++ b/tile-shader.hpp
@@ -1,33 +1,4 @@
#pragma once
-/*
- This file is part of Magnum.
-
- Original authors — credit is appreciated but not required:
-
- 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
- 2020, 2021, 2022 — Vladimír Vondruš <mosra@centrum.cz>
-
- This is free and unencumbered software released into the public domain.
-
- Anyone is free to copy, modify, publish, use, compile, sell, or distribute
- this software, either in source code form or as a compiled binary, for any
- purpose, commercial or non-commercial, and by any means.
-
- In jurisdictions that recognize copyright laws, the author or authors of
- this software dedicate any and all copyright interest in the software to
- the public domain. We make this dedication for the benefit of the public
- at large and to the detriment of our heirs and successors. We intend this
- dedication to be an overt act of relinquishment in perpetuity of all
- present and future rights to this software under copyright law.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
#include <Magnum/GL/AbstractShaderProgram.h>
#include <Magnum/GL/Texture.h>
#include <Magnum/Math/Color.h>
@@ -46,10 +17,7 @@ struct tile_shader : GL::AbstractShaderProgram
auto& set_color(const Color3& color) { setUniform(_color_uniform, color); return *this; }
auto& set_projection(const Math::Matrix4<float>& mat) { setUniform(_projection_uniform, mat); return *this; }
- tile_shader& bindTexture(GL::Texture2D& texture) {
- texture.bind(TextureUnit);
- return *this;
- }
+ tile_shader& bindTexture(GL::Texture2D& texture);
private:
enum: Int { TextureUnit = 0 };