--- polyvox.orig/examples/Basic/glew/glew.cpp +++ polyvox/examples/Basic/glew/glew.cpp @@ -8844,7 +8844,7 @@ GLboolean glxewGetExtension (const char* GLuint len = _glewStrLen((const GLubyte*)name); /* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */ /* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */ - if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; + if (glXGetCurrentDisplay == NULL) return GL_FALSE; p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS); if (0 == p) return GL_FALSE; end = p + _glewStrLen(p); --- polyvox.orig/examples/OpenGL/glew/glew.cpp +++ polyvox/examples/OpenGL/glew/glew.cpp @@ -8844,7 +8844,7 @@ GLboolean glxewGetExtension (const char* GLuint len = _glewStrLen((const GLubyte*)name); /* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */ /* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */ - if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; + if (glXGetCurrentDisplay == NULL) return GL_FALSE; p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS); if (0 == p) return GL_FALSE; end = p + _glewStrLen(p); --- polyvox.orig/examples/Paging/glew/glew.cpp +++ polyvox/examples/Paging/glew/glew.cpp @@ -8844,7 +8844,7 @@ GLboolean glxewGetExtension (const char* GLuint len = _glewStrLen((const GLubyte*)name); /* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */ /* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */ - if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; + if (glXGetCurrentDisplay == NULL) return GL_FALSE; p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS); if (0 == p) return GL_FALSE; end = p + _glewStrLen(p); --- polyvox.orig/examples/SmoothLOD/glew/glew.cpp +++ polyvox/examples/SmoothLOD/glew/glew.cpp @@ -8844,7 +8844,7 @@ GLboolean glxewGetExtension (const char* GLuint len = _glewStrLen((const GLubyte*)name); /* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */ /* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */ - if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; + if (glXGetCurrentDisplay == NULL) return GL_FALSE; p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS); if (0 == p) return GL_FALSE; end = p + _glewStrLen(p); --- polyvox.orig/examples/Paging/main.cpp +++ polyvox/examples/Paging/main.cpp @@ -240,6 +240,7 @@ void load(const ConstVolumeProxy& vol, const PolyVox::Region& reg) { + (void) vol; std::cout << "warning unloading region: " << reg.getLowerCorner() << " -> " << reg.getUpperCorner() << std::endl; } --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl @@ -33,8 +33,8 @@ namespace PolyVox CubicSurfaceExtractorWithNormals::CubicSurfaceExtractorWithNormals(VolumeType* volData, Region region, SurfaceMesh* result) :m_volData(volData) ,m_sampVolume(volData) - ,m_regSizeInVoxels(region) ,m_meshCurrent(result) + ,m_regSizeInVoxels(region) { m_meshCurrent->clear(); } --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl @@ -391,7 +391,7 @@ namespace PolyVox } // load a block numblocks--; - Block* block = getUncompressedBlock(x,y,z); + //TODO? Block* block = getUncompressedBlock(x,y,z); } // for z } // for y } // for x --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl @@ -33,9 +33,9 @@ namespace PolyVox { template SimpleVolume::Block::Block(uint16_t uSideLength) - :m_uSideLength(0) + :m_tUncompressedData(0) + ,m_uSideLength(0) ,m_uSideLengthPower(0) - ,m_tUncompressedData(0) { if(uSideLength != 0) { --- polyvox.orig/examples/Paging/Perlin.cpp +++ polyvox/examples/Paging/Perlin.cpp @@ -211,7 +211,6 @@ void Perlin::init(void) float Perlin::perlin_noise_2D(float vec[2]) { int terms = mOctaves; - float freq = mFrequency; float result = 0.0f; float amp = mAmplitude; @@ -233,7 +232,6 @@ float Perlin::perlin_noise_2D(float vec[ float Perlin::perlin_noise_3D(float vec[3]) { int terms = mOctaves; - float freq = mFrequency; float result = 0.0f; float amp = mAmplitude; --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/Vector.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/Vector.inl @@ -165,7 +165,7 @@ namespace PolyVox template inline bool Vector::operator<(const Vector &rhs) const throw() { - for(int ct = 0; ct < Size; ++ct) + for(uint32_t ct = 0; ct < Size; ++ct) { if (m_tElements[ct] < rhs.m_tElements[ct]) return true; --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h @@ -77,10 +77,10 @@ namespace PolyVox ,start(v3dStart) ,end(v3dEnd) ,result(listResult) - ,hBias(fHBias) ,connectivity(connectivity) - ,isVoxelValidForPath(funcIsVoxelValidForPath) + ,hBias(fHBias) ,maxNumberOfNodes(uMaxNoOfNodes) + ,isVoxelValidForPath(funcIsVoxelValidForPath) ,progressCallback(funcProgressCallback) { } --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl @@ -121,6 +121,7 @@ namespace PolyVox template uint32_t MeshDecimator::performDecimationPass(float m_fMinDotProductForCollapse) { + (void)m_fMinDotProductForCollapse; //TODO // Count how many edges we have collapsed uint32_t noOfEdgesCollapsed = 0; @@ -252,6 +253,8 @@ namespace PolyVox template bool MeshDecimator::canCollapseMaterialEdge(uint32_t uSrc, uint32_t uDst) { + (void) uSrc; //TODO + (void) uDst; //TODO return false; } --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl @@ -32,11 +32,11 @@ namespace PolyVox //////////////////////////////////////////////////////////////////////////////// template< template class VolumeType, typename VoxelType> Raycast::Raycast(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirection, RaycastResult& result) - :m_volData(volData) + :m_result(result) + ,m_volData(volData) ,m_sampVolume(volData) ,m_v3dStart(v3dStart) ,m_v3dDirection(v3dDirection) - ,m_result(result) { } --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl @@ -514,6 +514,7 @@ namespace PolyVox const Array2DInt32& m_pCurrentVertexIndicesY, const Array2DInt32& m_pCurrentVertexIndicesZ) { + (void) m_pCurrentVertexIndicesZ; //TODO int32_t indlist[12]; for(int i = 0; i < 12; i++) { --- polyvox.orig/examples/OpenGL/OpenGLWidget.cpp +++ polyvox/examples/OpenGL/OpenGLWidget.cpp @@ -241,6 +241,7 @@ void OpenGLWidget::mouseMoveEvent(QMouse void OpenGLWidget::wheelEvent(QWheelEvent* event) { + Q_UNUSED(event); } void OpenGLWidget::setupProjectionMatrix(void) --- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl +++ polyvox/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl @@ -69,18 +69,15 @@ namespace PolyVox const int iRatioX = m_volInput->getWidth() / m_arrayResult->getDimension(0); const int iRatioY = m_volInput->getHeight() / m_arrayResult->getDimension(1); const int iRatioZ = m_volInput->getDepth() / m_arrayResult->getDimension(2); - const int iRatioMax = (std::max)((std::max)(iRatioX, iRatioY), iRatioZ); const float fRatioX = iRatioX; const float fRatioY = iRatioY; const float fRatioZ = iRatioZ; - const float fRatioMax = iRatioMax; const Vector3DFloat v3dRatio(fRatioX, fRatioY, fRatioZ); const float fHalfRatioX = fRatioX * 0.5f; const float fHalfRatioY = fRatioY * 0.5f; const float fHalfRatioZ = fRatioZ * 0.5f; - const float fHalfRatioMax = fRatioMax * 0.5f; const Vector3DFloat v3dHalfRatio(fHalfRatioX, fHalfRatioY, fHalfRatioZ); const Vector3DFloat v3dOffset(0.5f,0.5f,0.5f);