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

Merge pull request #52790 from AnilBK/dont-construct

This commit is contained in:
Rémi Verschelde 2021-09-23 19:44:19 +02:00 committed by GitHub
parent 2ec1152b0f cc51b045da
commit 01f692c173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/math/aabb.cpp
View File

@ -52,8 +52,8 @@ void AABB::merge_with(const AABB &p_aabb) {
beg_1 = position; beg_1 = position;
beg_2 = p_aabb.position; beg_2 = p_aabb.position;
end_1 = Vector3(size.x, size.y, size.z) + beg_1; end_1 = size + beg_1;
end_2 = Vector3(p_aabb.size.x, p_aabb.size.y, p_aabb.size.z) + beg_2; end_2 = p_aabb.size + beg_2;
min.x = (beg_1.x < beg_2.x) ? beg_1.x : beg_2.x; min.x = (beg_1.x < beg_2.x) ? beg_1.x : beg_2.x;
min.y = (beg_1.y < beg_2.y) ? beg_1.y : beg_2.y; min.y = (beg_1.y < beg_2.y) ? beg_1.y : beg_2.y;

2
editor/editor_audio_buses.cpp
View File

@ -535,7 +535,7 @@ void EditorAudioBus::gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_RIGHT && mb->is_pressed()) { if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_RIGHT && mb->is_pressed()) {
Vector2 pos = Vector2(mb->get_position().x, mb->get_position().y); Vector2 pos = mb->get_position();
bus_popup->set_position(get_global_position() + pos); bus_popup->set_position(get_global_position() + pos);
bus_popup->popup(); bus_popup->popup();
} }

2
editor/import/resource_importer_texture_atlas.cpp
View File

@ -324,7 +324,7 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
atlas_texture.instantiate(); atlas_texture.instantiate();
atlas_texture->set_atlas(cache); atlas_texture->set_atlas(cache);
atlas_texture->set_region(Rect2(offset, pack_data.region.size)); atlas_texture->set_region(Rect2(offset, pack_data.region.size));
atlas_texture->set_margin(Rect2(pack_data.region.position, Size2(pack_data.image->get_width(), pack_data.image->get_height()) - pack_data.region.size)); atlas_texture->set_margin(Rect2(pack_data.region.position, pack_data.image->get_size() - pack_data.region.size));
texture = atlas_texture; texture = atlas_texture;
} else { } else {

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -120,7 +120,7 @@ void AnimationPlayerEditor::_notification(int p_what) {
Ref<Image> autoplay_img = autoplay_icon->get_image(); Ref<Image> autoplay_img = autoplay_icon->get_image();
Ref<Image> reset_img = reset_icon->get_image(); Ref<Image> reset_img = reset_icon->get_image();
Ref<Image> autoplay_reset_img; Ref<Image> autoplay_reset_img;
Size2 icon_size = Size2(autoplay_img->get_width(), autoplay_img->get_height()); Size2 icon_size = autoplay_img->get_size();
autoplay_reset_img.instantiate(); autoplay_reset_img.instantiate();
autoplay_reset_img->create(icon_size.x * 2, icon_size.y, false, autoplay_img->get_format()); autoplay_reset_img->create(icon_size.x * 2, icon_size.y, false, autoplay_img->get_format());
autoplay_reset_img->blit_rect(autoplay_img, Rect2(Point2(), icon_size), Point2()); autoplay_reset_img->blit_rect(autoplay_img, Rect2(Point2(), icon_size), Point2());

2
editor/plugins/cpu_particles_2d_editor_plugin.cpp
View File

@ -83,7 +83,7 @@ void CPUParticles2DEditorPlugin::_generate_emission_mask() {
} }
img->convert(Image::FORMAT_RGBA8); img->convert(Image::FORMAT_RGBA8);
ERR_FAIL_COND(img->get_format() != Image::FORMAT_RGBA8); ERR_FAIL_COND(img->get_format() != Image::FORMAT_RGBA8);
Size2i s = Size2(img->get_width(), img->get_height()); Size2i s = img->get_size();
ERR_FAIL_COND(s.width == 0 || s.height == 0); ERR_FAIL_COND(s.width == 0 || s.height == 0);
Vector<Point2> valid_positions; Vector<Point2> valid_positions;

2
editor/plugins/gpu_particles_2d_editor_plugin.cpp
View File

@ -158,7 +158,7 @@ void GPUParticles2DEditorPlugin::_generate_emission_mask() {
} }
img->convert(Image::FORMAT_RGBA8); img->convert(Image::FORMAT_RGBA8);
ERR_FAIL_COND(img->get_format() != Image::FORMAT_RGBA8); ERR_FAIL_COND(img->get_format() != Image::FORMAT_RGBA8);
Size2i s = Size2(img->get_width(), img->get_height()); Size2i s = img->get_size();
ERR_FAIL_COND(s.width == 0 || s.height == 0); ERR_FAIL_COND(s.width == 0 || s.height == 0);
Vector<Point2> valid_positions; Vector<Point2> valid_positions;

