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

general: Consistently name all bam factory functions make_from_bam 

See discussion in #1630
This commit is contained in:
rdb 2024-03-18 02:38:41 +01:00
parent d4a3b9bfcd
commit 40b824bdcc
102 changed files with 177 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/chan/animBundle.cxx
View File

@ -93,7 +93,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
* Factory method to generate a AnimBundle object
*/
TypedWritable *AnimBundle::
make_AnimBundle(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
AnimBundle *me = new AnimBundle;
DatagramIterator scan;
BamReader *manager;
@ -108,5 +108,5 @@ make_AnimBundle(const FactoryParams &params) {
*/
void AnimBundle::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_AnimBundle);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/animBundle.h
View File

@ -56,7 +56,7 @@ public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
static TypedWritable *make_AnimBundle(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

4
panda/src/chan/animChannelMatrixDynamic.cxx
View File

@ -246,7 +246,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
* Factory method to generate an AnimChannelMatrixDynamic object.
*/
TypedWritable *AnimChannelMatrixDynamic::
make_AnimChannelMatrixDynamic(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
AnimChannelMatrixDynamic *me = new AnimChannelMatrixDynamic;
DatagramIterator scan;
BamReader *manager;
@ -261,5 +261,5 @@ make_AnimChannelMatrixDynamic(const FactoryParams &params) {
*/
void AnimChannelMatrixDynamic::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelMatrixDynamic);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/animChannelMatrixDynamic.h
View File

@ -78,7 +78,7 @@ public:
virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
void fillin(DatagramIterator &scan, BamReader *manager);
static TypedWritable *make_AnimChannelMatrixDynamic(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
virtual TypeHandle get_type() const {

4
panda/src/chan/animChannelMatrixXfmTable.cxx
View File

@ -511,7 +511,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
* Factory method to generate an AnimChannelMatrixXfmTable object.
*/
TypedWritable *AnimChannelMatrixXfmTable::
make_AnimChannelMatrixXfmTable(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
AnimChannelMatrixXfmTable *me = new AnimChannelMatrixXfmTable;
DatagramIterator scan;
BamReader *manager;
@ -526,5 +526,5 @@ make_AnimChannelMatrixXfmTable(const FactoryParams &params) {
*/
void AnimChannelMatrixXfmTable::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelMatrixXfmTable);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/animChannelMatrixXfmTable.h
View File

@ -77,7 +77,7 @@ public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
static TypedWritable *make_AnimChannelMatrixXfmTable(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

4
panda/src/chan/animChannelScalarDynamic.cxx
View File

@ -174,7 +174,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
* Factory method to generate a AnimChannelScalarDynamic object
*/
TypedWritable *AnimChannelScalarDynamic::
make_AnimChannelScalarDynamic(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
AnimChannelScalarDynamic *me = new AnimChannelScalarDynamic;
DatagramIterator scan;
BamReader *manager;
@ -189,5 +189,5 @@ make_AnimChannelScalarDynamic(const FactoryParams &params) {
*/
void AnimChannelScalarDynamic::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelScalarDynamic);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/animChannelScalarDynamic.h
View File

@ -72,7 +72,7 @@ public:
virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
void fillin(DatagramIterator &scan, BamReader *manager);
static TypedWritable *make_AnimChannelScalarDynamic(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
virtual TypeHandle get_type() const {

6
panda/src/chan/animChannelScalarTable.cxx
View File

@ -324,8 +324,8 @@ fillin(DatagramIterator& scan, BamReader* manager) {
/**
* Factory method to generate a AnimChannelScalarTable object
*/
TypedWritable* AnimChannelScalarTable::
make_AnimChannelScalarTable(const FactoryParams &params) {
TypedWritable *AnimChannelScalarTable::
make_from_bam(const FactoryParams &params) {
AnimChannelScalarTable *me = new AnimChannelScalarTable;
DatagramIterator scan;
BamReader *manager;
@ -340,5 +340,5 @@ make_AnimChannelScalarTable(const FactoryParams &params) {
*/
void AnimChannelScalarTable::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelScalarTable);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/animChannelScalarTable.h
View File

@ -60,7 +60,7 @@ public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
static TypedWritable *make_AnimChannelScalarTable(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

6
panda/src/chan/animGroup.cxx
View File

@ -290,8 +290,8 @@ complete_pointers(TypedWritable **p_list, BamReader *) {
/**
* Factory method to generate a AnimGroup object
*/
TypedWritable* AnimGroup::
make_AnimGroup(const FactoryParams &params) {
TypedWritable *AnimGroup::
make_from_bam(const FactoryParams &params) {
AnimGroup *me = new AnimGroup;
DatagramIterator scan;
BamReader *manager;
@ -306,5 +306,5 @@ make_AnimGroup(const FactoryParams &params) {
*/
void AnimGroup::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_AnimGroup);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/animGroup.h
View File

@ -74,7 +74,7 @@ public:
virtual int complete_pointers(TypedWritable **p_list,
BamReader *manager);
static TypedWritable *make_AnimGroup(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

6
panda/src/chan/movingPartMatrix.cxx
View File

@ -387,8 +387,8 @@ apply_control(PandaNode *node) {
/**
* Factory method to generate a MovingPartMatrix object
*/
TypedWritable* MovingPartMatrix::
make_MovingPartMatrix(const FactoryParams &params) {
TypedWritable *MovingPartMatrix::
make_from_bam(const FactoryParams &params) {
MovingPartMatrix *me = new MovingPartMatrix;
DatagramIterator scan;
BamReader *manager;
@ -403,5 +403,5 @@ make_MovingPartMatrix(const FactoryParams &params) {
*/
void MovingPartMatrix::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_MovingPartMatrix);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/movingPartMatrix.h
View File

@ -47,7 +47,7 @@ protected:
public:
static void register_with_read_factory();
static TypedWritable *make_MovingPartMatrix(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
virtual TypeHandle get_type() const {

6
panda/src/chan/movingPartScalar.cxx
View File

@ -133,8 +133,8 @@ apply_control(PandaNode *node) {
/**
* Factory method to generate a MovingPartScalar object
*/
TypedWritable* MovingPartScalar::
make_MovingPartScalar(const FactoryParams &params) {
TypedWritable *MovingPartScalar::
make_from_bam(const FactoryParams &params) {
MovingPartScalar *me = new MovingPartScalar;
DatagramIterator scan;
BamReader *manager;
@ -149,5 +149,5 @@ make_MovingPartScalar(const FactoryParams &params) {
*/
void MovingPartScalar::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_MovingPartScalar);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/movingPartScalar.h
View File

@ -45,7 +45,7 @@ protected:
public:
static void register_with_read_factory();
static TypedWritable *make_MovingPartScalar(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
virtual TypeHandle get_type() const {

2
panda/src/chan/partBundle.cxx
View File

@ -772,7 +772,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
/**
* Factory method to generate a PartBundle object
*/
TypedWritable* PartBundle::
TypedWritable *PartBundle::
make_from_bam(const FactoryParams &params) {
PartBundle *me = new PartBundle;
DatagramIterator scan;

6
panda/src/chan/partGroup.cxx
View File

@ -677,8 +677,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
/**
* Factory method to generate a PartGroup object
*/
TypedWritable* PartGroup::
make_PartGroup(const FactoryParams &params) {
TypedWritable *PartGroup::
make_from_bam(const FactoryParams &params) {
PartGroup *me = new PartGroup;
DatagramIterator scan;
BamReader *manager;
@ -693,5 +693,5 @@ make_PartGroup(const FactoryParams &params) {
*/
void PartGroup::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_PartGroup);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/chan/partGroup.h
View File

@ -121,7 +121,7 @@ public:
virtual int complete_pointers(TypedWritable **p_list,
BamReader *manager);
static TypedWritable *make_PartGroup(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

6
panda/src/char/characterJoint.cxx
View File

@ -534,8 +534,8 @@ complete_pointers(TypedWritable **p_list, BamReader* manager) {
/**
* Factory method to generate a CharacterJoint object
*/
TypedWritable* CharacterJoint::
make_CharacterJoint(const FactoryParams &params) {
TypedWritable *CharacterJoint::
make_from_bam(const FactoryParams &params) {
CharacterJoint *me = new CharacterJoint;
DatagramIterator scan;
BamReader *manager;
@ -550,5 +550,5 @@ make_CharacterJoint(const FactoryParams &params) {
*/
void CharacterJoint::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CharacterJoint);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/char/characterJoint.h
View File

@ -91,7 +91,7 @@ public:
virtual int complete_pointers(TypedWritable **p_list,
BamReader *manager);
static TypedWritable *make_CharacterJoint(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

10
panda/src/char/characterJointBundle.cxx
View File

@ -97,9 +97,8 @@ r_set_character(PartGroup *group, Character *character) {
/**
* Factory method to generate a CharacterJointBundle object
*/
TypedWritable* CharacterJointBundle::
make_CharacterJointBundle(const FactoryParams &params)
{
TypedWritable *CharacterJointBundle::
make_from_bam(const FactoryParams &params) {
CharacterJointBundle *me = new CharacterJointBundle;
DatagramIterator scan;
BamReader *manager;
@ -114,7 +113,6 @@ make_CharacterJointBundle(const FactoryParams &params)
* Factory method to generate a CharacterJointBundle object
*/
void CharacterJointBundle::
register_with_read_factory()
{
BamReader::get_factory()->register_factory(get_class_type(), make_CharacterJointBundle);
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/char/characterJointBundle.h
View File

@ -47,7 +47,7 @@ private:
public:
static void register_with_read_factory();
static TypedWritable *make_CharacterJointBundle(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
virtual TypeHandle get_type() const {

10
panda/src/char/characterSlider.cxx
View File

@ -85,9 +85,8 @@ update_internals(PartBundle *, PartGroup *, bool, bool, Thread *current_thread)
/**
* Factory method to generate a CharacterSlider object
*/
TypedWritable* CharacterSlider::
make_CharacterSlider(const FactoryParams &params)
{
TypedWritable *CharacterSlider::
make_from_bam(const FactoryParams &params) {
CharacterSlider *me = new CharacterSlider;
DatagramIterator scan;
BamReader *manager;
@ -101,7 +100,6 @@ make_CharacterSlider(const FactoryParams &params)
* Factory method to generate a CharacterSlider object
*/
void CharacterSlider::
register_with_read_factory()
{
BamReader::get_factory()->register_factory(get_class_type(), make_CharacterSlider);
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/char/characterSlider.h
View File

@ -49,7 +49,7 @@ private:
public:
static void register_with_read_factory();
static TypedWritable *make_CharacterSlider(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
virtual TypeHandle get_type() const {

4
panda/src/collide/collisionBox.cxx
View File

@ -1414,7 +1414,7 @@ compute_vectors(Points &points) {
*/
void CollisionBox::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionBox);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
@ -1457,7 +1457,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
* Factory method to generate a CollisionBox object
*/
TypedWritable *CollisionBox::
make_CollisionBox(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
CollisionBox *me = new CollisionBox;
DatagramIterator scan;
BamReader *manager;

2
panda/src/collide/collisionBox.h
View File

@ -155,7 +155,7 @@ public:
virtual void write_datagram(BamWriter *manager, Datagram &me);
protected:
static TypedWritable *make_CollisionBox(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

7
panda/src/collide/collisionFloorMesh.cxx
View File

@ -386,8 +386,8 @@ fillin(DatagramIterator& scan, BamReader* manager)
/**
* Factory method to generate a CollisionPolygon object
*/
TypedWritable* CollisionFloorMesh::
make_CollisionFloorMesh(const FactoryParams &params) {
TypedWritable *CollisionFloorMesh::
make_from_bam(const FactoryParams &params) {
CollisionFloorMesh *me = new CollisionFloorMesh;
DatagramIterator scan;
BamReader *manager;
@ -402,10 +402,9 @@ make_CollisionFloorMesh(const FactoryParams &params) {
*/
void CollisionFloorMesh::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionFloorMesh);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
*
*/

2
panda/src/collide/collisionFloorMesh.h
View File

@ -101,7 +101,7 @@ public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
static TypedWritable *make_CollisionFloorMesh(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
static TypeHandle get_class_type() {
return _type_handle;
}

4
panda/src/collide/collisionHeightfield.cxx
View File

@ -799,7 +799,7 @@ get_test_pcollector() {
}
TypedWritable *CollisionHeightfield::
make_CollisionHeightfield(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
CollisionHeightfield *me = new CollisionHeightfield;
DatagramIterator scan;
BamReader *manager;
@ -815,5 +815,5 @@ fillin(DatagramIterator &scan, BamReader *manager) {
void CollisionHeightfield::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionHeightfield);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/collide/collisionHeightfield.h
View File

@ -151,7 +151,7 @@ private:
static PStatCollector _test_pcollector;
protected:
static TypedWritable *make_CollisionHeightfield(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

4
panda/src/collide/collisionInvSphere.cxx
View File

@ -562,7 +562,7 @@ fill_viz_geom() {
*/
void CollisionInvSphere::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionInvSphere);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
@ -578,7 +578,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
* Factory method to generate a CollisionInvSphere object
*/
TypedWritable *CollisionInvSphere::
make_CollisionInvSphere(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
CollisionInvSphere *me = new CollisionInvSphere;
DatagramIterator scan;
BamReader *manager;

2
panda/src/collide/collisionInvSphere.h
View File

@ -78,7 +78,7 @@ public:
virtual void write_datagram(BamWriter *manager, Datagram &me);
protected:
static TypedWritable *make_CollisionInvSphere(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

10
panda/src/collide/collisionPlane.cxx
View File

@ -596,9 +596,8 @@ fillin(DatagramIterator& scan, BamReader* manager)
/**
* Factory method to generate a CollisionPlane object
*/
TypedWritable* CollisionPlane::
make_CollisionPlane(const FactoryParams &params)
{
TypedWritable *CollisionPlane::
make_from_bam(const FactoryParams &params) {
CollisionPlane *me = new CollisionPlane;
DatagramIterator scan;
BamReader *manager;
@ -612,7 +611,6 @@ make_CollisionPlane(const FactoryParams &params)
* Factory method to generate a CollisionPlane object
*/
void CollisionPlane::
register_with_read_factory()
{
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionPlane);
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/collide/collisionPlane.h
View File

@ -90,7 +90,7 @@ public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
static TypedWritable *make_CollisionPlane(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

6
panda/src/collide/collisionPolygon.cxx
View File

@ -1877,8 +1877,8 @@ fillin(DatagramIterator &scan, BamReader *manager) {
/**
* Factory method to generate a CollisionPolygon object
*/
TypedWritable* CollisionPolygon::
make_CollisionPolygon(const FactoryParams &params) {
TypedWritable *CollisionPolygon::
make_from_bam(const FactoryParams &params) {
CollisionPolygon *me = new CollisionPolygon;
DatagramIterator scan;
BamReader *manager;
@ -1893,5 +1893,5 @@ make_CollisionPolygon(const FactoryParams &params) {
*/
void CollisionPolygon::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionPolygon);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}

2
panda/src/collide/collisionPolygon.h
View File

@ -154,7 +154,7 @@ public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
static TypedWritable *make_CollisionPolygon(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

4
panda/src/collide/collisionSphere.cxx
View File

@ -771,7 +771,7 @@ compute_point(PN_stdfloat latitude, PN_stdfloat longitude) const {
*/
void CollisionSphere::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CollisionSphere);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
@ -789,7 +789,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
* Factory method to generate a CollisionSphere object
*/
TypedWritable *CollisionSphere::
make_CollisionSphere(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
CollisionSphere *me = new CollisionSphere;
DatagramIterator scan;
BamReader *manager;

2
panda/src/collide/collisionSphere.h
View File

@ -101,7 +101,7 @@ public:
virtual void write_datagram(BamWriter *manager, Datagram &me);
protected:
static TypedWritable *make_CollisionSphere(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

4
panda/src/gobj/material.cxx
View File

@ -457,7 +457,7 @@ write(std::ostream &out, int indent_level) const {
*/
void Material::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_Material);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
@ -503,7 +503,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
* Factory method to generate a Material object
*/
TypedWritable *Material::
make_Material(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
Material *me = new Material;
DatagramIterator scan;
BamReader *manager;

2
panda/src/gobj/material.h
View File

@ -170,7 +170,7 @@ public:
virtual void write_datagram(BamWriter *manager, Datagram &me);
protected:
static TypedWritable *make_Material(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

6
panda/src/gobj/textureStage.cxx
View File

@ -346,14 +346,14 @@ operand_valid_for_alpha(TextureStage::CombineOperand co) {
*/
void TextureStage::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_TextureStage);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
* Factory method to generate a TextureStage object
*/
TypedWritable* TextureStage::
make_TextureStage(const FactoryParams &params) {
TypedWritable *TextureStage::
make_from_bam(const FactoryParams &params) {
DatagramIterator scan;
BamReader *manager;

2
panda/src/gobj/textureStage.h
View File

@ -262,7 +262,7 @@ public:
virtual void write_datagram(BamWriter *manager, Datagram &me);
virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
static TypedWritable *make_TextureStage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
protected:
void fillin(DatagramIterator& scan, BamReader* manager);

4
panda/src/parametrics/cubicCurveseg.cxx
View File

@ -516,14 +516,14 @@ compute_seg(int rtype0, PN_stdfloat t0, const LVecBase4 &v0,
*/
void CubicCurveseg::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_CubicCurveseg);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
* Factory method to generate an object of this type.
*/
TypedWritable *CubicCurveseg::
make_CubicCurveseg(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
CubicCurveseg *me = new CubicCurveseg;
DatagramIterator scan;
BamReader *manager;

2
panda/src/parametrics/cubicCurveseg.h
View File

@ -112,7 +112,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_CubicCurveseg(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
virtual void write_datagram(BamWriter *manager, Datagram &me);
void fillin(DatagramIterator &scan, BamReader *manager);

4
panda/src/parametrics/hermiteCurve.cxx
View File

@ -817,14 +817,14 @@ recompute_basis() {
*/
void HermiteCurve::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_HermiteCurve);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
* Factory method to generate an object of this type.
*/
TypedWritable *HermiteCurve::
make_HermiteCurve(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
HermiteCurve *me = new HermiteCurve;
DatagramIterator scan;
BamReader *manager;

2
panda/src/parametrics/hermiteCurve.h
View File

@ -154,7 +154,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_HermiteCurve(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
virtual void write_datagram(BamWriter *manager, Datagram &me);
void fillin(DatagramIterator &scan, BamReader *manager);

4
panda/src/parametrics/nurbsCurve.cxx
View File

@ -485,14 +485,14 @@ find_cv(PN_stdfloat t) {
*/
void NurbsCurve::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_NurbsCurve);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
* Factory method to generate an object of this type.
*/
TypedWritable *NurbsCurve::
make_NurbsCurve(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
NurbsCurve *me = new NurbsCurve;
DatagramIterator scan;
BamReader *manager;

2
panda/src/parametrics/nurbsCurve.h
View File

@ -111,7 +111,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_NurbsCurve(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
virtual void write_datagram(BamWriter *manager, Datagram &me);
void fillin(DatagramIterator &scan, BamReader *manager);

4
panda/src/pnmimage/pnmFileType.h
View File

@ -58,12 +58,8 @@ public:
// The TypedWritable interface follows.
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
protected:
static TypedWritable *make_PNMFileType(const FactoryParams &params);
public:
static TypeHandle get_class_type() {
return _type_handle;

4
panda/src/pnmimagetypes/pnmFileTypeBMP.cxx
View File

@ -119,7 +119,7 @@ make_writer(std::ostream *file, bool owns_file) {
void PNMFileTypeBMP::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeBMP);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -131,7 +131,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeBMP::
make_PNMFileTypeBMP(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeBMP.h
View File

@ -78,7 +78,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeBMP(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeEXR.cxx
View File

@ -482,7 +482,7 @@ write_data(xel *array, xelval *alpha) {
void PNMFileTypeEXR::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeEXR);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -494,7 +494,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeEXR::
make_PNMFileTypeEXR(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeEXR.h
View File

@ -88,7 +88,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeEXR(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeIMG.cxx
View File

@ -315,7 +315,7 @@ write_row(xel *row_data, xelval *) {
void PNMFileTypeIMG::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeIMG);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -327,7 +327,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeIMG::
make_PNMFileTypeIMG(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeIMG.h
View File

@ -63,7 +63,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeIMG(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeJPG.cxx
View File

@ -120,7 +120,7 @@ make_writer(std::ostream *file, bool owns_file) {
void PNMFileTypeJPG::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeJPG);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -132,7 +132,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeJPG::
make_PNMFileTypeJPG(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeJPG.h
View File

@ -105,7 +105,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeJPG(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypePNG.cxx
View File

@ -141,7 +141,7 @@ make_writer(ostream *file, bool owns_file) {
void PNMFileTypePNG::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypePNG);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -153,7 +153,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypePNG::
make_PNMFileTypePNG(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypePNG.h
View File

@ -101,7 +101,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypePNG(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypePNM.cxx
View File

@ -1219,7 +1219,7 @@ write_row(xel *row_data, xelval *) {
void PNMFileTypePNM::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypePNM);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -1231,7 +1231,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypePNM::
make_PNMFileTypePNM(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypePNM.h
View File

@ -72,7 +72,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypePNM(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypePfm.cxx
View File

@ -316,7 +316,7 @@ write_pfm(const PfmFile &pfm) {
void PNMFileTypePfm::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypePfm);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -328,6 +328,6 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypePfm::
make_PNMFileTypePfm(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypePfm.h
View File

@ -69,7 +69,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypePfm(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeSGI.cxx
View File

@ -123,7 +123,7 @@ make_writer(std::ostream *file, bool owns_file) {
void PNMFileTypeSGI::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeSGI);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -135,7 +135,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeSGI::
make_PNMFileTypeSGI(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeSGI.h
View File

@ -111,7 +111,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeSGI(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeSoftImage.cxx
View File

@ -725,7 +725,7 @@ write_row(xel *row_data, xelval *alpha_data) {
void PNMFileTypeSoftImage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeSoftImage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -737,7 +737,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeSoftImage::
make_PNMFileTypeSoftImage(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
View File

@ -70,7 +70,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeSoftImage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx
View File

@ -587,7 +587,7 @@ read_data(xel *array, xelval *alpha) {
void PNMFileTypeStbImage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeStbImage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -599,7 +599,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeStbImage::
make_PNMFileTypeStbImage(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeStbImage.h
View File

@ -46,7 +46,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeStbImage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeTGA.cxx
View File

@ -557,7 +557,7 @@ write_data(xel *array, xelval *) {
void PNMFileTypeTGA::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeTGA);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -569,7 +569,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeTGA::
make_PNMFileTypeTGA(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeTGA.h
View File

@ -100,7 +100,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeTGA(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

4
panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
View File

@ -1249,7 +1249,7 @@ tiff_error(const char *module, const char *format, va_list ap) {
void PNMFileTypeTIFF::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PNMFileTypeTIFF);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -1261,7 +1261,7 @@ register_with_read_factory() {
* we just pull the object from the registry.
*/
TypedWritable *PNMFileTypeTIFF::
make_PNMFileTypeTIFF(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
}

2
panda/src/pnmimagetypes/pnmFileTypeTIFF.h
View File

@ -97,7 +97,7 @@ public:
static void register_with_read_factory();
protected:
static TypedWritable *make_PNMFileTypeTIFF(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
static TypeHandle get_class_type() {

9
panda/src/text/geomTextGlyph.cxx
View File

@ -175,16 +175,15 @@ add_glyph(const TextGlyph *glyph) {
*/
void GeomTextGlyph::
register_with_read_factory() {
BamReader::get_factory()->register_factory(get_class_type(), make_GeomTextGlyph);
BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
}
/**
* Factory method to generate a GeomTextGlyph object
*/
TypedWritable* GeomTextGlyph::
make_GeomTextGlyph(const FactoryParams &params) {
GeomTextGlyph *me = new GeomTextGlyph(nullptr,
nullptr);
TypedWritable *GeomTextGlyph::
make_from_bam(const FactoryParams &params) {
GeomTextGlyph *me = new GeomTextGlyph(nullptr, nullptr);
DatagramIterator scan;
BamReader *manager;

2
panda/src/text/geomTextGlyph.h
View File

@ -52,7 +52,7 @@ private:
public:
static void register_with_read_factory();
static TypedWritable *make_GeomTextGlyph(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
PUBLISHED:
static TypeHandle get_class_type() {

6
pandatool/src/palettizer/destTextureImage.cxx
View File

@ -123,7 +123,7 @@ to_power_2(int value) {
void DestTextureImage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_DestTextureImage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -140,8 +140,8 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* DestTextureImage::
make_DestTextureImage(const FactoryParams &params) {
TypedWritable *DestTextureImage::
make_from_bam(const FactoryParams &params) {
DestTextureImage *me = new DestTextureImage;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/destTextureImage.h
View File

@ -45,7 +45,7 @@ public:
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
protected:
static TypedWritable *make_DestTextureImage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

6
pandatool/src/palettizer/eggFile.cxx
View File

@ -696,7 +696,7 @@ rescan_textures() {
void EggFile::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_EggFile);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -764,8 +764,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* EggFile::
make_EggFile(const FactoryParams &params) {
TypedWritable *EggFile::
make_from_bam(const FactoryParams &params) {
EggFile *me = new EggFile();
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/eggFile.h
View File

@ -107,7 +107,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_EggFile(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

4
pandatool/src/palettizer/paletteGroup.cxx
View File

@ -560,7 +560,7 @@ update_images(bool redo_all) {
void PaletteGroup::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PaletteGroup);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -654,7 +654,7 @@ finalize(BamReader *) {
* all the data read.
*/
TypedWritable *PaletteGroup::
make_PaletteGroup(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
PaletteGroup *me = new PaletteGroup;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/paletteGroup.h
View File

@ -115,7 +115,7 @@ public:
virtual void finalize(BamReader *manager);
protected:
static TypedWritable *make_PaletteGroup(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

6
pandatool/src/palettizer/paletteGroups.cxx
View File

@ -280,7 +280,7 @@ r_make_complete(PaletteGroups::Groups &result, PaletteGroup *group) {
void PaletteGroups::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PaletteGroups);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -320,8 +320,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* PaletteGroups::
make_PaletteGroups(const FactoryParams &params) {
TypedWritable *PaletteGroups::
make_from_bam(const FactoryParams &params) {
PaletteGroups *me = new PaletteGroups;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/paletteGroups.h
View File

@ -76,7 +76,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_PaletteGroups(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
void fillin(DatagramIterator &scan, BamReader *manager);

4
pandatool/src/palettizer/paletteImage.cxx
View File

@ -969,7 +969,7 @@ remove_image() {
void PaletteImage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PaletteImage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -1037,7 +1037,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* all the data read.
*/
TypedWritable *PaletteImage::
make_PaletteImage(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
PaletteImage *me = new PaletteImage;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/paletteImage.h
View File

@ -117,7 +117,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_PaletteImage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

6
pandatool/src/palettizer/palettePage.cxx
View File

@ -214,7 +214,7 @@ update_images(bool redo_all) {
void PalettePage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_PalettePage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -271,8 +271,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* PalettePage::
make_PalettePage(const FactoryParams &params) {
TypedWritable *PalettePage::
make_from_bam(const FactoryParams &params) {
PalettePage *me = new PalettePage;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/palettePage.h
View File

@ -69,7 +69,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_PalettePage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

6
pandatool/src/palettizer/palettizer.cxx
View File

@ -913,7 +913,7 @@ compute_statistics(std::ostream &out, int indent_level,
void Palettizer::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_Palettizer);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -1099,8 +1099,8 @@ finalize(BamReader *manager) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* Palettizer::
make_Palettizer(const FactoryParams &params) {
TypedWritable *Palettizer::
make_from_bam(const FactoryParams &params) {
Palettizer *me = new Palettizer;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/palettizer.h
View File

@ -152,7 +152,7 @@ public:
virtual void finalize(BamReader *manager);
protected:
static TypedWritable *make_Palettizer(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

4
pandatool/src/palettizer/sourceTextureImage.cxx
View File

@ -149,7 +149,7 @@ set_header(const PNMImageHeader &header) {
void SourceTextureImage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_SourceTextureImage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -188,7 +188,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* all the data read.
*/
TypedWritable *SourceTextureImage::
make_SourceTextureImage(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
SourceTextureImage *me = new SourceTextureImage;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/sourceTextureImage.h
View File

@ -56,7 +56,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_SourceTextureImage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
public:

4
pandatool/src/palettizer/textureImage.cxx
View File

@ -1236,7 +1236,7 @@ get_source_key(const Filename &filename, const Filename &alpha_filename,
void TextureImage::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_TextureImage);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -1346,7 +1346,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* all the data read.
*/
TypedWritable *TextureImage::
make_TextureImage(const FactoryParams &params) {
make_from_bam(const FactoryParams &params) {
TextureImage *me = new TextureImage;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/textureImage.h
View File

@ -161,7 +161,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_TextureImage(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

6
pandatool/src/palettizer/texturePlacement.cxx
View File

@ -987,7 +987,7 @@ compute_size_from_uvs(const LTexCoordd &min_uv, const LTexCoordd &max_uv) {
void TexturePlacement::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_TexturePlacement);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -1077,8 +1077,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* TexturePlacement::
make_TexturePlacement(const FactoryParams &params) {
TypedWritable *TexturePlacement::
make_from_bam(const FactoryParams &params) {
TexturePlacement *me = new TexturePlacement;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/texturePlacement.h
View File

@ -120,7 +120,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_TexturePlacement(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager);
private:

6
pandatool/src/palettizer/texturePosition.cxx
View File

@ -75,7 +75,7 @@ operator = (const TexturePosition &copy) {
void TexturePosition::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_TexturePosition);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -103,8 +103,8 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* TexturePosition::
make_TexturePosition(const FactoryParams &params) {
TypedWritable *TexturePosition::
make_from_bam(const FactoryParams &params) {
TexturePosition *me = new TexturePosition;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/texturePosition.h
View File

@ -50,7 +50,7 @@ public:
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
protected:
static TypedWritable *make_TexturePosition(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
void fillin(DatagramIterator &scan, BamReader *manager);

6
pandatool/src/palettizer/textureProperties.cxx
View File

@ -834,7 +834,7 @@ union_quality_level(EggTexture::QualityLevel a, EggTexture::QualityLevel b) {
void TextureProperties::
register_with_read_factory() {
BamReader::get_factory()->
register_factory(get_class_type(), make_TextureProperties);
register_factory(get_class_type(), make_from_bam);
}
/**
@ -888,8 +888,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
* encountered in a Bam file; it should allocate and return a new object with
* all the data read.
*/
TypedWritable* TextureProperties::
make_TextureProperties(const FactoryParams &params) {
TypedWritable *TextureProperties::
make_from_bam(const FactoryParams &params) {
TextureProperties *me = new TextureProperties;
DatagramIterator scan;
BamReader *manager;

2
pandatool/src/palettizer/textureProperties.h
View File

@ -92,7 +92,7 @@ public:
BamReader *manager);
protected:
static TypedWritable *make_TextureProperties(const FactoryParams &params);
static TypedWritable *make_from_bam(const FactoryParams &params);
public:
void fillin(DatagramIterator &scan, BamReader *manager);

Some files were not shown because too many files have changed in this diff Show More