Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mesh file picker and then some

Browse Source
This commit is contained in:
Aleric Inglewood
2013-01-07 23:12:09 +01:00
parent d188ecae70
commit 5efcc7186e
4 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llfloatermodelpreview.cpp
View File

@@ -345,27 +345,6 @@ BOOL stop_gloderror()
return FALSE;
}
LLMeshFilePicker::LLMeshFilePicker(LLModelPreview* mp, S32 lod)
{
mMP = mp;
mLOD = lod;
open(FFLOAD_COLLADA);
run(boost::bind(&LLMeshFilePicker::loadFromCollada, this));
}
// static
void LLMeshFilePicker::loadFromCollada(LLMeshFilePicker* filepicker)
{
LLMeshFilePicker* self = (LLMeshFilePicker*)filepicker;
if (self && filepicker->hasFilename())
self->notify(filepicker->getFilename());
}
void LLMeshFilePicker::notify(const std::string& filename)
{
mMP->loadModel(filename, mLOD);
}
//-----------------------------------------------------------------------------
// LLFloaterModelPreview()
//-----------------------------------------------------------------------------
@@ -583,7 +562,19 @@ void LLFloaterModelPreview::loadModel(S32 lod)
{
mModelPreview->mLoading = true;
new LLMeshFilePicker(mModelPreview, lod);
AIFilePicker* filepicker = AIFilePicker::create();
filepicker->open(FFLOAD_COLLADA, "", "mesh");
filepicker->run(boost::bind(&LLFloaterModelPreview::loadModel_continued, this, filepicker, lod));
}
void LLFloaterModelPreview::loadModel_continued(AIFilePicker* filepicker, S32 lod)
{
std::string filename;
if (filepicker->hasFilename()) // User did not click Cancel?
{
filename = filepicker->getFilename();
}
mModelPreview->loadModel(filename, lod); // Pass an empty filename if the user clicked Cancel.
}
void LLFloaterModelPreview::loadModel(S32 lod, const std::string& file_name, bool force_disable_slm)