16
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -128,7 +128,7 @@ void ViewportRotationControl::_draw_axis(const Axis2D &p_axis) {
const Color axis_color = axis_colors[direction]; const Color axis_color = axis_colors[direction];
const double alpha = focused ? 1.0 : ((p_axis.z_axis + 1.0) / 2.0) * 0.5 + 0.5; const double alpha = focused ? 1.0 : ((p_axis.z_axis + 1.0) / 2.0) * 0.5 + 0.5;
const Color c = focused ? Color(0.9, 0.9, 0.9) : Color(axis_color.r, axis_color.g, axis_color.b, alpha); const Color c = focused ? Color(0.9, 0.9, 0.9) : Color(axis_color, alpha);
if (positive) { if (positive) {
// Draw axis lines for the positive axes. // Draw axis lines for the positive axes.
@ -854,8 +854,8 @@ void Node3DEditorViewport::_update_name() {
} }
void Node3DEditorViewport::_compute_edit(const Point2 &p_point) { void Node3DEditorViewport::_compute_edit(const Point2 &p_point) {
_edit.click_ray = _get_ray(Vector2(p_point.x, p_point.y)); _edit.click_ray = _get_ray(p_point);
_edit.click_ray_pos = _get_ray_pos(Vector2(p_point.x, p_point.y)); _edit.click_ray_pos = _get_ray_pos(p_point);
_edit.plane = TRANSFORM_VIEW; _edit.plane = TRANSFORM_VIEW;
spatial_editor->update_transform_gizmo(); spatial_editor->update_transform_gizmo();
_edit.center = spatial_editor->get_gizmo_transform().origin; _edit.center = spatial_editor->get_gizmo_transform().origin;
@ -934,8 +934,8 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
return false; return false;
} }
Vector3 ray_pos = _get_ray_pos(Vector2(p_screenpos.x, p_screenpos.y)); Vector3 ray_pos = _get_ray_pos(p_screenpos);
Vector3 ray = _get_ray(Vector2(p_screenpos.x, p_screenpos.y)); Vector3 ray = _get_ray(p_screenpos);
Transform3D gt = spatial_editor->get_gizmo_transform(); Transform3D gt = spatial_editor->get_gizmo_transform();
@ -998,7 +998,7 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
} else { } else {
//handle plane translate //handle plane translate
_edit.mode = TRANSFORM_TRANSLATE; _edit.mode = TRANSFORM_TRANSLATE;
_compute_edit(Point2(p_screenpos.x, p_screenpos.y)); _compute_edit(p_screenpos);
_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_translate ? 3 : 0)); _edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_translate ? 3 : 0));
} }
return true; return true;
@ -1036,7 +1036,7 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
} else { } else {
//handle rotate //handle rotate
_edit.mode = TRANSFORM_ROTATE; _edit.mode = TRANSFORM_ROTATE;
_compute_edit(Point2(p_screenpos.x, p_screenpos.y)); _compute_edit(p_screenpos);
_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis); _edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis);
} }
return true; return true;
@ -1102,7 +1102,7 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
} else { } else {
//handle scale //handle scale
_edit.mode = TRANSFORM_SCALE; _edit.mode = TRANSFORM_SCALE;
_compute_edit(Point2(p_screenpos.x, p_screenpos.y)); _compute_edit(p_screenpos);
_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_scale ? 3 : 0)); _edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_scale ? 3 : 0));
} }
return true; return true;

24
editor/plugins/polygon_2d_editor_plugin.cpp
View File

