Instancer storage rework

project/demo/src/DemoScene.gd

@@ -1,6 +1,10 @@
 @tool
 extends Node
 
+@export var dump_tree: bool = false :
+ set(value):
+ print_tree()
+
 
 func _ready():
  if not Engine.is_editor_hint() and has_node("UI"):

src/register_types.cpp

@@ -21,12 +21,12 @@ void initialize_terrain_3d(ModuleInitializationLevel p_level) {
  ClassDB::register_class<Terrain3DInstancer>();
  ClassDB::register_class<Terrain3DMaterial>();
  ClassDB::register_class<Terrain3DMeshAsset>();
- ClassDB::register_class<Terrain3DStorage>(); // Deprecated 0.9.3 - Remove 0.9.4+
+ ClassDB::register_class<Terrain3DStorage>(); // Deprecated 0.9.3 - Remove 1.0
  ClassDB::register_class<Terrain3DRegion>();
  ClassDB::register_class<Terrain3DTextureAsset>();
  ClassDB::register_class<Terrain3DUtil>();
- ClassDB::register_class<Terrain3DTexture>(); // Deprecated 0.9.2 - Remove 0.9.3+
- ClassDB::register_class<Terrain3DTextureList>(); // Deprecated 0.9.2 - Remove 0.9.3+
+ ClassDB::register_class<Terrain3DTexture>(); // Deprecated 0.9.2 - Remove 1.0
+ ClassDB::register_class<Terrain3DTextureList>(); // Deprecated 0.9.2 - Remove 1.0
 }
 
 void uninitialize_terrain_3d(ModuleInitializationLevel p_level) {

src/terrain_3d.cpp

@@ -151,7 +151,7 @@ void Terrain3D::_build_containers() {
  _label_nodes->set_name("Labels");
  add_child(_label_nodes, true);
  _mmi_nodes = memnew(Node);
- _mmi_nodes->set_name("MMIs");
+ _mmi_nodes->set_name("MMI");
  add_child(_mmi_nodes, true);
 }
 
@@ -223,7 +223,7 @@ void Terrain3D::_update_collision() {
  int time = Time::get_singleton()->get_ticks_msec();
  int shape_size = _region_size + 1;
  float hole_const = NAN;
- // DEPRECATED - Jolt v0.12 supports NAN. Remove check when it's old.
+ // DEPRECATED - Jolt v0.12 supports NAN. Remove 1.0. Jolt 0.13 supports 4.3.
  if (ProjectSettings::get_singleton()->get_setting("physics/3d/physics_engine") == "JoltPhysics3D") {
  hole_const = FLT_MAX;
  }
@@ -984,23 +984,15 @@ void Terrain3D::set_mesh_size(const int p_size) {
 void Terrain3D::set_vertex_spacing(const real_t p_spacing) {
  real_t spacing = CLAMP(p_spacing, 0.25f, 100.0f);
  if (_vertex_spacing != spacing) {
- real_t scale = spacing / _vertex_spacing;
  _vertex_spacing = spacing;
  LOG(INFO, "Setting vertex spacing: ", _vertex_spacing);
  _clear_meshes();
  _destroy_collision();
  _destroy_instancer();
  _initialize();
  _data->_vertex_spacing = _vertex_spacing;
- Dictionary mmis = _instancer->get_mmis();
- Array keys = mmis.keys();
- for (int i = 0; i < keys.size(); i++) {
- MultiMeshInstance3D *mmi = cast_to<MultiMeshInstance3D>(mmis[keys[i]]);
- if (mmi != nullptr) {
- mmi->set_scale(Vector3(_vertex_spacing, 1.f, _vertex_spacing));
- }
- }
  update_region_labels();
+ _instancer->_update_vertex_spacing(_vertex_spacing);
  }
  if (IS_EDITOR && _plugin != nullptr) {
  _plugin->call("update_region_grid");
@@ -1573,12 +1565,12 @@ void Terrain3D::_bind_methods() {
  ADD_SIGNAL(MethodInfo("material_changed"));
  ADD_SIGNAL(MethodInfo("assets_changed"));
 
- // DEPRECATED 0.9.2 - Remove 0.9.3+
+ // DEPRECATED 0.9.2 - Remove 1.0
  ClassDB::bind_method(D_METHOD("set_texture_list", "texture_list"), &Terrain3D::set_texture_list);
  ClassDB::bind_method(D_METHOD("get_texture_list"), &Terrain3D::get_texture_list);
  ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_list", PROPERTY_HINT_RESOURCE_TYPE, "Terrain3DTextureList", PROPERTY_USAGE_NONE), "set_texture_list", "get_texture_list");
 
- // DEPRECATED 0.9.3 - Remove 0.9.4+
+ // DEPRECATED 0.9.3 - Remove 1.0
  ClassDB::bind_method(D_METHOD("set_storage", "storage"), &Terrain3D::set_storage);
  ClassDB::bind_method(D_METHOD("get_storage"), &Terrain3D::get_storage);
  ClassDB::bind_method(D_METHOD("split_storage"), &Terrain3D::split_storage);
@@ -1589,7 +1581,7 @@ void Terrain3D::_bind_methods() {
 // DEPRECATED Functions
 ///////////////////////////
 
-// DEPRECATED 0.9.2 - Remove 0.9.3+
+// DEPRECATED 0.9.2 - Remove 1.0
 void Terrain3D::set_texture_list(const Ref<Terrain3DTextureList> &p_texture_list) {
  if (p_texture_list.is_null()) {
  LOG(ERROR, "Attempted to upgrade Terrain3DTextureList, but received null (perhaps already a Terrain3DAssets). Reconnect manually and save.");
@@ -1603,7 +1595,7 @@ void Terrain3D::set_texture_list(const Ref<Terrain3DTextureList> &p_texture_list
  set_assets(assets);
 }
 
-// DEPRECATED 0.9.3 - Remove 0.9.4+
+// DEPRECATED 0.9.3 - Remove 1.0
 void Terrain3D::set_storage(const Ref<Terrain3DStorage> &p_storage) {
  _storage = p_storage;
  if (p_storage.is_valid()) {
@@ -1640,7 +1632,7 @@ void Terrain3D::split_storage() {
  region->set_height_map(hmaps[i]);
  region->set_control_map(ctlmaps[i]);
  region->set_color_map(clrmaps[i]);
- region->set_multimeshes(mms[locations[i]]);
+ region->set_multimeshes(mms[locations[i]]); // TODO BROKEN
  _data->add_region(region, false);
  LOG(INFO, "Splicing region ", locations[i]);
  }

src/terrain_3d.h

@@ -228,11 +228,11 @@ class Terrain3D : public Node3D {
  static void _bind_methods();
 
 public:
- // DEPRECATED 0.9.2 - Remove 0.9.3+
+ // DEPRECATED 0.9.2 - Remove 1.0
  void set_texture_list(const Ref<Terrain3DTextureList> &p_texture_list);
  Ref<Terrain3DTextureList> get_texture_list() const { return Ref<Terrain3DTextureList>(); }
 
- // DEPRECATED 0.9.3 - Remove 0.9.4+
+ // DEPRECATED 0.9.3 - Remove 1.0
  Ref<Terrain3DStorage> _storage;
  void set_storage(const Ref<Terrain3DStorage> &p_storage);
  Ref<Terrain3DStorage> get_storage() const { return _storage; }

src/terrain_3d_assets.cpp

@@ -596,7 +596,7 @@ void Terrain3DAssets::_bind_methods() {
  ADD_SIGNAL(MethodInfo("textures_changed"));
 }
 
-// Deprecated 0.9.2 - Remove 0.9.3+
+// Deprecated 0.9.2 - Remove 1.0
 void Terrain3DTextureList::set_textures(const TypedArray<Terrain3DTexture> &p_textures) {
  LOG(WARN, "Terrain3DTextureList: Converting Terrain3DTextures to Terrain3DTextureAssets. Save to complete.");
  for (int i = 0; i < p_textures.size(); i++) {

src/terrain_3d_assets.h

@@ -89,7 +89,7 @@ class Terrain3DAssets : public Resource {
 
 VARIANT_ENUM_CAST(Terrain3DAssets::AssetType);
 
-// Deprecated 0.9.2 - Remove 0.9.3+
+// Deprecated 0.9.2 - Remove 1.0
 
 class Terrain3DTexture : public Terrain3DTextureAsset {
  GDCLASS(Terrain3DTexture, Terrain3DTextureAsset);

src/terrain_3d_data.cpp

@@ -220,6 +220,7 @@ Ref<Terrain3DRegion> Terrain3DData::add_region_blank(const Vector2i &p_region_lo
  region.instantiate();
  region->set_location(p_region_loc);
  region->set_region_size(_region_size);
+ region->set_vertex_spacing(_vertex_spacing);
  if (add_region(region, p_update) == OK) {
  region->set_modified(true);
  return region;
@@ -257,6 +258,7 @@ Error Terrain3DData::add_region(const Ref<Terrain3DRegion> &p_region, const bool
  LOG(DEBUG, "Storing region ", region_loc, " version ", vformat("%.3f", p_region->get_version()), " id: ", _region_locations.size());
  if (p_update) {
  force_update_maps();
+ _terrain->get_instancer()->force_update_mmis();
  }
  return OK;
 }
@@ -293,6 +295,7 @@ void Terrain3DData::remove_region(const Ref<Terrain3DRegion> &p_region, const bo
  if (p_update) {
  LOG(DEBUG, "Updating generated maps");
  force_update_maps();
+ _terrain->get_instancer()->force_update_mmis();
  }
 }
 
@@ -625,7 +628,7 @@ real_t Terrain3DData::get_height(const Vector3 &p_global_position) const {
  const real_t &step = _vertex_spacing;
  pos.y = 0.f;
  // Round to nearest vertex
- Vector3 pos_round = Vector3(round_multiple(pos.x, step), 0.f, round_multiple(pos.z, step));
+ Vector3 pos_round = pos.snapped(Vector3(step, 0.f, step));
  // If requested position is close to a vertex, return its height
  if ((pos - pos_round).length() < 0.01f) {
  return get_pixel(TYPE_HEIGHT, pos).r;
@@ -672,7 +675,7 @@ bool Terrain3DData::is_in_slope(const Vector3 &p_global_position, const Vector2
  auto get_height = [&](Vector3 pos) -> real_t {
  real_t step = _terrain->get_vertex_spacing();
  // Round to nearest vertex
- Vector3 pos_round = Vector3(round_multiple(pos.x, step), 0.f, round_multiple(pos.z, step));
+ Vector3 pos_round = pos.snapped(Vector3(step, 0.f, step));
  real_t height = get_pixel(TYPE_HEIGHT, pos_round).r;
  return std::isnan(height) ? 0.f : height;
  };

src/terrain_3d_editor.cpp

@@ -74,7 +74,6 @@ Ref<Terrain3DRegion> Terrain3DEditor::_operate_region(const Vector2i &p_region_l
  _original_regions.push_back(region);
  height_range = region->get_height_range();
  _terrain->get_data()->remove_region(region);
- _terrain->get_instancer()->force_update_mmis();
  changed = true;
  }
 
@@ -716,7 +715,7 @@ void Terrain3DEditor::start_operation(const Vector3 &p_global_position) {
  _edited_regions = TypedArray<Terrain3DRegion>();
  _added_removed_locations = TypedArray<Vector2i>();
  // Reset counter at start to ensure first click places an instance
- _terrain->get_instancer()->reset_instance_counter();
+ _terrain->get_instancer()->reset_density_counter();
  _terrain->get_data()->clear_edited_area();
  _operation_position = p_global_position;
  _operation_movement = Vector3();