From 1ad2f26b9d753940e26d0ac3be96392feb73ae9e Mon Sep 17 00:00:00 2001 From: Lauren Budorick Date: Fri, 8 Aug 2014 15:50:35 -0700 Subject: VICTORY --- include/mbgl/renderer/bucket.hpp | 2 +- include/mbgl/renderer/debug_bucket.hpp | 2 +- include/mbgl/renderer/fill_bucket.hpp | 2 +- include/mbgl/renderer/line_bucket.hpp | 2 +- include/mbgl/renderer/painter.hpp | 22 +++++++++++----------- include/mbgl/renderer/raster_bucket.hpp | 2 +- include/mbgl/renderer/symbol_bucket.hpp | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'include/mbgl/renderer') diff --git a/include/mbgl/renderer/bucket.hpp b/include/mbgl/renderer/bucket.hpp index a8bd437bb6..1391f6e3e3 100644 --- a/include/mbgl/renderer/bucket.hpp +++ b/include/mbgl/renderer/bucket.hpp @@ -13,7 +13,7 @@ class StyleLayer; class Bucket : private util::noncopyable { public: - virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id) = 0; + virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix) = 0; virtual bool hasData() const = 0; virtual ~Bucket() {} diff --git a/include/mbgl/renderer/debug_bucket.hpp b/include/mbgl/renderer/debug_bucket.hpp index ac4f18cc2c..660b7fcba8 100644 --- a/include/mbgl/renderer/debug_bucket.hpp +++ b/include/mbgl/renderer/debug_bucket.hpp @@ -20,7 +20,7 @@ class DebugBucket : public Bucket { public: DebugBucket(DebugFontBuffer& fontBuffer); - virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id); + virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; void drawLines(PlainShader& shader); diff --git a/include/mbgl/renderer/fill_bucket.hpp b/include/mbgl/renderer/fill_bucket.hpp index 9193b09149..e9340cce68 100644 --- a/include/mbgl/renderer/fill_bucket.hpp +++ b/include/mbgl/renderer/fill_bucket.hpp @@ -44,7 +44,7 @@ public: const StyleBucketFill& properties); ~FillBucket(); - virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id); + virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; void addGeometry(pbf& data); diff --git a/include/mbgl/renderer/line_bucket.hpp b/include/mbgl/renderer/line_bucket.hpp index d42b10bfb7..f65ca35605 100644 --- a/include/mbgl/renderer/line_bucket.hpp +++ b/include/mbgl/renderer/line_bucket.hpp @@ -28,7 +28,7 @@ public: PointElementsBuffer& pointElementsBuffer, const StyleBucketLine& properties); - virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id); + virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; void addGeometry(pbf& data); diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index fa981c3c25..d4810cf69b 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -70,26 +70,26 @@ public: void changeMatrix(); // Renders a particular layer from a tile. - void renderTileLayer(const Tile& tile, std::shared_ptr layer_desc); + void renderTileLayer(const Tile& tile, std::shared_ptr layer_desc, const mat4 &matrix); // Renders debug information for a tile. void renderTileDebug(const Tile& tile); // Renders the red debug frame around a tile, visualizing its perimeter. - void renderDebugFrame(); + void renderDebugFrame(const mat4 &matrix); - void renderDebugText(DebugBucket& bucket); + void renderDebugText(DebugBucket& bucket, const mat4 &matrix); void renderDebugText(const std::vector &strings); - void renderFill(FillBucket& bucket, const FillProperties& properties, const Tile::ID& id, const mat4 &mat); - void renderFill(FillBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); - void renderLine(LineBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); - void renderSymbol(SymbolBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); - void renderRaster(RasterBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); + void renderFill(FillBucket& bucket, const FillProperties& properties, const Tile::ID& id, const mat4 &matrix); + void renderFill(FillBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); + void renderLine(LineBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); + void renderSymbol(SymbolBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); + void renderRaster(RasterBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); void preparePrerender(RasterBucket &bucket); void finishPrerender(RasterBucket &bucket); - void renderPrerenderedTexture(RasterBucket &bucket); + void renderPrerenderedTexture(RasterBucket &bucket, const mat4 &matrix); void createPrerendered(RasterBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); @@ -119,7 +119,7 @@ public: bool needsAnimation() const; private: void setupShaders(); - const mat4 &translatedMatrix(const std::array &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Map); + const mat4 &translatedMatrix(const mat4& matrix, const std::array &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Map); void prepareTile(const Tile& tile); @@ -129,7 +129,7 @@ public: void depthMask(bool value); public: - mat4 matrix; +// mat4 matrix; mat4 vtxMatrix; mat4 projMatrix; mat4 nativeMatrix; diff --git a/include/mbgl/renderer/raster_bucket.hpp b/include/mbgl/renderer/raster_bucket.hpp index 4eccb22bd4..41f4d4e4c0 100644 --- a/include/mbgl/renderer/raster_bucket.hpp +++ b/include/mbgl/renderer/raster_bucket.hpp @@ -18,7 +18,7 @@ class RasterBucket : public Bucket { public: RasterBucket(const std::shared_ptr &texturepool, const StyleBucketRaster& properties); - virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id); + virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; bool setImage(const std::string &data); diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/include/mbgl/renderer/symbol_bucket.hpp index c003230cae..e890274238 100644 --- a/include/mbgl/renderer/symbol_bucket.hpp +++ b/include/mbgl/renderer/symbol_bucket.hpp @@ -53,7 +53,7 @@ class SymbolBucket : public Bucket { public: SymbolBucket(const StyleBucketSymbol &properties, Collision &collision); - virtual void render(Painter &painter, std::shared_ptr layer_desc, const Tile::ID &id); + virtual void render(Painter &painter, std::shared_ptr layer_desc, const Tile::ID &id, const mat4 &matrix); virtual bool hasData() const; virtual bool hasTextData() const; virtual bool hasIconData() const; -- cgit v1.2.1