summaryrefslogtreecommitdiffstats
path: root/scene
diff options
context:
space:
mode:
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/sprite_2d.cpp3
-rw-r--r--scene/3d/decal.cpp2
-rw-r--r--scene/3d/fog_volume.cpp4
-rw-r--r--scene/3d/gpu_particles_collision_3d.cpp10
-rw-r--r--scene/3d/occluder_instance_3d.cpp2
-rw-r--r--scene/3d/voxel_gi.cpp2
-rw-r--r--scene/gui/aspect_ratio_container.cpp6
-rw-r--r--scene/gui/center_container.cpp3
-rw-r--r--scene/gui/check_box.cpp16
-rw-r--r--scene/gui/check_button.cpp4
-rw-r--r--scene/gui/control.cpp3
-rw-r--r--scene/gui/dialogs.cpp3
-rw-r--r--scene/gui/graph_edit.cpp3
-rw-r--r--scene/gui/graph_element.cpp3
-rw-r--r--scene/gui/panel_container.cpp3
-rw-r--r--scene/gui/popup.cpp3
-rw-r--r--scene/gui/progress_bar.cpp6
-rw-r--r--scene/gui/rich_text_label.cpp2
-rw-r--r--scene/gui/scroll_container.cpp3
-rw-r--r--scene/gui/subviewport_container.cpp3
-rw-r--r--scene/gui/tab_container.cpp3
-rw-r--r--scene/gui/texture_button.cpp4
-rw-r--r--scene/gui/texture_progress_bar.cpp3
-rw-r--r--scene/main/viewport.cpp6
-rw-r--r--scene/main/window.cpp8
-rw-r--r--scene/resources/2d/polygon_path_finder.cpp3
-rw-r--r--scene/resources/2d/tile_set.cpp6
-rw-r--r--scene/resources/3d/primitive_meshes.cpp6
-rw-r--r--scene/resources/navigation_polygon.cpp3
29 files changed, 48 insertions, 78 deletions
diff --git a/scene/2d/sprite_2d.cpp b/scene/2d/sprite_2d.cpp
index 3c19dd0020..5745a59297 100644
--- a/scene/2d/sprite_2d.cpp
+++ b/scene/2d/sprite_2d.cpp
@@ -374,8 +374,7 @@ bool Sprite2D::is_pixel_opaque(const Point2 &p_point) const {
q.y = texture->get_size().height - q.y - 1;
}
} else {
- q.x = MIN(q.x, texture->get_size().width - 1);
- q.y = MIN(q.y, texture->get_size().height - 1);
+ q = q.min(texture->get_size() - Vector2(1, 1));
}
return texture->is_pixel_opaque((int)q.x, (int)q.y);
diff --git a/scene/3d/decal.cpp b/scene/3d/decal.cpp
index 6878df21d8..caabb4225f 100644
--- a/scene/3d/decal.cpp
+++ b/scene/3d/decal.cpp
@@ -31,7 +31,7 @@
#include "decal.h"
void Decal::set_size(const Vector3 &p_size) {
- size = Vector3(MAX(0.001, p_size.x), MAX(0.001, p_size.y), MAX(0.001, p_size.z));
+ size = p_size.max(Vector3(0.001, 0.001, 0.001));
RS::get_singleton()->decal_set_size(decal, size);
update_gizmos();
}
diff --git a/scene/3d/fog_volume.cpp b/scene/3d/fog_volume.cpp
index 12ca1888c4..8af386f282 100644
--- a/scene/3d/fog_volume.cpp
+++ b/scene/3d/fog_volume.cpp
@@ -73,9 +73,7 @@ bool FogVolume::_get(const StringName &p_name, Variant &r_property) const {
void FogVolume::set_size(const Vector3 &p_size) {
size = p_size;
- size.x = MAX(0.0, size.x);
- size.y = MAX(0.0, size.y);
- size.z = MAX(0.0, size.z);
+ size = size.max(Vector3());
RS::get_singleton()->fog_volume_set_size(_get_volume(), size);
update_gizmos();
}
diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp
index cbc75801b0..8fd5f25749 100644
--- a/scene/3d/gpu_particles_collision_3d.cpp
+++ b/scene/3d/gpu_particles_collision_3d.cpp
@@ -330,7 +330,7 @@ void GPUParticlesCollisionSDF3D::_find_closest_distance(const Vector3 &p_pos, co
Vector3 center = p_bvh[p_bvh_cell].bounds.position + he;
Vector3 rel = (p_pos - center).abs();
- Vector3 closest(MIN(rel.x, he.x), MIN(rel.y, he.y), MIN(rel.z, he.z));
+ Vector3 closest = rel.min(he);
float d = rel.distance_to(closest);
if (d >= r_closest_distance) {
@@ -382,9 +382,7 @@ Vector3i GPUParticlesCollisionSDF3D::get_estimated_cell_size() const {
float cell_size = aabb.get_longest_axis_size() / float(subdiv);
Vector3i sdf_size = Vector3i(aabb.size / cell_size);
- sdf_size.x = MAX(1, sdf_size.x);
- sdf_size.y = MAX(1, sdf_size.y);
- sdf_size.z = MAX(1, sdf_size.z);
+ sdf_size = sdf_size.max(Vector3i(1, 1, 1));
return sdf_size;
}
@@ -397,9 +395,7 @@ Ref<Image> GPUParticlesCollisionSDF3D::bake() {
float cell_size = aabb.get_longest_axis_size() / float(subdiv);
Vector3i sdf_size = Vector3i(aabb.size / cell_size);
- sdf_size.x = MAX(1, sdf_size.x);
- sdf_size.y = MAX(1, sdf_size.y);
- sdf_size.z = MAX(1, sdf_size.z);
+ sdf_size = sdf_size.max(Vector3i(1, 1, 1));
if (bake_begin_function) {
bake_begin_function(100);
diff --git a/scene/3d/occluder_instance_3d.cpp b/scene/3d/occluder_instance_3d.cpp
index 8d995a8785..2f77185d0d 100644
--- a/scene/3d/occluder_instance_3d.cpp
+++ b/scene/3d/occluder_instance_3d.cpp
@@ -236,7 +236,7 @@ void BoxOccluder3D::set_size(const Vector3 &p_size) {
return;
}
- size = Vector3(MAX(p_size.x, 0.0f), MAX(p_size.y, 0.0f), MAX(p_size.z, 0.0f));
+ size = p_size.max(Vector3());
_update();
}
diff --git a/scene/3d/voxel_gi.cpp b/scene/3d/voxel_gi.cpp
index eb8569fa30..938d6e5699 100644
--- a/scene/3d/voxel_gi.cpp
+++ b/scene/3d/voxel_gi.cpp
@@ -294,7 +294,7 @@ VoxelGI::Subdiv VoxelGI::get_subdiv() const {
void VoxelGI::set_size(const Vector3 &p_size) {
// Prevent very small size dimensions as these breaks baking if other size dimensions are set very high.
- size = Vector3(MAX(1.0, p_size.x), MAX(1.0, p_size.y), MAX(1.0, p_size.z));
+ size = p_size.max(Vector3(1.0, 1.0, 1.0));
update_gizmos();
}
diff --git a/scene/gui/aspect_ratio_container.cpp b/scene/gui/aspect_ratio_container.cpp
index 94240ccead..711dd13781 100644
--- a/scene/gui/aspect_ratio_container.cpp
+++ b/scene/gui/aspect_ratio_container.cpp
@@ -46,8 +46,7 @@ Size2 AspectRatioContainer::get_minimum_size() const {
continue;
}
Size2 minsize = c->get_combined_minimum_size();
- ms.width = MAX(ms.width, minsize.width);
- ms.height = MAX(ms.height, minsize.height);
+ ms = ms.max(minsize);
}
return ms;
}
@@ -144,8 +143,7 @@ void AspectRatioContainer::_notification(int p_what) {
} break;
}
child_size *= scale_factor;
- child_size.x = MAX(child_size.x, child_minsize.x);
- child_size.y = MAX(child_size.y, child_minsize.y);
+ child_size = child_size.max(child_minsize);
float align_x = 0.5;
switch (alignment_horizontal) {
diff --git a/scene/gui/center_container.cpp b/scene/gui/center_container.cpp
index 7a860cdea7..acdeae289b 100644
--- a/scene/gui/center_container.cpp
+++ b/scene/gui/center_container.cpp
@@ -47,8 +47,7 @@ Size2 CenterContainer::get_minimum_size() const {
continue;
}
Size2 minsize = c->get_combined_minimum_size();
- ms.width = MAX(ms.width, minsize.width);
- ms.height = MAX(ms.height, minsize.height);
+ ms = ms.max(minsize);
}
return ms;
diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp
index 46c20e4a1c..af6696834e 100644
--- a/scene/gui/check_box.cpp
+++ b/scene/gui/check_box.cpp
@@ -36,28 +36,28 @@
Size2 CheckBox::get_icon_size() const {
Size2 tex_size = Size2(0, 0);
if (!theme_cache.checked.is_null()) {
- tex_size = Size2(theme_cache.checked->get_width(), theme_cache.checked->get_height());
+ tex_size = theme_cache.checked->get_size();
}
if (!theme_cache.unchecked.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.unchecked->get_width()), MAX(tex_size.height, theme_cache.unchecked->get_height()));
+ tex_size = tex_size.max(theme_cache.unchecked->get_size());
}
if (!theme_cache.radio_checked.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_checked->get_width()), MAX(tex_size.height, theme_cache.radio_checked->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_checked->get_size());
}
if (!theme_cache.radio_unchecked.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_unchecked->get_width()), MAX(tex_size.height, theme_cache.radio_unchecked->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_unchecked->get_size());
}
if (!theme_cache.checked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.checked_disabled->get_width()), MAX(tex_size.height, theme_cache.checked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.checked_disabled->get_size());
}
if (!theme_cache.unchecked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.unchecked_disabled->get_width()), MAX(tex_size.height, theme_cache.unchecked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.unchecked_disabled->get_size());
}
if (!theme_cache.radio_checked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_checked_disabled->get_width()), MAX(tex_size.height, theme_cache.radio_checked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_checked_disabled->get_size());
}
if (!theme_cache.radio_unchecked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_unchecked_disabled->get_width()), MAX(tex_size.height, theme_cache.radio_unchecked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_unchecked_disabled->get_size());
}
return tex_size;
}
diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp
index ca2ef220fd..ab3b74a3c3 100644
--- a/scene/gui/check_button.cpp
+++ b/scene/gui/check_button.cpp
@@ -57,10 +57,10 @@ Size2 CheckButton::get_icon_size() const {
Size2 tex_size = Size2(0, 0);
if (!on_tex.is_null()) {
- tex_size = Size2(on_tex->get_width(), on_tex->get_height());
+ tex_size = on_tex->get_size();
}
if (!off_tex.is_null()) {
- tex_size = Size2(MAX(tex_size.width, off_tex->get_width()), MAX(tex_size.height, off_tex->get_height()));
+ tex_size = tex_size.max(off_tex->get_size());
}
return tex_size;
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index d65399446c..342b90bb52 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1653,8 +1653,7 @@ Size2 Control::get_custom_minimum_size() const {
void Control::_update_minimum_size_cache() {
Size2 minsize = get_minimum_size();
- minsize.x = MAX(minsize.x, data.custom_minimum_size.x);
- minsize.y = MAX(minsize.y, data.custom_minimum_size.y);
+ minsize = minsize.max(data.custom_minimum_size);
data.minimum_size_cache = minsize;
data.minimum_size_valid = true;
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 3746b667f6..c13a2e281a 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -252,8 +252,7 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
}
Size2 child_minsize = c->get_combined_minimum_size();
- content_minsize.x = MAX(child_minsize.x, content_minsize.x);
- content_minsize.y = MAX(child_minsize.y, content_minsize.y);
+ content_minsize = child_minsize.max(content_minsize);
}
// Then we take the background panel as it provides the offsets,
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 056872a4fe..8bce5c0caa 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -181,8 +181,7 @@ void GraphEditMinimap::gui_input(const Ref<InputEvent> &p_ev) {
if (is_resizing) {
// Prevent setting minimap wider than GraphEdit.
Vector2 new_minimap_size;
- new_minimap_size.width = MIN(get_size().width - mm->get_relative().x, ge->get_size().width - 2.0 * minimap_padding.x);
- new_minimap_size.height = MIN(get_size().height - mm->get_relative().y, ge->get_size().height - 2.0 * minimap_padding.y);
+ new_minimap_size = (get_size() - mm->get_relative()).min(ge->get_size() - 2.0 * minimap_padding);
ge->set_minimap_size(new_minimap_size);
queue_redraw();
diff --git a/scene/gui/graph_element.cpp b/scene/gui/graph_element.cpp
index 7fa5b0ceec..9eb9578b2c 100644
--- a/scene/gui/graph_element.cpp
+++ b/scene/gui/graph_element.cpp
@@ -74,8 +74,7 @@ Size2 GraphElement::get_minimum_size() const {
Size2i size = child->get_combined_minimum_size();
- minsize.width = MAX(minsize.width, size.width);
- minsize.height = MAX(minsize.height, size.height);
+ minsize = minsize.max(size);
}
return minsize;
diff --git a/scene/gui/panel_container.cpp b/scene/gui/panel_container.cpp
index 306ef4936f..ef85919859 100644
--- a/scene/gui/panel_container.cpp
+++ b/scene/gui/panel_container.cpp
@@ -44,8 +44,7 @@ Size2 PanelContainer::get_minimum_size() const {
}
Size2 minsize = c->get_combined_minimum_size();
- ms.width = MAX(ms.width, minsize.width);
- ms.height = MAX(ms.height, minsize.height);
+ ms = ms.max(minsize);
}
if (theme_cache.panel_style.is_valid()) {
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index 0c5a882044..0927404947 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -224,8 +224,7 @@ Size2 PopupPanel::_get_contents_minimum_size() const {
}
Size2 cms = c->get_combined_minimum_size();
- ms.x = MAX(cms.x, ms.x);
- ms.y = MAX(cms.y, ms.y);
+ ms = cms.max(ms);
}
return ms + theme_cache.panel_style->get_minimum_size();
diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp
index c66b30f130..b2617e6fc7 100644
--- a/scene/gui/progress_bar.cpp
+++ b/scene/gui/progress_bar.cpp
@@ -35,15 +35,13 @@
Size2 ProgressBar::get_minimum_size() const {
Size2 minimum_size = theme_cache.background_style->get_minimum_size();
- minimum_size.height = MAX(minimum_size.height, theme_cache.fill_style->get_minimum_size().height);
- minimum_size.width = MAX(minimum_size.width, theme_cache.fill_style->get_minimum_size().width);
+ minimum_size = minimum_size.max(theme_cache.fill_style->get_minimum_size());
if (show_percentage) {
String txt = "100%";
TextLine tl = TextLine(txt, theme_cache.font, theme_cache.font_size);
minimum_size.height = MAX(minimum_size.height, theme_cache.background_style->get_minimum_size().height + tl.get_size().y);
} else { // this is needed, else the progressbar will collapse
- minimum_size.width = MAX(minimum_size.width, 1);
- minimum_size.height = MAX(minimum_size.height, 1);
+ minimum_size = minimum_size.max(Size2(1, 1));
}
return minimum_size;
}
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index cb7ccb583e..1baf71dd07 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -951,7 +951,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
case ITEM_IMAGE: {
ItemImage *img = static_cast<ItemImage *>(it);
if (img->pad) {
- Size2 pad_size = Size2(MIN(rect.size.x, img->image->get_width()), MIN(rect.size.y, img->image->get_height()));
+ Size2 pad_size = rect.size.min(img->image->get_size());
Vector2 pad_off = (rect.size - pad_size) / 2;
img->image->draw_rect(ci, Rect2(p_ofs + rect.position + off + pad_off, pad_size), false, img->color);
} else {
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index 89d308de3f..1447d2f002 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -56,8 +56,7 @@ Size2 ScrollContainer::get_minimum_size() const {
Size2 child_min_size = c->get_combined_minimum_size();
- largest_child_min_size.x = MAX(largest_child_min_size.x, child_min_size.x);
- largest_child_min_size.y = MAX(largest_child_min_size.y, child_min_size.y);
+ largest_child_min_size = largest_child_min_size.max(child_min_size);
}
if (horizontal_scroll_mode == SCROLL_MODE_DISABLED) {
diff --git a/scene/gui/subviewport_container.cpp b/scene/gui/subviewport_container.cpp
index 0d33774e20..f6cfe6ab18 100644
--- a/scene/gui/subviewport_container.cpp
+++ b/scene/gui/subviewport_container.cpp
@@ -45,8 +45,7 @@ Size2 SubViewportContainer::get_minimum_size() const {
}
Size2 minsize = c->get_size();
- ms.width = MAX(ms.width, minsize.width);
- ms.height = MAX(ms.height, minsize.height);
+ ms = ms.max(minsize);
}
return ms;
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 741b38a35a..df3c9631f9 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -871,8 +871,7 @@ Size2 TabContainer::get_minimum_size() const {
}
Size2 cms = c->get_combined_minimum_size();
- largest_child_min_size.x = MAX(largest_child_min_size.x, cms.x);
- largest_child_min_size.y = MAX(largest_child_min_size.y, cms.y);
+ largest_child_min_size = largest_child_min_size.max(cms);
}
ms.y += largest_child_min_size.y;
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index dcbb25c41d..0b197c8c02 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -103,8 +103,8 @@ bool TextureButton::has_point(const Point2 &p_point) const {
point *= scale;
// finally, we need to check if the point is inside a rectangle with a position >= 0,0 and a size <= mask_size
- rect.position = Point2(MAX(0, _texture_region.position.x), MAX(0, _texture_region.position.y));
- rect.size = Size2(MIN(mask_size.x, _texture_region.size.x), MIN(mask_size.y, _texture_region.size.y));
+ rect.position = Point2().max(_texture_region.position);
+ rect.size = mask_size.min(_texture_region.size);
}
if (!rect.has_point(point)) {
diff --git a/scene/gui/texture_progress_bar.cpp b/scene/gui/texture_progress_bar.cpp
index 248260a7d2..5261cbe3eb 100644
--- a/scene/gui/texture_progress_bar.cpp
+++ b/scene/gui/texture_progress_bar.cpp
@@ -249,8 +249,7 @@ Point2 TextureProgressBar::get_relative_center() {
p += rad_center_off;
p.x /= progress->get_width();
p.y /= progress->get_height();
- p.x = CLAMP(p.x, 0, 1);
- p.y = CLAMP(p.y, 0, 1);
+ p = p.clamp(Point2(), Point2(1, 1));
return p;
}
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index c8d2d71c2a..41f3ff108c 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2747,8 +2747,7 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
Size2i min_size = gui.currently_dragged_subwindow->get_min_size();
Size2i min_size_clamped = gui.currently_dragged_subwindow->get_clamped_minimum_size();
- min_size_clamped.x = MAX(min_size_clamped.x, 1);
- min_size_clamped.y = MAX(min_size_clamped.y, 1);
+ min_size_clamped = min_size_clamped.max(Size2i(1, 1));
Rect2i r = gui.subwindow_resize_from_rect;
@@ -2809,8 +2808,7 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
Size2i max_size = gui.currently_dragged_subwindow->get_max_size();
if ((max_size.x > 0 || max_size.y > 0) && (max_size.x >= min_size.x && max_size.y >= min_size.y)) {
- max_size.x = MAX(max_size.x, 1);
- max_size.y = MAX(max_size.y, 1);
+ max_size = max_size.max(Size2i(1, 1));
if (r.size.x > max_size.x) {
r.size.x = max_size.x;
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 6632dd9033..bced493d98 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -1033,8 +1033,7 @@ void Window::_update_window_size() {
}
if (embedder) {
- size.x = MAX(size.x, 1);
- size.y = MAX(size.y, 1);
+ size = size.max(Size2i(1, 1));
embedder->_sub_window_update(this);
} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
@@ -1545,8 +1544,7 @@ Size2 Window::_get_contents_minimum_size() const {
Point2i pos = c->get_position();
Size2i min = c->get_combined_minimum_size();
- max.x = MAX(pos.x + min.x, max.x);
- max.y = MAX(pos.y + min.y, max.y);
+ max = max.max(pos + min);
}
}
@@ -1703,7 +1701,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio
Vector2i size_ratio = parent_rect.size * p_fallback_ratio;
Rect2i popup_rect;
- popup_rect.size = Vector2i(MIN(size_ratio.x, expected_size.x), MIN(size_ratio.y, expected_size.y));
+ popup_rect.size = size_ratio.min(expected_size);
popup_rect.size = _clamp_window_size(popup_rect.size);
if (parent_rect != Rect2()) {
diff --git a/scene/resources/2d/polygon_path_finder.cpp b/scene/resources/2d/polygon_path_finder.cpp
index 617a53f0a3..3aa292431d 100644
--- a/scene/resources/2d/polygon_path_finder.cpp
+++ b/scene/resources/2d/polygon_path_finder.cpp
@@ -64,8 +64,7 @@ void PolygonPathFinder::setup(const Vector<Vector2> &p_points, const Vector<int>
points.write[i].pos = p_points[i];
points.write[i].penalty = 0;
- outside_point.x = i == 0 ? p_points[0].x : (MAX(p_points[i].x, outside_point.x));
- outside_point.y = i == 0 ? p_points[0].y : (MAX(p_points[i].y, outside_point.y));
+ outside_point = i == 0 ? p_points[0] : p_points[i].max(outside_point);
if (i == 0) {
bounds.position = points[i].pos;
diff --git a/scene/resources/2d/tile_set.cpp b/scene/resources/2d/tile_set.cpp
index d09723d765..66d97398b9 100644
--- a/scene/resources/2d/tile_set.cpp
+++ b/scene/resources/2d/tile_set.cpp
@@ -4650,7 +4650,7 @@ Ref<Texture2D> TileSetAtlasSource::get_texture() const {
void TileSetAtlasSource::set_margins(Vector2i p_margins) {
if (p_margins.x < 0 || p_margins.y < 0) {
WARN_PRINT("Atlas source margins should be positive.");
- margins = Vector2i(MAX(0, p_margins.x), MAX(0, p_margins.y));
+ margins = p_margins.max(Vector2i());
} else {
margins = p_margins;
}
@@ -4666,7 +4666,7 @@ Vector2i TileSetAtlasSource::get_margins() const {
void TileSetAtlasSource::set_separation(Vector2i p_separation) {
if (p_separation.x < 0 || p_separation.y < 0) {
WARN_PRINT("Atlas source separation should be positive.");
- separation = Vector2i(MAX(0, p_separation.x), MAX(0, p_separation.y));
+ separation = p_separation.max(Vector2i());
} else {
separation = p_separation;
}
@@ -4682,7 +4682,7 @@ Vector2i TileSetAtlasSource::get_separation() const {
void TileSetAtlasSource::set_texture_region_size(Vector2i p_tile_size) {
if (p_tile_size.x <= 0 || p_tile_size.y <= 0) {
WARN_PRINT("Atlas source tile_size should be strictly positive.");
- texture_region_size = Vector2i(MAX(1, p_tile_size.x), MAX(1, p_tile_size.y));
+ texture_region_size = p_tile_size.max(Vector2i(1, 1));
} else {
texture_region_size = p_tile_size;
}
diff --git a/scene/resources/3d/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp
index c2b2a6d68b..ee772f960a 100644
--- a/scene/resources/3d/primitive_meshes.cpp
+++ b/scene/resources/3d/primitive_meshes.cpp
@@ -2845,10 +2845,8 @@ void TextMesh::_generate_glyph_mesh_data(const GlyphMeshKey &p_key, const Glyph
for (int j = 0; j < gl_data.contours[i].size(); j++) {
int next = (j + 1 == gl_data.contours[i].size()) ? 0 : (j + 1);
- gl_data.min_p.x = MIN(gl_data.min_p.x, gl_data.contours[i][j].point.x);
- gl_data.min_p.y = MIN(gl_data.min_p.y, gl_data.contours[i][j].point.y);
- gl_data.max_p.x = MAX(gl_data.max_p.x, gl_data.contours[i][j].point.x);
- gl_data.max_p.y = MAX(gl_data.max_p.y, gl_data.contours[i][j].point.y);
+ gl_data.min_p = gl_data.min_p.min(gl_data.contours[i][j].point);
+ gl_data.max_p = gl_data.max_p.max(gl_data.contours[i][j].point);
length += (gl_data.contours[i][next].point - gl_data.contours[i][j].point).length();
inp.GetPoint(j) = gl_data.contours[i][j].point;
diff --git a/scene/resources/navigation_polygon.cpp b/scene/resources/navigation_polygon.cpp
index e830153330..274b13a487 100644
--- a/scene/resources/navigation_polygon.cpp
+++ b/scene/resources/navigation_polygon.cpp
@@ -251,8 +251,7 @@ void NavigationPolygon::make_polygons_from_outlines() {
}
const Vector2 *r = ol.ptr();
for (int j = 0; j < olsize; j++) {
- outside_point.x = MAX(r[j].x, outside_point.x);
- outside_point.y = MAX(r[j].y, outside_point.y);
+ outside_point = outside_point.max(r[j]);
}
}