TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

whoops, fix bam reading

Browse Source
This commit is contained in:
David Rose 2011-12-18 01:26:17 +00:00
parent 0fa828b5e3
commit a4728957da
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,6 +309,7 @@ write_datagram(BamWriter *manager, Datagram &dg) {
dg.add_uint8(_numeric_type); dg.add_uint8(_numeric_type);
dg.add_uint8(_contents); dg.add_uint8(_contents);
dg.add_uint16(_start); dg.add_uint16(_start);
dg.add_uint8(_column_alignment);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -343,6 +344,11 @@ fillin(DatagramIterator &scan, BamReader *manager) {
_contents = (Contents)scan.get_uint8(); _contents = (Contents)scan.get_uint8();
_start = scan.get_uint16(); _start = scan.get_uint16();
_column_alignment = 1;
if (manager->get_file_minor_ver() >= 29) {
_column_alignment = scan.get_uint8();
}
setup(); setup();
} }

3
panda/src/putil/bam.h
View File

@ -33,7 +33,7 @@ static const unsigned short _bam_major_ver = 6;
// Bumped to major version 6 on 2/11/06 to factor out PandaNode::CData. // Bumped to major version 6 on 2/11/06 to factor out PandaNode::CData.
static const unsigned short _bam_first_minor_ver = 14; static const unsigned short _bam_first_minor_ver = 14;
static const unsigned short _bam_minor_ver = 28; static const unsigned short _bam_minor_ver = 29;
// Bumped to minor version 14 on 12/19/07 to change default ColorAttrib. // Bumped to minor version 14 on 12/19/07 to change default ColorAttrib.
// Bumped to minor version 15 on 4/9/08 to add TextureAttrib::_implicit_sort. // Bumped to minor version 15 on 4/9/08 to add TextureAttrib::_implicit_sort.
// Bumped to minor version 16 on 5/13/08 to add Texture::_quality_level. // Bumped to minor version 16 on 5/13/08 to add Texture::_quality_level.
@ -49,6 +49,7 @@ static const unsigned short _bam_minor_ver = 28;
// Bumped to minor version 26 on 8/5/11 to add multiview (stereo) Textures. // Bumped to minor version 26 on 8/5/11 to add multiview (stereo) Textures.
// Bumped to minor version 27 on 10/9/11 to add stdfloat_double. // Bumped to minor version 27 on 10/9/11 to add stdfloat_double.
// Bumped to minor version 28 on 11/28/11 to add Texture::_auto_texture_scale. // Bumped to minor version 28 on 11/28/11 to add Texture::_auto_texture_scale.
// Bumped to minor version 29 on 12/17/11 to add GeomVertexColumn::_column_alignment.
#endif #endif