livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing GLTF filter to mesh model loader on Linux

master
Beq 2025-08-22 22:43:24 +01:00
parent 1be2b04093
commit 489d1bb044
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llfilepicker.cpp
View File

@ -1455,6 +1455,20 @@ static std::string add_collada_filter_to_gtkchooser(GtkWindow *picker)
LLTrans::getString("collada_files") + " (*.dae)"); LLTrans::getString("collada_files") + " (*.dae)");
} }
// <FS:Beq> migrate to GLTF support
static std::string add_model_filter_to_gtkchooser(GtkWindow *picker)
{
// "Model files (*.dae, *.gltf, *.glb)"
GtkFileFilter *gfilter = gtk_file_filter_new();
gtk_file_filter_add_pattern(gfilter, "*.dae");
gtk_file_filter_add_pattern(gfilter, "*.gltf");
gtk_file_filter_add_pattern(gfilter, "*.glb");
std::string filtername = LLTrans::getString("model_files") + " (*.dae; *.gltf; *.glb)";
add_common_filters_to_gtkchooser(gfilter, picker, filtername);
return filtername;
}
// </FS:Beq>
static std::string add_imageload_filter_to_gtkchooser(GtkWindow *picker) static std::string add_imageload_filter_to_gtkchooser(GtkWindow *picker)
{ {
GtkFileFilter *gfilter = gtk_file_filter_new(); GtkFileFilter *gfilter = gtk_file_filter_new();
@ -1676,7 +1690,7 @@ bool LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking )
filtername = dead_code_should_blow_up_here(picker); filtername = dead_code_should_blow_up_here(picker);
break; break;
case FFLOAD_COLLADA: case FFLOAD_COLLADA:
filtername = add_collada_filter_to_gtkchooser(picker); filtername = add_model_filter_to_gtkchooser(picker);
break; break;
case FFLOAD_IMAGE: case FFLOAD_IMAGE:
filtername = add_imageload_filter_to_gtkchooser(picker); filtername = add_imageload_filter_to_gtkchooser(picker);
@ -1936,6 +1950,9 @@ bool LLFilePicker::openFileDialog( int32_t filter, bool blocking, EType aType )
file_dialog_filter = "*.raw"; file_dialog_filter = "*.raw";
break; break;
case FFLOAD_MODEL: case FFLOAD_MODEL:
file_type = "model_files";
file_dialog_filter = "*.{dae,gltf,glb}";
break;
case FFLOAD_COLLADA: case FFLOAD_COLLADA:
file_type = "collada_files"; file_type = "collada_files";
file_dialog_filter = "*.dae"; file_dialog_filter = "*.dae";

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -663,6 +663,7 @@ https://www.firestormviewer.org/support for help fixing this problem.
<string name="dictionary_files">Dictionaries</string> <string name="dictionary_files">Dictionaries</string>
<string name="backup_files">Object Backups</string> <string name="backup_files">Object Backups</string>
<string name="collada_files">COLLADA Models</string> <string name="collada_files">COLLADA Models</string>
<string name="model_files">Mesh Models</string>
<string name="csv_files">Comma separated values</string> <string name="csv_files">Comma separated values</string>
<string name="recompile_script_verb">Recompile</string> <string name="recompile_script_verb">Recompile</string>