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

add EggData::merge

Browse Source
This commit is contained in:
David Rose 2003-02-12 00:48:20 +00:00
parent 7481abba57
commit baf7c22921
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/egg/eggData.cxx
View File

@ -157,6 +157,18 @@ read(istream &in) {
return (egg_error_count() == 0); return (egg_error_count() == 0);
} }
////////////////////////////////////////////////////////////////////
// Function: EggData::merge
// Access: Public
// Description: Appends the other egg structure to the end of this
// one. The other egg structure is invalidated.
////////////////////////////////////////////////////////////////////
void EggData::
merge(EggData &other) {
other.set_coordinate_system(get_coordinate_system());
steal_children(other);
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: EggData::load_externals // Function: EggData::load_externals

1
panda/src/egg/eggData.h
View File

@ -54,6 +54,7 @@ public:
bool read(Filename filename); bool read(Filename filename);
bool read(istream &in); bool read(istream &in);
void merge(EggData &other);
bool load_externals(const DSearchPath &searchpath = DSearchPath()); bool load_externals(const DSearchPath &searchpath = DSearchPath());
int collapse_equivalent_textures(); int collapse_equivalent_textures();