From 7011fd3731ef9bf10217deac219604bf1d2314f6 Mon Sep 17 00:00:00 2001 From: Olivier Prat Date: Mon, 23 Oct 2017 15:46:11 +0200 Subject: [PATCH] Removed Mac and Ubuntu warnings --- libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp | 2 ++ libraries/shared/src/ViewFrustum.cpp | 24 +++++++++---------- .../utilities/render/debugOutline.js | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp b/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp index 27319e1696..528a2b524b 100644 --- a/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp +++ b/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp @@ -501,6 +501,7 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E break; } case gpu::COMPRESSED: + case gpu::NUINT2: case gpu::NUM_TYPES: { // quiet compiler Q_UNREACHABLE(); } @@ -551,6 +552,7 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E break; } case gpu::COMPRESSED: + case gpu::NUINT2: case gpu::NUM_TYPES: { // quiet compiler Q_UNREACHABLE(); } diff --git a/libraries/shared/src/ViewFrustum.cpp b/libraries/shared/src/ViewFrustum.cpp index 747b39f79e..f3eb165c51 100644 --- a/libraries/shared/src/ViewFrustum.cpp +++ b/libraries/shared/src/ViewFrustum.cpp @@ -590,18 +590,18 @@ bool ViewFrustum::getProjectedRect(const AABox& box, glm::vec2& bottomLeft, glm: std::array vertices; std::array boxEdges{ - Edge(BOTTOM_LEFT_NEAR, BOTTOM_RIGHT_NEAR), - Edge(TOP_LEFT_NEAR, TOP_RIGHT_NEAR), - Edge(BOTTOM_LEFT_FAR, BOTTOM_RIGHT_FAR), - Edge(TOP_LEFT_FAR, TOP_RIGHT_FAR), - Edge(BOTTOM_LEFT_NEAR, TOP_LEFT_NEAR), - Edge(BOTTOM_LEFT_FAR, TOP_LEFT_FAR), - Edge(BOTTOM_RIGHT_NEAR, TOP_RIGHT_NEAR), - Edge(BOTTOM_RIGHT_FAR, TOP_RIGHT_FAR), - Edge(BOTTOM_LEFT_NEAR, BOTTOM_LEFT_FAR), - Edge(TOP_LEFT_NEAR, TOP_LEFT_FAR), - Edge(BOTTOM_RIGHT_NEAR, BOTTOM_RIGHT_FAR), - Edge(TOP_RIGHT_NEAR, TOP_RIGHT_FAR) + Edge{BOTTOM_LEFT_NEAR, BOTTOM_RIGHT_NEAR}, + Edge{TOP_LEFT_NEAR, TOP_RIGHT_NEAR}, + Edge{BOTTOM_LEFT_FAR, BOTTOM_RIGHT_FAR}, + Edge{TOP_LEFT_FAR, TOP_RIGHT_FAR}, + Edge{BOTTOM_LEFT_NEAR, TOP_LEFT_NEAR}, + Edge{BOTTOM_LEFT_FAR, TOP_LEFT_FAR}, + Edge{BOTTOM_RIGHT_NEAR, TOP_RIGHT_NEAR}, + Edge{BOTTOM_RIGHT_FAR, TOP_RIGHT_FAR}, + Edge{BOTTOM_LEFT_NEAR, BOTTOM_LEFT_FAR}, + Edge{TOP_LEFT_NEAR, TOP_LEFT_FAR}, + Edge{BOTTOM_RIGHT_NEAR, BOTTOM_RIGHT_FAR}, + Edge{TOP_RIGHT_NEAR, TOP_RIGHT_FAR} }; std::array distancesToNearPlane; std::bitset areVerticesInside; diff --git a/scripts/developer/utilities/render/debugOutline.js b/scripts/developer/utilities/render/debugOutline.js index 72585e07fb..ce32d61e1b 100644 --- a/scripts/developer/utilities/render/debugOutline.js +++ b/scripts/developer/utilities/render/debugOutline.js @@ -143,7 +143,7 @@ function update(deltaTime) { selectedID = prevID selectedType = prevType Selection.addToSelectedItemsList(selectionName, selectedType, selectedID) - //print("OUTLINE " + outlineGroupIndex + " picked type: " + result.type + ", id: " + result.objectID); + print("OUTLINE " + outlineGroupIndex + " picked type: " + result.type + ", id: " + result.objectID); } } else { if (prevID != 0 && !isSelectionAddEnabled) {