Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 06:46:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more voxelEctomy

Browse source
This commit is contained in:
ZappoMan 2014-12-30 20:35:21 -08:00
parent 5cef7d0e9d
commit 67595ea571
3 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,9 +68,6 @@ PacketVersion versionForPacketType(PacketType type) {
case PacketTypeCreateAssignment:
case PacketTypeRequestAssignment:
return 2;
case PacketTypeVoxelSet:
case PacketTypeVoxelSetDestructive:
return 1;
case PacketTypeOctreeStats:
return 1;
case PacketTypeEntityAddOrEdit:
@ -82,8 +79,6 @@ PacketVersion versionForPacketType(PacketType type) {
return 1;
case PacketTypeMetavoxelData:
return 10;
case PacketTypeVoxelData:
return VERSION_VOXELS_HAS_FILE_BREAKS;
default:
return 0;
}
@ -114,11 +109,6 @@ QString nameForPacketType(PacketType type) {
PACKET_TYPE_NAME_LOOKUP(PacketTypeMuteEnvironment);
PACKET_TYPE_NAME_LOOKUP(PacketTypeAudioStreamStats);
PACKET_TYPE_NAME_LOOKUP(PacketTypeDataServerConfirm);
PACKET_TYPE_NAME_LOOKUP(PacketTypeVoxelQuery);
PACKET_TYPE_NAME_LOOKUP(PacketTypeVoxelData);
PACKET_TYPE_NAME_LOOKUP(PacketTypeVoxelSet);
PACKET_TYPE_NAME_LOOKUP(PacketTypeVoxelSetDestructive);
PACKET_TYPE_NAME_LOOKUP(PacketTypeVoxelErase);
PACKET_TYPE_NAME_LOOKUP(PacketTypeOctreeStats);
PACKET_TYPE_NAME_LOOKUP(PacketTypeJurisdiction);
PACKET_TYPE_NAME_LOOKUP(PacketTypeJurisdictionRequest);
@ -134,7 +124,6 @@ QString nameForPacketType(PacketType type) {
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityErase);
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityAddResponse);
PACKET_TYPE_NAME_LOOKUP(PacketTypeOctreeDataNack);
PACKET_TYPE_NAME_LOOKUP(PacketTypeVoxelEditNack);
PACKET_TYPE_NAME_LOOKUP(PacketTypeAudioEnvironment);
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityEditNack);
PACKET_TYPE_NAME_LOOKUP(PacketTypeSignedTransactionPayment);

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

@ -42,11 +42,11 @@ enum PacketType {
PacketTypeMuteEnvironment,
PacketTypeAudioStreamStats,
PacketTypeDataServerConfirm, // 20
PacketTypeVoxelQuery,
PacketTypeVoxelData,
PacketTypeVoxelSet,
PacketTypeVoxelSetDestructive,
PacketTypeVoxelErase, // 25
UNUSED_5,
UNUSED_6,
UNUSED_7,
UNUSED_8,
UNUSED_9, // 25
PacketTypeOctreeStats,
PacketTypeJurisdiction,
PacketTypeJurisdictionRequest,
@ -67,7 +67,7 @@ enum PacketType {
PacketTypeEntityErase,
PacketTypeEntityAddResponse,
PacketTypeOctreeDataNack, // 45
PacketTypeVoxelEditNack,
UNUSED_10,
PacketTypeAudioEnvironment,
PacketTypeEntityEditNack,
PacketTypeSignedTransactionPayment,
@ -83,8 +83,8 @@ const QSet<PacketType> NON_VERIFIED_PACKETS = QSet<PacketType>()
<< PacketTypeDomainServerRequireDTLS << PacketTypeDomainConnectRequest
<< PacketTypeDomainList << PacketTypeDomainListRequest << PacketTypeDomainConnectionDenied
<< PacketTypeCreateAssignment << PacketTypeRequestAssignment << PacketTypeStunResponse
<< PacketTypeNodeJsonStats << PacketTypeVoxelQuery << PacketTypeEntityQuery
<< PacketTypeOctreeDataNack << PacketTypeVoxelEditNack << PacketTypeEntityEditNack
<< PacketTypeNodeJsonStats << PacketTypeEntityQuery
<< PacketTypeOctreeDataNack << PacketTypeEntityEditNack
<< PacketTypeIceServerHeartbeat << PacketTypeIceServerHeartbeatResponse
<< PacketTypeUnverifiedPing << PacketTypeUnverifiedPingReply;

12
libraries/octree/src/Octree.cpp
View file

@ -1946,18 +1946,6 @@ bool Octree::readFromSVOFile(const char* fileName) {
dataLength -= sizeof(expectedType);
gotVersion = *dataAt;
// NOTE: SPECIAL CASE for old voxel svo files. The old voxel SVO files didn't have header
// details. They started with the the octalcode for the root. Which was always 00 which matches PacketTypeUnknown
unsigned char* firstByteAt = (unsigned char*)&fileHeader;
unsigned char firstByteValue = *firstByteAt;
if (expectedType == PacketTypeVoxelData && firstByteValue == 0) {
gotType = PacketTypeVoxelData;
gotVersion = 0;
qDebug() << "Detected OLD Voxels format.";
headerLength = 0; // old format files don't have headers
file.seekg( 0, std::ios::beg ); // rewind to the beginning so old logic will work
}
if (gotType == expectedType) {
if (canProcessVersion(gotVersion)) {
dataAt += sizeof(gotVersion);