Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 02:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

support old format models.svo files

Browse source
This commit is contained in:
ZappoMan 2014-06-25 19:28:53 -07:00
parent 59a2f093fd
commit 52a04c5270
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/models/src/ModelItem.cpp
View file

@ -636,9 +636,10 @@ ModelItemID ModelItem::readModelItemIDFromBuffer(const unsigned char* data, int
}
int ModelItem::readModelDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args) {
// TODO: handle old format??
//if (args.bitstreamVersion >= VERSION_MODELS_HAVE_ANIMATION) {
if (args.bitstreamVersion < VERSION_MODELS_SUPPORT_SPLIT_MTU) {
return oldVersionReadModelDataFromBuffer(data, bytesLeftToRead, args);
}
// Header bytes
// object ID [16 bytes]

3
libraries/models/src/ModelItem.h
View file

@ -57,9 +57,6 @@ const glm::quat MODEL_DEFAULT_MODEL_ROTATION;
const QString MODEL_DEFAULT_ANIMATION_URL("");
const float MODEL_DEFAULT_ANIMATION_FPS = 30.0f;
const PacketVersion VERSION_MODELS_HAVE_ANIMATION = 1;
const PacketVersion VERSION_ROOT_ELEMENT_HAS_DATA = 2;
// PropertyFlags support
enum ModelPropertyList {
PROP_PAGED_PROPERTY,

2
libraries/networking/src/PacketHeaders.cpp
View file

@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType type) {
case PacketTypeParticleErase:
return 1;
case PacketTypeModelData:
return 2;
return VERSION_MODELS_SUPPORT_SPLIT_MTU;
case PacketTypeModelErase:
return 1;
default:

4
libraries/networking/src/PacketHeaders.h
View file

@ -111,4 +111,8 @@ PacketType packetTypeForPacket(const char* packet);
int arithmeticCodingValueFromBuffer(const char* checkValue);
int numBytesArithmeticCodingFromBuffer(const char* checkValue);
const PacketVersion VERSION_MODELS_HAVE_ANIMATION = 1;
const PacketVersion VERSION_ROOT_ELEMENT_HAS_DATA = 2;
const PacketVersion VERSION_MODELS_SUPPORT_SPLIT_MTU = 3;
#endif // hifi_PacketHeaders_h