asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13205 from TheSofox/ParallaxLayer_mirroring_regression_fix

Browse source 
Fixed #13167. Restored ParallaxLayer mirroring that was broken by pull request #12421
This commit is contained in:
Rémi Verschelde 2017-11-23 09:32:27 +01:00 committed by GitHub
commit f2d07d5aeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/2d/parallax_layer.cpp
View file

@ -73,7 +73,8 @@ void ParallaxLayer::_update_mirroring() {
RID c = pb->get_world_2d()->get_canvas(); RID c = pb->get_world_2d()->get_canvas();
RID ci = get_canvas_item(); 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);
} }
} }
@ -116,18 +117,21 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, float p_sc
Point2 new_ofs = (screen_offset + (p_offset - screen_offset) * motion_scale) + motion_offset * p_scale + orig_offset * p_scale; Point2 new_ofs = (screen_offset + (p_offset - screen_offset) * motion_scale) + motion_offset * p_scale + orig_offset * p_scale;
Vector2 mirror = Vector2(1, 1);
if (mirroring.x) { 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) { if (mirroring.y) {
mirror.y = -1; double den = mirroring.y * p_scale;
new_ofs.y -= den * ceil(new_ofs.y / den);
} }
set_position(new_ofs); set_position(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 { String ParallaxLayer::get_configuration_warning() const {