godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16795 from TheSofox/parallax-mirroring-regression-fix-2 

Fix for Parallax Mirroring regression introduced by pull request #12709
This commit is contained in:
Rémi Verschelde 2018-02-18 17:19:09 +01:00 committed by GitHub
parent 5dae399fc5 afccc72be3
commit 456935c363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/2d/parallax_layer.cpp
View File

@ -80,7 +80,8 @@ void ParallaxLayer::_update_mirroring() {
RID c = pb->get_world_2d()->get_canvas();
RID ci = get_canvas_item();
VisualServer::get_singleton()->canvas_set_item_mirroring(c, ci, mirroring);
Point2 mirrorScale = mirroring * get_scale();
VisualServer::get_singleton()->canvas_set_item_mirroring(c, ci, mirrorScale);
}
}
@ -126,15 +127,20 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, float p_sc
Vector2 mirror = Vector2(1, 1);
if (mirroring.x) {
mirror.x = -1;
double den = mirroring.x * p_scale;
double before = new_ofs.x;
new_ofs.x -= den * ceil(new_ofs.x / den);
}
if (mirroring.y) {
mirror.y = -1;
double den = mirroring.y * p_scale;
new_ofs.y -= den * ceil(new_ofs.y / den);
}
set_pos(new_ofs);
set_scale(mirror * p_scale * orig_scale);
set_scale(Vector2(1, 1) * p_scale * orig_scale);
_update_mirroring();
}
String ParallaxLayer::get_configuration_warning() const {