|
@@ -750,7 +750,7 @@ int GenericTilePolygonEditor::get_polygon_count() {
|
|
|
return polygons.size();
|
|
|
}
|
|
|
|
|
|
-int GenericTilePolygonEditor::add_polygon(Vector<Point2> p_polygon, int p_index) {
|
|
|
+int GenericTilePolygonEditor::add_polygon(const Vector<Point2> &p_polygon, int p_index) {
|
|
|
ERR_FAIL_COND_V(p_polygon.size() < 3, -1);
|
|
|
ERR_FAIL_COND_V(!multiple_polygon_mode && polygons.size() >= 1, -1);
|
|
|
|
|
@@ -782,7 +782,7 @@ void GenericTilePolygonEditor::clear_polygons() {
|
|
|
base_control->queue_redraw();
|
|
|
}
|
|
|
|
|
|
-void GenericTilePolygonEditor::set_polygon(int p_polygon_index, Vector<Point2> p_polygon) {
|
|
|
+void GenericTilePolygonEditor::set_polygon(int p_polygon_index, const Vector<Point2> &p_polygon) {
|
|
|
ERR_FAIL_INDEX(p_polygon_index, (int)polygons.size());
|
|
|
ERR_FAIL_COND(p_polygon.size() < 3);
|
|
|
polygons[p_polygon_index] = p_polygon;
|
|
@@ -954,7 +954,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
|
|
|
_set_snap_option(EditorSettings::get_singleton()->get_project_metadata("editor_metadata", "tile_snap_option", SNAP_NONE));
|
|
|
}
|
|
|
|
|
|
-void TileDataDefaultEditor::_property_value_changed(const StringName &p_property, Variant p_value, const StringName &p_field) {
|
|
|
+void TileDataDefaultEditor::_property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field) {
|
|
|
ERR_FAIL_NULL(dummy_object);
|
|
|
dummy_object->set(p_property, p_value);
|
|
|
emit_signal(SNAME("needs_redraw"));
|
|
@@ -975,7 +975,7 @@ void TileDataDefaultEditor::_set_painted_value(TileSetAtlasSource *p_tile_set_at
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void TileDataDefaultEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, Variant p_value) {
|
|
|
+void TileDataDefaultEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, const Variant &p_value) {
|
|
|
TileData *tile_data = p_tile_set_atlas_source->get_tile_data(p_coords, p_alternative_tile);
|
|
|
ERR_FAIL_NULL(tile_data);
|
|
|
tile_data->set(property, p_value);
|
|
@@ -987,7 +987,7 @@ Variant TileDataDefaultEditor::_get_value(TileSetAtlasSource *p_tile_set_atlas_s
|
|
|
return tile_data->get(property);
|
|
|
}
|
|
|
|
|
|
-void TileDataDefaultEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, Variant p_new_value) {
|
|
|
+void TileDataDefaultEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, const Variant &p_new_value) {
|
|
|
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
|
|
|
for (const KeyValue<TileMapCell, Variant> &E : p_previous_values) {
|
|
|
Vector2i coords = E.key.get_atlas_coords();
|
|
@@ -1250,7 +1250,7 @@ void TileDataDefaultEditor::draw_over_tile(CanvasItem *p_canvas_item, Transform2
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void TileDataDefaultEditor::setup_property_editor(Variant::Type p_type, String p_property, String p_label, Variant p_default_value) {
|
|
|
+void TileDataDefaultEditor::setup_property_editor(Variant::Type p_type, const String &p_property, const String &p_label, const Variant &p_default_value) {
|
|
|
ERR_FAIL_COND_MSG(!property.is_empty(), "Cannot setup TileDataDefaultEditor twice");
|
|
|
property = p_property;
|
|
|
property_type = p_type;
|
|
@@ -1446,7 +1446,7 @@ void TileDataOcclusionShapeEditor::_set_painted_value(TileSetAtlasSource *p_tile
|
|
|
polygon_editor->set_background(p_tile_set_atlas_source->get_texture(), p_tile_set_atlas_source->get_tile_texture_region(p_coords), tile_data->get_texture_origin(), tile_data->get_flip_h(), tile_data->get_flip_v(), tile_data->get_transpose(), tile_data->get_modulate());
|
|
|
}
|
|
|
|
|
|
-void TileDataOcclusionShapeEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, Variant p_value) {
|
|
|
+void TileDataOcclusionShapeEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, const Variant &p_value) {
|
|
|
TileData *tile_data = p_tile_set_atlas_source->get_tile_data(p_coords, p_alternative_tile);
|
|
|
ERR_FAIL_NULL(tile_data);
|
|
|
Ref<OccluderPolygon2D> occluder_polygon = p_value;
|
|
@@ -1461,7 +1461,7 @@ Variant TileDataOcclusionShapeEditor::_get_value(TileSetAtlasSource *p_tile_set_
|
|
|
return tile_data->get_occluder(occlusion_layer);
|
|
|
}
|
|
|
|
|
|
-void TileDataOcclusionShapeEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, Variant p_new_value) {
|
|
|
+void TileDataOcclusionShapeEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, const Variant &p_new_value) {
|
|
|
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
|
|
|
for (const KeyValue<TileMapCell, Variant> &E : p_previous_values) {
|
|
|
Vector2i coords = E.key.get_atlas_coords();
|
|
@@ -1487,7 +1487,7 @@ TileDataOcclusionShapeEditor::TileDataOcclusionShapeEditor() {
|
|
|
add_child(polygon_editor);
|
|
|
}
|
|
|
|
|
|
-void TileDataCollisionEditor::_property_value_changed(const StringName &p_property, Variant p_value, const StringName &p_field) {
|
|
|
+void TileDataCollisionEditor::_property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field) {
|
|
|
dummy_object->set(p_property, p_value);
|
|
|
}
|
|
|
|
|
@@ -1602,7 +1602,7 @@ void TileDataCollisionEditor::_set_painted_value(TileSetAtlasSource *p_tile_set_
|
|
|
polygon_editor->set_background(p_tile_set_atlas_source->get_texture(), p_tile_set_atlas_source->get_tile_texture_region(p_coords), tile_data->get_texture_origin(), tile_data->get_flip_h(), tile_data->get_flip_v(), tile_data->get_transpose(), tile_data->get_modulate());
|
|
|
}
|
|
|
|
|
|
-void TileDataCollisionEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, Variant p_value) {
|
|
|
+void TileDataCollisionEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, const Variant &p_value) {
|
|
|
TileData *tile_data = p_tile_set_atlas_source->get_tile_data(p_coords, p_alternative_tile);
|
|
|
ERR_FAIL_NULL(tile_data);
|
|
|
|
|
@@ -1640,7 +1640,7 @@ Variant TileDataCollisionEditor::_get_value(TileSetAtlasSource *p_tile_set_atlas
|
|
|
return dict;
|
|
|
}
|
|
|
|
|
|
-void TileDataCollisionEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, Variant p_new_value) {
|
|
|
+void TileDataCollisionEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, const Variant &p_new_value) {
|
|
|
Dictionary new_dict = p_new_value;
|
|
|
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
|
|
|
for (const KeyValue<TileMapCell, Variant> &E : p_previous_values) {
|
|
@@ -1808,7 +1808,7 @@ void TileDataTerrainsEditor::_update_terrain_selector() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void TileDataTerrainsEditor::_property_value_changed(const StringName &p_property, Variant p_value, const StringName &p_field) {
|
|
|
+void TileDataTerrainsEditor::_property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field) {
|
|
|
Variant old_value = dummy_object->get(p_property);
|
|
|
dummy_object->set(p_property, p_value);
|
|
|
if (p_property == "terrain_set") {
|
|
@@ -2862,7 +2862,7 @@ void TileDataNavigationEditor::_set_painted_value(TileSetAtlasSource *p_tile_set
|
|
|
polygon_editor->set_background(p_tile_set_atlas_source->get_texture(), p_tile_set_atlas_source->get_tile_texture_region(p_coords), tile_data->get_texture_origin(), tile_data->get_flip_h(), tile_data->get_flip_v(), tile_data->get_transpose(), tile_data->get_modulate());
|
|
|
}
|
|
|
|
|
|
-void TileDataNavigationEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, Variant p_value) {
|
|
|
+void TileDataNavigationEditor::_set_value(TileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile, const Variant &p_value) {
|
|
|
TileData *tile_data = p_tile_set_atlas_source->get_tile_data(p_coords, p_alternative_tile);
|
|
|
ERR_FAIL_NULL(tile_data);
|
|
|
Ref<NavigationPolygon> nav_polygon = p_value;
|
|
@@ -2877,7 +2877,7 @@ Variant TileDataNavigationEditor::_get_value(TileSetAtlasSource *p_tile_set_atla
|
|
|
return tile_data->get_navigation_polygon(navigation_layer);
|
|
|
}
|
|
|
|
|
|
-void TileDataNavigationEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, Variant p_new_value) {
|
|
|
+void TileDataNavigationEditor::_setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, const HashMap<TileMapCell, Variant, TileMapCell> &p_previous_values, const Variant &p_new_value) {
|
|
|
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
|
|
|
for (const KeyValue<TileMapCell, Variant> &E : p_previous_values) {
|
|
|
Vector2i coords = E.key.get_atlas_coords();
|