Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3076 from ey6es/master

Browse source 
Fixes for uninitialized variable warnings, disabled strict aliasing to allow safe type punning (and avoid warnings).
This commit is contained in:
Clément Brisset 2014-06-25 18:18:58 -07:00
commit e7d3e244fb
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -13,7 +13,7 @@ if (WIN32)
elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas") #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
endif(WIN32) endif(WIN32)
if (NOT QT_CMAKE_PREFIX_PATH) if (NOT QT_CMAKE_PREFIX_PATH)

2
interface/src/ui/MetavoxelEditor.cpp
View file

@ -771,7 +771,7 @@ int VoxelizationVisitor::visit(MetavoxelInfo& info) {
} }
return DEFAULT_ORDER; return DEFAULT_ORDER;
} }
QRgb closestColor; QRgb closestColor = QRgb();
float closestDistance = FLT_MAX; float closestDistance = FLT_MAX;
for (unsigned int i = 0; i < sizeof(DIRECTION_ROTATIONS) / sizeof(DIRECTION_ROTATIONS[0]); i++) { for (unsigned int i = 0; i < sizeof(DIRECTION_ROTATIONS) / sizeof(DIRECTION_ROTATIONS[0]); i++) {
glm::vec3 rotated = DIRECTION_ROTATIONS[i] * center; glm::vec3 rotated = DIRECTION_ROTATIONS[i] * center;

4
libraries/metavoxels/src/MetavoxelData.cpp
View file

@ -1094,14 +1094,14 @@ const int ORDER_ELEMENT_MASK = (1 << ORDER_ELEMENT_BITS) - 1;
int MetavoxelVisitor::encodeRandomOrder() { int MetavoxelVisitor::encodeRandomOrder() {
// see http://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_.22inside-out.22_algorithm // see http://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_.22inside-out.22_algorithm
int order; int order = 0;
int randomValues = rand(); int randomValues = rand();
for (int i = 0, iShift = 0; i < MetavoxelNode::CHILD_COUNT; i++, iShift += ORDER_ELEMENT_BITS) { for (int i = 0, iShift = 0; i < MetavoxelNode::CHILD_COUNT; i++, iShift += ORDER_ELEMENT_BITS) {
int j = (randomValues >> iShift) % (i + 1); int j = (randomValues >> iShift) % (i + 1);
int jShift = j * ORDER_ELEMENT_BITS; int jShift = j * ORDER_ELEMENT_BITS;
if (j != i) { if (j != i) {
int jValue = (order >> jShift) & ORDER_ELEMENT_MASK; int jValue = (order >> jShift) & ORDER_ELEMENT_MASK;
order = (order & ~(ORDER_ELEMENT_MASK << iShift)) | (jValue << iShift); order |= (jValue << iShift);
} }
order = (order & ~(ORDER_ELEMENT_MASK << jShift)) | (i << jShift); order = (order & ~(ORDER_ELEMENT_MASK << jShift)) | (i << jShift);
} }