Fix loading new directory; retain not loading empty directory to save existing data

Author: TokisanGames

project/demo/src/CodeGenerated.gd

@@ -24,14 +24,14 @@ func create_terrain() -> Terrain3D:
 	green_gr.set_color(1, Color.from_hsv(120./360., .4, .37))
 	var green_ta: Terrain3DTextureAsset = await create_texture_asset("Grass", green_gr, 1024)
 	green_ta.uv_scale = 0.1
-	green_ta.detiling = 0.1
+	green_ta.detiling_rotation = 0.1
 
 	var brown_gr := Gradient.new()
 	brown_gr.set_color(0, Color.from_hsv(30./360., .4, .3))
 	brown_gr.set_color(1, Color.from_hsv(30./360., .4, .4))
 	var brown_ta: Terrain3DTextureAsset = await create_texture_asset("Dirt", brown_gr, 1024)
 	brown_ta.uv_scale = 0.03
-	green_ta.detiling = 0.1
+	green_ta.detiling_rotation = 0.1
 
 	var grass_ma: Terrain3DMeshAsset = create_mesh_asset("Grass", Color.from_hsv(120./360., .4, .37)) 
 

project/demo/src/UI.gd

@@ -27,7 +27,7 @@ func _process(p_delta) -> void:
 			UI toggle: F9
 			Render mode: F10
 			Full screen: F11
-			Mouse toggle: Escape
+			Mouse toggle: Escape / F12
 			"""
 
 
@@ -47,7 +47,7 @@ func _unhandled_key_input(p_event: InputEvent) -> void:
 			KEY_F11:
 				toggle_fullscreen()
 				get_viewport().set_input_as_handled()
-			KEY_ESCAPE:
+			KEY_ESCAPE, KEY_F12:
 				if Input.get_mouse_mode() == Input.MOUSE_MODE_VISIBLE:
 					Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 				else:

src/terrain_3d.cpp

@@ -425,9 +425,12 @@ void Terrain3D::set_debug_level(const int p_level) {
 void Terrain3D::set_data_directory(String p_dir) {
 	LOG(INFO, "Setting data directory to ", p_dir);
 	if (_data_directory != p_dir) {
-		if (_data_directory.is_empty()) {
+		if (_data_directory.is_empty() && Util::get_files(p_dir, "terrain3d*.res").size() == 0) {
+			// If _data_directory was empty and now specified, and has no data
+			// assume we want to retain the current data
 			_data_directory = p_dir;
 		} else {
+			// Else clear data and if not null, load
 			_initialized = false;
 			_destroy_labels();
 			_destroy_collision();
@@ -897,7 +900,7 @@ void Terrain3D::_notification(const int p_what) {
 			// Editor Node is about to save the current scene
 			LOG(INFO, "NOTIFICATION_EDITOR_PRE_SAVE");
 			if (_data_directory.is_empty()) {
-				LOG(ERROR, "Data directory is empty. Set it to write data to disk.");
+				LOG(ERROR, "Data directory is empty. Set it to save regions to disk.");
 			} else if (!_data) {
 				LOG(DEBUG, "Save requested, but no valid data object. Skipping");
 			} else {

src/terrain_3d_assets.cpp

@@ -609,7 +609,6 @@ void Terrain3DAssets::update_mesh_list() {
 
 Error Terrain3DAssets::save(const String &p_path) {
 	if (p_path.is_empty() && get_path().is_empty()) {
-		LOG(ERROR, "No valid path provided");
 		return ERR_FILE_NOT_FOUND;
 	}
 	if (!p_path.is_empty()) {

src/terrain_3d_data.cpp

@@ -351,24 +351,21 @@ void Terrain3DData::save_region(const Vector2i &p_region_loc, const String &p_di
 
 void Terrain3DData::load_directory(const String &p_dir) {
 	if (p_dir.is_empty()) {
-		LOG(ERROR, "Specified data directory is blank");
+		LOG(ERROR, "Specified directory name is blank");
 		return;
 	}
-	Ref<DirAccess> da = DirAccess::open(p_dir);
-	if (da.is_null()) {
-		LOG(ERROR, "Cannot read Terrain3D data directory: ", p_dir);
+
+	LOG(INFO, "Loading region files from ", p_dir);
+	PackedStringArray files = Util::get_files(p_dir, "terrain3d*.res");
+	if (files.size() == 0) {
+		LOG(INFO, "No Terrain3D region files found in: ", p_dir);
 		return;
 	}
-	_clear();
 
-	LOG(INFO, "Loading region files from ", p_dir);
-	PackedStringArray files = da->get_files();
+	_clear();
 	for (int i = 0; i < files.size(); i++) {
-		String fname = files[i].trim_suffix(".remap");
+		String fname = files[i];
 		String path = p_dir + String("/") + fname;
-		if (!fname.begins_with("terrain3d") || !fname.ends_with(".res")) {
-			continue;
-		}
 		LOG(DEBUG, "Loading region from ", path);
 		Vector2i loc = Util::filename_to_location(fname);
 		if (loc.x == INT32_MAX) {

src/terrain_3d_material.cpp

@@ -737,7 +737,6 @@ void Terrain3DMaterial::set_show_vertex_grid(const bool p_enabled) {
 
 Error Terrain3DMaterial::save(const String &p_path) {
 	if (p_path.is_empty() && get_path().is_empty()) {
-		LOG(ERROR, "No valid path provided");
 		return ERR_FILE_NOT_FOUND;
 	}
 	if (!p_path.is_empty()) {

src/terrain_3d_util.cpp

@@ -1,5 +1,6 @@
 // Copyright © 2025 Cory Petkovsek, Roope Palmroos, and Contributors.
 
+#include <godot_cpp/classes/dir_access.hpp>
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/file_access.hpp>
 #include <godot_cpp/classes/time.hpp>
@@ -108,6 +109,25 @@ String Terrain3DUtil::location_to_string(const Vector2i &p_region_loc) {
 	return x_str + y_str;
 }
 
+PackedStringArray Terrain3DUtil::get_files(const String &p_dir, const String &p_glob) {
+	PackedStringArray files;
+	Ref<DirAccess> da = DirAccess::open(p_dir);
+	if (da.is_null()) {
+		LOG(ERROR, "Cannot open directory: ", p_dir);
+		return files;
+	}
+	PackedStringArray dir_files = da->get_files();
+	for (int i = 0; i < dir_files.size(); i++) {
+		String fname = dir_files[i].trim_suffix(".remap");
+		if (!fname.matchn(p_glob)) {
+			continue;
+		}
+		LOG(DEBUG, "Found file: ", p_dir + String("/") + fname);
+		files.push_back(fname);
+	}
+	return files;
+}
+
 Ref<Image> Terrain3DUtil::black_to_alpha(const Ref<Image> &p_image) {
 	if (p_image.is_null()) {
 		return Ref<Image>();

src/terrain_3d_util.h

@@ -33,6 +33,7 @@ class Terrain3DUtil : public Object {
 	static Vector2i string_to_location(const String &p_string);
 	static String location_to_filename(const Vector2i &p_region_loc);
 	static String location_to_string(const Vector2i &p_region_loc);
+	static PackedStringArray get_files(const String &p_dir, const String &p_glob = "*");
 
 	// Image operations
 	static Ref<Image> black_to_alpha(const Ref<Image> &p_image);