copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed eraser tool coordinate space

Browse source
This commit is contained in:
Yousef Khadadeh 2026-05-26 11:59:55 +03:00
parent abfc259bc9
commit 20a7e0bc37
4 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/CanvasComponents/CanvasComponentContainer.cpp
View file

@ -153,7 +153,7 @@ CanvasComponentEraseDetailResult CanvasComponentContainer::collides_with_erase_d
return CanvasComponentEraseDetailResult::NO_CHANGE;
}
else if(get_comp().can_erase_detail()) {
TransformData drawTransform = calculate_draw_transform(camCoords);
TransformData drawTransform = calculate_draw_transform(camCoords, coords);
SkMatrix m = SkMatrix::I();
m.postScale(1.0 / drawTransform.scale, 1.0 / drawTransform.scale).postRotate(-drawTransform.rotation).postTranslate(-drawTransform.translation.x(), -drawTransform.translation.y());
std::optional<SkPath> transformedPath = checkAgainstCam.tryMakeTransform(m);
@ -173,7 +173,7 @@ bool CanvasComponentContainer::collides_with(const CoordSpaceHelper& camCoords,
else if(coords.inverseScale < (camCoords.inverseScale >> COMP_COLLIDE_MIN_SHIFT_TINY))
return checkAgainstCam.contains(convert_vec2<SkPoint>(camCoords.to_space(worldAABB.value().min)));
else {
TransformData drawTransform = calculate_draw_transform(camCoords);
TransformData drawTransform = calculate_draw_transform(camCoords, coords);
SkMatrix m = SkMatrix::I();
m.postScale(1.0 / drawTransform.scale, 1.0 / drawTransform.scale).postRotate(-drawTransform.rotation).postTranslate(-drawTransform.translation.x(), -drawTransform.translation.y());
std::optional<SkPath> transformedPath = checkAgainstCam.tryMakeTransform(m);
@ -191,7 +191,7 @@ bool CanvasComponentContainer::collides_with_point(const CoordSpaceHelper& camCo
else if(coords.inverseScale < (camCoords.inverseScale >> COMP_COLLIDE_MIN_SHIFT_TINY)) // Object is too tiny, just dismiss the collision
return false;
else {
TransformData drawTransform = calculate_draw_transform(camCoords);
TransformData drawTransform = calculate_draw_transform(camCoords, coords);
SkMatrix m = SkMatrix::I();
m.postScale(1.0 / drawTransform.scale, 1.0 / drawTransform.scale).postRotate(-drawTransform.rotation).postTranslate(-drawTransform.translation.x(), -drawTransform.translation.y());
SkPoint p = m.mapPoint(convert_vec2<SkPoint>(checkAgainstCam));
@ -199,7 +199,7 @@ bool CanvasComponentContainer::collides_with_point(const CoordSpaceHelper& camCo
}
}
void CanvasComponentContainer::canvas_do_transform(SkCanvas* canvas, const TransformData& transformData) const {
void CanvasComponentContainer::canvas_do_transform(SkCanvas* canvas, const TransformData& transformData) {
canvas->scale(transformData.scale, transformData.scale);
canvas->rotate(transformData.rotation);
canvas->translate(transformData.translation.x(), transformData.translation.y());
@ -211,7 +211,7 @@ bool CanvasComponentContainer::should_draw(const DrawData& drawData) const {
CanvasComponentContainer::PreDrawData CanvasComponentContainer::calculate_predraw_data(const DrawData& drawData) const {
PreDrawData toRet;
toRet.transformData = calculate_draw_transform(drawData.cam.c);
toRet.transformData = calculate_draw_transform(drawData.cam.c, coords);
if(toRet.transformData.scale < COMP_MAX_BEFORE_STOP_SCALING)
toRet.extraData = get_comp().get_predraw_data(drawData);
else
@ -219,7 +219,7 @@ CanvasComponentContainer::PreDrawData CanvasComponentContainer::calculate_predra
return toRet;
}
CanvasComponentContainer::TransformData CanvasComponentContainer::calculate_draw_transform(const CoordSpaceHelper& camCoords) const {
CanvasComponentContainer::TransformData CanvasComponentContainer::calculate_draw_transform(const CoordSpaceHelper& camCoords, const CoordSpaceHelper& coords) {
TransformData toRet;
toRet.translation = -coords.to_space(camCoords.pos);
toRet.rotation = (coords.rotation - camCoords.rotation) * 180.0 / std::numbers::pi;

4
src/CanvasComponents/CanvasComponentContainer.hpp
View file

@ -83,7 +83,8 @@ class CanvasComponentContainer {
void draw(SkCanvas* canvas, const DrawData& drawData) const;
void draw_with_predraw_data(SkCanvas* canvas, const DrawData& drawData, const PreDrawData& preDrawData) const;
PreDrawData calculate_predraw_data(const DrawData& drawData) const;
TransformData calculate_draw_transform(const CoordSpaceHelper& camCoords) const;
static TransformData calculate_draw_transform(const CoordSpaceHelper& camCoords, const CoordSpaceHelper& coords);
static void canvas_do_transform(SkCanvas* canvas, const TransformData& transformData);
void commit_update(DrawingProgram& drawP);
void commit_transform_dont_invalidate_cache(); // Must be thread safe
void commit_transform(DrawingProgram& drawP);
@ -107,7 +108,6 @@ class CanvasComponentContainer {
unsigned get_mipmap_level(const DrawData& drawData) const;
CanvasComponent* allocate_comp(CanvasComponentType type);
void canvas_do_transform(SkCanvas* canvas, const TransformData& transformData) const;
void calculate_world_bounds();
std::optional<SCollision::AABB<WorldScalar>> worldAABB;

2
src/CanvasComponents/ImageCanvasComponent.cpp
View file

@ -78,7 +78,7 @@ void ImageCanvasComponent::draw_download_progress_bar(SkCanvas* canvas, const Dr
return;
if(compContainer->should_draw(drawData)) {
canvas->save();
compContainer->canvas_do_transform(canvas, compContainer->calculate_draw_transform(drawData.cam.c));
compContainer->canvas_do_transform(canvas, compContainer->calculate_draw_transform(drawData.cam.c, compContainer->coords));
SkPaint p;
p.setStroke(true);
p.setStrokeWidth(10.0f);