@ -449,7 +449,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
if (mb.is_valid()) { if (mb.is_valid()) {
if (mb->get_button_index() == MOUSE_BUTTON_LEFT) { if (mb->get_button_index() == MOUSE_BUTTON_LEFT) {
if (mb->is_pressed()) { if (mb->is_pressed()) {
uv_drag_from = snap_point(Vector2(mb->get_position().x, mb->get_position().y)); uv_drag_from = snap_point(mb->get_position());
uv_drag = true; uv_drag = true;
points_prev = node->get_uv(); points_prev = node->get_uv();
@ -463,7 +463,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
if (uv_move_current == UV_MODE_CREATE) { if (uv_move_current == UV_MODE_CREATE) {
if (!uv_create) { if (!uv_create) {
points_prev.resize(0); points_prev.resize(0);
Vector2 tuv = mtx.affine_inverse().xform(snap_point(Vector2(mb->get_position().x, mb->get_position().y))); Vector2 tuv = mtx.affine_inverse().xform(snap_point(mb->get_position()));
points_prev.push_back(tuv); points_prev.push_back(tuv);
uv_create_to = tuv; uv_create_to = tuv;
point_drag_index = 0; point_drag_index = 0;
@ -483,7 +483,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
uv_edit_draw->update(); uv_edit_draw->update();
} else { } else {
Vector2 tuv = mtx.affine_inverse().xform(snap_point(Vector2(mb->get_position().x, mb->get_position().y))); Vector2 tuv = mtx.affine_inverse().xform(snap_point(mb->get_position()));
// Close the polygon if selected point is near start. Threshold for closing scaled by zoom level // Close the polygon if selected point is near start. Threshold for closing scaled by zoom level
if (points_prev.size() > 2 && tuv.distance_to(points_prev[0]) < (8 / uv_draw_zoom)) { if (points_prev.size() > 2 && tuv.distance_to(points_prev[0]) < (8 / uv_draw_zoom)) {
@ -527,7 +527,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
uv_create_bones_prev = node->call("_get_bones"); uv_create_bones_prev = node->call("_get_bones");
int internal_vertices = node->get_internal_vertex_count(); int internal_vertices = node->get_internal_vertex_count();
Vector2 pos = mtx.affine_inverse().xform(snap_point(Vector2(mb->get_position().x, mb->get_position().y))); Vector2 pos = mtx.affine_inverse().xform(snap_point(mb->get_position()));
uv_create_poly_prev.push_back(pos); uv_create_poly_prev.push_back(pos);
uv_create_uv_prev.push_back(pos); uv_create_uv_prev.push_back(pos);
@ -573,7 +573,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
for (int i = points_prev.size() - internal_vertices; i < points_prev.size(); i++) { for (int i = points_prev.size() - internal_vertices; i < points_prev.size(); i++) {
Vector2 tuv = mtx.xform(uv_create_poly_prev[i]); Vector2 tuv = mtx.xform(uv_create_poly_prev[i]);
real_t dist = tuv.distance_to(Vector2(mb->get_position().x, mb->get_position().y)); real_t dist = tuv.distance_to(mb->get_position());
if (dist < 8 && dist < closest_dist) { if (dist < 8 && dist < closest_dist) {
closest = i; closest = i;
closest_dist = dist; closest_dist = dist;
@ -626,7 +626,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
point_drag_index = -1; point_drag_index = -1;
for (int i = 0; i < points_prev.size(); i++) { for (int i = 0; i < points_prev.size(); i++) {
Vector2 tuv = mtx.xform(points_prev[i]); Vector2 tuv = mtx.xform(points_prev[i]);
if (tuv.distance_to(Vector2(mb->get_position().x, mb->get_position().y)) < 8) { if (tuv.distance_to(mb->get_position()) < 8) {
uv_drag_from = tuv; uv_drag_from = tuv;
point_drag_index = i; point_drag_index = i;
} }
@ -643,7 +643,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
for (int i = 0; i < points_prev.size(); i++) { for (int i = 0; i < points_prev.size(); i++) {
Vector2 tuv = mtx.xform(points_prev[i]); Vector2 tuv = mtx.xform(points_prev[i]);
real_t dist = tuv.distance_to(Vector2(mb->get_position().x, mb->get_position().y)); real_t dist = tuv.distance_to(mb->get_position());
if (dist < 8 && dist < closest_dist) { if (dist < 8 && dist < closest_dist) {
closest = i; closest = i;
closest_dist = dist; closest_dist = dist;
@ -695,7 +695,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
polys.write[j] = mtx.xform(points_prev[idx]); polys.write[j] = mtx.xform(points_prev[idx]);
} }
if (Geometry2D::is_point_in_polygon(Vector2(mb->get_position().x, mb->get_position().y), polys)) { if (Geometry2D::is_point_in_polygon(mb->get_position(), polys)) {
erase_index = i; erase_index = i;
break; break;
} }
@ -791,7 +791,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
switch (uv_move_current) { switch (uv_move_current) {
case UV_MODE_CREATE: { case UV_MODE_CREATE: {
if (uv_create) { if (uv_create) {
uv_create_to = mtx.affine_inverse().xform(snap_point(Vector2(mm->get_position().x, mm->get_position().y))); uv_create_to = mtx.affine_inverse().xform(snap_point(mm->get_position()));
} }
} break; } break;
case UV_MODE_EDIT_POINT: { case UV_MODE_EDIT_POINT: {
@ -870,7 +870,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
} break; } break;
case UV_MODE_PAINT_WEIGHT: case UV_MODE_PAINT_WEIGHT:
case UV_MODE_CLEAR_WEIGHT: { case UV_MODE_CLEAR_WEIGHT: {
bone_paint_pos = Vector2(mm->get_position().x, mm->get_position().y); bone_paint_pos = mm->get_position();
} break; } break;
default: { default: {
} }
@ -905,10 +905,10 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
uv_edit_draw->update(); uv_edit_draw->update();
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
} else if (polygon_create.size()) { } else if (polygon_create.size()) {
uv_create_to = mtx.affine_inverse().xform(Vector2(mm->get_position().x, mm->get_position().y)); uv_create_to = mtx.affine_inverse().xform(mm->get_position());
uv_edit_draw->update(); uv_edit_draw->update();
} else if (uv_mode == UV_MODE_PAINT_WEIGHT || uv_mode == UV_MODE_CLEAR_WEIGHT) { } else if (uv_mode == UV_MODE_PAINT_WEIGHT || uv_mode == UV_MODE_CLEAR_WEIGHT) {
bone_paint_pos = Vector2(mm->get_position().x, mm->get_position().y); bone_paint_pos = mm->get_position();
uv_edit_draw->update(); uv_edit_draw->update();
} }
} }

4
editor/plugins/sprite_2d_editor_plugin.cpp
View File

@ -182,7 +182,7 @@ void Sprite2DEditor::_update_mesh_data() {
if (node->is_region_enabled()) { if (node->is_region_enabled()) {
rect = node->get_region_rect(); rect = node->get_region_rect();
} else { } else {
rect.size = Size2(image->get_width(), image->get_height()); rect.size = image->get_size();
} }
Ref<BitMap> bm; Ref<BitMap> bm;
@ -209,7 +209,7 @@ void Sprite2DEditor::_update_mesh_data() {
computed_uv.clear(); computed_uv.clear();
computed_indices.clear(); computed_indices.clear();
Size2 img_size = Vector2(image->get_width(), image->get_height()); Size2 img_size = image->get_size();
for (int i = 0; i < lines.size(); i++) { for (int i = 0; i < lines.size(); i++) {
lines.write[i] = expand(lines[i], rect, epsilon); lines.write[i] = expand(lines[i], rect, epsilon);
} }

8
editor/plugins/texture_region_editor_plugin.cpp
View File

@ -321,12 +321,12 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) {
prev_margin = margins[3]; prev_margin = margins[3];
} }
if (edited_margin >= 0) { if (edited_margin >= 0) {
drag_from = Vector2(mb->get_position().x, mb->get_position().y); drag_from = mb->get_position();
drag = true; drag = true;
} }
} }
if (edited_margin < 0 && snap_mode == SNAP_AUTOSLICE) { if (edited_margin < 0 && snap_mode == SNAP_AUTOSLICE) {
Vector2 point = mtx.affine_inverse().xform(Vector2(mb->get_position().x, mb->get_position().y)); Vector2 point = mtx.affine_inverse().xform(mb->get_position());
for (const Rect2 &E : autoslice_cache) { for (const Rect2 &E : autoslice_cache) {
if (E.has_point(point)) { if (E.has_point(point)) {
rect = E; rect = E;
@ -372,7 +372,7 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) {
} }
} }
} else if (edited_margin < 0) { } else if (edited_margin < 0) {
drag_from = mtx.affine_inverse().xform(Vector2(mb->get_position().x, mb->get_position().y)); drag_from = mtx.affine_inverse().xform(mb->get_position());
if (snap_mode == SNAP_PIXEL) { if (snap_mode == SNAP_PIXEL) {
drag_from = drag_from.snapped(Vector2(1, 1)); drag_from = drag_from.snapped(Vector2(1, 1));
} else if (snap_mode == SNAP_GRID) { } else if (snap_mode == SNAP_GRID) {
@ -393,7 +393,7 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
Vector2 tuv = endpoints[i]; Vector2 tuv = endpoints[i];
if (tuv.distance_to(Vector2(mb->get_position().x, mb->get_position().y)) < handle_radius) { if (tuv.distance_to(mb->get_position()) < handle_radius) {
drag_index = i; drag_index = i;
} }
} }

2
editor/plugins/tiles/tile_map_editor.cpp
View File

@ -790,7 +790,7 @@ void TileMapEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p_over
// Get the tile modulation. // Get the tile modulation.
Color modulate = tile_data->get_modulate(); Color modulate = tile_data->get_modulate();
Color self_modulate = tile_map->get_self_modulate(); Color self_modulate = tile_map->get_self_modulate();
modulate = Color(modulate.r * self_modulate.r, modulate.g * self_modulate.g, modulate.b * self_modulate.b, modulate.a * self_modulate.a); modulate *= self_modulate;
// Draw the tile. // Draw the tile.
p_overlay->draw_texture_rect_region(atlas_source->get_texture(), dest_rect, source_rect, modulate * Color(1.0, 1.0, 1.0, 0.5), transpose, tile_set->is_uv_clipping()); p_overlay->draw_texture_rect_region(atlas_source->get_texture(), dest_rect, source_rect, modulate * Color(1.0, 1.0, 1.0, 0.5), transpose, tile_set->is_uv_clipping());

2
editor/plugins/tiles/tiles_editor_plugin.cpp
View File

@ -146,7 +146,7 @@ void TilesEditor::synchronize_atlas_view(Object *p_current) {
ERR_FAIL_COND(!tile_atlas_view); ERR_FAIL_COND(!tile_atlas_view);
if (tile_atlas_view->is_visible_in_tree()) { if (tile_atlas_view->is_visible_in_tree()) {
tile_atlas_view->set_transform(atlas_view_zoom, Vector2(atlas_view_scroll.x, atlas_view_scroll.y)); tile_atlas_view->set_transform(atlas_view_zoom, atlas_view_scroll);
} }
} }

2
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -1945,7 +1945,7 @@ void VisualShaderEditor::_set_node_size(int p_type, int p_node, const Vector2 &p
box_size.x -= 28 * EDSCALE; box_size.x -= 28 * EDSCALE;
box_size.y -= text_box->get_offset(SIDE_TOP); box_size.y -= text_box->get_offset(SIDE_TOP);
box_size.y -= 28 * EDSCALE; box_size.y -= 28 * EDSCALE;
text_box->set_custom_minimum_size(Size2(box_size.x, box_size.y)); text_box->set_custom_minimum_size(box_size);
text_box->set_size(Size2(1, 1)); text_box->set_size(Size2(1, 1));
} }
} }

2
scene/2d/cpu_particles_2d.cpp
View File

@ -155,7 +155,7 @@ void CPUParticles2D::_update_mesh_texture() {
Vector<Vector2> vertices; Vector<Vector2> vertices;
vertices.push_back(-tex_size * 0.5); vertices.push_back(-tex_size * 0.5);
vertices.push_back(-tex_size * 0.5 + Vector2(tex_size.x, 0)); vertices.push_back(-tex_size * 0.5 + Vector2(tex_size.x, 0));
vertices.push_back(-tex_size * 0.5 + Vector2(tex_size.x, tex_size.y)); vertices.push_back(-tex_size * 0.5 + tex_size);
vertices.push_back(-tex_size * 0.5 + Vector2(0, tex_size.y)); vertices.push_back(-tex_size * 0.5 + Vector2(0, tex_size.y));
Vector<Vector2> uvs; Vector<Vector2> uvs;
AtlasTexture *atlas_texure = Object::cast_to<AtlasTexture>(*texture); AtlasTexture *atlas_texure = Object::cast_to<AtlasTexture>(*texture);

3
scene/2d/tile_map.cpp
View File

@ -1037,8 +1037,7 @@ void TileMap::draw_tile(RID p_canvas_item, Vector2i p_position, const Ref<TileSe
TileData *tile_data = Object::cast_to<TileData>(atlas_source->get_tile_data(p_atlas_coords, p_alternative_tile)); TileData *tile_data = Object::cast_to<TileData>(atlas_source->get_tile_data(p_atlas_coords, p_alternative_tile));
// Get the tile modulation. // Get the tile modulation.
Color modulate = tile_data->get_modulate(); Color modulate = tile_data->get_modulate() * p_modulation;
modulate = Color(modulate.r * p_modulation.r, modulate.g * p_modulation.g, modulate.b * p_modulation.b, modulate.a * p_modulation.a);
// Compute the offset. // Compute the offset.
Vector2i tile_offset = atlas_source->get_tile_effective_texture_offset(p_atlas_coords, p_alternative_tile); Vector2i tile_offset = atlas_source->get_tile_effective_texture_offset(p_atlas_coords, p_alternative_tile);

4
scene/gui/code_edit.cpp
View File

@ -296,7 +296,7 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
mpos.x = get_size().x - mpos.x; mpos.x = get_size().x - mpos.x;
} }
Point2i pos = get_line_column_at_pos(Point2i(mpos.x, mpos.y)); Point2i pos = get_line_column_at_pos(mpos);
int line = pos.y; int line = pos.y;
int col = pos.x; int col = pos.x;
@ -321,7 +321,7 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
mpos.x = get_size().x - mpos.x; mpos.x = get_size().x - mpos.x;
} }
Point2i pos = get_line_column_at_pos(Point2i(mpos.x, mpos.y)); Point2i pos = get_line_column_at_pos(mpos);
int line = pos.y; int line = pos.y;
int col = pos.x; int col = pos.x;

2
scene/gui/color_picker.cpp
View File

@ -996,7 +996,7 @@ void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> mev = p_event; Ref<InputEventMouseMotion> mev = p_event;
if (mev.is_valid()) { if (mev.is_valid()) {
Viewport *r = get_tree()->get_root(); Viewport *r = get_tree()->get_root();
if (!r->get_visible_rect().has_point(Point2(mev->get_global_position().x, mev->get_global_position().y))) { if (!r->get_visible_rect().has_point(mev->get_global_position())) {
return; return;
} }

2
scene/gui/graph_edit.cpp
View File

@ -697,7 +697,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
} else if (!just_disconnected) { } else if (!just_disconnected) {
String from = connecting_from; String from = connecting_from;
int from_slot = connecting_index; int from_slot = connecting_index;
Vector2 ofs = Vector2(mb->get_position().x, mb->get_position().y); Vector2 ofs = mb->get_position();
if (!connecting_out) { if (!connecting_out) {
emit_signal(SNAME("connection_from_empty"), from, from_slot, ofs); emit_signal(SNAME("connection_from_empty"), from, from_slot, ofs);

2
scene/gui/graph_node.cpp
View File

@ -871,7 +871,7 @@ void GraphNode::gui_input(const Ref<InputEvent> &p_ev) {
ERR_FAIL_COND_MSG(get_parent_control() == nullptr, "GraphNode must be the child of a GraphEdit node."); ERR_FAIL_COND_MSG(get_parent_control() == nullptr, "GraphNode must be the child of a GraphEdit node.");
if (mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_LEFT) { if (mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_LEFT) {
Vector2 mpos = Vector2(mb->get_position().x, mb->get_position().y); Vector2 mpos = mb->get_position();
if (close_rect.size != Size2() && close_rect.has_point(mpos)) { if (close_rect.size != Size2() && close_rect.has_point(mpos)) {
//send focus to parent //send focus to parent
get_parent_control()->grab_focus(); get_parent_control()->grab_focus();

4
scene/gui/rich_text_label.cpp
View File

@ -333,7 +333,7 @@ void RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font>
} else { } else {
frame->lines.write[i].offset.y = 0; frame->lines.write[i].offset.y = 0;
} }
frame->lines.write[i].offset += Vector2(offset.x, offset.y); frame->lines.write[i].offset += offset;
float h = frame->lines[i].text_buf->get_size().y; float h = frame->lines[i].text_buf->get_size().y;
if (frame->min_size_over.y > 0) { if (frame->min_size_over.y > 0) {
@ -578,7 +578,7 @@ void RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
} else { } else {
frame->lines.write[i].offset.y = 0; frame->lines.write[i].offset.y = 0;
} }
frame->lines.write[i].offset += Vector2(offset.x, offset.y); frame->lines.write[i].offset += offset;
float h = frame->lines[i].text_buf->get_size().y; float h = frame->lines[i].text_buf->get_size().y;
if (frame->min_size_over.y > 0) { if (frame->min_size_over.y > 0) {

2
scene/gui/scroll_bar.cpp
View File

@ -560,7 +560,7 @@ void ScrollBar::_drag_node_input(const Ref<InputEvent> &p_input) {
if (mm.is_valid()) { if (mm.is_valid()) {
if (drag_node_touching && !drag_node_touching_deaccel) { if (drag_node_touching && !drag_node_touching_deaccel) {
Vector2 motion = Vector2(mm->get_relative().x, mm->get_relative().y); Vector2 motion = mm->get_relative();
drag_node_accum -= motion; drag_node_accum -= motion;
Vector2 diff = drag_node_from + drag_node_accum; Vector2 diff = drag_node_from + drag_node_accum;

2
scene/gui/scroll_container.cpp
View File

@ -167,7 +167,7 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
if (mm.is_valid()) { if (mm.is_valid()) {
if (drag_touching && !drag_touching_deaccel) { if (drag_touching && !drag_touching_deaccel) {
Vector2 motion = Vector2(mm->get_relative().x, mm->get_relative().y); Vector2 motion = mm->get_relative();
drag_accum -= motion; drag_accum -= motion;
if (beyond_deadzone || (scroll_h && Math::abs(drag_accum.x) > deadzone) || (scroll_v && Math::abs(drag_accum.y) > deadzone)) { if (beyond_deadzone || (scroll_h && Math::abs(drag_accum.x) > deadzone) || (scroll_v && Math::abs(drag_accum.y) > deadzone)) {

14
scene/gui/text_edit.cpp
View File

@ -1444,7 +1444,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
if (mb->get_button_index() == MOUSE_BUTTON_LEFT) { if (mb->get_button_index() == MOUSE_BUTTON_LEFT) {
_reset_caret_blink_timer(); _reset_caret_blink_timer();
Point2i pos = get_line_column_at_pos(Point2i(mpos.x, mpos.y)); Point2i pos = get_line_column_at_pos(mpos);
int row = pos.y; int row = pos.y;
int col = pos.x; int col = pos.x;
@ -1547,7 +1547,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
if (mb->get_button_index() == MOUSE_BUTTON_RIGHT && context_menu_enabled) { if (mb->get_button_index() == MOUSE_BUTTON_RIGHT && context_menu_enabled) {
_reset_caret_blink_timer(); _reset_caret_blink_timer();
Point2i pos = get_line_column_at_pos(Point2i(mpos.x, mpos.y)); Point2i pos = get_line_column_at_pos(mpos);
int row = pos.y; int row = pos.y;
int col = pos.x; int col = pos.x;
@ -5385,7 +5385,7 @@ void TextEdit::_update_selection_mode_pointer() {
dragging_selection = true; dragging_selection = true;
Point2 mp = get_local_mouse_pos(); Point2 mp = get_local_mouse_pos();
Point2i pos = get_line_column_at_pos(Point2i(mp.x, mp.y)); Point2i pos = get_line_column_at_pos(mp);
int line = pos.y; int line = pos.y;
int col = pos.x; int col = pos.x;
@ -5402,7 +5402,7 @@ void TextEdit::_update_selection_mode_word() {
dragging_selection = true; dragging_selection = true;
Point2 mp = get_local_mouse_pos(); Point2 mp = get_local_mouse_pos();
Point2i pos = get_line_column_at_pos(Point2i(mp.x, mp.y)); Point2i pos = get_line_column_at_pos(mp);
int line = pos.y; int line = pos.y;
int col = pos.x; int col = pos.x;
@ -5450,7 +5450,7 @@ void TextEdit::_update_selection_mode_line() {
dragging_selection = true; dragging_selection = true;
Point2 mp = get_local_mouse_pos(); Point2 mp = get_local_mouse_pos();
Point2i pos = get_line_column_at_pos(Point2i(mp.x, mp.y)); Point2i pos = get_line_column_at_pos(mp);
int line = pos.y; int line = pos.y;
int col = pos.x; int col = pos.x;
@ -5765,7 +5765,7 @@ void TextEdit::_update_minimap_hover() {
return; return;
} }
const int row = get_minimap_line_at_pos(Point2i(mp.x, mp.y)); const int row = get_minimap_line_at_pos(mp);
const bool new_hovering_minimap = row >= get_first_visible_line() && row <= get_last_full_visible_line(); const bool new_hovering_minimap = row >= get_first_visible_line() && row <= get_last_full_visible_line();
if (new_hovering_minimap != hovering_minimap) { if (new_hovering_minimap != hovering_minimap) {
@ -5786,7 +5786,7 @@ void TextEdit::_update_minimap_click() {
minimap_clicked = true; minimap_clicked = true;
dragging_minimap = true; dragging_minimap = true;
int row = get_minimap_line_at_pos(Point2i(mp.x, mp.y)); int row = get_minimap_line_at_pos(mp);
if (row >= get_first_visible_line() && (row < get_last_full_visible_line() || row >= (text.size() - 1))) { if (row >= get_first_visible_line() && (row < get_last_full_visible_line() || row >= (text.size() - 1))) {
minimap_scroll_ratio = v_scroll->get_as_ratio(); minimap_scroll_ratio = v_scroll->get_as_ratio();

2
scene/resources/bit_map.cpp
View File

@ -48,7 +48,7 @@ void BitMap::create_from_image_alpha(const Ref<Image> &p_image, float p_threshol
img->convert(Image::FORMAT_LA8); img->convert(Image::FORMAT_LA8);
ERR_FAIL_COND(img->get_format() != Image::FORMAT_LA8); ERR_FAIL_COND(img->get_format() != Image::FORMAT_LA8);
create(Size2(img->get_width(), img->get_height())); create(img->get_size());
const uint8_t *r = img->get_data().ptr(); const uint8_t *r = img->get_data().ptr();
uint8_t *w = bitmask.ptrw(); uint8_t *w = bitmask.ptrw();

4
scene/resources/default_theme/default_theme.cpp
View File

@ -51,7 +51,7 @@ static Ref<StyleBoxTexture> make_stylebox(T p_src, float p_left, float p_top, fl
} else { } else {
texture = Ref<ImageTexture>(memnew(ImageTexture)); texture = Ref<ImageTexture>(memnew(ImageTexture));
Ref<Image> img = memnew(Image(p_src)); Ref<Image> img = memnew(Image(p_src));
const Size2 orig_size = Size2(img->get_width(), img->get_height()); const Size2 orig_size = img->get_size();
img->convert(Image::FORMAT_RGBA8); img->convert(Image::FORMAT_RGBA8);
img->resize(orig_size.x * scale, orig_size.y * scale); img->resize(orig_size.x * scale, orig_size.y * scale);
@ -97,7 +97,7 @@ template <class T>
static Ref<Texture2D> make_icon(T p_src) { static Ref<Texture2D> make_icon(T p_src) {
Ref<ImageTexture> texture(memnew(ImageTexture)); Ref<ImageTexture> texture(memnew(ImageTexture));
Ref<Image> img = memnew(Image(p_src)); Ref<Image> img = memnew(Image(p_src));
const Size2 orig_size = Size2(img->get_width(), img->get_height()); const Size2 orig_size = img->get_size();
img->convert(Image::FORMAT_RGBA8); img->convert(Image::FORMAT_RGBA8);
img->resize(orig_size.x * scale, orig_size.y * scale); img->resize(orig_size.x * scale, orig_size.y * scale);
texture->create_from_image(img); texture->create_from_image(img);

2
servers/rendering/renderer_canvas_cull.cpp
View File

@ -182,7 +182,7 @@ void RendererCanvasCull::_attach_canvas_item_for_draw(RendererCanvasCull::Item *
if (ci->commands != nullptr) { if (ci->commands != nullptr) {
ci->final_transform = xform; ci->final_transform = xform;
ci->final_modulate = Color(modulate.r * ci->self_modulate.r, modulate.g * ci->self_modulate.g, modulate.b * ci->self_modulate.b, modulate.a * ci->self_modulate.a); ci->final_modulate = modulate * ci->self_modulate;
ci->global_rect_cache = global_rect; ci->global_rect_cache = global_rect;
ci->global_rect_cache.position -= p_clip_rect.position; ci->global_rect_cache.position -= p_clip_rect.position;
ci->light_masked = false; ci->light_masked = false;

2
servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
View File

@ -3365,7 +3365,7 @@ void RendererSceneRenderRD::_setup_decals(const PagedArray<RID> &p_decals, const
Vector3 decal_extents = storage->decal_get_extents(decal); Vector3 decal_extents = storage->decal_get_extents(decal);
Transform3D scale_xform; Transform3D scale_xform;
scale_xform.basis.scale(Vector3(decal_extents.x, decal_extents.y, decal_extents.z)); scale_xform.basis.scale(decal_extents);
Transform3D to_decal_xform = (p_camera_inverse_xform * di->transform * scale_xform * uv_xform).affine_inverse(); Transform3D to_decal_xform = (p_camera_inverse_xform * di->transform * scale_xform * uv_xform).affine_inverse();
RendererStorageRD::store_transform(to_decal_xform, dd.xform); RendererStorageRD::store_transform(to_decal_xform, dd.xform);