diff options
| author | Juan Linietsky | 2014-02-13 18:03:28 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-02-13 18:03:28 -0300 |
| commit | 58cda02a389759d18176216c06f375d364cefef1 (patch) | |
| tree | 4102902585d12ea6807ceaee1370136d29b601e1 /scene/2d/screen_button.cpp | |
| parent | 1adc330b68b1f6ca18aac05daf88c7d4d757fd0a (diff) | |
| download | godot-58cda02a389759d18176216c06f375d364cefef1.tar.gz godot-58cda02a389759d18176216c06f375d364cefef1.tar.zst godot-58cda02a389759d18176216c06f375d364cefef1.zip | |
-fixed export templates not loading/exporting on Windows
-fixed TouchScreenButton with stretch2d
-fixed(?) OSX crash on startup (test!!)
-compilation fixes on windows
-CollisionPolygon editor works again
-find buttons en find dialog
-TileMap editor cleanup (removed "error", made nicer)
-viewport flicker fixed
-make .scn default extension for saving scenes
-export the rest of the network classes to gdscript
Diffstat (limited to 'scene/2d/screen_button.cpp')
| -rw-r--r-- | scene/2d/screen_button.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index f386dc63e..871c35147 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -155,7 +155,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) { if (finger_pressed==-1 || p_event.screen_touch.index==finger_pressed) { - Point2 coord = (get_viewport_transform() * get_global_transform()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y)); + Point2 coord = (get_global_transform()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y)); bool touched=false; if (bitmask.is_valid()) { @@ -231,7 +231,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) { if (finger_pressed!=-1) return; //already fingering - Point2 coord = (get_viewport_transform() * get_global_transform()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y)); + Point2 coord = (get_global_transform()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y)); bool touched=false; if (bitmask.is_valid()) { |