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

Merge pull request #93971 from KoBeWi/casually_crashing_in_background

Browse source 
Fix crash in tile physics editor
This commit is contained in:
Rémi Verschelde 2024-07-05 15:07:54 +02:00
commit c9ca3aa9ab
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
editor/plugins/tiles/tile_data_editors.cpp
View file

@ -139,9 +139,17 @@ void GenericTilePolygonEditor::_base_control_draw() {
const Ref<StyleBox> focus_stylebox = get_theme_stylebox(SNAME("Focus"), EditorStringName(EditorStyles)); const Ref<StyleBox> focus_stylebox = get_theme_stylebox(SNAME("Focus"), EditorStringName(EditorStyles));
// Get the background data. // Get the background data.
TileData *tile_data = background_atlas_source->get_tile_data(background_atlas_coords, background_alternative_id); Rect2 background_region;
ERR_FAIL_NULL(tile_data); TileData *tile_data = nullptr;
Rect2 background_region = background_atlas_source->get_tile_texture_region(background_atlas_coords);
if (background_atlas_source.is_valid()) {
tile_data = background_atlas_source->get_tile_data(background_atlas_coords, background_alternative_id);
ERR_FAIL_NULL(tile_data);
background_region = background_atlas_source->get_tile_texture_region(background_atlas_coords);
} else {
// If no tile was selected yet, use default size.
background_region.size = tile_set->get_tile_size();
}
// Draw the focus rectangle. // Draw the focus rectangle.
if (base_control->has_focus()) { if (base_control->has_focus()) {
@ -157,11 +165,14 @@ void GenericTilePolygonEditor::_base_control_draw() {
base_control->draw_set_transform_matrix(xform); base_control->draw_set_transform_matrix(xform);
// Draw fill rect under texture region. // Draw fill rect under texture region.
Rect2 texture_rect(-background_region.size / 2 - tile_data->get_texture_origin(), background_region.size); Rect2 texture_rect(-background_region.size / 2, background_region.size);
if (tile_data) {
texture_rect.position -= tile_data->get_texture_origin();
}
base_control->draw_rect(texture_rect, Color(1, 1, 1, 0.3)); base_control->draw_rect(texture_rect, Color(1, 1, 1, 0.3));
// Draw the background. // Draw the background.
if (background_atlas_source->get_texture().is_valid()) { if (tile_data && background_atlas_source->get_texture().is_valid()) {
Size2 region_size = background_region.size; Size2 region_size = background_region.size;
if (tile_data->get_flip_h()) { if (tile_data->get_flip_h()) {
region_size.x = -region_size.x; region_size.x = -region_size.x;
@ -174,8 +185,13 @@ void GenericTilePolygonEditor::_base_control_draw() {
// Compute and draw the grid area. // Compute and draw the grid area.
Rect2 grid_area = Rect2(-base_tile_size / 2, base_tile_size); Rect2 grid_area = Rect2(-base_tile_size / 2, base_tile_size);
grid_area.expand_to(-background_region.get_size() / 2 - tile_data->get_texture_origin()); if (tile_data) {
grid_area.expand_to(background_region.get_size() / 2 - tile_data->get_texture_origin()); grid_area.expand_to(-background_region.get_size() / 2 - tile_data->get_texture_origin());
grid_area.expand_to(background_region.get_size() / 2 - tile_data->get_texture_origin());
} else {
grid_area.expand_to(-background_region.get_size() / 2);
grid_area.expand_to(background_region.get_size() / 2);
}
base_control->draw_rect(grid_area, Color(1, 1, 1, 0.3), false); base_control->draw_rect(grid_area, Color(1, 1, 1, 0.3), false);
// Draw grid. // Draw grid.