瀏覽代碼

Merge pull request #73714 from KoBeWi/tireset

Fix reset_state() in TileSet
Rémi Verschelde 2 年之前
父節點
當前提交
44e9690108
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 5 0
      scene/resources/tile_set.cpp
  2. 0 1
      scene/resources/tile_set.h

+ 5 - 0
scene/resources/tile_set.cpp

@@ -2527,6 +2527,11 @@ void TileSet::reset_state() {
 	while (!source_ids.is_empty()) {
 		remove_source(source_ids[0]);
 	}
+
+	tile_shape = TILE_SHAPE_SQUARE;
+	tile_layout = TILE_LAYOUT_STACKED;
+	tile_offset_axis = TILE_OFFSET_AXIS_HORIZONTAL;
+	tile_size = Size2i(16, 16);
 }
 
 const Vector2i TileSetSource::INVALID_ATLAS_COORDS = Vector2i(-1, -1);

+ 0 - 1
scene/resources/tile_set.h

@@ -308,7 +308,6 @@ private:
 	TileLayout tile_layout = TILE_LAYOUT_STACKED;
 	TileOffsetAxis tile_offset_axis = TILE_OFFSET_AXIS_HORIZONTAL;
 	Size2i tile_size = Size2i(16, 16); //Size2(64, 64);
-	Vector2 tile_skew = Vector2(0, 0);
 
 	// Rendering.
 	bool uv_clipping = false;