diff options
| -rw-r--r-- | shaders/tile-shader.cpp | 3 | ||||
| -rw-r--r-- | shaders/tile-shader.hpp | 8 | ||||
| -rw-r--r-- | src/wireframe-mesh.cpp | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/shaders/tile-shader.cpp b/shaders/tile-shader.cpp index aeba4929..4648b263 100644 --- a/shaders/tile-shader.cpp +++ b/shaders/tile-shader.cpp @@ -3,6 +3,7 @@ #include <algorithm> #include <Corrade/Containers/Reference.h> #include <Corrade/Utility/Resource.h> +#include <Magnum/Math/Vector4.h> #include <Magnum/GL/Context.h> #include <Magnum/GL/Shader.h> #include <Magnum/GL/Version.h> @@ -43,7 +44,7 @@ tile_shader& tile_shader::set_camera_offset(Vector2 camera_offset) return *this; } -tile_shader& tile_shader::set_tint(const Color4& tint) +tile_shader& tile_shader::set_tint(const Vector4& tint) { if (tint != tint_) setUniform(TintUniform, tint_ = tint); diff --git a/shaders/tile-shader.hpp b/shaders/tile-shader.hpp index 2dd7e607..c0f0c656 100644 --- a/shaders/tile-shader.hpp +++ b/shaders/tile-shader.hpp @@ -2,7 +2,7 @@ #include <Magnum/GL/AbstractShaderProgram.h> #include <Magnum/Math/Vector2.h> #include <Magnum/Math/Vector3.h> -#include <Magnum/Math/Color.h> +#include <Magnum/Math/Vector4.h> namespace Magnum::Examples { @@ -17,14 +17,14 @@ struct tile_shader : GL::AbstractShaderProgram tile_shader& set_scale(const Vector2& scale); Vector2 camera_offset() const { return camera_offset_; } tile_shader& set_camera_offset(Vector2 camera_offset); - Color4 tint () const { return tint_; } - tile_shader& set_tint(const Color4& tint); + Vector4 tint() const { return tint_; } + tile_shader& set_tint(const Vector4& tint); static constexpr Vector2 project(Vector3 pt); private: Vector2 scale_, camera_offset_; - Color4 tint_; + Vector4 tint_; enum { ScaleUniform = 0, OffsetUniform = 1, TintUniform = 2, }; }; diff --git a/src/wireframe-mesh.cpp b/src/wireframe-mesh.cpp index 843bc760..14af4a15 100644 --- a/src/wireframe-mesh.cpp +++ b/src/wireframe-mesh.cpp @@ -14,10 +14,10 @@ namespace Magnum::Examples::wireframe GL::RectangleTexture wireframe::null::make_constant_texture() { - const Vector4ub pixel{255, 255, 255, 255}; + const Vector4ub data[] = { {255, 255, 255, 255} }; Trade::ImageData2D img{PixelStorage{}.setImageHeight(1).setRowLength(1).setAlignment(1), PixelFormat::RGBA8Unorm, {1, 1}, {}, - Containers::arrayView(&pixel, 1), {}, {}}; + Containers::arrayView(data, 1), {}, {}}; GL::RectangleTexture tex; tex.setWrapping(GL::SamplerWrapping::ClampToEdge) .setMagnificationFilter(GL::SamplerFilter::Nearest) |