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

rm rasterize_properties, should be close to working...doesn't work

Browse Source
This commit is contained in:
Lauren Budorick
2014-08-06 17:40:48 -07:00
parent 9e1156d660
commit 560cc112e1
20 changed files with 94 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/renderer/painter_raster.cpp
View File

@@ -11,81 +11,37 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> lay
const RasterProperties &properties = layer_desc->getProperties<RasterProperties>();
if (layer_desc->rasterize) {
auto rasterize = std::make_unique<RasterizeProperties>();
if (layer_desc->layers) {
bucket.texture.bindFramebuffer();
if (pass == Translucent) {
// Buffer value around the 0..4096 extent that will be drawn into the 256x256 pixel
// texture. We later scale the texture so that the actual bounds will align with this
// tile's bounds. The reason we do this is so that the
const RasterizedProperties rasterize = layer_desc->rasterize->get(id.z);
if (!bucket.prerendered) {
bucket.prerendered = std::make_unique<PrerenderedTexture>(rasterize);
bucket.prerendered->bindFramebuffer();
preparePrerender(*bucket.prerendered);
const RasterProperties modifiedProperties = [&]{
RasterProperties modifiedProperties = properties;
// modifiedProperties.opacity = 1; // figure out why this was here
return modifiedProperties;
}();
// When drawing the fill, we want to draw a buffer around too, so we
// essentially downscale everyting, and then upscale it later when rendering.
const int buffer = rasterize.buffer * 4096.0f;
const mat4 vtxMatrix = [&]{
mat4 vtxMatrix;
matrix::ortho(vtxMatrix, -buffer, 4096 + buffer, -4096 - buffer, buffer, 0, 1);
matrix::translate(vtxMatrix, vtxMatrix, 0, -4096, 0);
return vtxMatrix;
}();
setOpaque();
// renderFill(bucket, modifiedProperties, id, vtxMatrix);
// resize();
// changeMatrix();
// map.updateRenderState();
// drawClippingMasks(getActiveSources());
// Actually render the layers
map.renderLayers(layer_desc->layers);
// Finalize the rendering, e.g. by calling debug render calls per tile.
// This guarantees that we have at least one function per tile called.
// When only rendering layers via the stylesheet, it's possible that we don't
// ever visit a tile during rendering.
// for (const std::shared_ptr<StyleSource> &source : getActiveSources()) {
// source->source->finishRender(painter);
// }
//
// // Schedule another rerender when we definitely need a next frame.
// if (transform.needsTransition() || style->hasTransitions()) {
// update();
// }
glFlush();
preparePrerender(bucket);
if (rasterize.blur > 0) {
bucket.prerendered->blur(*this, rasterize.blur);
}
// RESET STATE
bucket.prerendered->unbindFramebuffer();
finishPrerender(*bucket.prerendered);
}
renderPrerenderedTexture(*bucket.prerendered, properties);
const RasterProperties modifiedProperties = [&]{
RasterProperties modifiedProperties = properties;
modifiedProperties.opacity = 1; // figure out why this was here
return modifiedProperties;
}();
const int buffer = bucket.properties.buffer * 4096.0f;
const mat4 vtxMatrix = [&]{
mat4 vtxMatrix;
matrix::ortho(vtxMatrix, -buffer, 4096 + buffer, -4096 - buffer, buffer, 0, 1);
matrix::translate(vtxMatrix, vtxMatrix, 0, -4096, 0);
return vtxMatrix;
}();
map.renderLayers(layer_desc->layers);
if (bucket.properties.blur > 0) {
bucket.texture.blur(*this, bucket.properties.blur);
}
bucket.texture.unbindFramebuffer();
finishPrerender(bucket);
renderPrerenderedTexture(bucket);
}
depthMask(false);
@@ -94,7 +50,7 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> lay
rasterShader->setMatrix(matrix);
rasterShader->setBuffer(0);
rasterShader->setOpacity(1);
// rasterShader->setOpacity(properties.opacity * tile_data->raster->opacity);
// rasterShader->setOpacity(properties.opacity * tile_data->raster->opacity); // TODO fix
glDepthRange(strata + strata_epsilon, 1.0f);
bucket.drawRaster(*rasterShader, tileStencilBuffer, coveringRasterArray);
@@ -102,7 +58,3 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> lay
depthMask(true);
}
void Painter::renderRaster(GLuint texture, const RasterizeProperties &properties){
// TODO do I need this?
// map.renderLayers(layer_desc->layers);
}