History

added render pipeline warnings menu item

ZappoMan committed 13 years ago

Commit 8f0dd1f1 parent 7625c9a3 files · +21 −5Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 3 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+7−5
@@ -103,7 +103,7 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 102 unmodified lines
103 _tree->readBitstreamToTree(voxelData, numBytes - 1);103 _tree->readBitstreamToTree(voxelData, numBytes - 1);
104 double end = usecTimestampNow();104 double end = usecTimestampNow();
105 double elapsedmsec = (end - start)/1000.0;105 double elapsedmsec = (end - start)/1000.0;
106 if (elapsedmsec > 1) {106 if (_renderWarningsOn && elapsedmsec > 1) {
107 if (elapsedmsec > 1000) {107 if (elapsedmsec > 1000) {
108 double elapsedsec = (end - start)/1000000.0;108 double elapsedsec = (end - start)/1000000.0;
109 printLog("WARNING! readBitstreamToTree() took %lf seconds\n",elapsedsec);109 printLog("WARNING! readBitstreamToTree() took %lf seconds\n",elapsedsec);
@@ -155,7 +155,7 @@ void VoxelSystem::setupNewVoxelsForDrawing() { · 45 unmodified lines
155 }155 }
156 double end = usecTimestampNow();156 double end = usecTimestampNow();
157 double elapsedmsec = (end - start)/1000.0;157 double elapsedmsec = (end - start)/1000.0;
158 if (elapsedmsec > 1) {158 if (_renderWarningsOn && elapsedmsec > 1) {
159 if (elapsedmsec > 1000) {159 if (elapsedmsec > 1000) {
160 double elapsedsec = (end - start)/1000000.0;160 double elapsedsec = (end - start)/1000000.0;
161 printLog("WARNING! newTreeToArrays() took %lf seconds\n",elapsedsec);161 printLog("WARNING! newTreeToArrays() took %lf seconds\n",elapsedsec);
@@ -181,7 +181,7 @@ void VoxelSystem::copyWrittenDataToReadArrays() { · 19 unmodified lines
181 }181 }
182 double end = usecTimestampNow();182 double end = usecTimestampNow();
183 double elapsedmsec = (end - start)/1000.0;183 double elapsedmsec = (end - start)/1000.0;
184 if (elapsedmsec > 1) {184 if (_renderWarningsOn && elapsedmsec > 1) {
185 if (elapsedmsec > 1000) {185 if (elapsedmsec > 1000) {
186 double elapsedsec = (end - start)/1000000.0;186 double elapsedsec = (end - start)/1000000.0;
187 printLog("WARNING! copyWrittenDataToReadArrays() took %lf seconds\n",elapsedsec);187 printLog("WARNING! copyWrittenDataToReadArrays() took %lf seconds\n",elapsedsec);
@@ -260,6 +260,8 @@ VoxelSystem* VoxelSystem::clone() const { · 72 unmodified lines
260 260
261void VoxelSystem::init() {261void VoxelSystem::init() {
262 262
263 _renderWarningsOn = false;
264
263 // When we change voxels representations in the arrays, we'll update this265 // When we change voxels representations in the arrays, we'll update this
264 _voxelsDirty = false;266 _voxelsDirty = false;
265 _voxelsInArrays = 0;267 _voxelsInArrays = 0;
@@ -365,7 +367,7 @@ void VoxelSystem::updateVBOs() { · 99 unmodified lines
365 }367 }
366 double end = usecTimestampNow();368 double end = usecTimestampNow();
367 double elapsedmsec = (end - start)/1000.0;369 double elapsedmsec = (end - start)/1000.0;
368 if (elapsedmsec > 1) {370 if (_renderWarningsOn && elapsedmsec > 1) {
369 if (elapsedmsec > 1000) {371 if (elapsedmsec > 1000) {
370 double elapsedsec = (end - start)/1000000.0;372 double elapsedsec = (end - start)/1000000.0;
371 printLog("WARNING! updateVBOs() took %lf seconds\n",elapsedsec);373 printLog("WARNING! updateVBOs() took %lf seconds\n",elapsedsec);
@@ -411,7 +413,7 @@ void VoxelSystem::render() { · 39 unmodified lines
411 glPopMatrix();413 glPopMatrix();
412 double end = usecTimestampNow();414 double end = usecTimestampNow();
413 double elapsedmsec = (end - start)/1000.0;415 double elapsedmsec = (end - start)/1000.0;
414 if (elapsedmsec > 1) {416 if (_renderWarningsOn && elapsedmsec > 1) {
415 if (elapsedmsec > 1000) {417 if (elapsedmsec > 1000) {
416 double elapsedsec = (end - start)/1000000.0;418 double elapsedsec = (end - start)/1000000.0;
417 printLog("WARNING! render() took %lf seconds\n",elapsedsec);419 printLog("WARNING! render() took %lf seconds\n",elapsedsec);