From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 27 Aug 2021 23:12:42 +0000 (+0200)
Subject: radiant: also list images from dds/textures/ as textures/ ones
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c47f9a96ca72b3dc5ffeb1a196e0917a88f27885;p=xonotic%2Fnetradiant.git

radiant: also list images from dds/textures/ as textures/ ones
---

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index f741f0ce..18311b40 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -823,6 +823,14 @@ void operator()( const char* name ) const {
 };
 
 void TextureDirectory_loadTexture( const char* directory, const char* texture ){
+	// Doom3-like dds/ prefix (used by DarkPlaces).
+	// When we list dds/textures/ folder,
+	// store the texture names without dds/ prefix.
+	if ( !strncmp( "dds/", directory, 4 ) )
+	{
+		directory = &directory[ 4 ];
+	}
+
 	StringOutputStream name( 256 );
 	name << directory << StringRange( texture, path_get_filename_base_end( texture ) );
 
@@ -865,6 +873,9 @@ void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* d
 		{
 			LoadShaderVisitor visitor;
 			archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "textures/" );
+
+			// Doom3-like dds/ prefix (used by DarkPlaces).
+			archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "dds/textures/" );
 		}
 		else if ( extension_equal_i( path_get_extension( directory ), "wad" ) )
 		{
@@ -886,7 +897,19 @@ void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* d
 			StringOutputStream dirstring( 64 );
 			dirstring << "textures/" << directory;
 
-			Radiant_getImageModules().foreachModule( LoadTexturesByTypeVisitor( dirstring.c_str() ) );
+			{
+				LoadTexturesByTypeVisitor visitor( dirstring.c_str() );
+				Radiant_getImageModules().foreachModule( visitor );
+			}
+
+			// Doom3-like dds/ prefix (used by DarkPlaces).
+			dirstring.clear();
+			dirstring << "dds/textures/" << directory;
+
+			{
+				LoadTexturesByTypeVisitor visitor( dirstring.c_str() );
+				Radiant_getImageModules().foreachModule( visitor );
+			}
 		}
 	}
 
@@ -913,6 +936,15 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c
 			LoadTexturesByTypeVisitor visitor( dirstring.c_str() );
 			Radiant_getImageModules().foreachModule( visitor );
 		}
+
+		// Doom3-like dds/ prefix (used by DarkPlaces).
+		dirstring.clear();
+		dirstring << "dds/textures/" << directory;
+
+		{
+			LoadTexturesByTypeVisitor visitor( dirstring.c_str() );
+			Radiant_getImageModules().foreachModule( visitor );
+		}
 	}
 
 	// we'll display the newly loaded textures + all the ones already in use