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

make Octree::readBitstreamToTree() virtual

Browse source
This commit is contained in:
Andrew Meadows 2017-08-16 11:45:18 -07:00
parent 171151b92a
commit 82ed19386f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityTree.cpp
View file

@ -107,7 +107,7 @@ void EntityTree::eraseAllOctreeElements(bool createNewRoot) {
} }
void EntityTree::readBitstreamToTree(const unsigned char* bitstream, void EntityTree::readBitstreamToTree(const unsigned char* bitstream,
unsigned long int bufferSizeBytes, ReadBitstreamToTreeParams& args) { uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args) {
Octree::readBitstreamToTree(bitstream, bufferSizeBytes, args); Octree::readBitstreamToTree(bitstream, bufferSizeBytes, args);
// add entities // add entities

2
libraries/entities/src/EntityTree.h
View file

@ -82,7 +82,7 @@ public:
virtual void eraseAllOctreeElements(bool createNewRoot = true) override; virtual void eraseAllOctreeElements(bool createNewRoot = true) override;
virtual void readBitstreamToTree(const unsigned char* bitstream, virtual void readBitstreamToTree(const unsigned char* bitstream,
unsigned long int bufferSizeBytes, ReadBitstreamToTreeParams& args) override; uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args) override;
int readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args); int readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args);
// These methods will allow the OctreeServer to send your tree inbound edit packets of your // These methods will allow the OctreeServer to send your tree inbound edit packets of your

2
libraries/octree/src/Octree.h
View file

@ -232,7 +232,7 @@ public:
virtual void eraseAllOctreeElements(bool createNewRoot = true); virtual void eraseAllOctreeElements(bool createNewRoot = true);
void readBitstreamToTree(const unsigned char* bitstream, uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args); virtual void readBitstreamToTree(const unsigned char* bitstream, uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args);
void deleteOctalCodeFromTree(const unsigned char* codeBuffer, bool collapseEmptyTrees = DONT_COLLAPSE); void deleteOctalCodeFromTree(const unsigned char* codeBuffer, bool collapseEmptyTrees = DONT_COLLAPSE);
void reaverageOctreeElements(OctreeElementPointer startElement = OctreeElementPointer()); void reaverageOctreeElements(OctreeElementPointer startElement = OctreeElementPointer());