fix byte normals, fix crashes in switching between voxel shader and normal mode

ZappoMan committed 13 years ago

Commit eb6af1a1 parent 2487a553 files · +65 −15Browse files

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

Unified · Split

                              0,0,0, 1,0,0, 1,1,0, 0,1,0, 0,0,1, 1,0,1, 1,1,1, 0,1,1,
                              0,0,0, 1,0,0, 1,1,0, 0,1,0, 0,0,1, 1,0,1, 1,1,1, 0,1,1 };
-GLbyte identityNormals[] = { 0,0,-1, 0,0,-1, 0,0,-1, 0,0,-1,
+GLfloat identityNormals[] = { 0,0,-1, 0,0,-1, 0,0,-1, 0,0,-1,
                               0,0,+1, 0,0,+1, 0,0,+1, 0,0,+1,
                               0,-1,0, 0,-1,0, 0,+1,0, 0,+1,0,
                               0,-1,0, 0,-1,0, 0,+1,0, 0,+1,0,
         init();
     }
     pthread_mutex_unlock(&_bufferWriteLock);
+    if (wasInitialized) {
+        forceRedrawEntireTree();
+    }
 }
         init();
     }
     pthread_mutex_unlock(&_bufferWriteLock);
+    if (wasInitialized) {
+        forceRedrawEntireTree();
+    }
 }
 void VoxelSystem::setUseVoxelShader(bool useVoxelShader) {
     pthread_mutex_lock(&_bufferWriteLock);
     bool wasInitialized = _initialized;
     if (wasInitialized) {
+        clearAllNodesBufferIndex();
         cleanupVoxelMemory();
     }
     _useVoxelShader = useVoxelShader;
         init();
     }
     pthread_mutex_unlock(&_bufferWriteLock);
+    if (wasInitialized) {
+        forceRedrawEntireTree();
+    }
 }
 void VoxelSystem::cleanupVoxelMemory() {
             // populate the normalsArray
             for (int n = 0; n < _maxVoxels; n++) {
                 for (int i = 0; i < VERTEX_POINTS_PER_VOXEL; i++) {
-                    *(normalsArrayEndPointer++) = identityNormals[i];
+                    *(normalsArrayEndPointer++) = (identityNormals[i] * CHAR_MAX);
                 }
             }
                                      float voxelScale, const nodeColor& color) {
     if (_useVoxelShader) {
-        VoxelShaderVBOData* writeVerticesAt = &_writeVoxelShaderData[nodeIndex];
+        if (_writeVoxelShaderData) {
-        writeVerticesAt->x = startVertex.x * TREE_SCALE;
+            VoxelShaderVBOData* writeVerticesAt = &_writeVoxelShaderData[nodeIndex];
-        writeVerticesAt->y = startVertex.y * TREE_SCALE;
+            writeVerticesAt->x = startVertex.x * TREE_SCALE;
-        writeVerticesAt->z = startVertex.z * TREE_SCALE;
+            writeVerticesAt->y = startVertex.y * TREE_SCALE;
-        writeVerticesAt->s = voxelScale * TREE_SCALE;
+            writeVerticesAt->z = startVertex.z * TREE_SCALE;
-        writeVerticesAt->r = color[RED_INDEX];
+            writeVerticesAt->s = voxelScale * TREE_SCALE;
-        writeVerticesAt->g = color[GREEN_INDEX];
+            writeVerticesAt->r = color[RED_INDEX];
-        writeVerticesAt->b = color[BLUE_INDEX];
+            writeVerticesAt->g = color[GREEN_INDEX];
+            writeVerticesAt->b = color[BLUE_INDEX];
+        }
     } else {
-        for (int j = 0; j < VERTEX_POINTS_PER_VOXEL; j++ ) {
+        if (_writeVerticesArray && _writeColorsArray) {
-            GLfloat* writeVerticesAt = _writeVerticesArray + (nodeIndex * VERTEX_POINTS_PER_VOXEL);
+            for (int j = 0; j < VERTEX_POINTS_PER_VOXEL; j++ ) {
-            GLubyte* writeColorsAt   = _writeColorsArray   + (nodeIndex * VERTEX_POINTS_PER_VOXEL);
+                GLfloat* writeVerticesAt = _writeVerticesArray + (nodeIndex * VERTEX_POINTS_PER_VOXEL);
-            *(writeVerticesAt+j) = startVertex[j % 3] + (identityVertices[j] * voxelScale);
+                GLubyte* writeColorsAt   = _writeColorsArray   + (nodeIndex * VERTEX_POINTS_PER_VOXEL);
-            *(writeColorsAt  +j) = color[j % 3];
+                *(writeVerticesAt+j) = startVertex[j % 3] + (identityVertices[j] * voxelScale);
+                *(writeColorsAt  +j) = color[j % 3];
+            }
         }
     }
 }
 }
+bool VoxelSystem::clearAllNodesBufferIndexOperation(VoxelNode* node, void* extraData) {
+    _nodeCount++;
+    node->setBufferIndex(GLBUFFER_INDEX_UNKNOWN);
+    return true;
+}
+void VoxelSystem::clearAllNodesBufferIndex() {
+    _nodeCount = 0;
+    _tree->recurseTreeWithOperation(clearAllNodesBufferIndexOperation);
+    qDebug("clearing buffer index of %d nodes\n", _nodeCount);
+    _tree->setDirtyBit();
+    setupNewVoxelsForDrawing();
+}
+bool VoxelSystem::forceRedrawEntireTreeOperation(VoxelNode* node, void* extraData) {
+    _nodeCount++;
+    node->setDirtyBit();
+    return true;
+}
+void VoxelSystem::forceRedrawEntireTree() {
+    _nodeCount = 0;
+    _tree->recurseTreeWithOperation(forceRedrawEntireTreeOperation);
+    qDebug("forcing redraw of %d nodes\n", _nodeCount);
+    _tree->setDirtyBit();
+    setupNewVoxelsForDrawing();
+}
 bool VoxelSystem::randomColorOperation(VoxelNode* node, void* extraData) {
     _nodeCount++;
     if (node->isColored()) {

fix byte normals, fix crashes in switching between voxel shader and normal mode

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code