diff options
| author | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
| commit | e46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch) | |
| tree | cf91f2869ff8f058c6682569fb31e22e5ee736ad /scene/main/viewport.cpp | |
| parent | 1dad6eca812e5c2e313b54265114de8a1d73d999 (diff) | |
| parent | 4a4f2479146aa33e235ed57cde311efda68d3c8f (diff) | |
| download | godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.gz godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.zst godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.zip | |
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to '')
| -rw-r--r-- | scene/main/viewport.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 550bae630..2c94d2e09 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -318,10 +318,10 @@ void Viewport::_test_new_mouseover(ObjectID new_collider) { } void Viewport::_notification(int p_what) { - + switch( p_what ) { - + case NOTIFICATION_ENTER_TREE: { if (get_parent()) { @@ -696,8 +696,8 @@ void Viewport::_notification(int p_what) { } RID Viewport::get_viewport() const { - - return viewport; + + return viewport; } void Viewport::set_rect(const Rect2& p_rect) { @@ -715,12 +715,12 @@ Rect2 Viewport::get_visible_rect() const { Rect2 r; - + if (rect.pos==Vector2() && rect.size==Size2()) { - + r=Rect2( Point2(), Size2( OS::get_singleton()->get_video_mode().width, OS::get_singleton()->get_video_mode().height ) ); } else { - + r=Rect2( rect.pos , rect.size ); } @@ -733,7 +733,7 @@ Rect2 Viewport::get_visible_rect() const { } Rect2 Viewport::get_rect() const { - + return rect; } @@ -1335,7 +1335,7 @@ void Viewport::_vp_input(const InputEvent& p_ev) { //they are converted to viewport coordinates - InputEvent ev = p_ev; + InputEvent ev = p_ev; _make_input_local(ev); input(ev); @@ -2240,7 +2240,7 @@ void Viewport::input(const InputEvent& p_event) { ERR_FAIL_COND(!is_inside_tree()); - get_tree()->_call_input_pause(input_group,"_input",p_event); + get_tree()->_call_input_pause(input_group,"_input",p_event); _gui_input_event(p_event); //get_tree()->call_group(SceneTree::GROUP_CALL_REVERSE|SceneTree::GROUP_CALL_REALTIME|SceneTree::GROUP_CALL_MULIILEVEL,gui_input_group,"_gui_input",p_event); //special one for GUI, as controls use their own process check } @@ -2409,10 +2409,10 @@ void Viewport::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_render_target_vflip","enable"), &Viewport::set_render_target_vflip); ObjectTypeDB::bind_method(_MD("get_render_target_vflip"), &Viewport::get_render_target_vflip); - + ObjectTypeDB::bind_method(_MD("set_render_target_clear_on_new_frame","enable"), &Viewport::set_render_target_clear_on_new_frame); ObjectTypeDB::bind_method(_MD("get_render_target_clear_on_new_frame"), &Viewport::get_render_target_clear_on_new_frame); - + ObjectTypeDB::bind_method(_MD("render_target_clear"), &Viewport::render_target_clear); ObjectTypeDB::bind_method(_MD("set_render_target_filter","enable"), &Viewport::set_render_target_filter); |
