diff --git a/panda/src/gobj/materialPool.cxx b/panda/src/gobj/materialPool.cxx index ffe0793847..fe6719e816 100644 --- a/panda/src/gobj/materialPool.cxx +++ b/panda/src/gobj/materialPool.cxx @@ -30,7 +30,7 @@ MaterialPool *MaterialPool::_global_ptr = (MaterialPool *)NULL; // indicated output stream. //////////////////////////////////////////////////////////////////// void MaterialPool:: -write(ostream &out, unsigned int) { +write(ostream &out) { get_ptr()->ns_list_contents(out); } diff --git a/panda/src/gobj/materialPool.h b/panda/src/gobj/materialPool.h index f4a8a2013e..8002144395 100644 --- a/panda/src/gobj/materialPool.h +++ b/panda/src/gobj/materialPool.h @@ -51,7 +51,7 @@ PUBLISHED: INLINE static const Material *get_material(const CPT(Material) &temp); INLINE static int garbage_collect(); INLINE static void list_contents(ostream &out); - static void write(ostream &out, unsigned int indent=0); + static void write(ostream &out); private: INLINE MaterialPool(); diff --git a/panda/src/gobj/texturePool.cxx b/panda/src/gobj/texturePool.cxx index 575633e522..5aaf6b548e 100644 --- a/panda/src/gobj/texturePool.cxx +++ b/panda/src/gobj/texturePool.cxx @@ -26,6 +26,18 @@ TexturePool *TexturePool::_global_ptr = (TexturePool *)NULL; +//////////////////////////////////////////////////////////////////// +// Function: TexturePool::write +// Access: Published, Static +// Description: Lists the contents of the texture pool to the +// indicated output stream. +// For debugging. +//////////////////////////////////////////////////////////////////// +void TexturePool:: +write(ostream &out) { + get_ptr()->ns_list_contents(out); +} + //////////////////////////////////////////////////////////////////// // Function: TexturePool::ns_has_texture // Access: Private @@ -265,15 +277,3 @@ get_ptr() { } return _global_ptr; } - -//////////////////////////////////////////////////////////////////// -// Function: TexturePool::write -// Access: Published, Static -// Description: Lists the contents of the texture pool to the -// indicated output stream. -// For debugging. -//////////////////////////////////////////////////////////////////// -void TexturePool:: -write(ostream &out, unsigned int) { - get_ptr()->ns_list_contents(out); -} diff --git a/panda/src/gobj/texturePool.h b/panda/src/gobj/texturePool.h index e98c157c46..e5f8788181 100644 --- a/panda/src/gobj/texturePool.h +++ b/panda/src/gobj/texturePool.h @@ -61,7 +61,7 @@ PUBLISHED: INLINE static const string &get_fake_texture_image(); // static void output(ostream &out); - static void write(ostream &out, unsigned int indent=0); + static void write(ostream &out); private: INLINE TexturePool(); diff --git a/panda/src/pgraph/modelPool.cxx b/panda/src/pgraph/modelPool.cxx index cdf2fe238a..b7a54a4dfa 100644 --- a/panda/src/pgraph/modelPool.cxx +++ b/panda/src/pgraph/modelPool.cxx @@ -25,6 +25,18 @@ ModelPool *ModelPool::_global_ptr = (ModelPool *)NULL; static Loader model_loader; +//////////////////////////////////////////////////////////////////// +// Function: ModelPool::write +// Access: Published, Static +// Description: Lists the contents of the model pool to the +// indicated output stream. +// Helps with debugging. +//////////////////////////////////////////////////////////////////// +void ModelPool:: +write(ostream &out) { + get_ptr()->ns_list_contents(out); +} + //////////////////////////////////////////////////////////////////// // Function: ModelPool::ns_has_model // Access: Private @@ -159,15 +171,3 @@ get_ptr() { } return _global_ptr; } - -//////////////////////////////////////////////////////////////////// -// Function: ModelPool::write -// Access: Public, Static -// Description: Lists the contents of the model pool to the -// indicated output stream. -// Helps with debugging. -//////////////////////////////////////////////////////////////////// -void ModelPool:: -write(ostream &out, unsigned int) { - get_ptr()->ns_list_contents(out); -} diff --git a/panda/src/pgraph/modelPool.h b/panda/src/pgraph/modelPool.h index 0dc498cc75..fcff87d28a 100644 --- a/panda/src/pgraph/modelPool.h +++ b/panda/src/pgraph/modelPool.h @@ -59,7 +59,7 @@ PUBLISHED: INLINE static int garbage_collect(); INLINE static void list_contents(ostream &out); - static void write(ostream &out, unsigned int indent=0); + static void write(ostream &out); private: INLINE ModelPool(); diff --git a/panda/src/text/fontPool.cxx b/panda/src/text/fontPool.cxx index cad0cedff3..17614251c8 100644 --- a/panda/src/text/fontPool.cxx +++ b/panda/src/text/fontPool.cxx @@ -29,6 +29,17 @@ FontPool *FontPool::_global_ptr = (FontPool *)NULL; static Loader model_loader; +//////////////////////////////////////////////////////////////////// +// Function: FontPool::write +// Access: Published, Static +// Description: Lists the contents of the font pool to the +// indicated output stream. +//////////////////////////////////////////////////////////////////// +void FontPool:: +write(ostream &out) { + get_ptr()->ns_list_contents(out); +} + //////////////////////////////////////////////////////////////////// // Function: FontPool::ns_has_font // Access: Private @@ -243,14 +254,3 @@ get_ptr() { } return _global_ptr; } - -//////////////////////////////////////////////////////////////////// -// Function: FontPool::write -// Access: Public, Static -// Description: Lists the contents of the font pool to the -// indicated output stream. -//////////////////////////////////////////////////////////////////// -void FontPool:: -write(ostream &out, unsigned int) { - get_ptr()->ns_list_contents(out); -} diff --git a/panda/src/text/fontPool.h b/panda/src/text/fontPool.h index d29477861c..5b0c7500d7 100644 --- a/panda/src/text/fontPool.h +++ b/panda/src/text/fontPool.h @@ -49,7 +49,7 @@ PUBLISHED: INLINE static int garbage_collect(); INLINE static void list_contents(ostream &out); - static void write(ostream &out, unsigned int indent=0); + static void write(ostream &out); private: INLINE FontPool();