RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix incorrect relative texture paths

This commit is contained in:
David Rose 2003-08-20 02:54:17 +00:00
parent 7620dff858
commit 0d74d793cb
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandatool/src/egg-palettize/eggFile.cxx
View File

@ -521,26 +521,34 @@ read_egg() {
nassertr(_data == (EggData *)NULL, false);
nassertr(!_source_filename.empty(), false);
Filename user_source_filename =
FilenameUnifier::make_user_filename(_source_filename);
if (!_source_filename.exists()) {
nout << _source_filename << " does not exist.\n";
nout << user_source_filename << " does not exist.\n";
return false;
}
EggData *data = new EggData;
if (!data->read(_source_filename)) {
if (!data->read(_source_filename, user_source_filename)) {
// Failure reading.
delete data;
return false;
}
// We also want to search for filenames based on our current
// directory from which we originally loaded the egg file. This is
// important because it's possible the egg file referenced some
// textures or something relative to that directory.
// We want to search for filenames based on the egg directory, and
// also on our current directory from which we originally loaded the
// egg file. This is important because it's possible the egg file
// referenced some textures or something relative to that directory.
DSearchPath dir;
dir.append_directory(_source_filename.get_dirname());
dir.append_directory(_current_directory);
data->resolve_filenames(dir);
// If any relative filenames remain, they are relative to the source
// directory, by convention.
data->force_filenames(_current_directory);
if (!data->load_externals()) {
// Failure reading an external.
delete data;

3
pandatool/src/egg-palettize/sourceTextureImage.cxx
View File

@ -135,7 +135,8 @@ read_header() {
PNMImageHeader header;
if (!header.read_header(_filename)) {
nout << "Warning: cannot read texture " << _filename << "\n";
nout << "Warning: cannot read texture "
<< FilenameUnifier::make_user_filename(_filename) << "\n";
return false;
}