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

use FilenameUnifier to make canonical

Browse Source
This commit is contained in:
David Rose 2003-06-04 22:50:42 +00:00
parent 1f896dbc2b
commit a5ad0969d4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandatool/src/egg-palettize/filenameUnifier.cxx
View File

@ -128,7 +128,7 @@ make_user_filename(Filename filename) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: FilenameUnifier::make_canonical // Function: FilenameUnifier::make_canonical
// Access: Private, Static // Access: Public, Static
// Description: Does the same thing as Filename::make_canonical()--it // Description: Does the same thing as Filename::make_canonical()--it
// converts the filename to its canonical form--but // converts the filename to its canonical form--but
// caches the operation so that repeated calls to // caches the operation so that repeated calls to

2
pandatool/src/egg-palettize/filenameUnifier.h
View File

@ -44,9 +44,9 @@ public:
static Filename get_bam_filename(Filename filename); static Filename get_bam_filename(Filename filename);
static Filename make_egg_filename(Filename filename); static Filename make_egg_filename(Filename filename);
static Filename make_user_filename(Filename filename); static Filename make_user_filename(Filename filename);
static void make_canonical(Filename &filename);
private: private:
static void make_canonical(Filename &filename);
static Filename _txa_filename; static Filename _txa_filename;
static Filename _txa_dir; static Filename _txa_dir;

2
pandatool/src/egg-palettize/textureImage.cxx
View File

@ -689,7 +689,7 @@ copy_unplaced(bool redo_all) {
placement->get_omit_reason() != OR_unknown) { placement->get_omit_reason() != OR_unknown) {
DestTextureImage *dest = new DestTextureImage(placement); DestTextureImage *dest = new DestTextureImage(placement);
Filename filename = dest->get_filename(); Filename filename = dest->get_filename();
filename.make_canonical(); FilenameUnifier::make_canonical(filename);
pair<Dests::iterator, bool> insert_result = generate.insert pair<Dests::iterator, bool> insert_result = generate.insert
(Dests::value_type(filename, dest)); (Dests::value_type(filename, dest));