Merge pull request #82901 from kleonc/sprite-base-3d-gizmo-plugin

Make gizmo plugin handle `SpriteBase3D` instead of `Sprite3D`
This commit is contained in:
Rémi Verschelde
2023-10-06 12:53:13 +02:00
5 changed files with 22 additions and 26 deletions

View File

@ -398,12 +398,10 @@ Ref<TriangleMesh> SpriteBase3D::generate_triangle_mesh() const {
real_t px_size = get_pixel_size();
Vector2 vertices[4] = {
(final_rect.position + Vector2(0, final_rect.size.y)) * px_size,
(final_rect.position + final_rect.size) * px_size,
(final_rect.position + Vector2(final_rect.size.x, 0)) * px_size,
final_rect.position * px_size,
};
int x_axis = ((axis + 1) % 3);
@ -1191,7 +1189,7 @@ Rect2 AnimatedSprite3D::get_item_rect() const {
Size2 s = t->get_size();
Point2 ofs = get_offset();
if (centered) {
if (is_centered()) {
ofs -= s / 2;
}

View File

@ -236,8 +236,6 @@ class AnimatedSprite3D : public SpriteBase3D {
float speed_scale = 1.0;
float custom_speed_scale = 1.0;
bool centered = false;
real_t frame_speed_scale = 1.0;
real_t frame_progress = 0.0;