asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #84754 from aXu-AP/sprite2dplugin-rect

Browse source 
Add region rect and frames support to Sprite2DPlugin converter
This commit is contained in:
Yuri Sizov 2023-12-14 17:38:19 +01:00
commit daddb2b469
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
editor/plugins/sprite_2d_editor_plugin.cpp
View file

@ -159,9 +159,6 @@ void Sprite2DEditor::_popup_debug_uv_dialog() {
if (texture.is_null()) { if (texture.is_null()) {
error_message = TTR("Can't convert an empty sprite to mesh."); error_message = TTR("Can't convert an empty sprite to mesh.");
} }
if (node->get_hframes() > 1 || node->get_vframes() > 1) {
error_message = TTR("Can't convert a sprite using animation frames to mesh.");
}
if (!error_message.is_empty()) { if (!error_message.is_empty()) {
err_dialog->set_text(error_message); err_dialog->set_text(error_message);
@ -185,9 +182,9 @@ void Sprite2DEditor::_update_mesh_data() {
image->decompress(); image->decompress();
} }
// TODO: Add support for Sprite2D's region. Rect2 rect = node->is_region_enabled() ? node->get_region_rect() : Rect2(Point2(), image->get_size());
Rect2 rect; rect.size /= Vector2(node->get_hframes(), node->get_vframes());
rect.size = image->get_size(); rect.position += node->get_frame_coords() * rect.size;
Ref<BitMap> bm; Ref<BitMap> bm;
bm.instantiate(); bm.instantiate();
@ -224,18 +221,15 @@ void Sprite2DEditor::_update_mesh_data() {
for (int i = 0; i < lines[j].size(); i++) { for (int i = 0; i < lines[j].size(); i++) {
Vector2 vtx = lines[j][i]; Vector2 vtx = lines[j][i];
computed_uv.push_back(vtx / img_size); computed_uv.push_back((vtx + rect.position) / img_size);
vtx -= rect.position; //offset by rect position
//flip if flipped
if (node->is_flipped_h()) { if (node->is_flipped_h()) {
vtx.x = rect.size.x - vtx.x - 1.0; vtx.x = rect.size.x - vtx.x;
} }
if (node->is_flipped_v()) { if (node->is_flipped_v()) {
vtx.y = rect.size.y - vtx.y - 1.0; vtx.y = rect.size.y - vtx.y;
} }
vtx += node->get_offset();
if (node->is_centered()) { if (node->is_centered()) {
vtx -= rect.size / 2.0; vtx -= rect.size / 2.0;
} }
@ -249,8 +243,8 @@ void Sprite2DEditor::_update_mesh_data() {
for (int k = 0; k < 3; k++) { for (int k = 0; k < 3; k++) {
int idx = i + k; int idx = i + k;
int idxn = i + (k + 1) % 3; int idxn = i + (k + 1) % 3;
uv_lines.push_back(lines[j][poly[idx]]); uv_lines.push_back(lines[j][poly[idx]] + rect.position);
uv_lines.push_back(lines[j][poly[idxn]]); uv_lines.push_back(lines[j][poly[idxn]] + rect.position);
computed_indices.push_back(poly[idx] + index_ofs); computed_indices.push_back(poly[idx] + index_ofs);
} }
@ -273,19 +267,18 @@ void Sprite2DEditor::_update_mesh_data() {
for (int i = 0; i < lines[pi].size(); i++) { for (int i = 0; i < lines[pi].size(); i++) {
Vector2 vtx = lines[pi][i]; Vector2 vtx = lines[pi][i];
ol.write[i] = vtx + rect.position;
ol.write[i] = vtx;
vtx -= rect.position; //offset by rect position
//flip if flipped
if (node->is_flipped_h()) { if (node->is_flipped_h()) {
vtx.x = rect.size.x - vtx.x - 1.0; vtx.x = rect.size.x - vtx.x;
} }
if (node->is_flipped_v()) { if (node->is_flipped_v()) {
vtx.y = rect.size.y - vtx.y - 1.0; vtx.y = rect.size.y - vtx.y;
}
// Don't bake offset to Polygon2D which has offset property.
if (selected_menu_item != MENU_OPTION_CONVERT_TO_POLYGON_2D) {
vtx += node->get_offset();
} }
if (node->is_centered()) { if (node->is_centered()) {
vtx -= rect.size / 2.0; vtx -= rect.size / 2.0;
} }