From 3105d9b1f35959f70975fd6de034b9168cd3b337 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Wed, 29 Dec 2021 13:22:22 +0000 Subject: Rename speed to velocity when it's a directional Vector --- core/input/input.cpp | 30 ++++++++++++------------- core/input/input.h | 12 +++++----- core/input/input_event.cpp | 55 +++++++++++++++++++++------------------------- core/input/input_event.h | 12 +++++----- 4 files changed, 52 insertions(+), 57 deletions(-) (limited to 'core/input') diff --git a/core/input/input.cpp b/core/input/input.cpp index 3dfe73ab8e..a5d022cce3 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -121,7 +121,7 @@ void Input::_bind_methods() { ClassDB::bind_method(D_METHOD("set_accelerometer", "value"), &Input::set_accelerometer); ClassDB::bind_method(D_METHOD("set_magnetometer", "value"), &Input::set_magnetometer); ClassDB::bind_method(D_METHOD("set_gyroscope", "value"), &Input::set_gyroscope); - ClassDB::bind_method(D_METHOD("get_last_mouse_speed"), &Input::get_last_mouse_speed); + ClassDB::bind_method(D_METHOD("get_last_mouse_velocity"), &Input::get_last_mouse_velocity); ClassDB::bind_method(D_METHOD("get_mouse_button_mask"), &Input::get_mouse_button_mask); ClassDB::bind_method(D_METHOD("set_mouse_mode", "mode"), &Input::set_mouse_mode); ClassDB::bind_method(D_METHOD("get_mouse_mode"), &Input::get_mouse_mode); @@ -183,7 +183,7 @@ void Input::get_argument_options(const StringName &p_function, int p_idx, Listget_ticks_usec(); uint32_t tdiff = tick - last_tick; float delta_t = tdiff / 1000000.0; @@ -202,17 +202,17 @@ void Input::SpeedTrack::update(const Vector2 &p_delta_p) { accum = accum - slice; accum_t -= min_ref_frame; - speed = (slice / min_ref_frame).lerp(speed, min_ref_frame / max_ref_frame); + velocity = (slice / min_ref_frame).lerp(velocity, min_ref_frame / max_ref_frame); } } -void Input::SpeedTrack::reset() { +void Input::VelocityTrack::reset() { last_tick = OS::get_singleton()->get_ticks_usec(); - speed = Vector2(); + velocity = Vector2(); accum_t = 0; } -Input::SpeedTrack::SpeedTrack() { +Input::VelocityTrack::VelocityTrack() { min_ref_frame = 0.1; max_ref_frame = 0.3; reset(); @@ -515,7 +515,7 @@ void Input::_parse_input_event_impl(const Ref &p_event, bool p_is_em drag_event->set_position(mm->get_position()); drag_event->set_relative(mm->get_relative()); - drag_event->set_speed(mm->get_speed()); + drag_event->set_velocity(mm->get_velocity()); event_dispatch_function(drag_event); } @@ -525,12 +525,12 @@ void Input::_parse_input_event_impl(const Ref &p_event, bool p_is_em if (st.is_valid()) { if (st->is_pressed()) { - SpeedTrack &track = touch_speed_track[st->get_index()]; + VelocityTrack &track = touch_velocity_track[st->get_index()]; track.reset(); } else { // Since a pointer index may not occur again (OSs may or may not reuse them), // imperatively remove it from the map to keep no fossil entries in it - touch_speed_track.erase(st->get_index()); + touch_velocity_track.erase(st->get_index()); } if (emulate_mouse_from_touch) { @@ -570,9 +570,9 @@ void Input::_parse_input_event_impl(const Ref &p_event, bool p_is_em Ref sd = p_event; if (sd.is_valid()) { - SpeedTrack &track = touch_speed_track[sd->get_index()]; + VelocityTrack &track = touch_velocity_track[sd->get_index()]; track.update(sd->get_relative()); - sd->set_speed(track.speed); + sd->set_velocity(track.velocity); if (emulate_mouse_from_touch && sd->get_index() == mouse_from_touch_index) { Ref motion_event; @@ -582,7 +582,7 @@ void Input::_parse_input_event_impl(const Ref &p_event, bool p_is_em motion_event->set_position(sd->get_position()); motion_event->set_global_position(sd->get_position()); motion_event->set_relative(sd->get_relative()); - motion_event->set_speed(sd->get_speed()); + motion_event->set_velocity(sd->get_velocity()); motion_event->set_button_mask(mouse_button_mask); _parse_input_event_impl(motion_event, true); @@ -696,7 +696,7 @@ void Input::set_gyroscope(const Vector3 &p_gyroscope) { } void Input::set_mouse_position(const Point2 &p_posf) { - mouse_speed_track.update(p_posf - mouse_pos); + mouse_velocity_track.update(p_posf - mouse_pos); mouse_pos = p_posf; } @@ -704,8 +704,8 @@ Point2 Input::get_mouse_position() const { return mouse_pos; } -Point2 Input::get_last_mouse_speed() const { - return mouse_speed_track.speed; +Point2 Input::get_last_mouse_velocity() const { + return mouse_velocity_track.velocity; } MouseButton Input::get_mouse_button_mask() const { diff --git a/core/input/input.h b/core/input/input.h index faec654a3c..92775bd125 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -117,9 +117,9 @@ private: int mouse_from_touch_index = -1; - struct SpeedTrack { + struct VelocityTrack { uint64_t last_tick; - Vector2 speed; + Vector2 velocity; Vector2 accum; float accum_t; float min_ref_frame; @@ -127,7 +127,7 @@ private: void update(const Vector2 &p_delta_p); void reset(); - SpeedTrack(); + VelocityTrack(); }; struct Joypad { @@ -141,8 +141,8 @@ private: int hat_current = 0; }; - SpeedTrack mouse_speed_track; - Map touch_speed_track; + VelocityTrack mouse_velocity_track; + Map touch_velocity_track; Map joy_names; int fallback_mapping = -1; @@ -274,7 +274,7 @@ public: Vector3 get_gyroscope() const; Point2 get_mouse_position() const; - Point2 get_last_mouse_speed() const; + Vector2 get_last_mouse_velocity() const; MouseButton get_mouse_button_mask() const; void warp_mouse_position(const Vector2 &p_to); diff --git a/core/input/input_event.cpp b/core/input/input_event.cpp index 7c98fa9540..95c0ae1022 100644 --- a/core/input/input_event.cpp +++ b/core/input/input_event.cpp @@ -739,20 +739,15 @@ Vector2 InputEventMouseMotion::get_relative() const { return relative; } -void InputEventMouseMotion::set_speed(const Vector2 &p_speed) { - speed = p_speed; +void InputEventMouseMotion::set_velocity(const Vector2 &p_velocity) { + velocity = p_velocity; } -Vector2 InputEventMouseMotion::get_speed() const { - return speed; +Vector2 InputEventMouseMotion::get_velocity() const { + return velocity; } Ref InputEventMouseMotion::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { - Vector2 g = get_global_position(); - Vector2 l = p_xform.xform(get_position() + p_local_ofs); - Vector2 r = p_xform.basis_xform(get_relative()); - Vector2 s = p_xform.basis_xform(get_speed()); - Ref mm; mm.instantiate(); @@ -761,20 +756,20 @@ Ref InputEventMouseMotion::xformed_by(const Transform2D &p_xform, co mm->set_modifiers_from_event(this); - mm->set_position(l); + mm->set_position(p_xform.xform(get_position() + p_local_ofs)); mm->set_pressure(get_pressure()); mm->set_tilt(get_tilt()); - mm->set_global_position(g); + mm->set_global_position(get_global_position()); mm->set_button_mask(get_button_mask()); - mm->set_relative(r); - mm->set_speed(s); + mm->set_relative(p_xform.basis_xform(get_relative())); + mm->set_velocity(p_xform.basis_xform(get_velocity())); return mm; } String InputEventMouseMotion::as_text() const { - return vformat(RTR("Mouse motion at position (%s) with speed (%s)"), String(get_position()), String(get_speed())); + return vformat(RTR("Mouse motion at position (%s) with velocity (%s)"), String(get_position()), String(get_velocity())); } String InputEventMouseMotion::to_string() { @@ -802,7 +797,7 @@ String InputEventMouseMotion::to_string() { // Work around the fact vformat can only take 5 substitutions but 6 need to be passed. String mask_and_position = vformat("button_mask=%s, position=(%s)", button_mask_string, String(get_position())); - return vformat("InputEventMouseMotion: %s, relative=(%s), speed=(%s), pressure=%.2f, tilt=(%s)", mask_and_position, String(get_relative()), String(get_speed()), get_pressure(), String(get_tilt())); + return vformat("InputEventMouseMotion: %s, relative=(%s), velocity=(%s), pressure=%.2f, tilt=(%s)", mask_and_position, String(get_relative()), String(get_velocity()), get_pressure(), String(get_tilt())); } bool InputEventMouseMotion::accumulate(const Ref &p_event) { @@ -841,7 +836,7 @@ bool InputEventMouseMotion::accumulate(const Ref &p_event) { set_position(motion->get_position()); set_global_position(motion->get_global_position()); - set_speed(motion->get_speed()); + set_velocity(motion->get_velocity()); relative += motion->get_relative(); return true; @@ -857,13 +852,13 @@ void InputEventMouseMotion::_bind_methods() { ClassDB::bind_method(D_METHOD("set_relative", "relative"), &InputEventMouseMotion::set_relative); ClassDB::bind_method(D_METHOD("get_relative"), &InputEventMouseMotion::get_relative); - ClassDB::bind_method(D_METHOD("set_speed", "speed"), &InputEventMouseMotion::set_speed); - ClassDB::bind_method(D_METHOD("get_speed"), &InputEventMouseMotion::get_speed); + ClassDB::bind_method(D_METHOD("set_velocity", "velocity"), &InputEventMouseMotion::set_velocity); + ClassDB::bind_method(D_METHOD("get_velocity"), &InputEventMouseMotion::get_velocity); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "tilt"), "set_tilt", "get_tilt"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pressure"), "set_pressure", "get_pressure"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "relative"), "set_relative", "get_relative"); - ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "speed"), "set_speed", "get_speed"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "velocity"), "set_velocity", "get_velocity"); } /////////////////////////////////// @@ -1188,12 +1183,12 @@ Vector2 InputEventScreenDrag::get_relative() const { return relative; } -void InputEventScreenDrag::set_speed(const Vector2 &p_speed) { - speed = p_speed; +void InputEventScreenDrag::set_velocity(const Vector2 &p_velocity) { + velocity = p_velocity; } -Vector2 InputEventScreenDrag::get_speed() const { - return speed; +Vector2 InputEventScreenDrag::get_velocity() const { + return velocity; } Ref InputEventScreenDrag::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { @@ -1207,17 +1202,17 @@ Ref InputEventScreenDrag::xformed_by(const Transform2D &p_xform, con sd->set_index(index); sd->set_position(p_xform.xform(pos + p_local_ofs)); sd->set_relative(p_xform.basis_xform(relative)); - sd->set_speed(p_xform.basis_xform(speed)); + sd->set_velocity(p_xform.basis_xform(velocity)); return sd; } String InputEventScreenDrag::as_text() const { - return vformat(RTR("Screen dragged with %s touch points at position (%s) with speed of (%s)"), itos(index), String(get_position()), String(get_speed())); + return vformat(RTR("Screen dragged with %s touch points at position (%s) with velocity of (%s)"), itos(index), String(get_position()), String(get_velocity())); } String InputEventScreenDrag::to_string() { - return vformat("InputEventScreenDrag: index=%d, position=(%s), relative=(%s), speed=(%s)", index, String(get_position()), String(get_relative()), String(get_speed())); + return vformat("InputEventScreenDrag: index=%d, position=(%s), relative=(%s), velocity=(%s)", index, String(get_position()), String(get_relative()), String(get_velocity())); } bool InputEventScreenDrag::accumulate(const Ref &p_event) { @@ -1230,7 +1225,7 @@ bool InputEventScreenDrag::accumulate(const Ref &p_event) { } set_position(drag->get_position()); - set_speed(drag->get_speed()); + set_velocity(drag->get_velocity()); relative += drag->get_relative(); return true; @@ -1246,13 +1241,13 @@ void InputEventScreenDrag::_bind_methods() { ClassDB::bind_method(D_METHOD("set_relative", "relative"), &InputEventScreenDrag::set_relative); ClassDB::bind_method(D_METHOD("get_relative"), &InputEventScreenDrag::get_relative); - ClassDB::bind_method(D_METHOD("set_speed", "speed"), &InputEventScreenDrag::set_speed); - ClassDB::bind_method(D_METHOD("get_speed"), &InputEventScreenDrag::get_speed); + ClassDB::bind_method(D_METHOD("set_velocity", "velocity"), &InputEventScreenDrag::set_velocity); + ClassDB::bind_method(D_METHOD("get_velocity"), &InputEventScreenDrag::get_velocity); ADD_PROPERTY(PropertyInfo(Variant::INT, "index"), "set_index", "get_index"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "position"), "set_position", "get_position"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "relative"), "set_relative", "get_relative"); - ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "speed"), "set_speed", "get_speed"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "velocity"), "set_velocity", "get_velocity"); } /////////////////////////////////// diff --git a/core/input/input_event.h b/core/input/input_event.h index 70046e4491..fe8eaa705b 100644 --- a/core/input/input_event.h +++ b/core/input/input_event.h @@ -271,7 +271,7 @@ class InputEventMouseMotion : public InputEventMouse { Vector2 tilt; float pressure = 0; Vector2 relative; - Vector2 speed; + Vector2 velocity; protected: static void _bind_methods(); @@ -286,8 +286,8 @@ public: void set_relative(const Vector2 &p_relative); Vector2 get_relative() const; - void set_speed(const Vector2 &p_speed); - Vector2 get_speed() const; + void set_velocity(const Vector2 &p_velocity); + Vector2 get_velocity() const; virtual Ref xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override; virtual String as_text() const override; @@ -388,7 +388,7 @@ class InputEventScreenDrag : public InputEventFromWindow { int index = 0; Vector2 pos; Vector2 relative; - Vector2 speed; + Vector2 velocity; protected: static void _bind_methods(); @@ -403,8 +403,8 @@ public: void set_relative(const Vector2 &p_relative); Vector2 get_relative() const; - void set_speed(const Vector2 &p_speed); - Vector2 get_speed() const; + void set_velocity(const Vector2 &p_velocity); + Vector2 get_velocity() const; virtual Ref xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override; virtual String as_text() const override; -- cgit v1.2.3