TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from eswartz/pr-rocket-fix-file-lookup-alone

Browse Source 
Resolve libRocket assets along the model-path
This commit is contained in:
rdb 2015-05-07 09:46:13 -05:00
commit c854872714
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/rocket/rocketFileInterface.cxx
View File

@ -41,8 +41,18 @@ Open(const Rocket::Core::String& path) {
PT(VirtualFile) file = _vfs->get_file(fn);
if (file == NULL) {
rocket_cat.error() << "Failed to find " << fn << "\n";
return (Rocket::Core::FileHandle) NULL;
// failed? Try model-path as a Panda-friendly fallback.
if (!fn.resolve_filename(get_model_path())) {
rocket_cat.error() << "Could not resolve " << fn
<< " along the model-path (currently: " << get_model_path() << ")\n";
return (Rocket::Core::FileHandle) NULL;
}
file = _vfs->get_file(fn);
if (file == NULL) {
rocket_cat.error() << "Failed to get " << fn << ", found on model-path\n";
return (Rocket::Core::FileHandle) NULL;
}
}
istream *str = file->open_read_file(true);