Merge pull request #5151 from ZappoMan/fixWarnings

fix some warnings

interface/src/devices/OculusManager.cpp

@@ -164,6 +164,7 @@ void OculusManager::connect() {
         int configResult = ovrHmd_ConfigureRendering(_ovrHmd, &cfg.Config,
             distortionCaps, _eyeFov, _eyeRenderDesc);
         assert(configResult);
+        (void)configResult; // quiet warning
 
 
         _recommendedTexSize = ovrHmd_GetFovTextureSize(_ovrHmd, ovrEye_Left, _eyeFov[ovrEye_Left], 1.0f);

libraries/entities/src/DeleteEntityOperator.cpp

@@ -95,6 +95,7 @@ bool DeleteEntityOperator::preRecursion(OctreeElement* element) {
                 EntityItemPointer theEntity = details.entity;
                 bool entityDeleted = entityTreeElement->removeEntityItem(theEntity); // remove it from the element
                 assert(entityDeleted);
+                (void)entityDeleted; // quite warning
                 _tree->setContainingElement(details.entity->getEntityItemID(), NULL); // update or id to element lookup
                 _foundCount++;
             }

libraries/physics/src/MeshMassProperties.cpp

@@ -270,7 +270,9 @@ void MeshMassProperties::computeMassProperties(const VectorOfPoints& points, con
     }
 
     // create some variables to hold temporary results
+    #ifdef DEBUG
     uint32_t numPoints = points.size();
+    #endif
     const btVector3 p0(0.0f, 0.0f, 0.0f);
     btMatrix3x3 tetraInertia;
     btMatrix3x3 doubleDebugInertia;

libraries/render-utils/src/TextRenderer3D.cpp

@@ -451,7 +451,6 @@ TextRenderer3D::TextRenderer3D(const char* family, float pointSize, int weight,
                            EffectType effect, int effectThickness, const QColor& color) :
     _effectType(effect),
     _effectThickness(effectThickness),
-    _pointSize(pointSize),
     _color(toGlm(color)),
     _font(loadFont3D(family)) {
     if (!_font) {

libraries/render-utils/src/TextRenderer3D.h

@@ -65,8 +65,6 @@ private:
     // the thickness of the effect
     const int _effectThickness;
 
-    const float _pointSize;
-
     // text color
     const glm::vec4 _color;
 

libraries/shared/src/MatrixStack.h

@@ -118,7 +118,9 @@ public:
 
   template <typename Function>
   void withPush(Function f) {
+    #ifdef DEBUG
     size_t startingDepth = size();
+    #endif
     push();
     f();
     pop();

libraries/shared/src/PhysicsCollisionGroups.h

@@ -55,7 +55,7 @@ const int16_t COLLISION_GROUP_COLLISIONLESS = 1 << 15;
 const int16_t COLLISION_MASK_DEFAULT = ~ COLLISION_GROUP_COLLISIONLESS;
 
 // STATIC also doesn't collide with other STATIC
-const int16_t COLLISION_MASK_STATIC = ~ (COLLISION_GROUP_COLLISIONLESS | COLLISION_MASK_STATIC);
+const int16_t COLLISION_MASK_STATIC = ~ (COLLISION_GROUP_COLLISIONLESS | COLLISION_GROUP_STATIC);
 
 const int16_t COLLISION_MASK_KINEMATIC = COLLISION_MASK_DEFAULT;
 

libraries/ui/src/VrMenu.cpp

@@ -135,8 +135,8 @@ void VrMenu::setRootMenu(QObject* rootMenu) {
 
 void VrMenu::addMenu(QMenu* menu) {
     Q_ASSERT(!MenuUserData::forObject(menu));
-    QObject * parent = menu->parent();
+    QObject* parent = menu->parent();
-    QObject * qmlParent;
+    QObject* qmlParent = nullptr;
     if (dynamic_cast<QMenu*>(parent)) {
         MenuUserData* userData = MenuUserData::forObject(parent);
         qmlParent = findMenuObject(userData->uuid.toString());

tools/vhacd-util/src/VHACDUtilApp.cpp

@@ -322,6 +322,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
                 QString outputFileName = baseFileName + "-" + QString::number(count) + ".obj";
                 writeOBJ(outputFileName, fbx, outputCentimeters, count);
                 count++;
+                (void)meshPart; // quiet warning
             }
         }
     }