Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-16 06:16:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed Mac and Ubuntu warnings

Browse source
This commit is contained in:
Olivier Prat 2017-10-23 15:46:11 +02:00
parent 43f9db5b70
commit 7011fd3731
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp
View file

@ -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();
}

24
libraries/shared/src/ViewFrustum.cpp
View file

@ -590,18 +590,18 @@ bool ViewFrustum::getProjectedRect(const AABox& box, glm::vec2& bottomLeft, glm:
std::array<glm::vec3, MAX_VERTEX_COUNT> vertices;
std::array<Edge, EDGE_COUNT> 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<float, VERTEX_COUNT> distancesToNearPlane;
std::bitset<MAX_VERTEX_COUNT> areVerticesInside;

2
scripts/developer/utilities/render/debugOutline.js
View file

@ -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) {