From c17c9f181880b33553201ae1ad9c3c287c11321b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 12 Jul 2015 10:29:43 -0700 Subject: [PATCH 1/4] quiet compiler --- interface/src/ui/overlays/Rectangle3DOverlay.cpp | 5 ++--- libraries/gpu/src/gpu/GLBackend.cpp | 2 +- .../render-utils/src/DeferredLightingEffect.cpp | 9 +++++---- libraries/render/src/render/Scene.cpp | 2 +- libraries/shared/src/PropertyFlags.h | 2 +- tests/entities/src/main.cpp | 14 ++++++++++---- 6 files changed, 20 insertions(+), 14 deletions(-) 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(); From f011d5c7f766616b731c73e080f1d960e34d1e58 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 12 Jul 2015 20:42:17 -0700 Subject: [PATCH 2/4] remove commented code --- tests/entities/src/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp index 66daeb2607..6aa021d1b2 100644 --- a/tests/entities/src/main.cpp +++ b/tests/entities/src/main.cpp @@ -108,7 +108,6 @@ void testPropertyFlags(uint32_t value) { original.setHasProperty((EntityPropertyList)i); } QByteArray encoded = original.encode(); - // auto originalSize = encoded.size(); for (size_t i = 0; i < enumSize; ++i) { encoded.append(qrand()); } From 5aca0c28ef15e7b6c7faf294cafa73659204e56a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 13 Jul 2015 07:37:59 -0700 Subject: [PATCH 3/4] quiet compiler --- libraries/entities/src/EntityItem.cpp | 24 ++++++++++++------------ libraries/gpu/src/gpu/GLBackend.cpp | 1 - tests/entities/src/main.cpp | 7 +++++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 794d0752a1..592382286a 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -385,7 +385,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef dataAt += encodedID.size(); bytesRead += encodedID.size(); Q_ASSERT(id == _id); - Q_ASSERT(parser.offset() == bytesRead); + Q_ASSERT(parser.offset() == (unsigned int) bytesRead); } #endif @@ -400,8 +400,8 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef quint32 type = typeCoder; EntityTypes::EntityType oldType = (EntityTypes::EntityType)type; Q_ASSERT(oldType == _type); - Q_ASSERT(parser.offset() == bytesRead); -#endif + Q_ASSERT(parser.offset() == (unsigned int) bytesRead); +#endif bool overwriteLocalData = true; // assume the new content overwrites our local data quint64 now = usecTimestampNow(); @@ -417,9 +417,9 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef dataAt += sizeof(createdFromBuffer2); bytesRead += sizeof(createdFromBuffer2); Q_ASSERT(createdFromBuffer2 == createdFromBuffer); - Q_ASSERT(parser.offset() == bytesRead); + Q_ASSERT(parser.offset() == (unsigned int) bytesRead); } -#endif +#endif if (_created == UNKNOWN_CREATED_TIME) { // we don't yet have a _created timestamp, so we accept this one createdFromBuffer -= clockSkew; @@ -458,9 +458,9 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef dataAt += sizeof(lastEditedFromBuffer2); bytesRead += sizeof(lastEditedFromBuffer2); Q_ASSERT(lastEditedFromBuffer2 == lastEditedFromBuffer); - Q_ASSERT(parser.offset() == bytesRead); + Q_ASSERT(parser.offset() == (unsigned int) bytesRead); } -#endif +#endif quint64 lastEditedFromBufferAdjusted = lastEditedFromBuffer - clockSkew; if (lastEditedFromBufferAdjusted > now) { lastEditedFromBufferAdjusted = now; @@ -534,10 +534,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef encodedUpdateDelta = updateDeltaCoder; // determine true length dataAt += encodedUpdateDelta.size(); bytesRead += encodedUpdateDelta.size(); - Q_ASSERT(parser.offset() == bytesRead); + Q_ASSERT(parser.offset() == (unsigned int) bytesRead); } -#endif - +#endif + if (overwriteLocalData) { _lastUpdated = lastEditedFromBufferAdjusted + updateDelta; // don't adjust for clock skew since we already did that #ifdef WANT_DEBUG @@ -562,7 +562,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef encodedSimulatedDelta = simulatedDeltaCoder; // determine true length dataAt += encodedSimulatedDelta.size(); bytesRead += encodedSimulatedDelta.size(); - Q_ASSERT(parser.offset() == bytesRead); + Q_ASSERT(parser.offset() == (unsigned int) bytesRead); } #endif @@ -599,7 +599,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef dataAt += propertyFlags.getEncodedLength(); bytesRead += propertyFlags.getEncodedLength(); Q_ASSERT(propertyFlags2 == propertyFlags); - Q_ASSERT(parser.offset() == bytesRead); + Q_ASSERT(parser.offset() == (unsigned int)bytesRead); } #endif diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp index a412c15514..55aaa12e4e 100644 --- a/libraries/gpu/src/gpu/GLBackend.cpp +++ b/libraries/gpu/src/gpu/GLBackend.cpp @@ -204,7 +204,6 @@ void GLBackend::do_drawInstanced(Batch& batch, uint32 paramOffset) { GLenum mode = _primitiveToGLmode[primitiveType]; uint32 numVertices = batch._params[paramOffset + 2]._uint; uint32 startVertex = batch._params[paramOffset + 1]._uint; - uint32 startInstance = batch._params[paramOffset + 0]._uint; glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances); (void) CHECK_GL_ERROR(); diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp index 6aa021d1b2..72dbf77dfa 100644 --- a/tests/entities/src/main.cpp +++ b/tests/entities/src/main.cpp @@ -85,7 +85,7 @@ void testByteCountCodedStable(const T& value) { #ifndef QT_NO_DEBUG auto consumed = decoder.decode(encoded.data(), encoded.size()); #endif - Q_ASSERT(consumed == originalEncodedSize); + Q_ASSERT(consumed == (unsigned int)originalEncodedSize); } @@ -108,6 +108,9 @@ void testPropertyFlags(uint32_t value) { original.setHasProperty((EntityPropertyList)i); } QByteArray encoded = original.encode(); + #ifndef QT_NO_DEBUG + auto originalSize = encoded.size(); + #endif for (size_t i = 0; i < enumSize; ++i) { encoded.append(qrand()); } @@ -123,7 +126,7 @@ void testPropertyFlags(uint32_t value) { auto decodeSize = decodeNew.decode((const uint8_t*)encoded.data(), encoded.size()); #endif Q_ASSERT(originalSize == decodeSize); - Q_ASSERT(decodeNew == original); + Q_ASSERT(decodeNew == (unsigned int) original); } } From 7a6cf40b546753ddaa1b54ae65b0f1464549fe24 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 13 Jul 2015 07:39:11 -0700 Subject: [PATCH 4/4] quiet compiler --- tests/entities/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp index 72dbf77dfa..a255ffa995 100644 --- a/tests/entities/src/main.cpp +++ b/tests/entities/src/main.cpp @@ -126,7 +126,7 @@ void testPropertyFlags(uint32_t value) { auto decodeSize = decodeNew.decode((const uint8_t*)encoded.data(), encoded.size()); #endif Q_ASSERT(originalSize == decodeSize); - Q_ASSERT(decodeNew == (unsigned int) original); + Q_ASSERT(decodeNew == original); } }