diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.cpp b/interface/src/ui/overlays/Rectangle3DOverlay.cpp index ddab8040b1..dfe5a3ad74 100644 --- a/interface/src/ui/overlays/Rectangle3DOverlay.cpp +++ b/interface/src/ui/overlays/Rectangle3DOverlay.cpp @@ -35,14 +35,13 @@ void Rectangle3DOverlay::render(RenderArgs* args) { if (!_visible) { return; // do nothing if we're not visible } - + float alpha = getAlpha(); xColor color = getColor(); const float MAX_COLOR = 255.0f; glm::vec4 rectangleColor(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha); glm::vec3 position = getPosition(); - glm::vec3 center = getCenter(); glm::vec2 dimensions = getDimensions(); glm::vec2 halfDimensions = dimensions * 0.5f; glm::quat rotation = getRotation(); @@ -67,7 +66,7 @@ void Rectangle3DOverlay::render(RenderArgs* args) { glm::vec3 point2(halfDimensions.x, -halfDimensions.y, 0.0f); glm::vec3 point3(halfDimensions.x, halfDimensions.y, 0.0f); glm::vec3 point4(-halfDimensions.x, halfDimensions.y, 0.0f); - + geometryCache->renderDashedLine(*batch, point1, point2, rectangleColor); geometryCache->renderDashedLine(*batch, point2, point3, rectangleColor); geometryCache->renderDashedLine(*batch, point3, point4, rectangleColor); diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp index d493978b88..a412c15514 100644 --- a/libraries/gpu/src/gpu/GLBackend.cpp +++ b/libraries/gpu/src/gpu/GLBackend.cpp @@ -238,7 +238,7 @@ void GLBackend::do_clearFramebuffer(Batch& batch, uint32 paramOffset) { std::vector drawBuffers; if (masks & Framebuffer::BUFFER_COLORS) { - for (int i = 0; i < Framebuffer::MAX_NUM_RENDER_BUFFERS; i++) { + for (unsigned int i = 0; i < Framebuffer::MAX_NUM_RENDER_BUFFERS; i++) { if (masks & (1 << i)) { drawBuffers.push_back(GL_COLOR_ATTACHMENT0 + i); } diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 9bda5b8048..d46aa4d8d4 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -474,17 +474,18 @@ void DeferredLightingEffect::render(RenderArgs* args) { // IN DEBUG: light->setShowContour(true); batch.setUniformBuffer(_spotLightLocations.lightBufferUnit, light->getSchemaBuffer()); - + auto eyeLightPos = eyePoint - light->getPosition(); auto eyeHalfPlaneDistance = glm::dot(eyeLightPos, light->getDirection()); - + const float TANGENT_LENGTH_SCALE = 0.666f; - glm::vec4 coneParam(light->getSpotAngleCosSin(), TANGENT_LENGTH_SCALE * tan(0.5 * light->getSpotAngle()), 1.0f); + glm::vec4 coneParam(light->getSpotAngleCosSin(), TANGENT_LENGTH_SCALE * tanf(0.5f * light->getSpotAngle()), 1.0f); float expandedRadius = light->getMaximumRadius() * (1.0f + SCALE_EXPANSION); // TODO: We shouldn;t have to do that test and use a different volume geometry for when inside the vlight volume, // we should be able to draw thre same geometry use DepthClamp but for unknown reason it's s not working... - if ((eyeHalfPlaneDistance > -nearRadius) && (glm::distance(eyePoint, glm::vec3(light->getPosition())) < expandedRadius + nearRadius)) { + if ((eyeHalfPlaneDistance > -nearRadius) && + (glm::distance(eyePoint, glm::vec3(light->getPosition())) < expandedRadius + nearRadius)) { coneParam.w = 0.0f; batch._glUniform4fv(_spotLightLocations.coneParam, 1, reinterpret_cast< const GLfloat* >(&coneParam)); diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp index 268f2b6841..1b52145a1c 100644 --- a/libraries/render/src/render/Scene.cpp +++ b/libraries/render/src/render/Scene.cpp @@ -76,7 +76,7 @@ void Item::Status::Value::setColor(float hue) { } void Item::Status::getPackedValues(glm::ivec4& values) const { - for (unsigned int i = 0; i < values.length(); i++) { + for (unsigned int i = 0; i < (unsigned int)values.length(); i++) { if (i < _values.size()) { values[i] = _values[i]().getPackedData(); } else { diff --git a/libraries/shared/src/PropertyFlags.h b/libraries/shared/src/PropertyFlags.h index b0ac9e76d8..0be7b3af93 100644 --- a/libraries/shared/src/PropertyFlags.h +++ b/libraries/shared/src/PropertyFlags.h @@ -208,7 +208,7 @@ inline size_t PropertyFlags::decode(const uint8_t* data, size_t size) { int bitAt = 0; int expectedBitCount; // unknown at this point int lastValueBit; - for (int byte = 0; byte < size; byte++) { + for (unsigned int byte = 0; byte < size; byte++) { char originalByte = data[byte]; bytesConsumed++; unsigned char maskBit = 0x80; // LEFT MOST BIT set diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp index 8d16d98103..66daeb2607 100644 --- a/tests/entities/src/main.cpp +++ b/tests/entities/src/main.cpp @@ -73,14 +73,18 @@ template void testByteCountCodedStable(const T& value) { ByteCountCoded coder((T)value); auto encoded = coder.encode(); + #ifndef QT_NO_DEBUG auto originalEncodedSize = encoded.size(); + #endif for (int i = 0; i < 10; ++i) { encoded.append(qrand()); } ByteCountCoded decoder; decoder.decode(encoded); Q_ASSERT(decoder.data == coder.data); + #ifndef QT_NO_DEBUG auto consumed = decoder.decode(encoded.data(), encoded.size()); + #endif Q_ASSERT(consumed == originalEncodedSize); } @@ -100,12 +104,12 @@ void testPropertyFlags(uint32_t value) { EntityPropertyFlags original; original.clear(); auto enumSize = sizeof(EntityPropertyList); - for (size_t i = 0; i < sizeof(EntityPropertyList) * 8; ++i) { + for (size_t i = 0; i < enumSize * 8; ++i) { original.setHasProperty((EntityPropertyList)i); } QByteArray encoded = original.encode(); - auto originalSize = encoded.size(); - for (size_t i = 0; i < sizeof(EntityPropertyList); ++i) { + // auto originalSize = encoded.size(); + for (size_t i = 0; i < enumSize; ++i) { encoded.append(qrand()); } @@ -116,7 +120,9 @@ void testPropertyFlags(uint32_t value) { } { + #ifndef QT_NO_DEBUG auto decodeSize = decodeNew.decode((const uint8_t*)encoded.data(), encoded.size()); + #endif Q_ASSERT(originalSize == decodeSize); Q_ASSERT(decodeNew == original); } @@ -129,7 +135,7 @@ void testPropertyFlags() { testPropertyFlags(0xFFFF); } -int main(int argc, char** argv) { +int main(int argc, char** argv) { QCoreApplication app(argc, argv); { auto start = usecTimestampNow();