Skip to content

Commit e19c8a4

Browse files
aaronfrankeaaronfranke
committed
Use const around square values
1 parent 16d7e67 commit e19c8a4

26 files changed

+102
-98
lines changed

‎editor/scene/2d/abstract_polygon_2d_editor.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ bool AbstractPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event)
496496

497497
// Center drag.
498498
if (edit_origin_and_center) {
499-
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
499+
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
500500

501501
if (mb->get_button_index() == MouseButton::LEFT) {
502502
if (mb->is_meta_pressed() || mb->is_ctrl_pressed() || mb->is_shift_pressed() || mb->is_alt_pressed()) {
@@ -836,9 +836,9 @@ AbstractPolygon2DEditor::PosVertex AbstractPolygon2DEditor::closest_point(const
836836
for (int i = 0; i < n_points; i++) {
837837
Vector2 cp = xform.xform(points[i] + offset);
838838

839-
real_t d = cp.distance_to(p_pos);
840-
if (d < closest_dist && d < grab_threshold) {
841-
closest_dist = d;
839+
const real_t dist = cp.distance_to(p_pos);
840+
if (dist < closest_dist && dist < grab_threshold) {
841+
closest_dist = dist;
842842
closest = PosVertex(j, i, cp);
843843
}
844844
}
@@ -874,9 +874,9 @@ AbstractPolygon2DEditor::PosVertex AbstractPolygon2DEditor::closest_edge_point(c
874874
continue; //not valid to reuse point
875875
}
876876

877-
real_t d = cp.distance_to(p_pos);
878-
if (d < closest_dist && d < grab_threshold) {
879-
closest_dist = d;
877+
const real_t dist = cp.distance_to(p_pos);
878+
if (dist < closest_dist && dist < grab_threshold) {
879+
closest_dist = dist;
880880
closest = PosVertex(j, i, cp);
881881
}
882882
}

‎editor/scene/2d/path_2d_editor_plugin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
8080
return false;
8181
}
8282

83-
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
83+
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
8484

8585
Ref<InputEventMouseButton> mb = p_event;
8686
if (mb.is_valid()) {

‎editor/scene/2d/tiles/tile_data_editors.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ void GenericTilePolygonEditor::_base_control_gui_input(Ref<InputEvent> p_event)
514514
undo_redo = memnew(EditorUndoRedoManager);
515515
}
516516

517-
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
517+
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
518518

519519
hovered_polygon_index = -1;
520520
hovered_point_index = -1;

‎editor/scene/3d/node_3d_editor_plugin.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ void ViewportRotationControl::_process_click(int p_index, Vector2 p_position, bo
430430

431431
void ViewportRotationControl::_process_drag(Ref<InputEventWithModifiers> p_event, int p_index, Vector2 p_position, Vector2 p_relative_position) {
432432
Point2 mouse_pos = get_local_mouse_position();
433-
const bool movement_threshold_passed = original_mouse_pos.distance_to(mouse_pos) > 4 * EDSCALE;
433+
const bool movement_threshold_passed = original_mouse_pos.distance_to(mouse_pos) > 4.0f * EDSCALE;
434434
if (orbiting_index == p_index && gizmo_activated && movement_threshold_passed) {
435435
if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_VISIBLE) {
436436
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
@@ -2261,7 +2261,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
22612261
if (change_nav_from_shortcut != NAVIGATION_NONE) {
22622262
nav_mode = change_nav_from_shortcut;
22632263
} else {
2264-
const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
2264+
const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8.0f * EDSCALE;
22652265

22662266
if ((selection_in_progress || clicked_wants_append) && movement_threshold_passed && clicked.is_valid()) {
22672267
cursor.region_select = true;

‎editor/scene/3d/path_3d_editor_plugin.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
619619
real_t cdist = from.distance_to(to);
620620
from = gt.xform(from);
621621
to = gt.xform(to);
622-
if (cdist > 0) {
622+
if (cdist > 0.0f) {
623623
const Vector2 segment_a = viewport->point_to_screen(from);
624624
const Vector2 segment_b = viewport->point_to_screen(to);
625625
Vector2 inters = Geometry2D::get_closest_point_to_segment(mbpos, segment_a, segment_b);
@@ -1068,8 +1068,8 @@ int Path3DGizmoPlugin::subgizmos_intersect_ray(const EditorNode3DGizmo *p_gizmo,
10681068

10691069
if (Path3DEditorPlugin::singleton->curve_edit->is_pressed()) {
10701070
for (int idx = 0; idx < curve->get_point_count(); ++idx) {
1071-
Vector3 pos = path->get_global_transform().xform(curve->get_point_position(idx));
1072-
if (p_camera->unproject_position(pos).distance_to(p_point) < 20) {
1071+
const Vector3 pos = path->get_global_transform().xform(curve->get_point_position(idx));
1072+
if (p_camera->unproject_position(pos).distance_to(p_point) < 20.0f) {
10731073
return idx;
10741074
}
10751075
}

‎editor/scene/3d/polygon_3d_editor_plugin.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_ca
145145
PackedVector2Array poly = _get_polygon();
146146

147147
//first check if a point is to be added (segment split)
148-
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
148+
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
149149

150150
switch (mode) {
151151
case MODE_CREATE: {
@@ -196,9 +196,9 @@ EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_ca
196196
}
197197

198198
//search edges
199-
int closest_idx = -1;
200199
Vector2 closest_pos;
201200
real_t closest_dist = 1e10;
201+
int closest_idx = -1;
202202
for (int i = 0; i < poly.size(); i++) {
203203
const Vector2 segment_a = p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth)));
204204
const Vector2 segment_b = p_camera->unproject_position(gt.xform(Vector3(poly[(i + 1) % poly.size()].x, poly[(i + 1) % poly.size()].y, depth)));
@@ -208,9 +208,9 @@ EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_ca
208208
continue; //not valid to reuse point
209209
}
210210

211-
real_t d = cp.distance_to(gpoint);
212-
if (d < closest_dist && d < grab_threshold) {
213-
closest_dist = d;
211+
const real_t dist = cp.distance_to(gpoint);
212+
if (dist < closest_dist && dist < grab_threshold) {
213+
closest_dist = dist;
214214
closest_pos = cp;
215215
closest_idx = i;
216216
}
@@ -230,15 +230,15 @@ EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_ca
230230
} else {
231231
//look for points to move
232232

233-
int closest_idx = -1;
234233
Vector2 closest_pos;
235234
real_t closest_dist = 1e10;
235+
int closest_idx = -1;
236236
for (int i = 0; i < poly.size(); i++) {
237237
Vector2 cp = p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth)));
238238

239-
real_t d = cp.distance_to(gpoint);
240-
if (d < closest_dist && d < grab_threshold) {
241-
closest_dist = d;
239+
const real_t dist = cp.distance_to(gpoint);
240+
if (dist < closest_dist && dist < grab_threshold) {
241+
closest_dist = dist;
242242
closest_pos = cp;
243243
closest_idx = i;
244244
}
@@ -275,15 +275,15 @@ EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_ca
275275
}
276276
}
277277
if (mb->get_button_index() == MouseButton::RIGHT && mb->is_pressed() && edited_point == -1) {
278-
int closest_idx = -1;
279278
Vector2 closest_pos;
280279
real_t closest_dist = 1e10;
280+
int closest_idx = -1;
281281
for (int i = 0; i < poly.size(); i++) {
282282
Vector2 cp = p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth)));
283283

284-
real_t d = cp.distance_to(gpoint);
285-
if (d < closest_dist && d < grab_threshold) {
286-
closest_dist = d;
284+
const real_t dist = cp.distance_to(gpoint);
285+
if (dist < closest_dist && dist < grab_threshold) {
286+
closest_dist = dist;
287287
closest_pos = cp;
288288
closest_idx = i;
289289
}

‎editor/scene/3d/skeleton_3d_editor_plugin.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,17 +1522,17 @@ int Skeleton3DGizmoPlugin::subgizmos_intersect_ray(const EditorNode3DGizmo *p_gi
15221522
}
15231523

15241524
// Select bone.
1525-
real_t grab_threshold = 4 * EDSCALE;
1526-
Vector3 ray_from = p_camera->get_global_transform().origin;
1527-
Transform3D gt = skeleton->get_global_transform();
1528-
int closest_idx = -1;
1525+
const Transform3D gt = skeleton->get_global_transform();
1526+
const Vector3 ray_from = p_camera->get_global_transform().origin;
1527+
const real_t grab_threshold = 4.0f * EDSCALE;
15291528
real_t closest_dist = 1e10;
1529+
int closest_idx = -1;
15301530
const int bone_count = skeleton->get_bone_count();
15311531
for (int i = 0; i < bone_count; i++) {
1532-
Vector3 joint_pos_3d = gt.xform(skeleton->get_bone_global_pose(i).origin);
1533-
Vector2 joint_pos_2d = p_camera->unproject_position(joint_pos_3d);
1534-
real_t dist_3d = ray_from.distance_to(joint_pos_3d);
1535-
real_t dist_2d = p_point.distance_to(joint_pos_2d);
1532+
const Vector3 joint_pos_3d = gt.xform(skeleton->get_bone_global_pose(i).origin);
1533+
const Vector2 joint_pos_2d = p_camera->unproject_position(joint_pos_3d);
1534+
const real_t dist_3d = ray_from.distance_to(joint_pos_3d);
1535+
const real_t dist_2d = p_point.distance_to(joint_pos_2d);
15361536
if (dist_2d < grab_threshold && dist_3d < closest_dist) {
15371537
closest_dist = dist_3d;
15381538
closest_idx = i;

‎modules/mobile_vr/mobile_vr_interface.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void MobileVRInterface::set_position_from_sensors() {
139139
// make copies of our inputs
140140
bool has_grav = false;
141141
Vector3 acc = input->get_accelerometer();
142-
Vector3 gyro = input->get_gyroscope();
142+
const Vector3 gyro = input->get_gyroscope();
143143
Vector3 grav = input->get_gravity();
144144
Vector3 magneto = scale_magneto(input->get_magnetometer()); // this may be overkill on iOS because we're already getting a calibrated magnetometer reading
145145

‎modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ bool NavigationLink2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_e
6464
return false;
6565
}
6666

67-
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
67+
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
6868
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
6969

7070
Ref<InputEventMouseButton> mb = p_event;

‎modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ int NavigationObstacle3DGizmoPlugin::subgizmos_intersect_ray(const EditorNode3DG
138138

139139
for (int idx = 0; idx < vertices.size(); ++idx) {
140140
Vector3 pos = gt.xform(vertices[idx]);
141-
if (p_camera->unproject_position(pos).distance_to(p_point) < 20) {
141+
if (p_camera->unproject_position(pos).distance_to(p_point) < 20.0f) {
142142
return idx;
143143
}
144144
}
@@ -456,7 +456,7 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
456456
Vector3 cpoint = Vector3(spoint.x, 0.0, spoint.z);
457457
Vector<Vector3> obstacle_vertices = obstacle_node->get_vertices();
458458

459-
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
459+
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
460460

461461
switch (mode) {
462462
case MODE_CREATE: {
@@ -474,9 +474,9 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
474474
continue; // Skip edge as clicked point is too close to existing vertex.
475475
}
476476

477-
real_t d = cp.distance_to(mouse_position);
478-
if (d < closest_dist && d < grab_threshold) {
479-
closest_dist = d;
477+
const real_t dist = cp.distance_to(mouse_position);
478+
if (dist < closest_dist && dist < grab_threshold) {
479+
closest_dist = dist;
480480
closest_edge_point = cp;
481481
closest_idx = i;
482482
}
@@ -542,9 +542,9 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
542542
}
543543

544544
//search edges
545-
int closest_idx = -1;
546545
Vector2 closest_pos;
547546
real_t closest_dist = 1e10;
547+
int closest_idx = -1;
548548
for (int i = 0; i < obstacle_vertices.size(); i++) {
549549
const Vector2 a = p_camera->unproject_position(gt.xform(obstacle_vertices[i]));
550550
const Vector2 b = p_camera->unproject_position(gt.xform(obstacle_vertices[(i + 1) % obstacle_vertices.size()]));
@@ -554,9 +554,9 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
554554
continue; //not valid to reuse point
555555
}
556556

557-
real_t d = cp.distance_to(mouse_position);
558-
if (d < closest_dist && d < grab_threshold) {
559-
closest_dist = d;
557+
const real_t dist = cp.distance_to(mouse_position);
558+
if (dist < closest_dist && dist < grab_threshold) {
559+
closest_dist = dist;
560560
closest_pos = cp;
561561
closest_idx = i;
562562
}
@@ -574,15 +574,15 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
574574
return EditorPlugin::AFTER_GUI_INPUT_STOP;
575575
}
576576
} else {
577-
int closest_idx = -1;
578577
Vector2 closest_pos;
579578
real_t closest_dist = 1e10;
579+
int closest_idx = -1;
580580
for (int i = 0; i < obstacle_vertices.size(); i++) {
581581
Vector2 cp = p_camera->unproject_position(gt.xform(obstacle_vertices[i]));
582582

583-
real_t d = cp.distance_to(mouse_position);
584-
if (d < closest_dist && d < grab_threshold) {
585-
closest_dist = d;
583+
const real_t dist = cp.distance_to(mouse_position);
584+
if (dist < closest_dist && dist < grab_threshold) {
585+
closest_dist = dist;
586586
closest_pos = cp;
587587
closest_idx = i;
588588
}
@@ -620,13 +620,13 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
620620

621621
case MODE_DELETE: {
622622
if (mb->get_button_index() == MouseButton::LEFT && mb->is_pressed()) {
623-
int closest_idx = -1;
624623
real_t closest_dist = 1e10;
624+
int closest_idx = -1;
625625
for (int i = 0; i < obstacle_vertices.size(); i++) {
626626
Vector2 point = p_camera->unproject_position(gt.xform(obstacle_vertices[i]));
627-
real_t d = point.distance_to(mouse_position);
628-
if (d < closest_dist && d < grab_threshold) {
629-
closest_dist = d;
627+
const real_t dist = point.distance_to(mouse_position);
628+
if (dist < closest_dist && dist < grab_threshold) {
629+
closest_dist = dist;
630630
closest_idx = i;
631631
}
632632
}

0 commit comments

Comments
 (0)