Fix meshasset not saving card height offset, consolidate density

Author: TokisanGames

project/addons/terrain_3d/src/asset_dock.gd

@@ -792,8 +792,8 @@ class ListEntry extends VBoxContainer:
 				var ma := Terrain3DMeshAsset.new()
 				if resource is Terrain3DMeshAsset:
 					ma.id = resource.id
-				ma.set_scene_file(res)
 				set_edited_resource(ma, false)
+				ma.set_scene_file(res)
 				resource = ma
 			elif res is Terrain3DMeshAsset and type == Terrain3DAssets.TYPE_MESH:
 				if resource is Terrain3DMeshAsset:

src/terrain_3d_mesh_asset.cpp

@@ -26,10 +26,6 @@ void Terrain3DMeshAsset::_set_generated_type(const GenType p_type) {
 		LOG(DEBUG, "Generating card mesh");
 		_meshes.push_back(_get_generated_mesh());
 		_set_material_override(_get_material());
-		_height_offset = 0.5f;
-		_generated_faces = 2;
-		_relative_density = 10.f;
-		_calculated_density = 10.f;
 	}
 }
 
@@ -158,8 +154,7 @@ void Terrain3DMeshAsset::clear() {
 	_cast_shadows = GeometryInstance3D::SHADOW_CASTING_SETTING_ON;
 	_generated_faces = 2.f;
 	_generated_size = Vector2(1.f, 1.f);
-	_relative_density = -1.f;
-	_calculated_density = -1.f;
+	_density = 10.f;
 	_packed_scene.unref();
 	_material_override.unref();
 	_set_generated_type(TYPE_TEXTURE_CARD);
@@ -187,19 +182,7 @@ void Terrain3DMeshAsset::set_height_offset(const real_t p_offset) {
 
 void Terrain3DMeshAsset::set_density(const real_t p_density) {
 	LOG(INFO, "Setting mesh density: ", p_density);
-	if (p_density < 0) {
-		_relative_density = _calculated_density;
-	} else {
-		_relative_density = CLAMP(p_density, 0.01f, 10.f);
-	}
-}
-
-real_t Terrain3DMeshAsset::get_density() const {
-	if (_relative_density > 0) {
-		return _relative_density;
-	} else {
-		return _calculated_density;
-	}
+	_density = CLAMP(p_density, 0.01f, 10.f);
 }
 
 void Terrain3DMeshAsset::set_visibility_range(const real_t p_visibility_range) {
@@ -260,17 +243,18 @@ void Terrain3DMeshAsset::set_scene_file(const Ref<PackedScene> &p_scene_file) {
 		}
 		if (_meshes.size() > 0) {
 			Ref<Mesh> mesh = _meshes[0];
-			_calculated_density = CLAMP(10.f / mesh->get_aabb().get_volume(), 0.01f, 10.0f);
-			_relative_density = _calculated_density;
-			LOG(DEBUG, "Emitting file_changed");
-			emit_signal("file_changed");
+			_density = CLAMP(10.f / mesh->get_aabb().get_volume(), 0.01f, 10.0f);
 		} else {
 			LOG(ERROR, "No MeshInstance3D found in scene file");
 		}
 		notify_property_list_changed();
 	} else {
 		set_generated_type(TYPE_TEXTURE_CARD);
+		_density = 10.f;
 	}
+	LOG(DEBUG, "Emitting file_changed");
+	emit_signal("file_changed");
+	emit_signal("instancer_setting_changed");
 }
 
 void Terrain3DMeshAsset::set_material_override(const Ref<Material> &p_material) {

src/terrain_3d_mesh_asset.h

@@ -37,8 +37,7 @@ class Terrain3DMeshAsset : public Terrain3DAssetResource {
 	Vector2 _generated_size = Vector2(1.f, 1.f);
 	Ref<PackedScene> _packed_scene;
 	Ref<Material> _material_override;
-	real_t _relative_density = -1.f;
-	real_t _calculated_density = -1.f;
+	real_t _density = 10.f;
 
 	// Working data
 	TypedArray<Mesh> _meshes;
@@ -65,7 +64,7 @@ class Terrain3DMeshAsset : public Terrain3DAssetResource {
 	void set_height_offset(const real_t p_offset);
 	real_t get_height_offset() const { return _height_offset; }
 	void set_density(const real_t p_density);
-	real_t get_density() const;
+	real_t get_density() const { return _density; }
 
 	void set_visibility_range(const real_t p_visibility_range);
 	real_t get_visibility_range() const { return _visibility_range; };