Add helper macros for constructing vectors from a scalar

Author: WhalesState

core/io/image.cpp

@@ -3401,7 +3401,7 @@ void Image::adjust_bcs(float p_brightness, float p_contrast, float p_saturation)
 		rgb *= p_brightness;
 		rgb = Vector3(0.5, 0.5, 0.5).lerp(rgb, p_contrast);
 		float center = (rgb.x + rgb.y + rgb.z) / 3.0;
-		rgb = Vector3(center, center, center).lerp(rgb, p_saturation);
+		rgb = VEC3(center).lerp(rgb, p_saturation);
 		c.r = rgb.x;
 		c.g = rgb.y;
 		c.b = rgb.z;

core/math/delaunay_3d.h

@@ -216,7 +216,7 @@ class Delaunay3D {
 			}
 
 			real_t longest_axis = rect.size[rect.get_longest_axis_index()];
-			proportions = Vector3(longest_axis, longest_axis, longest_axis) / rect.size;
+			proportions = VEC3(longest_axis) / rect.size;
 
 			for (uint32_t i = 0; i < point_count; i++) {
 				// Scale points to the unit cube to better utilize R128 precision
@@ -329,8 +329,7 @@ class Delaunay3D {
 					center.y = double(new_simplex->circum_center_y);
 					center.z = double(new_simplex->circum_center_z);
 
-					const real_t radius2 = Math::sqrt(double(new_simplex->circum_r2)) + 0.0001;
-					Vector3 extents = Vector3(radius2, radius2, radius2);
+					Vector3 extents = VEC3(Math::sqrt(double(new_simplex->circum_r2)) + 0.0001);
 					Vector3i from = Vector3i((center - extents) * proportions * ACCEL_GRID_SIZE);
 					Vector3i to = Vector3i((center + extents) * proportions * ACCEL_GRID_SIZE);
 					from = from.clampi(0, ACCEL_GRID_SIZE - 1);

core/math/math_defs.h

@@ -145,3 +145,11 @@ typedef double real_t;
 #else
 typedef float real_t;
 #endif
+
+// Vector from scalar.
+#define VEC2(scalar) Vector2(scalar, scalar)
+#define VEC2I(scalar) Vector2i(scalar, scalar)
+#define VEC3(scalar) Vector3(scalar, scalar, scalar)
+#define VEC3I(scalar) Vector3i(scalar, scalar, scalar)
+#define VEC4(scalar) Vector4(scalar, scalar, scalar, scalar)
+#define VEC4I(scalar) Vector4i(scalar, scalar, scalar, scalar)

drivers/d3d12/rendering_device_driver_d3d12.cpp

@@ -6120,7 +6120,7 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
 			if (options6.VariableShadingRateTier >= D3D12_VARIABLE_SHADING_RATE_TIER_2) {
 				fsr_capabilities.primitive_supported = true;
 				fsr_capabilities.attachment_supported = true;
-				fsr_capabilities.min_texel_size = Size2i(options6.ShadingRateImageTileSize, options6.ShadingRateImageTileSize);
+				fsr_capabilities.min_texel_size = VEC2I(options6.ShadingRateImageTileSize);
 				fsr_capabilities.max_texel_size = Size2i(8, 8);
 			}
 		}

drivers/gles3/storage/light_storage.cpp

@@ -812,7 +812,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
 
 	if (atlas->render_buffers.is_null()) {
 		atlas->render_buffers.instantiate();
-		atlas->render_buffers->configure_for_probe(Size2i(atlas->size, atlas->size));
+		atlas->render_buffers->configure_for_probe(VEC2I(atlas->size));
 	}
 
 	// First we check if our atlas is initialized.

drivers/gles3/storage/texture_storage.cpp

@@ -2041,7 +2041,7 @@ void TextureStorage::update_texture_atlas() {
 
 		for (int i = 0; i < item_count; i++) {
 			TextureAtlas::Texture *t = texture_atlas.textures.getptr(items[i].texture);
-			t->uv_rect.position = items[i].pos * border + Vector2i(border / 2, border / 2);
+			t->uv_rect.position = items[i].pos * border + VEC2I(border / 2);
 			t->uv_rect.size = items[i].pixel_size;
 
 			t->uv_rect.position /= Size2(texture_atlas.size);

editor/animation/animation_blend_tree_editor_plugin.cpp

@@ -933,7 +933,7 @@ void AnimationNodeBlendTreeEditor::_inspect_filters(const String &p_which) {
 		return;
 	}
 
-	filter_dialog->popup_centered(Size2(500, 500) * EDSCALE);
+	filter_dialog->popup_centered(VEC2(500 * EDSCALE));
 }
 
 void AnimationNodeBlendTreeEditor::_update_editor_settings() {

editor/animation/animation_player_editor_plugin.cpp

@@ -779,7 +779,7 @@ void AnimationPlayerEditor::_edit_animation_blend() {
 		return;
 	}
 
-	blend_editor.dialog->popup_centered(Size2(400, 400) * EDSCALE);
+	blend_editor.dialog->popup_centered(VEC2(400 * EDSCALE));
 	_update_animation_blend();
 }
 

editor/animation/animation_track_editor.cpp

@@ -2177,7 +2177,7 @@ void AnimationTrackEdit::_notification(int p_what) {
 					text_color.a *= 0.7;
 				} else if (node) {
 					Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node, "Node");
-					const Vector2 icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
+					const Vector2 icon_size = VEC2(get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
 
 					icon_rect = Rect2(Point2(ofs, (get_size().height - check->get_height()) / 2).round(), icon->get_size());
 					draw_texture_rect(icon, icon_rect);
@@ -3728,7 +3728,7 @@ AnimationTrackEdit *AnimationTrackEditPlugin::create_animation_track_edit(Object
 void AnimationTrackEditGroup::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
-			icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
+			icon_size = VEC2(get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
 		} break;
 
 		case NOTIFICATION_ACCESSIBILITY_UPDATE: {

editor/asset_library/asset_library_editor_plugin.cpp

@@ -137,7 +137,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) {
 
 	icon = memnew(TextureButton);
 	icon->set_accessibility_name(TTRC("Open asset details"));
-	icon->set_custom_minimum_size(Size2(64, 64) * EDSCALE);
+	icon->set_custom_minimum_size(VEC2(64 * EDSCALE));
 	hb->add_child(icon);
 
 	VBoxContainer *vb = memnew(VBoxContainer);
@@ -330,7 +330,7 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
 	item = memnew(EditorAssetLibraryItem);
 
 	desc_vbox->add_child(item);
-	desc_vbox->set_custom_minimum_size(Size2(440 * EDSCALE, 440 * EDSCALE));
+	desc_vbox->set_custom_minimum_size(VEC2(440 * EDSCALE));
 
 	description = memnew(RichTextLabel);
 	desc_vbox->add_child(description);