Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 15:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more optimizations on render pipeline

Browse source
This commit is contained in:
ZappoMan 2013-05-02 16:37:31 -07:00
parent 5a14c71225
commit fcce4753c9
3 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
interface/src/VoxelSystem.cpp
View file

@ -150,6 +150,7 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) {
void VoxelSystem::setupNewVoxelsForDrawing() {
double start = usecTimestampNow();
if (_tree->isDirty()) {
_callsToTreesToArrays++;
_voxelsUpdated = newTreeToArrays(_tree->rootNode);
_tree->clearDirtyBit(); // after we pull the trees into the array, we can consider the tree clean
} else {
@ -163,14 +164,16 @@ void VoxelSystem::setupNewVoxelsForDrawing() {
if (_renderWarningsOn && elapsedmsec > 1) {
if (elapsedmsec > 1000) {
double elapsedsec = (end - start)/1000000.0;
printLog("WARNING! newTreeToArrays() took %lf seconds\n",elapsedsec);
printLog("WARNING! newTreeToArrays() took %lf seconds %ld voxels updated\n", elapsedsec, _voxelsUpdated);
} else {
printLog("WARNING! newTreeToArrays() took %lf milliseconds\n",elapsedmsec);
printLog("WARNING! newTreeToArrays() took %lf milliseconds %ld voxels updated\n", elapsedmsec, _voxelsUpdated);
}
}
// copy the newly written data to the arrays designated for reading
copyWrittenDataToReadArrays();
if (_voxelsDirty) {
// copy the newly written data to the arrays designated for reading
copyWrittenDataToReadArrays();
}
}
void VoxelSystem::copyWrittenDataToReadArrays() {
@ -189,9 +192,11 @@ void VoxelSystem::copyWrittenDataToReadArrays() {
if (_renderWarningsOn && elapsedmsec > 1) {
if (elapsedmsec > 1000) {
double elapsedsec = (end - start)/1000000.0;
printLog("WARNING! copyWrittenDataToReadArrays() took %lf seconds\n",elapsedsec);
printLog("WARNING! copyWrittenDataToReadArrays() took %lf seconds for %ld voxels %ld updated\n",
elapsedsec, _voxelsInArrays, _voxelsUpdated);
} else {
printLog("WARNING! copyWrittenDataToReadArrays() took %lf milliseconds\n",elapsedmsec);
printLog("WARNING! copyWrittenDataToReadArrays() took %lf milliseconds for %ld voxels %ld updated\n",
elapsedmsec, _voxelsInArrays, _voxelsUpdated);
}
}
}
@ -266,6 +271,7 @@ VoxelSystem* VoxelSystem::clone() const {
void VoxelSystem::init() {
_renderWarningsOn = false;
_callsToTreesToArrays = 0;
// When we change voxels representations in the arrays, we'll update this
_voxelsDirty = false;
@ -373,13 +379,20 @@ void VoxelSystem::updateVBOs() {
double end = usecTimestampNow();
double elapsedmsec = (end - start)/1000.0;
if (_renderWarningsOn && elapsedmsec > 1) {
if (elapsedmsec > 1000) {
double elapsedsec = (end - start)/1000000.0;
printLog("WARNING! updateVBOs() took %lf seconds\n",elapsedsec);
if (elapsedmsec > 1) {
if (elapsedmsec > 1000) {
double elapsedsec = (end - start)/1000000.0;
printLog("WARNING! updateVBOs() took %lf seconds after %d calls to newTreeToArrays()\n",
elapsedsec, _callsToTreesToArrays);
} else {
printLog("WARNING! updateVBOs() took %lf milliseconds after %d calls to newTreeToArrays()\n",
elapsedmsec, _callsToTreesToArrays);
}
} else {
printLog("WARNING! updateVBOs() took %lf milliseconds\n",elapsedmsec);
printLog("WARNING! updateVBOs() called after %d calls to newTreeToArrays()\n",_callsToTreesToArrays);
}
}
_callsToTreesToArrays = 0; // clear it
}
void VoxelSystem::render() {

2
interface/src/VoxelSystem.h
View file

@ -63,6 +63,8 @@ public:
bool getRenderPipelineWarnings() const { return _renderWarningsOn; };
private:
int _callsToTreesToArrays;
bool _renderWarningsOn;
// Operation functions for tree recursion methods
static int _nodeCount;

12
libraries/voxels/src/VoxelNode.cpp
View file

@ -125,7 +125,9 @@ void VoxelNode::setFalseColor(colorPart red, colorPart green, colorPart blue) {
_currentColor[1] = green;
_currentColor[2] = blue;
_currentColor[3] = 1; // XXXBHG - False colors are always considered set
_isDirty = true;
if (_shouldRender) {
_isDirty = true;
}
}
}
@ -136,7 +138,9 @@ void VoxelNode::setFalseColored(bool isFalseColored) {
memcpy(&_currentColor,&_trueColor,sizeof(nodeColor));
}
_falseColored = isFalseColored;
_isDirty = true;
if (_shouldRender) {
_isDirty = true;
}
}
};
@ -149,7 +153,9 @@ void VoxelNode::setColor(const nodeColor& color) {
if (!_falseColored) {
memcpy(&_currentColor,&color,sizeof(nodeColor));
}
_isDirty = true;
if (_shouldRender) {
_isDirty = true;
}
}
}
#endif