fix image pattern rendering

3 files changed, 53 insertions, 12 deletions

diff --git a/include/mbgl/geometry/sprite_atlas.hpp b/include/mbgl/geometry/sprite_atlas.hpp
index dc2378c2fb..bc123abe13 100644
--- a/include/mbgl/geometry/sprite_atlas.hpp
+++ b/include/mbgl/geometry/sprite_atlas.hpp
@@ -49,6 +49,7 @@ public:
     inline float getHeight() const { return height; }
     inline float getTextureWidth() const { return width * pixelRatio; }
     inline float getTextureHeight() const { return height * pixelRatio; }
+    inline float getPixelRatio() const { return pixelRatio; }
 
 private:
     void allocate();
diff --git a/include/mbgl/shader/pattern_shader.hpp b/include/mbgl/shader/pattern_shader.hpp
index b1b49b54df..e574b755dc 100644
--- a/include/mbgl/shader/pattern_shader.hpp
+++ b/include/mbgl/shader/pattern_shader.hpp
@@ -11,33 +11,33 @@ public:
 
     void bind(char *offset);
 
-    void setColor(const std::array<float, 4>& color);
-    void setOffset(const std::array<float, 2>& offset);
-    void setPatternSize(const std::array<float, 2>& pattern_size);
     void setPatternTopLeft(const std::array<float, 2>& pattern_tl);
     void setPatternBottomRight(const std::array<float, 2>& pattern_br);
+    void setOpacity(float opacity);
+    void setImage(int image);
     void setMix(float mix);
+    void setPatternMatrix(const std::array<float, 9> &patternmatrix);
 
 private:
     int32_t a_pos = -1;
 
-    std::array<float, 4> color = {{}};
-    int32_t u_color = -1;
-
-    std::array<float, 2> offset = {{}};
-    int32_t u_offset = -1;
-
-    std::array<float, 2> pattern_size = {{}};
-    int32_t u_pattern_size = -1;
-
     std::array<float, 2> pattern_tl = {{}};
     int32_t u_pattern_tl = -1;
 
     std::array<float, 2> pattern_br = {{}};
     int32_t u_pattern_br = -1;
 
+    float opacity = 0;
+    int32_t u_opacity = -1;
+
+    int image = 0;
+    int32_t u_image = -1;
+
     float mix = 0;
     int32_t u_mix = -1;
+
+    std::array<float, 9> patternmatrix = {{}};
+    int32_t u_patternmatrix = -1;
 };
 
 }
diff --git a/include/mbgl/util/mat3.hpp b/include/mbgl/util/mat3.hpp
new file mode 100644
index 0000000000..d44b1435d3
--- /dev/null
+++ b/include/mbgl/util/mat3.hpp
@@ -0,0 +1,40 @@
+// This is an incomplete port of http://glmatrix.net/
+//
+// Copyright (c) 2013 Brandon Jones, Colin MacKenzie IV
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the
+// use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not claim
+//    that you wrote the original software. If you use this software in a
+//    product, an acknowledgment in the product documentation would be
+//    appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+//    misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+
+#ifndef MBGL_UTIL_MAT3
+#define MBGL_UTIL_MAT3
+
+#include <array>
+
+namespace mbgl {
+
+typedef std::array<float, 9> mat3;
+
+namespace matrix {
+
+void identity(mat3& out);
+void scale(mat3& out, const mat3& a, float x, float y);
+
+}
+}
+
+#endif