Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed incremental streaming stubs.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-20 18:12:08 -07:00
parent de0c45a919
commit 49f1d427ec
2 changed files with 0 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
libraries/metavoxels/src/MetavoxelData.cpp
View file

@ -602,83 +602,6 @@ void MetavoxelData::writeDelta(const MetavoxelData& reference, const MetavoxelLO
} }
} }
void MetavoxelData::readIncrementalDelta(const MetavoxelData& reference, const MetavoxelLOD& referenceLOD,
Bitstream& in, const MetavoxelLOD& lod) {
// shallow copy the reference
*this = reference;
// if nothing changed, return
bool changed;
in >> changed;
if (!changed) {
return;
}
// expand if the size has changed
bool sizeChanged;
in >> sizeChanged;
if (sizeChanged) {
float size;
in >> size;
while (_size < size) {
expand();
}
}
// read the nodes removed
forever {
AttributePointer attribute;
in >> attribute;
if (!attribute) {
break;
}
_roots.take(attribute)->decrementReferenceCount(attribute);
}
}
void MetavoxelData::writeIncrementalDelta(const MetavoxelData& reference, const MetavoxelLOD& referenceLOD,
Bitstream& out, const MetavoxelLOD& lod) const {
// first things first: there might be no change whatsoever
glm::vec3 minimum = getMinimum();
bool becameSubdivided = lod.becameSubdivided(minimum, _size, referenceLOD);
if (_size == reference._size && _roots == reference._roots && !becameSubdivided) {
out << false;
return;
}
out << true;
// compare the size; if changed (rare), we must compare to the expanded reference
const MetavoxelData* expandedReference = &reference;
if (_size == reference._size) {
out << false;
} else {
out << true;
out << _size;
MetavoxelData* expanded = new MetavoxelData(reference);
while (expanded->_size < _size) {
expanded->expand();
}
expandedReference = expanded;
}
// write the nodes removed
for (QHash<AttributePointer, MetavoxelNode*>::const_iterator it = expandedReference->_roots.constBegin();
it != expandedReference->_roots.constEnd(); it++) {
if (!_roots.contains(it.key())) {
out << it.key();
}
}
out << AttributePointer();
// delete the expanded reference if we had to expand
if (expandedReference != &reference) {
delete expandedReference;
}
}
MetavoxelNode* MetavoxelData::createRoot(const AttributePointer& attribute) { MetavoxelNode* MetavoxelData::createRoot(const AttributePointer& attribute) {
MetavoxelNode*& root = _roots[attribute]; MetavoxelNode*& root = _roots[attribute];
if (root) { if (root) {

5
libraries/metavoxels/src/MetavoxelData.h
View file

@ -118,11 +118,6 @@ public:
void writeDelta(const MetavoxelData& reference, const MetavoxelLOD& referenceLOD, void writeDelta(const MetavoxelData& reference, const MetavoxelLOD& referenceLOD,
Bitstream& out, const MetavoxelLOD& lod) const; Bitstream& out, const MetavoxelLOD& lod) const;
void readIncrementalDelta(const MetavoxelData& reference, const MetavoxelLOD& referenceLOD,
Bitstream& in, const MetavoxelLOD& lod);
void writeIncrementalDelta(const MetavoxelData& reference, const MetavoxelLOD& referenceLOD,
Bitstream& out, const MetavoxelLOD& lod) const;
MetavoxelNode* getRoot(const AttributePointer& attribute) const { return _roots.value(attribute); } MetavoxelNode* getRoot(const AttributePointer& attribute) const { return _roots.value(attribute); }
MetavoxelNode* createRoot(const AttributePointer& attribute); MetavoxelNode* createRoot(const AttributePointer& attribute);