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

fix reading bams 4.18

Browse Source
This commit is contained in:
David Rose 2005-04-22 21:44:22 +00:00
parent a3702b8a8f
commit 71cb47f94c
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panda/src/gobj/qpgeom.cxx
View File

@ -1032,10 +1032,24 @@ make_from_bam(const FactoryParams &params) {
parse_params(params, scan, manager); parse_params(params, scan, manager);
object->fillin(scan, manager); object->fillin(scan, manager);
manager->register_finalize(object);
return object; return object;
} }
////////////////////////////////////////////////////////////////////
// Function: qpGeom::finalize
// Access: Public, Virtual
// Description: Called by the BamReader to perform any final actions
// needed for setting up the object after all objects
// have been read and all pointers have been completed.
////////////////////////////////////////////////////////////////////
void qpGeom::
finalize(BamReader *manager) {
CDWriter cdata(_cycler);
reset_geom_rendering(cdata);
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: qpGeom::fillin // Function: qpGeom::fillin
// Access: Protected // Access: Protected
@ -1122,6 +1136,9 @@ write_datagram(BamWriter *manager, Datagram &dg) const {
dg.add_uint8(_primitive_type); dg.add_uint8(_primitive_type);
dg.add_uint8(_shade_model); dg.add_uint8(_shade_model);
// Actually, we shouldn't bother writing out _geom_rendering; we'll
// just throw it away anyway.
dg.add_uint16(_geom_rendering); dg.add_uint16(_geom_rendering);
} }
@ -1166,7 +1183,11 @@ fillin(DatagramIterator &scan, BamReader *manager) {
_primitive_type = (PrimitiveType)scan.get_uint8(); _primitive_type = (PrimitiveType)scan.get_uint8();
_shade_model = (ShadeModel)scan.get_uint8(); _shade_model = (ShadeModel)scan.get_uint8();
_geom_rendering = scan.get_uint16();
// To be removed: we no longer read _geom_rendering from the bam
// file; instead, we rederive it in finalize().
scan.get_uint16();
_got_usage_hint = false; _got_usage_hint = false;
_modified = qpGeom::get_next_modified(); _modified = qpGeom::get_next_modified();
} }

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

@ -198,6 +198,8 @@ public:
static void register_with_read_factory(); static void register_with_read_factory();
virtual void write_datagram(BamWriter *manager, Datagram &dg); virtual void write_datagram(BamWriter *manager, Datagram &dg);
virtual void finalize(BamReader *manager);
protected: protected:
static TypedWritable *make_from_bam(const FactoryParams &params); static TypedWritable *make_from_bam(const FactoryParams &params);
void fillin(DatagramIterator &scan, BamReader *manager); void fillin(DatagramIterator &scan, BamReader *manager);