quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add and use path_extension_is()

Browse Source
This commit is contained in:
Garux 2021-10-03 17:13:12 +03:00
parent a0e79e8ecd
commit b6d60fb17c
20 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/os/path.h
View File

@ -185,6 +185,12 @@ inline bool extension_equal( const char* extension, const char* other ){
return string_equal_nocase( extension, other ); return string_equal_nocase( extension, other );
} }
/// \brief Returns true if \p extension equals one of \p path. \p extension without period.
/// O(n)
inline bool path_extension_is( const char* path, const char* extension ){
return extension_equal( path_get_extension( path ), extension );
}
template<typename Functor> template<typename Functor>
class MatchFileExtension class MatchFileExtension
{ {

3
plugins/assmodel/model.cpp
View File

@ -693,10 +693,9 @@ scene::Node& loadPicoModel( Assimp::Importer& importer, ArchiveFile& file ){
if( scene != nullptr ){ if( scene != nullptr ){
if( scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE ) if( scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE )
globalWarningStream() << "AI_SCENE_FLAGS_INCOMPLETE\n"; globalWarningStream() << "AI_SCENE_FLAGS_INCOMPLETE\n";
const char *ext = path_get_extension( file.getName() );
const auto rootPath = StringOutputStream()( PathFilenameless( file.getName() ) ); const auto rootPath = StringOutputStream()( PathFilenameless( file.getName() ) );
const auto matName = StringOutputStream()( PathExtensionless( file.getName() ) ); const auto matName = StringOutputStream()( PathExtensionless( file.getName() ) );
return ( new PicoModelNode( AssScene{ scene, rootPath, string_equal_nocase( ext, "mdl" )? matName.c_str() : nullptr } ) )->node(); return ( new PicoModelNode( AssScene{ scene, rootPath, path_extension_is( file.getName(), "mdl" )? matName.c_str() : nullptr } ) )->node();
} }
else{ else{
return ( new PicoModelNode() )->node(); return ( new PicoModelNode() )->node();

2
plugins/shaders/shaders.cpp
View File

@ -1580,7 +1580,7 @@ void BuildShaderList( TextInputStream& shaderlist ){
{ {
// each token should be a shader filename // each token should be a shader filename
shaderFile << token; shaderFile << token;
if( !string_equal_nocase( path_get_extension( token ), g_shadersExtension ) ) if( !path_extension_is( token, g_shadersExtension ) )
shaderFile << "." << g_shadersExtension; shaderFile << "." << g_shadersExtension;
ShaderList_addShaderFile( shaderFile.c_str() ); ShaderList_addShaderFile( shaderFile.c_str() );

2
plugins/vfspk3/vfs.cpp
View File

@ -187,7 +187,7 @@ public:
if ( subname[0] == '/' ) { if ( subname[0] == '/' ) {
++subname; ++subname;
} }
if ( m_extension[0] == '*' || extension_equal( path_get_extension( subname ), m_extension ) ) { if ( m_extension[0] == '*' || path_extension_is( subname, m_extension ) ) {
pathlist_append_unique( m_matches, subname ); pathlist_append_unique( m_matches, subname );
} }
} }

2
radiant/environment.cpp
View File

@ -199,7 +199,7 @@ CopiedString g_openMapByCmd;
void cmdMap(){ void cmdMap(){
for ( int i = 1; i < g_argc; ++i ) for ( int i = 1; i < g_argc; ++i )
if( extension_equal( path_get_extension( g_argv[i] ), "map" ) ){ if( path_extension_is( g_argv[i], "map" ) ){
g_openMapByCmd = StringOutputStream( 256 )( PathCleaned( g_argv[i] ) ).c_str(); g_openMapByCmd = StringOutputStream( 256 )( PathCleaned( g_argv[i] ) ).c_str();
return; return;
} }

42
radiant/map.cpp
View File

@ -1677,7 +1677,7 @@ bool Map_ImportFile( const char* filename ){
bool success = false; bool success = false;
if ( extension_equal( path_get_extension( filename ), "bsp" ) ) { if ( path_extension_is( filename, "bsp" ) ) {
goto tryDecompile; goto tryDecompile;
} }
@ -1713,37 +1713,25 @@ bool Map_ImportFile( const char* filename ){
tryDecompile: tryDecompile:
const char *type = GlobalRadiant().getGameDescriptionKeyValue( "q3map2_type" ); const char *type = GlobalRadiant().getGameDescriptionKeyValue( "q3map2_type" );
int n = string_length( path_get_extension( filename ) ); if ( path_extension_is( filename, "bsp" ) || path_extension_is( filename, "map" ) ) {
if ( n && ( extension_equal( path_get_extension( filename ), "bsp" ) || extension_equal( path_get_extension( filename ), "map" ) ) ) { StringOutputStream str( 256 );
StringBuffer output; str << AppPath_get() << "q3map2." << RADIANT_EXECUTABLE;
output.push_string( AppPath_get() ); str << " -v -game " << ( ( type && *type ) ? type : "quake3" );
output.push_string( "q3map2." ); str << " -fs_basepath " << makeQuoted( EnginePath_get() );
output.push_string( RADIANT_EXECUTABLE ); str << " -fs_homepath " << makeQuoted( g_qeglobals.m_userEnginePath.c_str() );
output.push_string( " -v -game " ); str << " -fs_game " << gamename_get();
output.push_string( ( type && *type ) ? type : "quake3" ); str << " -convert -format " << ( BrushType_getTexdefType( GlobalBrushCreator().getFormat() ) == TEXDEFTYPEID_QUAKE ? "map" : "map_bp" );
output.push_string( " -fs_basepath \"" ); if ( path_extension_is( filename, "map" ) ) {
output.push_string( EnginePath_get() ); str << " -readmap ";
output.push_string( "\" -fs_homepath \"" );
output.push_string( g_qeglobals.m_userEnginePath.c_str() );
output.push_string( "\" -fs_game " );
output.push_string( gamename_get() );
output.push_string( " -convert -format " );
output.push_string( BrushType_getTexdefType( GlobalBrushCreator().getFormat() ) == TEXDEFTYPEID_QUAKE ? "map" : "map_bp" );
if ( extension_equal( path_get_extension( filename ), "map" ) ) {
output.push_string( " -readmap " );
} }
output.push_string( " \"" ); str << ' ' << makeQuoted( filename );
output.push_string( filename );
output.push_string( "\"" );
// run // run
Q_Exec( NULL, output.c_str(), NULL, false, true ); Q_Exec( NULL, str.c_str(), NULL, false, true );
// rebuild filename as "filenamewithoutext_converted.map" // rebuild filename as "filenamewithoutext_converted.map"
output.clear(); str( PathExtensionless( filename ), "_converted.map" );
output.push_range( filename, filename + string_length( filename ) - ( n + 1 ) ); filename = str.c_str();
output.push_string( "_converted.map" );
filename = output.c_str();
EBrushType brush_type = GlobalBrushCreator().getFormat(); EBrushType brush_type = GlobalBrushCreator().getFormat();
// open // open

2
radiant/modelwindow.cpp
View File

@ -1192,7 +1192,7 @@ public:
: m_modelExtensions( modelExtensions ), m_modelFS( modelFS ), m_modelFoldersMap( modelFoldersMap ){ : m_modelExtensions( modelExtensions ), m_modelFS( modelFS ), m_modelFoldersMap( modelFoldersMap ){
} }
void visit( const char* name ) override { void visit( const char* name ) override {
if( m_modelExtensions.find( path_get_extension( name ) ) != m_modelExtensions.end() && ( !m_avoid_pk3dir || !string_in_string_nocase( name, ".pk3dir/" ) ) ){ if( m_modelExtensions.count( path_get_extension( name ) ) && ( !m_avoid_pk3dir || !string_in_string_nocase( name, ".pk3dir/" ) ) ){
m_modelFS.insert( name ); m_modelFS.insert( name );
//% globalOutputStream() << name << " name\n"; //% globalOutputStream() << name << " name\n";
} }

2
radiant/preferences.cpp
View File

@ -311,7 +311,7 @@ public:
LoadGameFile( std::list<CGameDescription*>& games, const char* path ) : mGames( games ), mPath( path ){ LoadGameFile( std::list<CGameDescription*>& games, const char* path ) : mGames( games ), mPath( path ){
} }
void operator()( const char* name ) const { void operator()( const char* name ) const {
if ( !extension_equal( path_get_extension( name ), "game" ) ) { if ( !path_extension_is( name, "game" ) ) {
return; return;
} }
StringOutputStream strPath( 256 ); StringOutputStream strPath( 256 );

7
radiant/referencecache.cpp
View File

@ -115,11 +115,10 @@ bool MapResource_saveFile( const MapFormat& format, scene::Node& root, GraphTrav
bool file_saveBackup( const char* path ){ bool file_saveBackup( const char* path ){
if ( file_writeable( path ) ) { if ( file_writeable( path ) ) {
StringOutputStream backup( 256 ); const auto backup = StringOutputStream( 256 )( PathExtensionless( path ), ".bak" );
backup << StringRange( path, path_get_extension( path ) ) << "bak";
return ( !file_exists( backup.c_str() ) || file_remove( backup.c_str() ) ) // remove backup return ( !file_exists( backup ) || file_remove( backup ) ) // remove backup
&& file_move( path, backup.c_str() ); // rename current to backup && file_move( path, backup ); // rename current to backup
} }
globalErrorStream() << "map path is not writeable: " << makeQuoted( path ) << "\n"; globalErrorStream() << "map path is not writeable: " << makeQuoted( path ) << "\n";

2
radiant/texwindow.cpp
View File

@ -91,7 +91,7 @@ bool string_equal_start( const char* string, StringRange start ){
typedef std::set<CopiedString> TextureGroups; typedef std::set<CopiedString> TextureGroups;
void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ void TextureGroups_addWad( TextureGroups& groups, const char* archive ){
if ( extension_equal( path_get_extension( archive ), "wad" ) ) { if ( path_extension_is( archive, "wad" ) ) {
#if 1 #if 1
groups.insert( archive ); groups.insert( archive );
#else #else

15
tools/quake3/common/imagelib.cpp
View File

@ -820,9 +820,7 @@ void LoadBMP( const char *filename, byte **pic, byte **palette, int *width, int
============== ==============
*/ */
void Load256Image( const char *name, byte **pixels, byte **palette, int *width, int *height ){ void Load256Image( const char *name, byte **pixels, byte **palette, int *width, int *height ){
const char *ext = path_get_extension( name ); if ( path_extension_is( name, "lbm" ) ) {
if ( striEqual( ext, "lbm" ) ) {
LoadLBM( name, pixels, palette ); LoadLBM( name, pixels, palette );
if ( width ) { if ( width ) {
*width = bmhd.w; *width = bmhd.w;
@ -831,10 +829,10 @@ void Load256Image( const char *name, byte **pixels, byte **palette, int *width,
*height = bmhd.h; *height = bmhd.h;
} }
} }
else if ( striEqual( ext, "pcx" ) ) { else if ( path_extension_is( name, "pcx" ) ) {
LoadPCX( name, pixels, palette, width, height ); LoadPCX( name, pixels, palette, width, height );
} }
else if ( striEqual( ext, "bmp" ) ) { else if ( path_extension_is( name, "bmp" ) ) {
LoadBMP( name, pixels, palette, width, height ); LoadBMP( name, pixels, palette, width, height );
} }
else{ else{
@ -852,12 +850,11 @@ void Load256Image( const char *name, byte **pixels, byte **palette, int *width,
*/ */
void Save256Image( const char *name, byte *pixels, byte *palette, void Save256Image( const char *name, byte *pixels, byte *palette,
int width, int height ){ int width, int height ){
const char *ext = path_get_extension( name );
if ( striEqual( ext, "lbm" ) ) { if ( path_extension_is( name, "lbm" ) ) {
WriteLBMfile( name, pixels, width, height, palette ); WriteLBMfile( name, pixels, width, height, palette );
} }
else if ( striEqual( ext, "pcx" ) ) { else if ( path_extension_is( name, "pcx" ) ) {
WritePCXfile( name, pixels, width, height, palette ); WritePCXfile( name, pixels, width, height, palette );
} }
else{ else{
@ -1203,7 +1200,7 @@ void Load32BitImage( const char *name, unsigned **pixels, int *width, int *heig
int i; int i;
int v; int v;
if ( striEqual( path_get_extension( name ), "tga" ) ) { if ( path_extension_is( name, "tga" ) ) {
LoadTGA( name, (byte **)pixels, width, height ); LoadTGA( name, (byte **)pixels, width, height );
} }
else { else {

10
tools/quake3/common/vfs.cpp
View File

@ -192,12 +192,10 @@ void vfsInitDirectory( const char *path ){
if ( path_is_forbidden( name ) ) if ( path_is_forbidden( name ) )
continue; continue;
const char *ext = path_get_filename_base_end( name ); if ( path_extension_is( name, "pk3" ) ) {
if ( striEqual( ext, ".pk3" ) ) {
paks.push_back( StringOutputStream( 256 )( pathCleaned, name ) ); paks.push_back( StringOutputStream( 256 )( pathCleaned, name ) );
} }
else if ( striEqual( ext, ".pk3dir" ) ) { else if ( path_extension_is( name, "pk3dir" ) ) {
g_strDirs.emplace_back( StringOutputStream( 256 )( pathCleaned, name, '/' ) ); g_strDirs.emplace_back( StringOutputStream( 256 )( pathCleaned, name, '/' ) );
} }
} }
@ -235,7 +233,7 @@ std::vector<CopiedString> vfsListShaderFiles( const char *shaderPath ){
const char* name; const char* name;
while ( ( name = g_dir_read_name( dir ) ) ) while ( ( name = g_dir_read_name( dir ) ) )
{ {
if ( striEqual( path_get_filename_base_end( name ), ".shader" ) ) { if ( path_extension_is( name, "shader" ) ) {
insert( name ); insert( name );
} }
} }
@ -246,7 +244,7 @@ std::vector<CopiedString> vfsListShaderFiles( const char *shaderPath ){
for ( const VFS_PAKFILE& file : g_pakFiles ) for ( const VFS_PAKFILE& file : g_pakFiles )
{ {
const char *name = file.name.c_str(); const char *name = file.name.c_str();
if ( striEqual( path_get_filename_base_end( name ), ".shader" ) if ( path_extension_is( name, "shader" )
&& strniEqual( name, shaderPath, path_get_last_separator( name ) - name ) ) { && strniEqual( name, shaderPath, path_get_last_separator( name ) - name ) ) {
insert( path_get_filename_start( name ) ); insert( path_get_filename_start( name ) );
} }

2
tools/quake3/q3data/polyset.cpp
View File

@ -84,7 +84,7 @@ polyset_t *Polyset_LoadSets( const char *file, int *numpolysets, int maxTrisPerS
// //
// load the frame // load the frame
// //
if ( striEqual( path_get_filename_base_end( file ), ".3ds" ) ) { if ( path_extension_is( file, "3ds" ) ) {
_3DS_LoadPolysets( file, &psets, numpolysets, g_verbose ); _3DS_LoadPolysets( file, &psets, numpolysets, g_verbose );
} }
else{ else{

2
tools/quake3/q3data/q3data.cpp
View File

@ -576,7 +576,7 @@ int main( int argc, char **argv ){
} }
else if ( !strcmp( argv[i], "-dump" ) ) { else if ( !strcmp( argv[i], "-dump" ) ) {
printf( "Dumping contents of: '%s'\n", argv[i + 1] ); printf( "Dumping contents of: '%s'\n", argv[i + 1] );
if ( striEqual( path_get_filename_base_end( argv[i + 1] ), ".md3" ) ) { if ( path_extension_is( argv[i + 1], "md3" ) ) {
MD3_Dump( argv[i + 1] ); MD3_Dump( argv[i + 1] );
} }
else else

2
tools/quake3/q3map2/autopk3.cpp
View File

@ -788,7 +788,7 @@ int repackBSPMain( Args& args ){
std::vector<CopiedString> bspList; // absolute bsp paths std::vector<CopiedString> bspList; // absolute bsp paths
if ( striEqual( path_get_filename_base_end( fileName ), ".bsp" ) ){ if ( path_extension_is( fileName, "bsp" ) ){
while( !args.empty() ){ // handle multiple bsps input while( !args.empty() ){ // handle multiple bsps input
bspList.emplace_back( stream( PathExtensionless( ExpandArg( args.takeFront() ) ), ".bsp" ) ); bspList.emplace_back( stream( PathExtensionless( ExpandArg( args.takeFront() ) ), ".bsp" ) );
} }

4
tools/quake3/q3map2/bsp.cpp
View File

@ -885,10 +885,10 @@ int BSPMain( Args& args ){
/* expand mapname */ /* expand mapname */
strcpy( name, ExpandArg( fileName ) ); strcpy( name, ExpandArg( fileName ) );
if ( !striEqual( path_get_filename_base_end( name ), ".reg" ) ) { /* not .reg */ if ( !path_extension_is( name, "reg" ) ) { /* not .reg */
/* if we are doing a full map, delete the last saved region map */ /* if we are doing a full map, delete the last saved region map */
remove( StringOutputStream( 256 )( source, ".reg" ) ); remove( StringOutputStream( 256 )( source, ".reg" ) );
if ( !onlyents || !striEqual( path_get_filename_base_end( name ), ".ent" ) ) { if ( !onlyents || !path_extension_is( name, "ent" ) ) {
path_set_extension( name, ".map" ); /* .reg and .ent are ok too */ path_set_extension( name, ".map" ); /* .reg and .ent are ok too */
} }
} }

2
tools/quake3/q3map2/convert_bsp.cpp
View File

@ -879,7 +879,7 @@ int ConvertBSPMain( Args& args ){
force_bsp = true; force_bsp = true;
} }
if ( force_map || ( !force_bsp && striEqual( path_get_extension( source ), "map" ) && map_allowed ) ) { if ( force_map || ( !force_bsp && path_extension_is( source, "map" ) && map_allowed ) ) {
if ( !map_allowed ) { if ( !map_allowed ) {
Sys_Warning( "the requested conversion should not be done from .map files. Compile a .bsp first.\n" ); Sys_Warning( "the requested conversion should not be done from .map files. Compile a .bsp first.\n" );
} }

2
tools/quake3/q3map2/light.cpp
View File

@ -2677,7 +2677,7 @@ int LightMain( Args& args ){
path_set_extension( source, ".bsp" ); path_set_extension( source, ".bsp" );
strcpy( name, ExpandArg( fileName ) ); strcpy( name, ExpandArg( fileName ) );
if ( !striEqual( path_get_filename_base_end( name ), ".reg" ) ) { /* not .reg */ if ( !path_extension_is( name, "reg" ) ) { /* not .reg */
path_set_extension( name, ".map" ); path_set_extension( name, ".map" );
} }

2
tools/quake3/q3map2/map.cpp
View File

@ -1381,7 +1381,7 @@ void LoadEntityIndexMap( entity_t *e ){
Sys_FPrintf( SYS_VRB, "Entity %d (%s) has shader index map \"%s\"\n", mapEnt->mapEntityNum, e->classname(), indexMapFilename ); Sys_FPrintf( SYS_VRB, "Entity %d (%s) has shader index map \"%s\"\n", mapEnt->mapEntityNum, e->classname(), indexMapFilename );
/* handle tga image */ /* handle tga image */
if ( striEqual( path_get_extension( indexMapFilename ), "tga" ) ) { if ( path_extension_is( indexMapFilename, "tga" ) ) {
/* load it */ /* load it */
Load32BitImage( indexMapFilename, &pixels32, &w, &h ); Load32BitImage( indexMapFilename, &pixels32, &w, &h );

2
tools/quake3/q3map2/shaders.cpp
View File

@ -2012,7 +2012,7 @@ void LoadShaderInfo( void ){
return false; return false;
}; };
if( !striEqual( path_get_extension( token ), "shader" ) ) if( !path_extension_is( token , "shader" ) )
strcatQ( token, ".shader", sizeof( token ) ); strcatQ( token, ".shader", sizeof( token ) );
/* new shader file */ /* new shader file */
if ( !contains( token ) ) { if ( !contains( token ) ) {