summaryrefslogtreecommitdiffstats
path: root/scene
diff options
context:
space:
mode:
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/tile_map.cpp93
-rw-r--r--scene/2d/tile_map.h3
-rw-r--r--scene/gui/color_picker.cpp6
-rw-r--r--scene/resources/immediate_mesh.cpp13
4 files changed, 103 insertions, 12 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 1f70d4b558..1ea342c3f4 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -2498,6 +2498,11 @@ Vector2i TileMapLayer::get_coords_for_body_rid(RID p_physics_body) const {
}
TileMapLayer::~TileMapLayer() {
+ if (!tile_map_node) {
+ // Temporary layer.
+ return;
+ }
+
in_destructor = true;
clear();
internal_update();
@@ -3714,16 +3719,88 @@ bool TileMap::_get(const StringName &p_name, Variant &r_ret) const {
void TileMap::_get_property_list(List<PropertyInfo> *p_list) const {
p_list->push_back(PropertyInfo(Variant::INT, "format", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
p_list->push_back(PropertyInfo(Variant::NIL, "Layers", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
+
+#define MAKE_LAYER_PROPERTY(m_type, m_name, m_hint) \
+ { \
+ const String property_name = vformat("layer_%d/" m_name, i); \
+ p_list->push_back(PropertyInfo(m_type, property_name, PROPERTY_HINT_NONE, m_hint, (get(property_name) == property_get_revert(property_name)) ? PROPERTY_USAGE_EDITOR : PROPERTY_USAGE_DEFAULT)); \
+ }
+
for (unsigned int i = 0; i < layers.size(); i++) {
- p_list->push_back(PropertyInfo(Variant::STRING, vformat("layer_%d/name", i), PROPERTY_HINT_NONE));
- p_list->push_back(PropertyInfo(Variant::BOOL, vformat("layer_%d/enabled", i), PROPERTY_HINT_NONE));
- p_list->push_back(PropertyInfo(Variant::COLOR, vformat("layer_%d/modulate", i), PROPERTY_HINT_NONE));
- p_list->push_back(PropertyInfo(Variant::BOOL, vformat("layer_%d/y_sort_enabled", i), PROPERTY_HINT_NONE));
- p_list->push_back(PropertyInfo(Variant::INT, vformat("layer_%d/y_sort_origin", i), PROPERTY_HINT_NONE, "suffix:px"));
- p_list->push_back(PropertyInfo(Variant::INT, vformat("layer_%d/z_index", i), PROPERTY_HINT_NONE));
- p_list->push_back(PropertyInfo(Variant::BOOL, vformat("layer_%d/navigation_enabled", i), PROPERTY_HINT_NONE));
+ MAKE_LAYER_PROPERTY(Variant::STRING, "name", "");
+ MAKE_LAYER_PROPERTY(Variant::BOOL, "enabled", "");
+ MAKE_LAYER_PROPERTY(Variant::COLOR, "modulate", "");
+ MAKE_LAYER_PROPERTY(Variant::BOOL, "y_sort_enabled", "");
+ MAKE_LAYER_PROPERTY(Variant::INT, "y_sort_origin", "suffix:px");
+ MAKE_LAYER_PROPERTY(Variant::INT, "z_index", "");
+ MAKE_LAYER_PROPERTY(Variant::BOOL, "navigation_enabled", "");
p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("layer_%d/tile_data", i), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
}
+
+#undef MAKE_LAYER_PROPERTY
+}
+
+bool TileMap::_property_can_revert(const StringName &p_name) const {
+ Vector<String> components = String(p_name).split("/", true, 2);
+ if (components.size() == 2 && components[0].begins_with("layer_")) {
+ int index = components[0].trim_prefix("layer_").to_int();
+ if (index <= 0 || index >= (int)layers.size()) {
+ return false;
+ }
+
+ if (components[1] == "name") {
+ return layers[index]->get_name() != default_layer->get_name();
+ } else if (components[1] == "enabled") {
+ return layers[index]->is_enabled() != default_layer->is_enabled();
+ } else if (components[1] == "modulate") {
+ return layers[index]->get_modulate() != default_layer->get_modulate();
+ } else if (components[1] == "y_sort_enabled") {
+ return layers[index]->is_y_sort_enabled() != default_layer->is_y_sort_enabled();
+ } else if (components[1] == "y_sort_origin") {
+ return layers[index]->get_y_sort_origin() != default_layer->get_y_sort_origin();
+ } else if (components[1] == "z_index") {
+ return layers[index]->get_z_index() != default_layer->get_z_index();
+ } else if (components[1] == "navigation_enabled") {
+ return layers[index]->is_navigation_enabled() != default_layer->is_navigation_enabled();
+ }
+ }
+
+ return false;
+}
+
+bool TileMap::_property_get_revert(const StringName &p_name, Variant &r_property) const {
+ Vector<String> components = String(p_name).split("/", true, 2);
+ if (components.size() == 2 && components[0].begins_with("layer_")) {
+ int index = components[0].trim_prefix("layer_").to_int();
+ if (index <= 0 || index >= (int)layers.size()) {
+ return false;
+ }
+
+ if (components[1] == "name") {
+ r_property = default_layer->get_name();
+ return true;
+ } else if (components[1] == "enabled") {
+ r_property = default_layer->is_enabled();
+ return true;
+ } else if (components[1] == "modulate") {
+ r_property = default_layer->get_modulate();
+ return true;
+ } else if (components[1] == "y_sort_enabled") {
+ r_property = default_layer->is_y_sort_enabled();
+ return true;
+ } else if (components[1] == "y_sort_origin") {
+ r_property = default_layer->get_y_sort_origin();
+ return true;
+ } else if (components[1] == "z_index") {
+ r_property = default_layer->get_z_index();
+ return true;
+ } else if (components[1] == "navigation_enabled") {
+ r_property = default_layer->is_navigation_enabled();
+ return true;
+ }
+ }
+
+ return false;
}
Vector2 TileMap::map_to_local(const Vector2i &p_pos) const {
@@ -4747,6 +4824,8 @@ TileMap::TileMap() {
new_layer->set_tile_map(this);
new_layer->set_layer_index_in_tile_map_node(0);
layers.push_back(new_layer);
+
+ default_layer.instantiate();
}
TileMap::~TileMap() {
diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h
index a16595629c..1136e4190d 100644
--- a/scene/2d/tile_map.h
+++ b/scene/2d/tile_map.h
@@ -461,6 +461,7 @@ private:
// Layers.
LocalVector<Ref<TileMapLayer>> layers;
+ Ref<TileMapLayer> default_layer; // Dummy layer to fetch default values.
int selected_layer = -1;
bool pending_update = false;
@@ -479,6 +480,8 @@ protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const;
+ bool _property_can_revert(const StringName &p_name) const;
+ bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
void _notification(int p_what);
static void _bind_methods();
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 669ce11e5d..f250662be0 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -89,6 +89,10 @@ void ColorPicker::_notification(int p_what) {
shape_popup->set_item_icon(shape_popup->get_item_index(SHAPE_VHS_CIRCLE), theme_cache.shape_circle);
shape_popup->set_item_icon(shape_popup->get_item_index(SHAPE_OKHSL_CIRCLE), theme_cache.shape_circle);
+ if (current_shape != SHAPE_NONE) {
+ btn_shape->set_icon(shape_popup->get_item_icon(current_shape));
+ }
+
internal_margin->begin_bulk_theme_override();
internal_margin->add_theme_constant_override(SNAME("margin_bottom"), theme_cache.content_margin);
internal_margin->add_theme_constant_override(SNAME("margin_left"), theme_cache.content_margin);
@@ -1792,8 +1796,6 @@ ColorPicker::ColorPicker() {
shape_popup->set_item_checked(current_shape, true);
shape_popup->connect("id_pressed", callable_mp(this, &ColorPicker::set_picker_shape));
- btn_shape->set_icon(shape_popup->get_item_icon(current_shape));
-
add_mode(new ColorModeRGB(this));
add_mode(new ColorModeHSV(this));
add_mode(new ColorModeRAW(this));
diff --git a/scene/resources/immediate_mesh.cpp b/scene/resources/immediate_mesh.cpp
index 3507df8bd8..dde556c264 100644
--- a/scene/resources/immediate_mesh.cpp
+++ b/scene/resources/immediate_mesh.cpp
@@ -166,7 +166,7 @@ void ImmediateMesh::surface_end() {
normal_tangent_stride += sizeof(uint32_t);
}
uint32_t tangent_offset = 0;
- if (uses_tangents) {
+ if (uses_tangents || uses_normals) {
format |= ARRAY_FORMAT_TANGENT;
tangent_offset = vertex_stride * vertices.size() + normal_tangent_stride;
normal_tangent_stride += sizeof(uint32_t);
@@ -202,9 +202,16 @@ void ImmediateMesh::surface_end() {
*normal = value;
}
- if (uses_tangents) {
+ if (uses_tangents || uses_normals) {
uint32_t *tangent = (uint32_t *)&surface_vertex_ptr[i * normal_tangent_stride + tangent_offset];
- Vector2 t = tangents[i].normal.octahedron_tangent_encode(tangents[i].d);
+ Vector2 t;
+ if (uses_tangents) {
+ t = tangents[i].normal.octahedron_tangent_encode(tangents[i].d);
+ } else {
+ Vector3 tan = Vector3(0.0, 1.0, 0.0).cross(normals[i].normalized());
+ t = tan.octahedron_tangent_encode(1.0);
+ }
+
uint32_t value = 0;
value |= (uint16_t)CLAMP(t.x * 65535, 0, 65535);
value |= (uint16_t)CLAMP(t.y * 65535, 0, 65535) << 16;