From 03e434e901cebf3b78bcba9ef9c7fe941012735e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 2 Apr 2019 14:11:37 +0200 Subject: [PATCH] [core] use float for storing opacity attribute --- src/mbgl/programs/attributes.hpp | 2 +- src/mbgl/programs/symbol_program.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp index 803a9db50..003a3ae03 100644 --- a/src/mbgl/programs/attributes.hpp +++ b/src/mbgl/programs/attributes.hpp @@ -16,7 +16,7 @@ MBGL_DEFINE_ATTRIBUTE(int16_t, 2, label_pos); MBGL_DEFINE_ATTRIBUTE(int16_t, 2, anchor_pos); MBGL_DEFINE_ATTRIBUTE(uint16_t, 2, texture_pos); MBGL_DEFINE_ATTRIBUTE(int16_t, 4, normal_ed); -MBGL_DEFINE_ATTRIBUTE(uint8_t, 1, fade_opacity); +MBGL_DEFINE_ATTRIBUTE(float, 1, fade_opacity); MBGL_DEFINE_ATTRIBUTE(uint8_t, 2, placed); MBGL_DEFINE_ATTRIBUTE(uint16_t, 3, size); MBGL_DEFINE_ATTRIBUTE(float, 1, offset); diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 158dee301..80e6245a0 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -231,7 +231,7 @@ public: static gfx::Vertex opacityVertex(bool placed, float opacity) { return { - {{ static_cast((static_cast(opacity * 127) << 1) | static_cast(placed)) }} + {{ static_cast((static_cast(opacity * 127) << 1) | static_cast(placed)) }} }; } };