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

get rid of dead code

Browse source
This commit is contained in:
ZappoMan 2013-05-09 17:10:25 -07:00
parent 33fc9f5389
commit 2128cb8bff
2 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
interface/src/VoxelSystem.cpp
View file

@ -477,37 +477,6 @@ void VoxelSystem::updatePartialVBOs() {
} }
} }
void VoxelSystem::updateJustEnoughVBOs() {
bool somethingDirty = false;
glBufferIndex minDirty = GLBUFFER_INDEX_UNKNOWN;
glBufferIndex maxDirty = 0;
for (glBufferIndex i = 0; i < _voxelsInWriteArrays; i++) {
if (_voxelDirtyArray[i]) {
somethingDirty = true;
minDirty = std::min(minDirty,i);
maxDirty = std::max(maxDirty,i);
_voxelDirtyArray[i] = false;
}
}
if (somethingDirty) {
glBufferIndex segmentStart = minDirty;
glBufferIndex segmentEnd = maxDirty;
int segmentLength = (segmentEnd - segmentStart) + 1;
GLintptr segmentStartAt = segmentStart * VERTEX_POINTS_PER_VOXEL * sizeof(GLfloat);
GLsizeiptr segmentSizeBytes = segmentLength * VERTEX_POINTS_PER_VOXEL * sizeof(GLfloat);
GLfloat* readVerticesFrom = _readVerticesArray + (segmentStart * VERTEX_POINTS_PER_VOXEL);
glBindBuffer(GL_ARRAY_BUFFER, _vboVerticesID);
glBufferSubData(GL_ARRAY_BUFFER, segmentStartAt, segmentSizeBytes, readVerticesFrom);
segmentStartAt = segmentStart * VERTEX_POINTS_PER_VOXEL * sizeof(GLubyte);
segmentSizeBytes = segmentLength * VERTEX_POINTS_PER_VOXEL * sizeof(GLubyte);
GLubyte* readColorsFrom = _readColorsArray + (segmentStart * VERTEX_POINTS_PER_VOXEL);
glBindBuffer(GL_ARRAY_BUFFER, _vboColorsID);
glBufferSubData(GL_ARRAY_BUFFER, segmentStartAt, segmentSizeBytes, readColorsFrom);
}
}
void VoxelSystem::updateVBOs() { void VoxelSystem::updateVBOs() {
static char buffer[40] = { 0 }; static char buffer[40] = { 0 };
if (_renderWarningsOn) { if (_renderWarningsOn) {
@ -519,8 +488,7 @@ void VoxelSystem::updateVBOs() {
if (_renderFullVBO) { if (_renderFullVBO) {
updateFullVBOs(); updateFullVBOs();
} else { } else {
updateJustEnoughVBOs(); updatePartialVBOs(); // too many small segments?
//updatePartialVBOs(); // too many small segments?
} }
_voxelsDirty = false; _voxelsDirty = false;
} }

1
interface/src/VoxelSystem.h
View file

@ -136,7 +136,6 @@ public:
void updateVBOs(); void updateVBOs();
void updateFullVBOs(); // all voxels in the VBO void updateFullVBOs(); // all voxels in the VBO
void updatePartialVBOs(); // multiple segments, only dirty voxels void updatePartialVBOs(); // multiple segments, only dirty voxels
void updateJustEnoughVBOs(); // single segment from first dirty, to last dirty, may include clean voxels
}; };