Selective cache update goes a bit beyond its bounds, and also made sure that you can't edit objects to be too thin/small
This commit is contained in:
parent
81ac5a2302
commit
7bfa2798a5
3 changed files with 18 additions and 5 deletions
|
|
@ -335,16 +335,28 @@ void DrawingProgramCache::refresh_draw_cache(const std::shared_ptr<DrawingProgra
|
||||||
auto& iBounds = drawCache.invalidBounds.value();
|
auto& iBounds = drawCache.invalidBounds.value();
|
||||||
WorldVec bDim = bvhNode->bounds.dim();
|
WorldVec bDim = bvhNode->bounds.dim();
|
||||||
//std::cout << "\niMin: " << iBounds.min.x() << " " << iBounds.min.y() << "\niMax: " << iBounds.max.x() << " " << iBounds.max.y() << "\nbMin: " << bvhNode->bounds.min.x() << " " << bvhNode->bounds.min.y() << "\nbMax: " << bvhNode->bounds.max.x() << " " << bvhNode->bounds.max.y() << "\nbDim: " << bDim.x() << " " << bDim.y();
|
//std::cout << "\niMin: " << iBounds.min.x() << " " << iBounds.min.y() << "\niMax: " << iBounds.max.x() << " " << iBounds.max.y() << "\nbMin: " << bvhNode->bounds.min.x() << " " << bvhNode->bounds.min.y() << "\nbMax: " << bvhNode->bounds.max.x() << " " << bvhNode->bounds.max.y() << "\nbDim: " << bDim.x() << " " << bDim.y();
|
||||||
|
|
||||||
Vector2f clipBoundMin{static_cast<float>((iBounds.min.x() - bvhNode->bounds.min.x()) / bDim.x()) * bvhNode->resolution.x(),
|
Vector2f clipBoundMin{static_cast<float>((iBounds.min.x() - bvhNode->bounds.min.x()) / bDim.x()) * bvhNode->resolution.x(),
|
||||||
static_cast<float>((iBounds.min.y() - bvhNode->bounds.min.y()) / bDim.y()) * bvhNode->resolution.y()};
|
static_cast<float>((iBounds.min.y() - bvhNode->bounds.min.y()) / bDim.y()) * bvhNode->resolution.y()};
|
||||||
Vector2f clipBoundMax{static_cast<float>((iBounds.max.x() - bvhNode->bounds.min.x()) / bDim.x()) * bvhNode->resolution.x(),
|
Vector2f clipBoundMax{static_cast<float>((iBounds.max.x() - bvhNode->bounds.min.x()) / bDim.x()) * bvhNode->resolution.x(),
|
||||||
static_cast<float>((iBounds.max.y() - bvhNode->bounds.min.y()) / bDim.y()) * bvhNode->resolution.y()};
|
static_cast<float>((iBounds.max.y() - bvhNode->bounds.min.y()) / bDim.y()) * bvhNode->resolution.y()};
|
||||||
SkRect clipRect = SkRect::MakeLTRB(clipBoundMin.x(), clipBoundMin.y(), clipBoundMax.x(), clipBoundMax.y());
|
|
||||||
|
SkIRect clipRect = SkIRect::MakeLTRB(std::max<int>(clipBoundMin.x() - 2, 0),
|
||||||
|
std::max<int>(clipBoundMin.y() - 2, 0),
|
||||||
|
std::min<int>(clipBoundMax.x() + 2, bvhNode->resolution.x() - 1),
|
||||||
|
std::min<int>(clipBoundMax.y() + 2, bvhNode->resolution.y() - 1));
|
||||||
|
|
||||||
|
SCollision::AABB<float> clipRectBoundAABB{clipBoundMin - Vector2f{4, 4}, clipBoundMax + Vector2f{4, 4}};
|
||||||
|
SCollision::AABB<WorldScalar> clipRectBoundAABBWorld{
|
||||||
|
bvhNode->coords.from_space(clipRectBoundAABB.min),
|
||||||
|
bvhNode->coords.from_space(clipRectBoundAABB.max)
|
||||||
|
};
|
||||||
|
|
||||||
//std::cout << "\ncMin: " << clipBoundMin.x() << " " << clipBoundMin.y() << "\ncMax: " << clipBoundMax.x() << " " << clipBoundMax.y() << std::endl;
|
//std::cout << "\ncMin: " << clipBoundMin.x() << " " << clipBoundMin.y() << "\ncMax: " << clipBoundMax.x() << " " << clipBoundMax.y() << std::endl;
|
||||||
cacheCanvas->save();
|
cacheCanvas->save();
|
||||||
cacheCanvas->clipRect(clipRect);
|
cacheCanvas->clipIRect(clipRect);
|
||||||
cacheCanvas->clear(SkColor4f{0, 0, 0, 0});
|
cacheCanvas->clear(SkColor4f{0, 0, 0, 0});
|
||||||
draw_components_to_canvas(cacheCanvas, cacheDrawData, &drawCache.lastDrawnComponentPlacement, drawCache.invalidBounds);
|
draw_components_to_canvas(cacheCanvas, cacheDrawData, &drawCache.lastDrawnComponentPlacement, clipRectBoundAABBWorld);
|
||||||
cacheCanvas->restore();
|
cacheCanvas->restore();
|
||||||
drawCache.invalidBounds = std::nullopt;
|
drawCache.invalidBounds = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -140,9 +140,9 @@ void EditTool::tool_update() {
|
||||||
Vector2f newPos = a->coords.get_mouse_pos(drawP.world);
|
Vector2f newPos = a->coords.get_mouse_pos(drawP.world);
|
||||||
if(newPos != *controls.pointDragging->p) {
|
if(newPos != *controls.pointDragging->p) {
|
||||||
if(controls.pointDragging->min)
|
if(controls.pointDragging->min)
|
||||||
newPos = cwise_vec_max(*controls.pointDragging->min, newPos);
|
newPos = cwise_vec_max((*controls.pointDragging->min + Vector2f{controls.pointDragging->minimumDistanceBetweenBoundsAndPoint, controls.pointDragging->minimumDistanceBetweenBoundsAndPoint}).eval(), newPos);
|
||||||
if(controls.pointDragging->max)
|
if(controls.pointDragging->max)
|
||||||
newPos = cwise_vec_min(*controls.pointDragging->max, newPos);
|
newPos = cwise_vec_min((*controls.pointDragging->max - Vector2f{controls.pointDragging->minimumDistanceBetweenBoundsAndPoint, controls.pointDragging->minimumDistanceBetweenBoundsAndPoint}).eval(), newPos);
|
||||||
*controls.pointDragging->p = newPos;
|
*controls.pointDragging->p = newPos;
|
||||||
a->commit_update(drawP);
|
a->commit_update(drawP);
|
||||||
a->client_send_update(drawP);
|
a->client_send_update(drawP);
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ class EditTool : public DrawingProgramToolBase {
|
||||||
Vector2f* p;
|
Vector2f* p;
|
||||||
Vector2f* min;
|
Vector2f* min;
|
||||||
Vector2f* max;
|
Vector2f* max;
|
||||||
|
float minimumDistanceBetweenBoundsAndPoint = 1.0f;
|
||||||
};
|
};
|
||||||
|
|
||||||
EditTool(DrawingProgram& initDrawP);
|
EditTool(DrawingProgram& initDrawP);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue