Fixed objects being drawn ontop of cache images, causing transparency issues
This commit is contained in:
parent
f72d8c21fa
commit
75a614946c
2 changed files with 22 additions and 31 deletions
|
|
@ -371,49 +371,38 @@ void DrawingProgramCache::draw_components_to_canvas(SkCanvas* canvas, const Draw
|
||||||
size_t nextCacheToRender = 0;
|
size_t nextCacheToRender = 0;
|
||||||
for(auto& c : uncachedCompsToDraw) {
|
for(auto& c : uncachedCompsToDraw) {
|
||||||
for(;;) {
|
for(;;) {
|
||||||
if(nextCacheToRender >= cachedNodesToDraw.size() || c->pos < cachedNodesToDraw[nextCacheToRender]->drawCache.value().lastDrawnComponentPlacement)
|
if(nextCacheToRender >= cachedNodesToDraw.size() || c->pos <= cachedNodesToDraw[nextCacheToRender]->drawCache.value().lastDrawnComponentPlacement)
|
||||||
break;
|
break;
|
||||||
auto& bvhNode = cachedNodesToDraw[nextCacheToRender];
|
lastComponentDrawn = std::max(lastComponentDrawn, draw_cache_image_to_canvas(canvas, drawData, cachedNodesToDraw[nextCacheToRender]));
|
||||||
auto& drawCache = bvhNode->drawCache.value();
|
|
||||||
canvas->save();
|
|
||||||
bvhNode->coords.transform_sk_canvas(canvas, drawData);
|
|
||||||
drawCache.lastRenderTime = std::chrono::steady_clock::now();
|
|
||||||
|
|
||||||
lastComponentDrawn = std::max(lastComponentDrawn, drawCache.lastDrawnComponentPlacement);
|
|
||||||
|
|
||||||
SkPaint srcPaint;
|
|
||||||
srcPaint.setBlendMode(SkBlendMode::kSrc);
|
|
||||||
|
|
||||||
canvas->drawImage(drawCache.img, 0, 0, {SkFilterMode::kLinear, SkMipmapMode::kLinear}, &srcPaint);
|
|
||||||
|
|
||||||
canvas->restore();
|
|
||||||
nextCacheToRender++;
|
nextCacheToRender++;
|
||||||
}
|
}
|
||||||
c->obj->draw(canvas, drawData);
|
c->obj->draw(canvas, drawData);
|
||||||
c->obj->drawSetupData.shouldDraw = false;
|
c->obj->drawSetupData.shouldDraw = false;
|
||||||
lastComponentDrawn = std::max(lastComponentDrawn, c->pos);
|
lastComponentDrawn = std::max(lastComponentDrawn, c->pos);
|
||||||
}
|
}
|
||||||
for(;nextCacheToRender < cachedNodesToDraw.size(); nextCacheToRender++) {
|
for(;nextCacheToRender < cachedNodesToDraw.size(); nextCacheToRender++)
|
||||||
auto& bvhNode = cachedNodesToDraw[nextCacheToRender];
|
lastComponentDrawn = std::max(lastComponentDrawn, draw_cache_image_to_canvas(canvas, drawData, cachedNodesToDraw[nextCacheToRender]));
|
||||||
auto& drawCache = bvhNode->drawCache.value();
|
|
||||||
canvas->save();
|
|
||||||
bvhNode->coords.transform_sk_canvas(canvas, drawData);
|
|
||||||
drawCache.lastRenderTime = std::chrono::steady_clock::now();
|
|
||||||
|
|
||||||
lastComponentDrawn = std::max(lastComponentDrawn, drawCache.lastDrawnComponentPlacement);
|
|
||||||
|
|
||||||
SkPaint srcPaint;
|
|
||||||
srcPaint.setBlendMode(SkBlendMode::kSrc);
|
|
||||||
|
|
||||||
canvas->drawImage(drawCache.img, 0, 0, {SkFilterMode::kLinear, SkMipmapMode::kLinear}, &srcPaint);
|
|
||||||
|
|
||||||
canvas->restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(lastDrawnComponentPlacement)
|
if(lastDrawnComponentPlacement)
|
||||||
*lastDrawnComponentPlacement = lastComponentDrawn;
|
*lastDrawnComponentPlacement = lastComponentDrawn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint64_t DrawingProgramCache::draw_cache_image_to_canvas(SkCanvas* canvas, const DrawData& drawData, const std::shared_ptr<DrawingProgramCacheBVHNode>& bvhNode) {
|
||||||
|
auto& drawCache = bvhNode->drawCache.value();
|
||||||
|
canvas->save();
|
||||||
|
bvhNode->coords.transform_sk_canvas(canvas, drawData);
|
||||||
|
drawCache.lastRenderTime = std::chrono::steady_clock::now();
|
||||||
|
|
||||||
|
SkPaint srcPaint;
|
||||||
|
srcPaint.setBlendMode(SkBlendMode::kSrc);
|
||||||
|
|
||||||
|
canvas->drawImage(drawCache.img, 0, 0, {SkFilterMode::kLinear, SkMipmapMode::kLinear}, &srcPaint);
|
||||||
|
|
||||||
|
canvas->restore();
|
||||||
|
|
||||||
|
return drawCache.lastDrawnComponentPlacement;
|
||||||
|
}
|
||||||
|
|
||||||
DrawingProgramCache::~DrawingProgramCache() {
|
DrawingProgramCache::~DrawingProgramCache() {
|
||||||
clear_own_cached_surfaces();
|
clear_own_cached_surfaces();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,8 @@ class DrawingProgramCache {
|
||||||
const std::chrono::steady_clock::time_point& get_last_bvh_build_time() const;
|
const std::chrono::steady_clock::time_point& get_last_bvh_build_time() const;
|
||||||
void clear_own_cached_surfaces();
|
void clear_own_cached_surfaces();
|
||||||
private:
|
private:
|
||||||
|
uint64_t draw_cache_image_to_canvas(SkCanvas* canvas, const DrawData& drawData, const std::shared_ptr<DrawingProgramCacheBVHNode>& bvhNode);
|
||||||
|
|
||||||
void force_rebuild_dont_include_objs(std::vector<CollabListType::ObjectInfoPtr> componentsToBuild, const std::unordered_set<CollabListType::ObjectInfoPtr>& objsToNotInclude);
|
void force_rebuild_dont_include_objs(std::vector<CollabListType::ObjectInfoPtr> componentsToBuild, const std::unordered_set<CollabListType::ObjectInfoPtr>& objsToNotInclude);
|
||||||
void force_rebuild(const std::vector<CollabListType::ObjectInfoPtr>& componentsToBuild);
|
void force_rebuild(const std::vector<CollabListType::ObjectInfoPtr>& componentsToBuild);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue