Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-22 21:21:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 230d2d556c into 533c616cb8

Browse Source
This commit is contained in:
BlackShift 2024-10-22 22:13:37 +02:00 committed by GitHub
commit 9d3e43031c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 132 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/tiles/tile_set_atlas_source_editor.cpp
View File

@ -739,7 +739,13 @@ void TileSetAtlasSourceEditor::_update_tile_data_editors() {
// --- Physics ---
ADD_TILE_DATA_EDITOR_GROUP(TTR("Physics"));
for (int i = 0; i < tile_set->get_physics_layers_count(); i++) {
ADD_TILE_DATA_EDITOR(group, vformat(TTR("Physics Layer %d"), i), vformat("physics_layer_%d", i));
String name = tile_set->get_physics_layer_name(i);
if (name.is_empty()) {
ADD_TILE_DATA_EDITOR(group, vformat(TTR("Physics Layer %d"), i), vformat("physics_layer_%d", i));
} else {
ADD_TILE_DATA_EDITOR(group, name, vformat("physics_layer_%d", i));
}
if (!tile_data_editors.has(vformat("physics_layer_%d", i))) {
TileDataCollisionEditor *tile_data_collision_editor = memnew(TileDataCollisionEditor());
tile_data_collision_editor->hide();

113
scene/resources/2d/tile_set.cpp
View File

@ -577,6 +577,17 @@ int TileSet::get_occlusion_layers_count() const {
return occlusion_layers.size();
};
String TileSet::get_occlusion_layer_name(int p_index) const {
ERR_FAIL_INDEX_V(p_index, occlusion_layers.size(), "");
return occlusion_layers[p_index].name;
}
void TileSet::set_occlusion_layer_name(int p_index, String p_name) {
ERR_FAIL_INDEX(p_index, occlusion_layers.size());
occlusion_layers.write[p_index].name = p_name;
emit_changed();
}
void TileSet::add_occlusion_layer(int p_index) {
if (p_index < 0) {
p_index = occlusion_layers.size();
@ -640,6 +651,17 @@ int TileSet::get_physics_layers_count() const {
return physics_layers.size();
}
String TileSet::get_physics_layer_name(int p_index) const {
ERR_FAIL_INDEX_V(p_index, physics_layers.size(), "");
return physics_layers[p_index].name;
}
void TileSet::set_physics_layer_name(int p_index, String p_name) {
ERR_FAIL_INDEX(p_index, physics_layers.size());
physics_layers.write[p_index].name = p_name;
emit_changed();
}
void TileSet::add_physics_layer(int p_index) {
if (p_index < 0) {
p_index = physics_layers.size();
@ -714,6 +736,17 @@ int TileSet::get_terrain_sets_count() const {
return terrain_sets.size();
}
String TileSet::get_terrain_set_name(int p_index) const {
ERR_FAIL_INDEX_V(p_index, terrain_sets.size(), "");
return terrain_sets[p_index].name;
}
void TileSet::set_terrain_set_name(int p_index, String p_name) {
ERR_FAIL_INDEX(p_index, terrain_sets.size());
terrain_sets.write[p_index].name = p_name;
emit_changed();
}
void TileSet::add_terrain_set(int p_index) {
if (p_index < 0) {
p_index = terrain_sets.size();
@ -958,6 +991,16 @@ int TileSet::get_navigation_layers_count() const {
return navigation_layers.size();
}
String TileSet::get_navigation_layer_name(int p_index) const {
ERR_FAIL_INDEX_V(p_index, navigation_layers.size(), "");
return navigation_layers[p_index].name;
}
void TileSet::set_navigation_layer_name(int p_index, String p_name) {
ERR_FAIL_INDEX(p_index, navigation_layers.size());
navigation_layers.write[p_index].name = p_name;
}
void TileSet::add_navigation_layer(int p_index) {
if (p_index < 0) {
p_index = navigation_layers.size();
@ -3881,6 +3924,13 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
}
set_occlusion_layer_sdf_collision(index, p_value);
return true;
} else if (components[1] == "layer_name") {
ERR_FAIL_COND_V(p_value.get_type() != Variant::STRING, false);
while (index >= occlusion_layers.size()) {
add_occlusion_layer();
}
set_occlusion_layer_name(index, p_value);
return true;
}
} else if (components.size() == 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
// Physics layers.
@ -3907,6 +3957,13 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
}
set_physics_layer_physics_material(index, physics_material);
return true;
} else if (components[1] == "layer_name") {
ERR_FAIL_COND_V(p_value.get_type() != Variant::STRING, false);
while (index >= physics_layers.size()) {
add_physics_layer();
}
set_physics_layer_name(index, p_value);
return true;
}
} else if (components.size() >= 2 && components[0].begins_with("terrain_set_") && components[0].trim_prefix("terrain_set_").is_valid_int()) {
// Terrains.
@ -3942,7 +3999,15 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
set_terrain_color(terrain_set_index, terrain_index, p_value);
return true;
}
} else if (components[1] == "layer_name") {
ERR_FAIL_COND_V(p_value.get_type() != Variant::STRING, false);
while (terrain_set_index >= terrain_sets.size()) {
add_terrain_set();
}
set_terrain_set_name(terrain_set_index, p_value);
return true;
}
} else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
// Navigation layers.
int index = components[0].trim_prefix("navigation_layer_").to_int();
@ -3954,6 +4019,13 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
}
set_navigation_layer_layers(index, p_value);
return true;
} else if (components[1] == "layer_name") {
ERR_FAIL_COND_V(p_value.get_type() != Variant::STRING, false);
while (index >= navigation_layers.size()) {
add_navigation_layer();
}
set_navigation_layer_name(index, p_value);
return true;
}
} else if (components.size() == 2 && components[0].begins_with("custom_data_layer_") && components[0].trim_prefix("custom_data_layer_").is_valid_int()) {
// Custom data layers.
@ -4038,6 +4110,9 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
} else if (components[1] == "sdf_collision") {
r_ret = get_occlusion_layer_sdf_collision(index);
return true;
} else if (components[1] == "layer_name") {
r_ret = get_occlusion_layer_name(index);
return true;
}
} else if (components.size() == 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
// Physics layers.
@ -4054,6 +4129,9 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
} else if (components[1] == "physics_material") {
r_ret = get_physics_layer_physics_material(index);
return true;
} else if (components[1] == "layer_name") {
r_ret = get_physics_layer_name(index);
return true;
}
} else if (components.size() >= 2 && components[0].begins_with("terrain_set_") && components[0].trim_prefix("terrain_set_").is_valid_int()) {
// Terrains.
@ -4076,6 +4154,9 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
r_ret = get_terrain_color(terrain_set_index, terrain_index);
return true;
}
} else if (components[1] == "layer_name") {
r_ret = get_terrain_set_name(terrain_set_index);
return true;
}
} else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
// navigation layers.
@ -4086,6 +4167,9 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
if (components[1] == "layers") {
r_ret = get_navigation_layer_layers(index);
return true;
} else if (components[1] == "layer_name") {
r_ret = get_navigation_layer_name(index);
return true;
}
} else if (components.size() == 2 && components[0].begins_with("custom_data_layer_") && components[0].trim_prefix("custom_data_layer_").is_valid_int()) {
// Custom data layers.
@ -4154,6 +4238,13 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
// Rendering.
p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Rendering", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
for (int i = 0; i < occlusion_layers.size(); i++) {
// occlusion_layer_%d/layer_name
property_info = PropertyInfo(Variant::STRING, vformat("occlusion_layer_%d/layer_name", i));
if (occlusion_layers[i].name.is_empty()) {
property_info.usage ^= PROPERTY_USAGE_STORAGE;
}
p_list->push_back(property_info);
p_list->push_back(PropertyInfo(Variant::INT, vformat("occlusion_layer_%d/light_mask", i), PROPERTY_HINT_LAYERS_2D_RENDER));
// occlusion_layer_%d/sdf_collision
@ -4167,6 +4258,13 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
// Physics.
p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Physics", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
for (int i = 0; i < physics_layers.size(); i++) {
// physics_layer_%d/layer_name
property_info = PropertyInfo(Variant::STRING, vformat("physics_layer_%d/layer_name", i));
if (physics_layers[i].name.is_empty()) {
property_info.usage ^= PROPERTY_USAGE_STORAGE;
}
p_list->push_back(property_info);
p_list->push_back(PropertyInfo(Variant::INT, vformat("physics_layer_%d/collision_layer", i), PROPERTY_HINT_LAYERS_2D_PHYSICS));
// physics_layer_%d/collision_mask
@ -4198,6 +4296,13 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
// Navigation.
p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Navigation", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
for (int i = 0; i < navigation_layers.size(); i++) {
// physics_layer_%d/layer_name
property_info = PropertyInfo(Variant::STRING, vformat("navigation_layer_%d/layer_name", i));
if (navigation_layers[i].name.is_empty()) {
property_info.usage ^= PROPERTY_USAGE_STORAGE;
}
p_list->push_back(property_info);
p_list->push_back(PropertyInfo(Variant::INT, vformat("navigation_layer_%d/layers", i), PROPERTY_HINT_LAYERS_2D_NAVIGATION));
}
@ -4270,6 +4375,8 @@ void TileSet::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_uv_clipping"), &TileSet::is_uv_clipping);
ClassDB::bind_method(D_METHOD("get_occlusion_layers_count"), &TileSet::get_occlusion_layers_count);
ClassDB::bind_method(D_METHOD("get_occlusion_layer_name", "layer_index"), &TileSet::get_occlusion_layer_name);
ClassDB::bind_method(D_METHOD("set_occlusion_layer_name", "layer_index", "layer_name"), &TileSet::set_occlusion_layer_name);
ClassDB::bind_method(D_METHOD("add_occlusion_layer", "to_position"), &TileSet::add_occlusion_layer, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("move_occlusion_layer", "layer_index", "to_position"), &TileSet::move_occlusion_layer);
ClassDB::bind_method(D_METHOD("remove_occlusion_layer", "layer_index"), &TileSet::remove_occlusion_layer);
@ -4280,6 +4387,8 @@ void TileSet::_bind_methods() {
// Physics
ClassDB::bind_method(D_METHOD("get_physics_layers_count"), &TileSet::get_physics_layers_count);
ClassDB::bind_method(D_METHOD("get_physics_layer_name", "layer_index"), &TileSet::get_physics_layer_name);
ClassDB::bind_method(D_METHOD("set_physics_layer_name", "layer_index", "layer_name"), &TileSet::set_physics_layer_name);
ClassDB::bind_method(D_METHOD("add_physics_layer", "to_position"), &TileSet::add_physics_layer, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("move_physics_layer", "layer_index", "to_position"), &TileSet::move_physics_layer);
ClassDB::bind_method(D_METHOD("remove_physics_layer", "layer_index"), &TileSet::remove_physics_layer);
@ -4292,6 +4401,8 @@ void TileSet::_bind_methods() {
// Terrains
ClassDB::bind_method(D_METHOD("get_terrain_sets_count"), &TileSet::get_terrain_sets_count);
ClassDB::bind_method(D_METHOD("get_terrain_set_name", "layer_index"), &TileSet::get_terrain_set_name);
ClassDB::bind_method(D_METHOD("set_terrain_set_name", "layer_index", "layer_name"), &TileSet::set_terrain_set_name);
ClassDB::bind_method(D_METHOD("add_terrain_set", "to_position"), &TileSet::add_terrain_set, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("move_terrain_set", "terrain_set", "to_position"), &TileSet::move_terrain_set);
ClassDB::bind_method(D_METHOD("remove_terrain_set", "terrain_set"), &TileSet::remove_terrain_set);
@ -4309,6 +4420,8 @@ void TileSet::_bind_methods() {
// Navigation
ClassDB::bind_method(D_METHOD("get_navigation_layers_count"), &TileSet::get_navigation_layers_count);
ClassDB::bind_method(D_METHOD("get_navigation_layer_name", "layer_index"), &TileSet::get_navigation_layer_name);
ClassDB::bind_method(D_METHOD("set_navigation_layer_name", "layer_index", "layer_name"), &TileSet::set_navigation_layer_name);
ClassDB::bind_method(D_METHOD("add_navigation_layer", "to_position"), &TileSet::add_navigation_layer, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("move_navigation_layer", "layer_index", "to_position"), &TileSet::move_navigation_layer);
ClassDB::bind_method(D_METHOD("remove_navigation_layer", "layer_index"), &TileSet::remove_navigation_layer);

12
scene/resources/2d/tile_set.h
View File

@ -314,6 +314,7 @@ private:
// Rendering.
bool uv_clipping = false;
struct OcclusionLayer {
String name;
uint32_t light_mask = 1;
bool sdf_collision = false;
};
@ -325,6 +326,7 @@ private:
// Physics
struct PhysicsLayer {
String name;
uint32_t collision_layer = 1;
uint32_t collision_mask = 1;
Ref<PhysicsMaterial> physics_material;
@ -337,6 +339,7 @@ private:
Color color;
};
struct TerrainSet {
String name;
TerrainMode mode = TERRAIN_MODE_MATCH_CORNERS_AND_SIDES;
Vector<Terrain> terrains;
};
@ -352,6 +355,7 @@ private:
// Navigation
struct NavigationLayer {
String name;
uint32_t layers = 1;
};
Vector<NavigationLayer> navigation_layers;
@ -431,6 +435,8 @@ public:
bool is_uv_clipping() const;
int get_occlusion_layers_count() const;
String get_occlusion_layer_name(int p_index) const;
void set_occlusion_layer_name(int p_index, String p_name);
void add_occlusion_layer(int p_index = -1);
void move_occlusion_layer(int p_from_index, int p_to_pos);
void remove_occlusion_layer(int p_index);
@ -441,6 +447,8 @@ public:
// Physics
int get_physics_layers_count() const;
String get_physics_layer_name(int p_index) const;
void set_physics_layer_name(int p_index, String p_name);
void add_physics_layer(int p_index = -1);
void move_physics_layer(int p_from_index, int p_to_pos);
void remove_physics_layer(int p_index);
@ -453,6 +461,8 @@ public:
// Terrain sets
int get_terrain_sets_count() const;
String get_terrain_set_name(int p_index) const;
void set_terrain_set_name(int p_index, String p_name);
void add_terrain_set(int p_index = -1);
void move_terrain_set(int p_from_index, int p_to_pos);
void remove_terrain_set(int p_index);
@ -473,6 +483,8 @@ public:
// Navigation
int get_navigation_layers_count() const;
String get_navigation_layer_name(int p_index) const;
void set_navigation_layer_name(int p_index, String p_name);
void add_navigation_layer(int p_index = -1);
void move_navigation_layer(int p_from_index, int p_to_pos);
void remove_navigation_layer(int p_index);