tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Eliminate use of ClassProperties for layout

Browse Source
This commit is contained in:
John Firebaugh
2015-10-26 10:14:24 -07:00
parent 728a9858ea
commit a562567589
33 changed files with 237 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/map/raster_tile_data.cpp
View File

@@ -55,7 +55,7 @@ void RasterTileData::request(float pixelRatio,
state = State::loaded;
}
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool, layout), res.data, [this, callback] (RasterTileParseResult result) {
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool), res.data, [this, callback] (RasterTileParseResult result) {
workRequest.reset();
if (state != State::loaded) {
return;

2
src/mbgl/map/raster_tile_data.hpp
View File

@@ -2,7 +2,6 @@
#define MBGL_MAP_RASTER_TILE_DATA
#include <mbgl/map/tile_data.hpp>
#include <mbgl/style/style_properties.hpp>
#include <mbgl/renderer/raster_bucket.hpp>
#include <mbgl/storage/request_holder.hpp>
@@ -32,7 +31,6 @@ private:
Worker& worker;
RequestHolder req;
RasterLayoutProperties layout;
std::unique_ptr<Bucket> bucket;
std::unique_ptr<WorkRequest> workRequest;