From 2c72037e81872d61e055218aadb5773b908d5f2b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 8 Jul 2016 18:35:50 -0700
Subject: [PATCH] Fixing warnings

---
 interface/src/ui/overlays/Circle3DOverlay.cpp | 16 +++++++++-------
 interface/src/ui/overlays/Circle3DOverlay.h   |  4 ++--
 libraries/render-utils/src/GeometryCache.cpp  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index 22995cbc35..6ebfd5c71c 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -14,10 +14,12 @@
 #include <GeometryCache.h>
 #include <RegisteredMetaTypes.h>
 
-
 QString const Circle3DOverlay::TYPE = "circle3d";
 
-Circle3DOverlay::Circle3DOverlay() { }
+Circle3DOverlay::Circle3DOverlay() {
+    memset(&_minorTickMarksColor, 0, sizeof(_minorTickMarksColor));
+    memset(&_majorTickMarksColor, 0, sizeof(_majorTickMarksColor));
+}
 
 Circle3DOverlay::Circle3DOverlay(const Circle3DOverlay* circle3DOverlay) :
     Planar3DOverlay(circle3DOverlay),
@@ -84,10 +86,10 @@ void Circle3DOverlay::render(RenderArgs* args) {
 
             float pulseLevel = updatePulse();
             vec4 pulseModifier = vec4(1);
-            if (_alphaPulse != 0.0) {
+            if (_alphaPulse != 0.0f) {
                 pulseModifier.a = (_alphaPulse >= 0.0f) ? pulseLevel : (1.0f - pulseLevel);
             }
-            if (_colorPulse != 0.0) {
+            if (_colorPulse != 0.0f) {
                 float pulseValue = (_colorPulse >= 0.0f) ? pulseLevel : (1.0f - pulseLevel);
                 pulseModifier = vec4(vec3(pulseValue), pulseModifier.a);
             }
@@ -103,7 +105,7 @@ void Circle3DOverlay::render(RenderArgs* args) {
                 for (float angle = _startAt; angle <= _endAt; angle += SLICE_ANGLE) {
                     float range = (angle - _startAt) / (_endAt - _startAt);
                     float angleRadians = glm::radians(angle);
-                    points << glm::vec2(cos(angleRadians) * _outerRadius, sin(angleRadians) * _outerRadius);
+                    points << glm::vec2(cosf(angleRadians) * _outerRadius, sinf(angleRadians) * _outerRadius);
                     colors << glm::mix(outerStartColor, outerEndColor, range);
                 }
             } else {
@@ -112,10 +114,10 @@ void Circle3DOverlay::render(RenderArgs* args) {
                     float range = (angle - _startAt) / (_endAt - _startAt);
 
                     float angleRadians = glm::radians(angle);
-                    points << glm::vec2(cos(angleRadians) * _innerRadius, sin(angleRadians) * _innerRadius);
+                    points << glm::vec2(cosf(angleRadians) * _innerRadius, sinf(angleRadians) * _innerRadius);
                     colors << glm::mix(innerStartColor, innerEndColor, range);
 
-                    points << glm::vec2(cos(angleRadians) * _outerRadius, sin(angleRadians) * _outerRadius);
+                    points << glm::vec2(cosf(angleRadians) * _outerRadius, sinf(angleRadians) * _outerRadius);
                     colors << glm::mix(outerStartColor, outerEndColor, range);
                 }
             }
diff --git a/interface/src/ui/overlays/Circle3DOverlay.h b/interface/src/ui/overlays/Circle3DOverlay.h
index 39f1ade7e9..82c7c47dc7 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.h
+++ b/interface/src/ui/overlays/Circle3DOverlay.h
@@ -78,8 +78,8 @@ protected:
     float _minorTickMarksAngle { 0 };
     float _majorTickMarksLength { 0 };
     float _minorTickMarksLength { 0 };
-    xColor _majorTickMarksColor {};
-    xColor _minorTickMarksColor {};
+    xColor _majorTickMarksColor;
+    xColor _minorTickMarksColor;
     gpu::Primitive _solidPrimitive { gpu::TRIANGLE_FAN };
     int _quadVerticesID { 0 };
     int _lineVerticesID { 0 };
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 8be1c478be..4558b68af9 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -478,7 +478,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con
     const glm::vec3 NORMAL(0.0f, 0.0f, 1.0f);
     auto pointCount = points.size();
     auto colorCount = colors.size();
-    int compactColor;
+    int compactColor = 0;
     for (auto i = 0; i < pointCount; ++i) {
         const auto& point = points[i];
         *(vertex++) = point.x;