Skip to content

Commit 771f81f

Browse files
committed
Simplify vector initialization using from_scalar across codebase.
1 parent 6b7631c commit 771f81f

File tree

95 files changed

+189
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+189
-206
lines changed

core/io/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3401,7 +3401,7 @@ void Image::adjust_bcs(float p_brightness, float p_contrast, float p_saturation)
34013401
rgb *= p_brightness;
34023402
rgb = Vector3(0.5, 0.5, 0.5).lerp(rgb, p_contrast);
34033403
float center = (rgb.x + rgb.y + rgb.z) / 3.0;
3404-
rgb = Vector3(center, center, center).lerp(rgb, p_saturation);
3404+
rgb = Vector3::from_scalar(center).lerp(rgb, p_saturation);
34053405
c.r = rgb.x;
34063406
c.g = rgb.y;
34073407
c.b = rgb.z;

core/math/delaunay_3d.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class Delaunay3D {
216216
}
217217

218218
real_t longest_axis = rect.size[rect.get_longest_axis_index()];
219-
proportions = Vector3(longest_axis, longest_axis, longest_axis) / rect.size;
219+
proportions = Vector3::from_scalar(longest_axis) / rect.size;
220220

221221
for (uint32_t i = 0; i < point_count; i++) {
222222
// Scale points to the unit cube to better utilize R128 precision
@@ -329,8 +329,7 @@ class Delaunay3D {
329329
center.y = double(new_simplex->circum_center_y);
330330
center.z = double(new_simplex->circum_center_z);
331331

332-
const real_t radius2 = Math::sqrt(double(new_simplex->circum_r2)) + 0.0001;
333-
Vector3 extents = Vector3(radius2, radius2, radius2);
332+
Vector3 extents = Vector3::from_scalar(Math::sqrt(double(new_simplex->circum_r2)) + 0.0001);
334333
Vector3i from = Vector3i((center - extents) * proportions * ACCEL_GRID_SIZE);
335334
Vector3i to = Vector3i((center + extents) * proportions * ACCEL_GRID_SIZE);
336335
from = from.clampi(0, ACCEL_GRID_SIZE - 1);

core/variant/variant_call.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,7 +2878,7 @@ static void _register_variant_builtin_constants() {
28782878

28792879
_VariantCall::add_variant_constant(Variant::VECTOR3, "ZERO", Vector3(0, 0, 0));
28802880
_VariantCall::add_variant_constant(Variant::VECTOR3, "ONE", Vector3(1, 1, 1));
2881-
_VariantCall::add_variant_constant(Variant::VECTOR3, "INF", Vector3(Math::INF, Math::INF, Math::INF));
2881+
_VariantCall::add_variant_constant(Variant::VECTOR3, "INF", Vector3::from_scalar(Math::INF));
28822882
_VariantCall::add_variant_constant(Variant::VECTOR3, "LEFT", Vector3(-1, 0, 0));
28832883
_VariantCall::add_variant_constant(Variant::VECTOR3, "RIGHT", Vector3(1, 0, 0));
28842884
_VariantCall::add_variant_constant(Variant::VECTOR3, "UP", Vector3(0, 1, 0));
@@ -2918,8 +2918,8 @@ static void _register_variant_builtin_constants() {
29182918

29192919
_VariantCall::add_variant_constant(Variant::VECTOR3I, "ZERO", Vector3i(0, 0, 0));
29202920
_VariantCall::add_variant_constant(Variant::VECTOR3I, "ONE", Vector3i(1, 1, 1));
2921-
_VariantCall::add_variant_constant(Variant::VECTOR3I, "MIN", Vector3i(INT32_MIN, INT32_MIN, INT32_MIN));
2922-
_VariantCall::add_variant_constant(Variant::VECTOR3I, "MAX", Vector3i(INT32_MAX, INT32_MAX, INT32_MAX));
2921+
_VariantCall::add_variant_constant(Variant::VECTOR3I, "MIN", Vector3i::from_scalar(INT32_MIN));
2922+
_VariantCall::add_variant_constant(Variant::VECTOR3I, "MAX", Vector3i::from_scalar(INT32_MAX));
29232923
_VariantCall::add_variant_constant(Variant::VECTOR3I, "LEFT", Vector3i(-1, 0, 0));
29242924
_VariantCall::add_variant_constant(Variant::VECTOR3I, "RIGHT", Vector3i(1, 0, 0));
29252925
_VariantCall::add_variant_constant(Variant::VECTOR3I, "UP", Vector3i(0, 1, 0));

drivers/d3d12/rendering_device_driver_d3d12.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5897,7 +5897,7 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
58975897
if (options6.VariableShadingRateTier >= D3D12_VARIABLE_SHADING_RATE_TIER_2) {
58985898
fsr_capabilities.primitive_supported = true;
58995899
fsr_capabilities.attachment_supported = true;
5900-
fsr_capabilities.min_texel_size = Size2i(options6.ShadingRateImageTileSize, options6.ShadingRateImageTileSize);
5900+
fsr_capabilities.min_texel_size = Size2i::from_scalar(options6.ShadingRateImageTileSize);
59015901
fsr_capabilities.max_texel_size = Size2i(8, 8);
59025902
}
59035903
}

drivers/gles3/storage/light_storage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ AABB LightStorage::light_get_aabb(RID p_light) const {
355355
};
356356
case RS::LIGHT_OMNI: {
357357
float r = light->param[RS::LIGHT_PARAM_RANGE];
358-
return AABB(-Vector3(r, r, r), Vector3(r, r, r) * 2);
358+
return AABB(-Vector3(r, r, r), Vector3::from_scalar(r * 2));
359359
};
360360
case RS::LIGHT_DIRECTIONAL: {
361361
return AABB();
@@ -812,7 +812,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
812812

813813
if (atlas->render_buffers.is_null()) {
814814
atlas->render_buffers.instantiate();
815-
atlas->render_buffers->configure_for_probe(Size2i(atlas->size, atlas->size));
815+
atlas->render_buffers->configure_for_probe(Size2i::from_scalar(atlas->size));
816816
}
817817

818818
// First we check if our atlas is initialized.

drivers/gles3/storage/texture_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,7 @@ void TextureStorage::update_texture_atlas() {
19901990

19911991
for (int i = 0; i < item_count; i++) {
19921992
TextureAtlas::Texture *t = texture_atlas.textures.getptr(items[i].texture);
1993-
t->uv_rect.position = items[i].pos * border + Vector2i(border / 2, border / 2);
1993+
t->uv_rect.position = items[i].pos * border + Vector2i::from_scalar(border / 2);
19941994
t->uv_rect.size = items[i].pixel_size;
19951995

19961996
t->uv_rect.position /= Size2(texture_atlas.size);

editor/animation/animation_blend_tree_editor_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ void AnimationNodeBlendTreeEditor::_inspect_filters(const String &p_which) {
933933
return;
934934
}
935935

936-
filter_dialog->popup_centered(Size2(500, 500) * EDSCALE);
936+
filter_dialog->popup_centered(Size2::from_scalar(500 * EDSCALE));
937937
}
938938

939939
void AnimationNodeBlendTreeEditor::_update_editor_settings() {

editor/animation/animation_player_editor_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ void AnimationPlayerEditor::_edit_animation_blend() {
779779
return;
780780
}
781781

782-
blend_editor.dialog->popup_centered(Size2(400, 400) * EDSCALE);
782+
blend_editor.dialog->popup_centered(Size2::from_scalar(400 * EDSCALE));
783783
_update_animation_blend();
784784
}
785785

editor/animation/animation_track_editor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2177,7 +2177,7 @@ void AnimationTrackEdit::_notification(int p_what) {
21772177
text_color.a *= 0.7;
21782178
} else if (node) {
21792179
Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node, "Node");
2180-
const Vector2 icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
2180+
const Vector2 icon_size = Vector2::from_scalar(get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
21812181

21822182
icon_rect = Rect2(Point2(ofs, (get_size().height - check->get_height()) / 2).round(), icon->get_size());
21832183
draw_texture_rect(icon, icon_rect);
@@ -3728,7 +3728,7 @@ AnimationTrackEdit *AnimationTrackEditPlugin::create_animation_track_edit(Object
37283728
void AnimationTrackEditGroup::_notification(int p_what) {
37293729
switch (p_what) {
37303730
case NOTIFICATION_THEME_CHANGED: {
3731-
icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
3731+
icon_size = Vector2::from_scalar(get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
37323732
} break;
37333733

37343734
case NOTIFICATION_ACCESSIBILITY_UPDATE: {

editor/asset_library/asset_library_editor_plugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) {
137137

138138
icon = memnew(TextureButton);
139139
icon->set_accessibility_name(TTRC("Open asset details"));
140-
icon->set_custom_minimum_size(Size2(64, 64) * EDSCALE);
140+
icon->set_custom_minimum_size(Size2::from_scalar(64 * EDSCALE));
141141
hb->add_child(icon);
142142

143143
VBoxContainer *vb = memnew(VBoxContainer);
@@ -330,7 +330,7 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
330330
item = memnew(EditorAssetLibraryItem);
331331

332332
desc_vbox->add_child(item);
333-
desc_vbox->set_custom_minimum_size(Size2(440 * EDSCALE, 440 * EDSCALE));
333+
desc_vbox->set_custom_minimum_size(Size2::from_scalar(440 * EDSCALE));
334334

335335
description = memnew(RichTextLabel);
336336
desc_vbox->add_child(description);

0 commit comments

Comments
 (0)