add support for use of Byte normals

ZappoMan committed 13 years ago

Commit 2487a551 parent 0fbabe95 files · +72 −20Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 5 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 };
-GLfloat identityNormals[] = { 0,0,-1, 0,0,-1, 0,0,-1, 0,0,-1,
+GLbyte 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,
     connect(_tree, SIGNAL(importSize(float,float,float)), SIGNAL(importSize(float,float,float)));
     connect(_tree, SIGNAL(importProgress(int)), SIGNAL(importProgress(int)));
     _useVoxelShader = false;
+    _useByteNormals = false;
     _writeVoxelShaderData = NULL;
     _readVoxelShaderData = NULL;
     VoxelNode::removeDeleteHook(this);
 }
+void VoxelSystem::setUseByteNormals(bool useByteNormals) {
+    pthread_mutex_lock(&_bufferWriteLock);
+    bool wasInitialized = _initialized;
+    if (wasInitialized) {
+        cleanupVoxelMemory();
+    }
+    _useByteNormals = useByteNormals;
+    if (wasInitialized) {
+        init();
+    }
+    pthread_mutex_unlock(&_bufferWriteLock);
+}
 void VoxelSystem::setMaxVoxels(int maxVoxels) {
     pthread_mutex_lock(&_bufferWriteLock);
     bool wasInitialized = _initialized;
 void VoxelSystem::initVoxelMemory() {
     if (_useVoxelShader) {
+        qDebug("Using Voxel Shader...\n");
         GLuint* indicesArray = new GLuint[_maxVoxels];
         // populate the indicesArray
             }
         }
-        GLfloat* normalsArray = new GLfloat[VERTEX_POINTS_PER_VOXEL * _maxVoxels];
+        if (_useByteNormals) {
-        GLfloat* normalsArrayEndPointer = normalsArray;
+            qDebug("Using Byte Normals...\n");
+            GLbyte* normalsArray = new GLbyte[VERTEX_POINTS_PER_VOXEL * _maxVoxels];
+            GLbyte* normalsArrayEndPointer = normalsArray;
-        // populate the normalsArray
+            // populate the normalsArray
-        for (int n = 0; n < _maxVoxels; n++) {
+            for (int n = 0; n < _maxVoxels; n++) {
-            for (int i = 0; i < VERTEX_POINTS_PER_VOXEL; i++) {
+                for (int i = 0; i < VERTEX_POINTS_PER_VOXEL; i++) {
-                *(normalsArrayEndPointer++) = identityNormals[i];
+                    *(normalsArrayEndPointer++) = identityNormals[i];
+                }
+            }
+            // VBO for the normalsArray
+            glGenBuffers(1, &_vboNormalsID);
+            glBindBuffer(GL_ARRAY_BUFFER, _vboNormalsID);
+            glBufferData(GL_ARRAY_BUFFER,
+                         VERTEX_POINTS_PER_VOXEL * sizeof(GLbyte) * _maxVoxels,
+                         normalsArray, GL_STATIC_DRAW);
+            // delete the indices and normals arrays that are no longer needed
+            delete[] normalsArray;
+        } else {
+            qDebug("Using Float Normals...\n");
+            GLfloat* normalsArray = new GLfloat[VERTEX_POINTS_PER_VOXEL * _maxVoxels];
+            GLfloat* normalsArrayEndPointer = normalsArray;
+            // populate the normalsArray
+            for (int n = 0; n < _maxVoxels; n++) {
+                for (int i = 0; i < VERTEX_POINTS_PER_VOXEL; i++) {
+                    *(normalsArrayEndPointer++) = identityNormals[i];
+                }
             }
+            // VBO for the normalsArray
+            glGenBuffers(1, &_vboNormalsID);
+            glBindBuffer(GL_ARRAY_BUFFER, _vboNormalsID);
+            glBufferData(GL_ARRAY_BUFFER,
+                         VERTEX_POINTS_PER_VOXEL * sizeof(GLfloat) * _maxVoxels,
+                         normalsArray, GL_STATIC_DRAW);
+            // delete the indices and normals arrays that are no longer needed
+            delete[] normalsArray;
         }
         glGenBuffers(1, &_vboVerticesID);
         glBindBuffer(GL_ARRAY_BUFFER, _vboVerticesID);
         glBufferData(GL_ARRAY_BUFFER, VERTEX_POINTS_PER_VOXEL * sizeof(GLfloat) * _maxVoxels, NULL, GL_DYNAMIC_DRAW);
-        // VBO for the normalsArray
-        glGenBuffers(1, &_vboNormalsID);
-        glBindBuffer(GL_ARRAY_BUFFER, _vboNormalsID);
-        glBufferData(GL_ARRAY_BUFFER,
-                     VERTEX_POINTS_PER_VOXEL * sizeof(GLfloat) * _maxVoxels,
-                     normalsArray, GL_STATIC_DRAW);
         // VBO for colorsArray
         glGenBuffers(1, &_vboColorsID);
         glBindBuffer(GL_ARRAY_BUFFER, _vboColorsID);
         // delete the indices and normals arrays that are no longer needed
         delete[] indicesArray;
-        delete[] normalsArray;
         // we will track individual dirty sections with these arrays of bools
         glVertexPointer(3, GL_FLOAT, 0, 0);
         glBindBuffer(GL_ARRAY_BUFFER, _vboNormalsID);
-        glNormalPointer(GL_FLOAT, 0, 0);
+        glNormalPointer((_useByteNormals ? GL_BYTE : GL_FLOAT), 0, 0);
         glBindBuffer(GL_ARRAY_BUFFER, _vboColorsID);
         glColorPointer(3, GL_UNSIGNED_BYTE, 0, 0);
 void VoxelSystem::nodeAdded(Node* node) {
     if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
         uint16_t nodeID = node->getNodeID();
-        printf("VoxelSystem... voxel server %u added...\n", nodeID);
+        qDebug("VoxelSystem... voxel server %u added...\n", nodeID);
         _voxelServerCount++;
     }
 }
     if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
         _voxelServerCount--;
         uint16_t nodeID = node->getNodeID();
-        printf("VoxelSystem... voxel server %u removed...\n", nodeID);
+        qDebug("VoxelSystem... voxel server %u removed...\n", nodeID);
         if (_voxelServerCount > 0) {
             // Kill any voxels from the local tree that match this nodeID

add support for use of Byte normals

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code