Merge pull request #14126 from mapbox/gfx-refactor-4
Graphics refactor #4
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include <mbgl/programs/background_program.hpp>
|
||||
#include <mbgl/gfx/context_impl.hpp>
|
||||
#include <mbgl/renderer/image_atlas.hpp>
|
||||
#include <mbgl/renderer/cross_faded_property_evaluator.hpp>
|
||||
#include <mbgl/tile/tile_id.hpp>
|
||||
@@ -6,20 +7,22 @@
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
template std::unique_ptr<gfx::Program<BackgroundProgram>> gfx::Context::createProgram(const ProgramParameters&);
|
||||
template std::unique_ptr<gfx::Program<BackgroundPatternProgram>> gfx::Context::createProgram(const ProgramParameters&);
|
||||
|
||||
using namespace style;
|
||||
|
||||
static_assert(sizeof(BackgroundLayoutVertex) == 4, "expected BackgroundLayoutVertex size");
|
||||
|
||||
BackgroundPatternProgram::UniformValues
|
||||
BackgroundPatternProgram::uniformValues(mat4 matrix,
|
||||
float opacity,
|
||||
Size atlasSize,
|
||||
const ImagePosition& a,
|
||||
const ImagePosition& b,
|
||||
const CrossfadeParameters& fading,
|
||||
const UnwrappedTileID& tileID,
|
||||
const TransformState& state)
|
||||
{
|
||||
BackgroundPatternProgram::LayoutUniformValues
|
||||
BackgroundPatternProgram::layoutUniformValues(mat4 matrix,
|
||||
float opacity,
|
||||
Size atlasSize,
|
||||
const ImagePosition& a,
|
||||
const ImagePosition& b,
|
||||
const CrossfadeParameters& fading,
|
||||
const UnwrappedTileID& tileID,
|
||||
const TransformState& state) {
|
||||
int32_t tileSizeAtNearestZoom = util::tileSize * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z);
|
||||
int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z));
|
||||
int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
|
||||
|
||||
Reference in New Issue
Block a user