From db3cb8269158d0471e8f5d42c95941bfe762d81e Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Wed, 6 Jun 2001 01:58:11 +0000 Subject: [PATCH] plist => p_list --- panda/src/chan/animBundleNode.cxx | 6 +++--- panda/src/chan/animBundleNode.h | 2 +- panda/src/chan/animGroup.cxx | 10 +++++----- panda/src/chan/animGroup.h | 2 +- panda/src/chan/partBundleNode.cxx | 6 +++--- panda/src/chan/partBundleNode.h | 2 +- panda/src/chan/partGroup.cxx | 6 +++--- panda/src/chan/partGroup.h | 2 +- panda/src/collide/collisionNode.cxx | 6 +++--- panda/src/effects/lensFlareNode.cxx | 12 ++++++------ panda/src/gobj/geomSprite.cxx | 6 +++--- panda/src/graph/node.cxx | 4 ++-- panda/src/graph/nodeRelation.cxx | 14 +++++++------- panda/src/parametrics/piecewiseCurve.cxx | 8 ++++---- panda/src/sgattrib/materialTransition.cxx | 6 +++--- panda/src/sgattrib/textureTransition.cxx | 6 +++--- panda/src/sgraph/geomNode.cxx | 6 +++--- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/panda/src/chan/animBundleNode.cxx b/panda/src/chan/animBundleNode.cxx index 56bbbe4eb1..cb825ceafa 100644 --- a/panda/src/chan/animBundleNode.cxx +++ b/panda/src/chan/animBundleNode.cxx @@ -82,10 +82,10 @@ fillin(DatagramIterator& scan, BamReader* manager) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int AnimBundleNode:: -complete_pointers(vector_typedWritable &plist, BamReader* manager) +complete_pointers(vector_typedWritable &p_list, BamReader* manager) { - int start = NamedNode::complete_pointers(plist, manager); - _bundle = DCAST(AnimBundle, plist[start]); + int start = NamedNode::complete_pointers(p_list, manager); + _bundle = DCAST(AnimBundle, p_list[start]); return start+1; } diff --git a/panda/src/chan/animBundleNode.h b/panda/src/chan/animBundleNode.h index 8fd0634ccc..736ae72c0d 100644 --- a/panda/src/chan/animBundleNode.h +++ b/panda/src/chan/animBundleNode.h @@ -48,7 +48,7 @@ private: public: static void register_with_read_factory(void); virtual void write_datagram(BamWriter* manager, Datagram &me); - virtual int complete_pointers(vector_typedWritable &plist, + virtual int complete_pointers(vector_typedWritable &p_list, BamReader *manager); static TypedWritable *make_AnimBundleNode(const FactoryParams ¶ms); diff --git a/panda/src/chan/animGroup.cxx b/panda/src/chan/animGroup.cxx index 31dd3fde59..179c407f5f 100644 --- a/panda/src/chan/animGroup.cxx +++ b/panda/src/chan/animGroup.cxx @@ -228,20 +228,20 @@ fillin(DatagramIterator& scan, BamReader* manager) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int AnimGroup:: -complete_pointers(vector_typedWritable &plist, BamReader*) +complete_pointers(vector_typedWritable &p_list, BamReader*) { - nassertr(plist[0] != TypedWritable::Null, 0); - _root = DCAST(AnimBundle, plist[0]); + nassertr(p_list[0] != TypedWritable::Null, 0); + _root = DCAST(AnimBundle, p_list[0]); for(int i = 1; i < _num_children+1; i++) { - if (plist[i] == TypedWritable::Null) + if (p_list[i] == TypedWritable::Null) { chan_cat->warning() << get_type().get_name() << " Ignoring null child" << endl; } else { - _children.push_back(DCAST(AnimGroup, plist[i])); + _children.push_back(DCAST(AnimGroup, p_list[i])); } } return _num_children+1; diff --git a/panda/src/chan/animGroup.h b/panda/src/chan/animGroup.h index 7db91031e4..ba5fee7b6f 100644 --- a/panda/src/chan/animGroup.h +++ b/panda/src/chan/animGroup.h @@ -69,7 +69,7 @@ protected: public: static void register_with_read_factory(void); virtual void write_datagram(BamWriter* manager, Datagram &me); - virtual int complete_pointers(vector_typedWritable &plist, + virtual int complete_pointers(vector_typedWritable &p_list, BamReader *manager); static TypedWritable *make_AnimGroup(const FactoryParams ¶ms); diff --git a/panda/src/chan/partBundleNode.cxx b/panda/src/chan/partBundleNode.cxx index 463c8ce673..6355b61c85 100644 --- a/panda/src/chan/partBundleNode.cxx +++ b/panda/src/chan/partBundleNode.cxx @@ -83,10 +83,10 @@ fillin(DatagramIterator& scan, BamReader* manager) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int PartBundleNode:: -complete_pointers(vector_typedWritable &plist, BamReader* manager) +complete_pointers(vector_typedWritable &p_list, BamReader* manager) { - int start = NamedNode::complete_pointers(plist, manager); - _bundle = DCAST(PartBundle, plist[start]); + int start = NamedNode::complete_pointers(p_list, manager); + _bundle = DCAST(PartBundle, p_list[start]); //Let PartBundleNode tell the PartBundle about itselt _bundle->_node = this; return start+1; diff --git a/panda/src/chan/partBundleNode.h b/panda/src/chan/partBundleNode.h index 2738611411..f8277cd36e 100644 --- a/panda/src/chan/partBundleNode.h +++ b/panda/src/chan/partBundleNode.h @@ -50,7 +50,7 @@ private: public: virtual void write_datagram(BamWriter* manager, Datagram &me); - virtual int complete_pointers(vector_typedWritable &plist, + virtual int complete_pointers(vector_typedWritable &p_list, BamReader *manager); protected: diff --git a/panda/src/chan/partGroup.cxx b/panda/src/chan/partGroup.cxx index 2319d15901..26d0420a4a 100644 --- a/panda/src/chan/partGroup.cxx +++ b/panda/src/chan/partGroup.cxx @@ -503,19 +503,19 @@ fillin(DatagramIterator& scan, BamReader* manager) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int PartGroup:: -complete_pointers(vector_typedWritable &plist, BamReader*) +complete_pointers(vector_typedWritable &p_list, BamReader*) { int i; for(i = 0; i < _num_children; i++) { - if (plist[i] == TypedWritable::Null) + if (p_list[i] == TypedWritable::Null) { chan_cat->warning() << get_type().get_name() << " Ignoring null PartGroup" << endl; } else { - _children.push_back(DCAST(PartGroup, plist[i])); + _children.push_back(DCAST(PartGroup, p_list[i])); } } diff --git a/panda/src/chan/partGroup.h b/panda/src/chan/partGroup.h index caa68e7c2a..0f11acfdee 100644 --- a/panda/src/chan/partGroup.h +++ b/panda/src/chan/partGroup.h @@ -98,7 +98,7 @@ protected: public: static void register_with_read_factory(void); virtual void write_datagram(BamWriter* manager, Datagram &me); - virtual int complete_pointers(vector_typedWritable &plist, + virtual int complete_pointers(vector_typedWritable &p_list, BamReader *manager); static TypedWritable *make_PartGroup(const FactoryParams ¶ms); diff --git a/panda/src/collide/collisionNode.cxx b/panda/src/collide/collisionNode.cxx index 1a2caa1d76..907f0543f8 100644 --- a/panda/src/collide/collisionNode.cxx +++ b/panda/src/collide/collisionNode.cxx @@ -258,12 +258,12 @@ fillin(DatagramIterator& scan, BamReader* manager) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int CollisionNode:: -complete_pointers(vector_typedWritable &plist, BamReader* manager) { +complete_pointers(vector_typedWritable &p_list, BamReader* manager) { int num_solids = _solids.size(); - int start = NamedNode::complete_pointers(plist, manager); + int start = NamedNode::complete_pointers(p_list, manager); for (int i = 0; i < num_solids; i++) { - _solids[i] = DCAST(CollisionSolid, plist[start + i]); + _solids[i] = DCAST(CollisionSolid, p_list[start + i]); } return start + num_solids; diff --git a/panda/src/effects/lensFlareNode.cxx b/panda/src/effects/lensFlareNode.cxx index 6b64a919c3..50414bc05a 100644 --- a/panda/src/effects/lensFlareNode.cxx +++ b/panda/src/effects/lensFlareNode.cxx @@ -510,26 +510,26 @@ fillin(DatagramIterator &scan, BamReader *manager) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int LensFlareNode:: -complete_pointers(vector_typedWritable &plist, BamReader *manager) +complete_pointers(vector_typedWritable &p_list, BamReader *manager) { int i; - int start = Node::complete_pointers(plist, manager); + int start = Node::complete_pointers(p_list, manager); int end = _num_flares + start; for(i = start; i < end; i++) { - _flares.push_back(DCAST(Texture, plist[i])); + _flares.push_back(DCAST(Texture, p_list[i])); } - _blind = DCAST(Texture, plist[end]); + _blind = DCAST(Texture, p_list[end]); end += 1 + _num_arcs; for(; i < end; i++) { - _flare_arcs.push_back(DCAST(RenderRelation, plist[i])); + _flare_arcs.push_back(DCAST(RenderRelation, p_list[i])); } - _light_node = DCAST(Node, plist[end]); + _light_node = DCAST(Node, p_list[end]); return end+1; } diff --git a/panda/src/gobj/geomSprite.cxx b/panda/src/gobj/geomSprite.cxx index c1bc746a3a..efdefadf35 100644 --- a/panda/src/gobj/geomSprite.cxx +++ b/panda/src/gobj/geomSprite.cxx @@ -149,9 +149,9 @@ register_with_read_factory(void) { // Description: //////////////////////////////////////////////////////////////////// int GeomSprite:: -complete_pointers(vector_typedWritable &plist, BamReader *manager) { - int index = Geom::complete_pointers(plist, manager); - _texture = DCAST(Texture, plist[index]); +complete_pointers(vector_typedWritable &p_list, BamReader *manager) { + int index = Geom::complete_pointers(p_list, manager); + _texture = DCAST(Texture, p_list[index]); return index + 1; } diff --git a/panda/src/graph/node.cxx b/panda/src/graph/node.cxx index 84010ad86f..aab74d7de5 100644 --- a/panda/src/graph/node.cxx +++ b/panda/src/graph/node.cxx @@ -474,7 +474,7 @@ write_datagram(BamWriter *manager, Datagram &me) { // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int Node:: -complete_pointers(vector_typedWritable &plist, BamReader *manager) { +complete_pointers(vector_typedWritable &p_list, BamReader *manager) { if (manager->get_file_minor_ver() < 3) { // In bam versions before 3.3, this function does nothing (since // the arcs are completely responsible for adding themselves to @@ -504,7 +504,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) { DownRelationPointers::iterator drpi; for (drpi = drp.begin(); drpi != drp.end(); ++drpi) { - (*drpi) = DCAST(NodeRelation, plist[count]); + (*drpi) = DCAST(NodeRelation, p_list[count]); count++; } } diff --git a/panda/src/graph/nodeRelation.cxx b/panda/src/graph/nodeRelation.cxx index dcd399e06f..052b5c0bfe 100644 --- a/panda/src/graph/nodeRelation.cxx +++ b/panda/src/graph/nodeRelation.cxx @@ -900,11 +900,11 @@ write_datagram(BamWriter *manager, Datagram &me) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int NodeRelation:: -complete_pointers(vector_typedWritable &plist, BamReader *manager) { - nassertr(plist[0] != TypedWritable::Null && - plist[1] != TypedWritable::Null, 0); - _parent = DCAST(Node, plist[0]); - _child = DCAST(Node, plist[1]); +complete_pointers(vector_typedWritable &p_list, BamReader *manager) { + nassertr(p_list[0] != TypedWritable::Null && + p_list[1] != TypedWritable::Null, 0); + _parent = DCAST(Node, p_list[0]); + _child = DCAST(Node, p_list[1]); if (manager->get_file_minor_ver() < 3) { // In bam versions before 3.3, we let the NodeRelation completely @@ -935,7 +935,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) { //version doesn't know about, so we want to be able //to gracefully handle new functionality being thrown //at old code - if (plist[i] == TypedWritable::Null) + if (p_list[i] == TypedWritable::Null) { graph_cat->warning() << get_type().get_name() @@ -946,7 +946,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) { //Let set_transition do the work for storing //a reference to this transition, determing it's //exact type, telling the transition about me, etc... - set_transition(DCAST(NodeTransition, plist[i])); + set_transition(DCAST(NodeTransition, p_list[i])); } } return _num_transitions+2; diff --git a/panda/src/parametrics/piecewiseCurve.cxx b/panda/src/parametrics/piecewiseCurve.cxx index 12168ba1bd..b714df287a 100644 --- a/panda/src/parametrics/piecewiseCurve.cxx +++ b/panda/src/parametrics/piecewiseCurve.cxx @@ -625,14 +625,14 @@ fillin(DatagramIterator &scan, BamReader *manager) { // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int PiecewiseCurve:: -complete_pointers(vector_typedWritable &plist, BamReader *manager) { - int used = ParametricCurve::complete_pointers(plist, manager); +complete_pointers(vector_typedWritable &p_list, BamReader *manager) { + int used = ParametricCurve::complete_pointers(p_list, manager); - nassertr(used + _segs.size() <= plist.size(), used); + nassertr(used + _segs.size() <= p_list.size(), used); size_t i; for (i = 0; i < _segs.size(); i++) { - DCAST_INTO_R(_segs[i]._curve, plist[used + i], used); + DCAST_INTO_R(_segs[i]._curve, p_list[used + i], used); } return used + _segs.size(); diff --git a/panda/src/sgattrib/materialTransition.cxx b/panda/src/sgattrib/materialTransition.cxx index 906d3e101d..bfae1b028e 100644 --- a/panda/src/sgattrib/materialTransition.cxx +++ b/panda/src/sgattrib/materialTransition.cxx @@ -128,8 +128,8 @@ write_datagram(BamWriter *manager, Datagram &me) { // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int MaterialTransition:: -complete_pointers(vector_typedWritable &plist, BamReader *) { - if (plist[0] == TypedWritable::Null) { +complete_pointers(vector_typedWritable &p_list, BamReader *) { + if (p_list[0] == TypedWritable::Null) { if (sgattrib_cat.is_debug()) { sgattrib_cat->debug() << get_type().get_name() << " received null Material," @@ -139,7 +139,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *) { set_off(); } else { - _value = DCAST(Material, plist[0]); + _value = DCAST(Material, p_list[0]); } return 1; diff --git a/panda/src/sgattrib/textureTransition.cxx b/panda/src/sgattrib/textureTransition.cxx index c3c1308ce6..7166635b46 100644 --- a/panda/src/sgattrib/textureTransition.cxx +++ b/panda/src/sgattrib/textureTransition.cxx @@ -129,8 +129,8 @@ write_datagram(BamWriter *manager, Datagram &me) { // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int TextureTransition:: -complete_pointers(vector_typedWritable &plist, BamReader *) { - if (plist[0] == TypedWritable::Null) { +complete_pointers(vector_typedWritable &p_list, BamReader *) { + if (p_list[0] == TypedWritable::Null) { if (sgattrib_cat.is_debug()) { sgattrib_cat->debug() << get_type().get_name() << " received null Texture," @@ -140,7 +140,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *) { set_off(); } else { - _value = DCAST(Texture, plist[0]); + _value = DCAST(Texture, p_list[0]); } return 1; diff --git a/panda/src/sgraph/geomNode.cxx b/panda/src/sgraph/geomNode.cxx index 5828407bd1..6ed8bb30aa 100644 --- a/panda/src/sgraph/geomNode.cxx +++ b/panda/src/sgraph/geomNode.cxx @@ -278,12 +278,12 @@ write_datagram(BamWriter *manager, Datagram &me) // pointers that this object made to BamReader. //////////////////////////////////////////////////////////////////// int GeomNode:: -complete_pointers(vector_typedWritable &plist, BamReader* manager) +complete_pointers(vector_typedWritable &p_list, BamReader* manager) { - int start = NamedNode::complete_pointers(plist, manager); + int start = NamedNode::complete_pointers(p_list, manager); for(int i = start; i < _num_geoms+start; i++) { - PT(dDrawable) temp = DCAST(dDrawable, plist[i]); + PT(dDrawable) temp = DCAST(dDrawable, p_list[i]); _geoms.push_back(temp); } return start+_num_geoms;