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

Use "enum class" for input enums

Browse Source
This commit is contained in:
Aaron Franke
2021-08-13 16:31:57 -05:00
parent 4f85cad013
commit 3c0fdcc8ac
154 changed files with 3482 additions and 3392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/servers/test_physics_2d.cpp
View File

@ -196,10 +196,10 @@ protected:
if (mb->is_pressed()) {
Point2 p = mb->get_position();
if (mb->get_button_index() == 1) {
if (mb->get_button_index() == MouseButton::LEFT) {
ray_to = p;
_do_ray_query();
} else if (mb->get_button_index() == 2) {
} else if (mb->get_button_index() == MouseButton::RIGHT) {
ray_from = p;
_do_ray_query();
}
@ -211,10 +211,10 @@ protected:
if (mm.is_valid()) {
Point2 p = mm->get_position();
if (mm->get_button_mask() & MOUSE_BUTTON_MASK_LEFT) {
if ((mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) {
ray_to = p;
_do_ray_query();
} else if (mm->get_button_mask() & MOUSE_BUTTON_MASK_RIGHT) {
} else if ((mm->get_button_mask() & MouseButton::MASK_RIGHT) != MouseButton::NONE) {
ray_from = p;
_do_ray_query();
}

4
tests/servers/test_physics_3d.cpp
View File

@ -245,12 +245,12 @@ protected:
public:
virtual void input_event(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid() && mm->get_button_mask() & 4) {
if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_MIDDLE) != MouseButton::NONE) {
ofs_y -= mm->get_relative().y / 200.0;
ofs_x += mm->get_relative().x / 200.0;
}
if (mm.is_valid() && mm->get_button_mask() & 1) {
if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) {
real_t y = -mm->get_relative().y / 20.0;
real_t x = mm->get_relative().x / 20.0;