From 79fdb2e882ab6c60f7564e5e07cd238acc1b3db7 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 11 Dec 2015 11:47:59 -0800 Subject: [PATCH] Fix warnings on windows 64bit --- assignment-client/src/Agent.cpp | 2 +- .../src/audio/AudioMixerClientData.cpp | 2 +- .../octree/OctreeInboundPacketProcessor.cpp | 2 +- interface/src/Application.cpp | 2 +- interface/src/devices/DeviceTracker.cpp | 4 +-- interface/src/devices/Faceshift.cpp | 2 +- interface/src/devices/MotionTracker.cpp | 2 +- interface/src/devices/MotionTracker.h | 2 +- interface/src/ui/Stats.cpp | 16 ++++++------ .../animation/src/AnimBlendLinearMove.cpp | 8 +++--- libraries/animation/src/AnimClip.cpp | 6 ++--- .../animation/src/AnimInverseKinematics.cpp | 12 ++++----- libraries/animation/src/AnimSkeleton.cpp | 6 ++--- libraries/animation/src/AnimSkeleton.h | 2 +- libraries/animation/src/Rig.cpp | 10 +++---- libraries/animation/src/Rig.h | 2 +- .../animation/src/SwingTwistConstraint.cpp | 6 ++--- libraries/audio-client/src/AudioClient.cpp | 4 +-- .../src/RenderableBoxEntityItem.cpp | 2 +- .../RenderableParticleEffectEntityItem.cpp | 2 +- .../src/RenderablePolyVoxEntityItem.cpp | 2 +- .../src/RenderableSphereEntityItem.cpp | 2 +- libraries/entities/src/EntityItem.cpp | 4 +-- .../entities/src/EntityItemProperties.cpp | 2 +- libraries/entities/src/EntityTree.cpp | 4 +-- libraries/environment/src/EnvironmentData.cpp | 4 +-- libraries/environment/src/EnvironmentData.h | 4 +-- libraries/fbx/src/FBXReader.h | 3 +-- libraries/fbx/src/FBXReader_Mesh.cpp | 2 +- libraries/gpu/src/gpu/GLBackendOutput.cpp | 10 +++---- libraries/gpu/src/gpu/GLBackendTexture.cpp | 4 +-- libraries/gpu/src/gpu/Texture.cpp | 2 +- .../src/model-networking/ModelCache.cpp | 4 +-- libraries/model/src/model/Geometry.h | 8 +++--- libraries/networking/src/LimitedNodeList.h | 2 +- libraries/networking/src/PacketSender.cpp | 2 +- libraries/networking/src/PacketSender.h | 2 +- .../networking/src/ReceivedPacketProcessor.h | 2 +- libraries/networking/src/udt/PacketList.cpp | 2 +- libraries/networking/src/udt/PacketList.h | 2 +- libraries/octree/src/JurisdictionMap.cpp | 2 +- libraries/octree/src/JurisdictionMap.h | 2 +- libraries/octree/src/Octree.cpp | 8 +++--- .../octree/src/OctreeEditPacketSender.cpp | 4 +-- libraries/octree/src/OctreePacketData.cpp | 2 +- libraries/octree/src/OctreeSceneStats.cpp | 14 +++++----- .../octree/src/OctreeScriptingInterface.h | 2 +- libraries/physics/src/MeshMassProperties.cpp | 4 +-- .../procedural/src/procedural/Procedural.cpp | 4 +-- libraries/render-utils/src/AnimDebugDraw.cpp | 6 ++--- .../src/DeferredLightingEffect.cpp | 2 +- libraries/render-utils/src/GeometryCache.cpp | 26 +++++++++---------- libraries/render-utils/src/Model.h | 2 +- .../render-utils/src/RenderDeferredTask.cpp | 16 ++++++------ libraries/render/src/render/DrawTask.h | 2 +- libraries/render/src/render/Scene.h | 2 +- libraries/shared/src/BufferParser.h | 2 +- libraries/shared/src/PropertyFlags.h | 4 +-- libraries/shared/src/RenderArgs.h | 4 +-- libraries/shared/src/SharedUtil.cpp | 4 +-- libraries/shared/src/shared/JSONHelpers.cpp | 4 +-- tests/entities/src/main.cpp | 2 +- tests/gpu-test/src/main.cpp | 8 +++--- tests/render-utils/src/main.cpp | 2 +- tests/ui/src/main.cpp | 2 +- tools/scribe/src/TextTemplate.cpp | 4 +-- tools/udt-test/src/UDTTest.cpp | 4 +-- tools/vhacd-util/src/VHACDUtil.cpp | 6 ++--- 68 files changed, 152 insertions(+), 153 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 46fa8c8181..610fab3d35 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -384,7 +384,7 @@ void Agent::processAgentAvatarAndAudio(float deltaTime) { int numAvailableBytes = (soundByteArray.size() - _numAvatarSoundSentBytes) > SCRIPT_AUDIO_BUFFER_BYTES ? SCRIPT_AUDIO_BUFFER_BYTES : soundByteArray.size() - _numAvatarSoundSentBytes; - numAvailableSamples = numAvailableBytes / sizeof(int16_t); + numAvailableSamples = (int16_t)numAvailableBytes / sizeof(int16_t); // check if the all of the _numAvatarAudioBufferSamples to be sent are silence diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 729e9fa633..f2fa29f12c 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -171,7 +171,7 @@ void AudioMixerClientData::sendAudioStreamStatsPackets(const SharedNodePointer& statsPacket->writePrimitive(appendFlag); appendFlag = 1; - int numStreamStatsRoomFor = (statsPacket->size() - sizeof(quint8) - sizeof(quint16)) / sizeof(AudioStreamStats); + int numStreamStatsRoomFor = (int)(statsPacket->size() - sizeof(quint8) - sizeof(quint16)) / sizeof(AudioStreamStats); // calculate and pack the number of stream stats to follow quint16 numStreamStatsToPack = std::min(numStreamStatsRemaining, numStreamStatsRoomFor); diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp index 6e4e822196..c5d010871c 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp @@ -293,7 +293,7 @@ int OctreeInboundPacketProcessor::sendNackPackets() { qDebug() << "NACK Sent back to editor/client... destinationNode=" << nodeUUID; - packetsSent += nackPacketList->getNumPackets(); + packetsSent += (int)nackPacketList->getNumPackets(); // send the list of nack packets totalBytesSent += nodeList->sendPacketList(std::move(nackPacketList), *destinationNode); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8ebfaf7ff1..d82da2b237 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3054,7 +3054,7 @@ int Application::sendNackPackets() { } if (nackPacketList->getNumPackets()) { - packetsSent += nackPacketList->getNumPackets(); + packetsSent += (int)nackPacketList->getNumPackets(); // send the packet list nodeList->sendPacketList(std::move(nackPacketList), *node); diff --git a/interface/src/devices/DeviceTracker.cpp b/interface/src/devices/DeviceTracker.cpp index 2a956a42de..2cd4950064 100644 --- a/interface/src/devices/DeviceTracker.cpp +++ b/interface/src/devices/DeviceTracker.cpp @@ -20,7 +20,7 @@ DeviceTracker::SingletonData::~SingletonData() { } int DeviceTracker::getNumDevices() { - return Singleton::get()->_devicesMap.size(); + return (int)Singleton::get()->_devicesMap.size(); } DeviceTracker::ID DeviceTracker::getDeviceID(const Name& name) { @@ -58,7 +58,7 @@ DeviceTracker::ID DeviceTracker::registerDevice(const Name& name, DeviceTracker* } // Good to register the device - deviceID = Singleton::get()->_devicesVector.size(); + deviceID = (ID)Singleton::get()->_devicesVector.size(); Singleton::get()->_devicesMap.insert(Map::value_type(name, deviceID)); Singleton::get()->_devicesVector.push_back(device); device->assignIDAndName(deviceID, name); diff --git a/interface/src/devices/Faceshift.cpp b/interface/src/devices/Faceshift.cpp index a25135cd76..3596c79419 100644 --- a/interface/src/devices/Faceshift.cpp +++ b/interface/src/devices/Faceshift.cpp @@ -255,7 +255,7 @@ void Faceshift::receive(const QByteArray& buffer) { } case fsMsg::MSG_OUT_BLENDSHAPE_NAMES: { const vector& names = static_pointer_cast(msg)->blendshape_names(); - for (size_t i = 0; i < names.size(); i++) { + for (auto i = 0; i < names.size(); i++) { if (names[i] == "EyeBlink_L") { _leftBlinkIndex = i; diff --git a/interface/src/devices/MotionTracker.cpp b/interface/src/devices/MotionTracker.cpp index 97c02b48bf..234a8d0c0c 100644 --- a/interface/src/devices/MotionTracker.cpp +++ b/interface/src/devices/MotionTracker.cpp @@ -90,7 +90,7 @@ MotionTracker::Index MotionTracker::addJoint(const Semantic& semantic, Index par // All good then allocate the joint - Index newIndex = _jointsArray.size(); + Index newIndex = (Index)_jointsArray.size(); _jointsArray.push_back(JointTracker(semantic, parent)); _jointsMap.insert(JointTracker::Map::value_type(semantic, newIndex)); diff --git a/interface/src/devices/MotionTracker.h b/interface/src/devices/MotionTracker.h index edfd3ae991..a4b5e6735e 100644 --- a/interface/src/devices/MotionTracker.h +++ b/interface/src/devices/MotionTracker.h @@ -90,7 +90,7 @@ public: virtual bool isConnected() const; - Index numJointTrackers() const { return _jointsArray.size(); } + Index numJointTrackers() const { return (Index)_jointsArray.size(); } /// Access a Joint from it's index. /// Index 0 is always the "Root". diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp index 55751d8631..6acacee41d 100644 --- a/interface/src/ui/Stats.cpp +++ b/interface/src/ui/Stats.cpp @@ -118,7 +118,7 @@ void Stats::updateStats(bool force) { STAT_UPDATE(avatarCount, avatarManager->size() - 1); STAT_UPDATE(avatarRenderableCount, avatarManager->getNumberInRenderRange()); STAT_UPDATE(avatarRenderDistance, (int) round(avatarManager->getRenderDistance())); // deliberately truncating - STAT_UPDATE(serverCount, nodeList->size()); + STAT_UPDATE(serverCount, (int)nodeList->size()); STAT_UPDATE(renderrate, (int)qApp->getFps()); if (qApp->getActiveDisplayPlugin()) { STAT_UPDATE(presentrate, (int)round(qApp->getActiveDisplayPlugin()->presentRate())); @@ -270,7 +270,7 @@ void Stats::updateStats(bool force) { if (voxelPacketsToProcess == 0) { _resetRecentMaxPacketsSoon = true; } else if (voxelPacketsToProcess > _recentMaxPackets) { - _recentMaxPackets = voxelPacketsToProcess; + _recentMaxPackets = (int)voxelPacketsToProcess; } // Server Octree Elements @@ -344,18 +344,18 @@ void Stats::setRenderDetails(const RenderDetails& details) { STAT_UPDATE(triangles, details._trianglesRendered); STAT_UPDATE(materialSwitches, details._materialSwitches); if (_expanded) { - STAT_UPDATE(opaqueConsidered, details._opaque._considered); + STAT_UPDATE(opaqueConsidered, (int)details._opaque._considered); STAT_UPDATE(opaqueOutOfView, details._opaque._outOfView); STAT_UPDATE(opaqueTooSmall, details._opaque._tooSmall); - STAT_UPDATE(opaqueRendered, details._opaque._rendered); - STAT_UPDATE(translucentConsidered, details._translucent._considered); + STAT_UPDATE(opaqueRendered, (int)details._opaque._rendered); + STAT_UPDATE(translucentConsidered, (int)details._translucent._considered); STAT_UPDATE(translucentOutOfView, details._translucent._outOfView); STAT_UPDATE(translucentTooSmall, details._translucent._tooSmall); - STAT_UPDATE(translucentRendered, details._translucent._rendered); - STAT_UPDATE(otherConsidered, details._other._considered); + STAT_UPDATE(translucentRendered, (int)details._translucent._rendered); + STAT_UPDATE(otherConsidered, (int)details._other._considered); STAT_UPDATE(otherOutOfView, details._other._outOfView); STAT_UPDATE(otherTooSmall, details._other._tooSmall); - STAT_UPDATE(otherRendered, details._other._rendered); + STAT_UPDATE(otherRendered, (int)details._other._rendered); } } diff --git a/libraries/animation/src/AnimBlendLinearMove.cpp b/libraries/animation/src/AnimBlendLinearMove.cpp index d8985f8b72..3be6a0f1b8 100644 --- a/libraries/animation/src/AnimBlendLinearMove.cpp +++ b/libraries/animation/src/AnimBlendLinearMove.cpp @@ -46,10 +46,10 @@ const AnimPoseVec& AnimBlendLinearMove::evaluate(const AnimVariantMap& animVars, evaluateAndBlendChildren(animVars, triggersOut, alpha, prevPoseIndex, nextPoseIndex, prevDeltaTime, nextDeltaTime); } else { - float clampedAlpha = glm::clamp(_alpha, 0.0f, (float)(_children.size() - 1)); - size_t prevPoseIndex = glm::floor(clampedAlpha); - size_t nextPoseIndex = glm::ceil(clampedAlpha); - float alpha = glm::fract(clampedAlpha); + auto clampedAlpha = glm::clamp(_alpha, 0.0f, (float)(_children.size() - 1)); + auto prevPoseIndex = glm::floor(clampedAlpha); + auto nextPoseIndex = glm::ceil(clampedAlpha); + auto alpha = glm::fract(clampedAlpha); float prevDeltaTime, nextDeltaTime; setFrameAndPhase(dt, alpha, prevPoseIndex, nextPoseIndex, &prevDeltaTime, &nextDeltaTime, triggersOut); evaluateAndBlendChildren(animVars, triggersOut, alpha, prevPoseIndex, nextPoseIndex, prevDeltaTime, nextDeltaTime); diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp index 9eed3ad14c..986bb0a30e 100644 --- a/libraries/animation/src/AnimClip.cpp +++ b/libraries/animation/src/AnimClip.cpp @@ -57,7 +57,7 @@ const AnimPoseVec& AnimClip::evaluate(const AnimVariantMap& animVars, float dt, // It can be quite possible for the user to set _startFrame and _endFrame to // values before or past valid ranges. We clamp the frames here. - int frameCount = _anim.size(); + int frameCount = (int)_anim.size(); prevIndex = std::min(std::max(0, prevIndex), frameCount - 1); nextIndex = std::min(std::max(0, nextIndex), frameCount - 1); @@ -92,8 +92,8 @@ void AnimClip::copyFromNetworkAnim() { // by matching joints with the same name. const FBXGeometry& geom = _networkAnim->getGeometry(); AnimSkeleton animSkeleton(geom); - const int animJointCount = animSkeleton.getNumJoints(); - const int skeletonJointCount = _skeleton->getNumJoints(); + const auto animJointCount = animSkeleton.getNumJoints(); + const auto skeletonJointCount = _skeleton->getNumJoints(); std::vector jointMap; jointMap.reserve(animJointCount); for (int i = 0; i < animJointCount; i++) { diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp index c057147c03..9276b96714 100644 --- a/libraries/animation/src/AnimInverseKinematics.cpp +++ b/libraries/animation/src/AnimInverseKinematics.cpp @@ -114,7 +114,7 @@ void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std:: } if (removeUnfoundJoints) { - int numVars = _targetVarVec.size(); + auto numVars = _targetVarVec.size(); int i = 0; while (i < numVars) { if (_targetVarVec[i].jointIndex == -1) { @@ -145,7 +145,7 @@ void AnimInverseKinematics::solveWithCyclicCoordinateDescent(const std::vector 0) { _relativePoses[i].rot = _accumulators[i].getAverage(); _accumulators[i].clear(); @@ -283,8 +283,8 @@ void AnimInverseKinematics::solveWithCyclicCoordinateDescent(const std::vectorgetParentIndex(i); + for (auto i = lowestMovedIndex; i <= _maxTargetIndex; ++i) { + auto parentIndex = _skeleton->getParentIndex((int)i); if (parentIndex != -1) { absolutePoses[i] = absolutePoses[parentIndex] * _relativePoses[i]; } diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp index 7879c8a776..8dcb2157c5 100644 --- a/libraries/animation/src/AnimSkeleton.cpp +++ b/libraries/animation/src/AnimSkeleton.cpp @@ -31,7 +31,7 @@ AnimSkeleton::AnimSkeleton(const std::vector& joints) { } int AnimSkeleton::nameToJointIndex(const QString& jointName) const { - for (size_t i = 0; i < _joints.size(); i++) { + for (auto i = 0; i < _joints.size(); i++) { if (_joints[i].name == jointName) { return i; } @@ -39,7 +39,7 @@ int AnimSkeleton::nameToJointIndex(const QString& jointName) const { return -1; } -int AnimSkeleton::getNumJoints() const { +size_t AnimSkeleton::getNumJoints() const { return _joints.size(); } @@ -101,7 +101,7 @@ void AnimSkeleton::buildSkeletonFromJoints(const std::vector& joints) _relativeDefaultPoses.reserve(joints.size()); // iterate over FBXJoints and extract the bind pose information. - for (size_t i = 0; i < joints.size(); i++) { + for (auto i = 0; i < joints.size(); i++) { // build relative and absolute default poses glm::mat4 rotTransform = glm::mat4_cast(_joints[i].preRotation * _joints[i].rotation * _joints[i].postRotation); diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h index 7312fea6b1..73e31d090a 100644 --- a/libraries/animation/src/AnimSkeleton.h +++ b/libraries/animation/src/AnimSkeleton.h @@ -27,7 +27,7 @@ public: AnimSkeleton(const std::vector& joints); int nameToJointIndex(const QString& jointName) const; const QString& getJointName(int jointIndex) const; - int getNumJoints() const; + size_t getNumJoints() const; // absolute pose, not relative to parent const AnimPose& getAbsoluteBindPose(int jointIndex) const; diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 464ff28980..950ac58ae2 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -233,7 +233,7 @@ bool Rig::jointStatesEmpty() { return _internalPoseSet._relativePoses.empty(); } -int Rig::getJointStateCount() const { +size_t Rig::getJointStateCount() const { return _internalPoseSet._relativePoses.size(); } @@ -434,7 +434,7 @@ void Rig::calcAnimAlpha(float speed, const std::vector& referenceSpeeds, void Rig::computeEyesInRootFrame(const AnimPoseVec& poses) { // TODO: use cached eye/hips indices for these calculations - int numPoses = poses.size(); + auto numPoses = poses.size(); int hipsIndex = _animSkeleton->nameToJointIndex(QString("Hips")); int headIndex = _animSkeleton->nameToJointIndex(QString("Head")); if (hipsIndex > 0 && headIndex > 0) { @@ -1066,8 +1066,8 @@ glm::mat4 Rig::getJointTransform(int jointIndex) const { } void Rig::copyJointsIntoJointData(QVector& jointDataVec) const { - jointDataVec.resize(getJointStateCount()); - for (int i = 0; i < jointDataVec.size(); i++) { + jointDataVec.resize((int)getJointStateCount()); + for (auto i = 0; i < jointDataVec.size(); i++) { JointData& data = jointDataVec[i]; data.rotationSet |= getJointStateRotation(i, data.rotation); // geometry offset is used here so that translations are in meters. @@ -1164,7 +1164,7 @@ void Rig::computeAvatarBoundingCapsule( // even if they do not have legs (default robot) totalExtents.addPoint(glm::vec3(0.0f)); - int numPoses = finalPoses.size(); + auto numPoses = finalPoses.size(); for (int i = 0; i < numPoses; i++) { const FBXJointShapeInfo& shapeInfo = geometry.joints.at(i).shapeInfo; AnimPose pose = finalPoses[i]; diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h index e3ec5d18cf..8d8d425112 100644 --- a/libraries/animation/src/Rig.h +++ b/libraries/animation/src/Rig.h @@ -89,7 +89,7 @@ public: void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset); void reset(const FBXGeometry& geometry); bool jointStatesEmpty(); - int getJointStateCount() const; + size_t getJointStateCount() const; int indexOfJoint(const QString& jointName) const; void setModelOffset(const glm::mat4& modelOffsetMat); diff --git a/libraries/animation/src/SwingTwistConstraint.cpp b/libraries/animation/src/SwingTwistConstraint.cpp index f9cea2abad..c29f75202c 100644 --- a/libraries/animation/src/SwingTwistConstraint.cpp +++ b/libraries/animation/src/SwingTwistConstraint.cpp @@ -36,7 +36,7 @@ void SwingTwistConstraint::SwingLimitFunction::setCone(float maxAngle) { } void SwingTwistConstraint::SwingLimitFunction::setMinDots(const std::vector& minDots) { - uint32_t numDots = minDots.size(); + uint32_t numDots = (uint32_t)minDots.size(); _minDots.clear(); if (numDots == 0) { // push two copies of MIN_MINDOT @@ -90,7 +90,7 @@ void SwingTwistConstraint::setSwingLimits(const std::vector& swungDir }; std::vector limits; - uint32_t numLimits = swungDirections.size(); + uint32_t numLimits = (uint32_t)swungDirections.size(); limits.reserve(numLimits); // compute the limit pairs: @@ -108,7 +108,7 @@ void SwingTwistConstraint::setSwingLimits(const std::vector& swungDir } std::vector minDots; - numLimits = limits.size(); + numLimits = (uint32_t)limits.size(); if (numLimits == 0) { // trivial case: nearly free constraint std::vector minDots; diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index a8a68de60d..0fa43e203b 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -1184,11 +1184,11 @@ float AudioClient::getAudioOutputMsecsUnplayed() const { } qint64 AudioClient::AudioOutputIODevice::readData(char * data, qint64 maxSize) { - int samplesRequested = maxSize / sizeof(int16_t); + auto samplesRequested = maxSize / sizeof(int16_t); int samplesPopped; int bytesWritten; - if ((samplesPopped = _receivedAudioStream.popSamples(samplesRequested, false)) > 0) { + if ((samplesPopped = _receivedAudioStream.popSamples((int)samplesRequested, false)) > 0) { AudioRingBuffer::ConstIterator lastPopOutput = _receivedAudioStream.getLastPopOutput(); lastPopOutput.readSamples((int16_t*)data, samplesPopped); bytesWritten = samplesPopped * sizeof(int16_t); diff --git a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp index 54fe491c46..a1cdbbaf51 100644 --- a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp @@ -66,5 +66,5 @@ void RenderableBoxEntityItem::render(RenderArgs* args) { DependencyManager::get()->renderSolidCubeInstance(batch, getTransformToCenter(), cubeColor); } static const auto triCount = DependencyManager::get()->getCubeTriangleCount(); - args->_details._trianglesRendered += triCount; + args->_details._trianglesRendered += (int)triCount; } diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp index 520069abdf..4abd8dbafd 100644 --- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp @@ -106,7 +106,7 @@ public: batch.setInputBuffer(0, _particleBuffer, 0, sizeof(ParticlePrimitive)); auto numParticles = _particleBuffer->getSize() / sizeof(ParticlePrimitive); - batch.drawInstanced(numParticles, gpu::TRIANGLE_STRIP, VERTEX_PER_PARTICLE); + batch.drawInstanced((gpu::uint32)numParticles, gpu::TRIANGLE_STRIP, (gpu::uint32)VERTEX_PER_PARTICLE); } protected: diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 10593a9e04..22f83d37f6 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -539,7 +539,7 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) { int voxelVolumeSizeLocation = _pipeline->getProgram()->getUniforms().findLocation("voxelVolumeSize"); batch._glUniform3f(voxelVolumeSizeLocation, _voxelVolumeSize.x, _voxelVolumeSize.y, _voxelVolumeSize.z); - batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0); + batch.drawIndexed(gpu::TRIANGLES, (gpu::uint32)mesh->getNumIndices(), 0); } bool RenderablePolyVoxEntityItem::addToScene(EntityItemPointer self, diff --git a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp index 8768e41a07..6c72dc488c 100644 --- a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp @@ -72,5 +72,5 @@ void RenderableSphereEntityItem::render(RenderArgs* args) { DependencyManager::get()->renderSolidSphereInstance(batch, modelTransform, sphereColor); } static const auto triCount = DependencyManager::get()->getSphereTriangleCount(); - args->_details._trianglesRendered += triCount; + args->_details._trianglesRendered += (int)triCount; } diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index f74cdedb9d..13d5c2836f 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -620,7 +620,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef Q_ASSERT(parser.data() + parser.offset() == dataAt); #else const unsigned char* dataAt = parser.data() + parser.offset(); - int bytesRead = parser.offset(); + int bytesRead = (int)parser.offset(); #endif auto nodeList = DependencyManager::get(); @@ -749,7 +749,7 @@ void EntityItem::debugDump() const { void EntityItem::adjustEditPacketForClockSkew(QByteArray& buffer, int clockSkew) { unsigned char* dataAt = reinterpret_cast(buffer.data()); int octets = numberOfThreeBitSectionsInCode(dataAt); - int lengthOfOctcode = bytesRequiredForCodeLength(octets); + int lengthOfOctcode = (int)bytesRequiredForCodeLength(octets); dataAt += lengthOfOctcode; // lastEdited diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 2e785519da..98a099fcaa 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1124,7 +1124,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int // the first part of the data is an octcode, this is a required element of the edit packet format, but we don't // actually use it, we do need to skip it and read to the actual data we care about. int octets = numberOfThreeBitSectionsInCode(data); - int bytesToReadOfOctcode = bytesRequiredForCodeLength(octets); + int bytesToReadOfOctcode = (int)bytesRequiredForCodeLength(octets); // we don't actually do anything with this octcode... dataAt += bytesToReadOfOctcode; diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index fb2acf3fe7..ba6294f8a8 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -1062,7 +1062,7 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons break; // bail to prevent buffer overflow } - QByteArray encodedID = dataByteArray.mid(processedBytes, NUM_BYTES_RFC4122_UUID); + QByteArray encodedID = dataByteArray.mid((int)processedBytes, NUM_BYTES_RFC4122_UUID); QUuid entityID = QUuid::fromRfc4122(encodedID); dataAt += encodedID.size(); processedBytes += encodedID.size(); @@ -1081,7 +1081,7 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons } deleteEntities(entityItemIDsToDelete, true, true); } - return processedBytes; + return (int)processedBytes; } EntityTreeElementPointer EntityTree::getContainingElement(const EntityItemID& entityItemID) /*const*/ { diff --git a/libraries/environment/src/EnvironmentData.cpp b/libraries/environment/src/EnvironmentData.cpp index 4cb8f7a010..7a0bd29bc0 100644 --- a/libraries/environment/src/EnvironmentData.cpp +++ b/libraries/environment/src/EnvironmentData.cpp @@ -38,7 +38,7 @@ glm::vec3 EnvironmentData::getSunLocation(const glm::vec3& cameraPosition) const return _sunLocation; } -int EnvironmentData::getBroadcastData(unsigned char* destinationBuffer) const { +size_t EnvironmentData::getBroadcastData(unsigned char* destinationBuffer) const { unsigned char* bufferStart = destinationBuffer; memcpy(destinationBuffer, &_id, sizeof(_id)); @@ -77,7 +77,7 @@ int EnvironmentData::getBroadcastData(unsigned char* destinationBuffer) const { return destinationBuffer - bufferStart; } -int EnvironmentData::parseData(const unsigned char* sourceBuffer, int numBytes) { +size_t EnvironmentData::parseData(const unsigned char* sourceBuffer, int numBytes) { const unsigned char* startPosition = sourceBuffer; memcpy(&_id, sourceBuffer, sizeof(_id)); diff --git a/libraries/environment/src/EnvironmentData.h b/libraries/environment/src/EnvironmentData.h index ebbb3d1fb0..daed752d4c 100644 --- a/libraries/environment/src/EnvironmentData.h +++ b/libraries/environment/src/EnvironmentData.h @@ -54,8 +54,8 @@ public: glm::vec3 getAtmosphereCenter(const glm::vec3& cameraPosition) const; glm::vec3 getSunLocation(const glm::vec3& cameraPosition) const; - int getBroadcastData(unsigned char* destinationBuffer) const; - int parseData(const unsigned char* sourceBuffer, int numBytes); + size_t getBroadcastData(unsigned char* destinationBuffer) const; + size_t parseData(const unsigned char* sourceBuffer, int numBytes); private: diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h index 0ddbc11bda..51cb5baf9f 100644 --- a/libraries/fbx/src/FBXReader.h +++ b/libraries/fbx/src/FBXReader.h @@ -195,8 +195,7 @@ public: QMultiHash newIndices; QVector > blendshapeIndexMaps; QVector > partMaterialTextures; - QHash texcoordSetMap; - std::map texcoordSetMap2; + QHash texcoordSetMap; }; /// A single animation frame extracted from an FBX document. diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp index dbada15588..5a824aa284 100644 --- a/libraries/fbx/src/FBXReader_Mesh.cpp +++ b/libraries/fbx/src/FBXReader_Mesh.cpp @@ -288,7 +288,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn #endif } - QHash::iterator it = data.extracted.texcoordSetMap.find(attrib.name); + QHash::iterator it = data.extracted.texcoordSetMap.find(attrib.name); if (it == data.extracted.texcoordSetMap.end()) { data.extracted.texcoordSetMap.insert(attrib.name, data.attributes.size()); data.attributes.push_back(attrib); diff --git a/libraries/gpu/src/gpu/GLBackendOutput.cpp b/libraries/gpu/src/gpu/GLBackendOutput.cpp index 3ae8ee5435..6d8ce7b2c6 100755 --- a/libraries/gpu/src/gpu/GLBackendOutput.cpp +++ b/libraries/gpu/src/gpu/GLBackendOutput.cpp @@ -118,7 +118,7 @@ GLBackend::GLFramebuffer* GLBackend::syncGPUObject(const Framebuffer& framebuffe // Last but not least, define where we draw if (!colorBuffers.empty()) { - glDrawBuffers(colorBuffers.size(), colorBuffers.data()); + glDrawBuffers((GLsizei)colorBuffers.size(), colorBuffers.data()); } else { glDrawBuffer( GL_NONE ); } @@ -253,7 +253,7 @@ void GLBackend::do_clearFramebuffer(Batch& batch, size_t paramOffset) { } if (!drawBuffers.empty()) { - glDrawBuffers(drawBuffers.size(), drawBuffers.data()); + glDrawBuffers((GLsizei)drawBuffers.size(), drawBuffers.data()); glClearColor(color.x, color.y, color.z, color.w); glmask |= GL_COLOR_BUFFER_BIT; @@ -291,7 +291,7 @@ void GLBackend::do_clearFramebuffer(Batch& batch, size_t paramOffset) { if (_output._framebuffer && !drawBuffers.empty()) { auto glFramebuffer = syncGPUObject(*_output._framebuffer); if (glFramebuffer) { - glDrawBuffers(glFramebuffer->_colorBuffers.size(), glFramebuffer->_colorBuffers.data()); + glDrawBuffers((GLsizei)glFramebuffer->_colorBuffers.size(), glFramebuffer->_colorBuffers.data()); } } @@ -301,13 +301,13 @@ void GLBackend::do_clearFramebuffer(Batch& batch, size_t paramOffset) { void GLBackend::do_blit(Batch& batch, size_t paramOffset) { auto srcframebuffer = batch._framebuffers.get(batch._params[paramOffset]._uint); Vec4i srcvp; - for (size_t i = 0; i < 4; ++i) { + for (auto i = 0; i < 4; ++i) { srcvp[i] = batch._params[paramOffset + 1 + i]._int; } auto dstframebuffer = batch._framebuffers.get(batch._params[paramOffset + 5]._uint); Vec4i dstvp; - for (size_t i = 0; i < 4; ++i) { + for (auto i = 0; i < 4; ++i) { dstvp[i] = batch._params[paramOffset + 6 + i]._int; } diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp index 71c5a83331..65f2e5ca8a 100755 --- a/libraries/gpu/src/gpu/GLBackendTexture.cpp +++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp @@ -357,7 +357,7 @@ GLBackend::GLTexture* GLBackend::syncGPUObject(const Texture& texture) { object->_storageStamp = texture.getStamp(); object->_contentStamp = texture.getDataStamp(); - object->_size = texture.getSize(); + object->_size = (GLuint)texture.getSize(); } glBindTexture(GL_TEXTURE_2D, boundTex); @@ -435,7 +435,7 @@ GLBackend::GLTexture* GLBackend::syncGPUObject(const Texture& texture) { object->_storageStamp = texture.getStamp(); object->_contentStamp = texture.getDataStamp(); - object->_size = texture.getSize(); + object->_size = (GLuint)texture.getSize(); } glBindTexture(GL_TEXTURE_CUBE_MAP, boundTex); diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp index ae6f3b740d..3f2415d240 100755 --- a/libraries/gpu/src/gpu/Texture.cpp +++ b/libraries/gpu/src/gpu/Texture.cpp @@ -99,7 +99,7 @@ bool Texture::Storage::assignMipData(uint16 level, const Element& format, Size s // The bytes assigned here are supposed to contain all the faces bytes of the mip. // For tex1D, 2D, 3D there is only one face // For Cube, we expect the 6 faces in the order X+, X-, Y+, Y-, Z+, Z- - int sizePerFace = size / mip.size(); + auto sizePerFace = size / mip.size(); auto faceBytes = bytes; Size allocated = 0; for (auto& face : mip) { diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp index c7d3523496..e1aeb92e41 100644 --- a/libraries/model-networking/src/model-networking/ModelCache.cpp +++ b/libraries/model-networking/src/model-networking/ModelCache.cpp @@ -335,7 +335,7 @@ void NetworkGeometry::modelParseSuccess(FBXGeometry* geometry) { _meshes.emplace_back(buildNetworkMesh(mesh, _textureBaseUrl)); } - QHash fbxMatIDToMatID; + QHash fbxMatIDToMatID; foreach(const FBXMaterial& material, _geometry->materials) { fbxMatIDToMatID[material.materialID] = _materials.size(); _materials.emplace_back(buildNetworkMaterial(material, _textureBaseUrl)); @@ -349,7 +349,7 @@ void NetworkGeometry::modelParseSuccess(FBXGeometry* geometry) { NetworkShape* networkShape = new NetworkShape(); networkShape->_meshID = meshID; networkShape->_partID = partID; - networkShape->_materialID = fbxMatIDToMatID[part.materialID]; + networkShape->_materialID = (int)fbxMatIDToMatID[part.materialID]; _shapes.emplace_back(networkShape); partID++; } diff --git a/libraries/model/src/model/Geometry.h b/libraries/model/src/model/Geometry.h index a35d55d938..fa29faff5f 100755 --- a/libraries/model/src/model/Geometry.h +++ b/libraries/model/src/model/Geometry.h @@ -46,11 +46,11 @@ public: // Vertex buffer void setVertexBuffer(const BufferView& buffer); const BufferView& getVertexBuffer() const { return _vertexBuffer; } - uint getNumVertices() const { return _vertexBuffer.getNumElements(); } + size_t getNumVertices() const { return _vertexBuffer.getNumElements(); } bool hasVertexData() const { return _vertexBuffer._buffer.get() != nullptr; } // Attribute Buffers - int getNumAttributes() const { return _attributeBuffers.size(); } + size_t getNumAttributes() const { return _attributeBuffers.size(); } void addAttribute(Slot slot, const BufferView& buffer); const BufferView getAttributeBuffer(int attrib) const; @@ -63,7 +63,7 @@ public: // Index Buffer void setIndexBuffer(const BufferView& buffer); const BufferView& getIndexBuffer() const { return _indexBuffer; } - uint getNumIndices() const { return _indexBuffer.getNumElements(); } + size_t getNumIndices() const { return _indexBuffer.getNumElements(); } // Access vertex position value const Vec3& getPos3(Index index) const { return _vertexBuffer.get(index); } @@ -104,7 +104,7 @@ public: void setPartBuffer(const BufferView& buffer); const BufferView& getPartBuffer() const { return _partBuffer; } - uint getNumParts() const { return _partBuffer.getNumElements(); } + size_t getNumParts() const { return _partBuffer.getNumElements(); } // evaluate the bounding box of A part Box evalPartBound(int partNum) const; diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 7f95291e5b..c89949b9fd 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -131,7 +131,7 @@ public: void (*linkedDataCreateCallback)(Node *); - int size() const { return _nodeHash.size(); } + size_t size() const { return _nodeHash.size(); } SharedNodePointer nodeWithUUID(const QUuid& nodeUUID); diff --git a/libraries/networking/src/PacketSender.cpp b/libraries/networking/src/PacketSender.cpp index 14737dfb8d..0cfd67cc4e 100644 --- a/libraries/networking/src/PacketSender.cpp +++ b/libraries/networking/src/PacketSender.cpp @@ -259,7 +259,7 @@ bool PacketSender::nonThreadedProcess() { } } - int packetsLeft = _packets.size(); + auto packetsLeft = _packets.size(); // Now that we know how many packets to send this call to process, just send them. while ((packetsSentThisCall < packetsToSendThisCall) && (packetsLeft > 0)) { diff --git a/libraries/networking/src/PacketSender.h b/libraries/networking/src/PacketSender.h index e4792c55c3..e177172788 100644 --- a/libraries/networking/src/PacketSender.h +++ b/libraries/networking/src/PacketSender.h @@ -50,7 +50,7 @@ public: bool hasPacketsToSend() const { return _packets.size() > 0; } /// how many packets are there in the send queue waiting to be sent - int packetsToSendCount() const { return _packets.size(); } + size_t packetsToSendCount() const { return _packets.size(); } /// If you're running in non-threaded mode, call this to give us a hint as to how frequently you will call process. /// This has no effect in threaded mode. This is only considered a hint in non-threaded mode. diff --git a/libraries/networking/src/ReceivedPacketProcessor.h b/libraries/networking/src/ReceivedPacketProcessor.h index 3a0e93ee09..1d9580f3d0 100644 --- a/libraries/networking/src/ReceivedPacketProcessor.h +++ b/libraries/networking/src/ReceivedPacketProcessor.h @@ -44,7 +44,7 @@ public: } /// How many received packets waiting are to be processed - int packetsToProcessCount() const { return _packets.size(); } + size_t packetsToProcessCount() const { return _packets.size(); } float getIncomingPPS() const { return _incomingPPS.getAverage(); } float getProcessedPPS() const { return _processedPPS.getAverage(); } diff --git a/libraries/networking/src/udt/PacketList.cpp b/libraries/networking/src/udt/PacketList.cpp index e4212ccb88..978df9b9bb 100644 --- a/libraries/networking/src/udt/PacketList.cpp +++ b/libraries/networking/src/udt/PacketList.cpp @@ -129,7 +129,7 @@ QByteArray PacketList::getMessage() const { } QByteArray data; - data.reserve(sizeBytes); + data.reserve((int)sizeBytes); for (auto& packet : _packets) { data.append(packet->getPayload(), packet->getPayloadSize()); diff --git a/libraries/networking/src/udt/PacketList.h b/libraries/networking/src/udt/PacketList.h index 2c6c14f42f..4f1e46e616 100644 --- a/libraries/networking/src/udt/PacketList.h +++ b/libraries/networking/src/udt/PacketList.h @@ -39,7 +39,7 @@ public: bool isReliable() const { return _isReliable; } bool isOrdered() const { return _isOrdered; } - int getNumPackets() const { return _packets.size() + (_currentPacket ? 1 : 0); } + size_t getNumPackets() const { return _packets.size() + (_currentPacket ? 1 : 0); } size_t getDataSize() const; size_t getMessageSize() const; QByteArray getMessage() const; diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp index d473b3973e..5e66e21242 100644 --- a/libraries/octree/src/JurisdictionMap.cpp +++ b/libraries/octree/src/JurisdictionMap.cpp @@ -278,7 +278,7 @@ std::unique_ptr JurisdictionMap::packIntoPacket() { packet->write(reinterpret_cast(_rootOctalCode), bytes); // if and only if there's a root jurisdiction, also include the end nodes - int endNodeCount = _endNodes.size(); + auto endNodeCount = _endNodes.size(); packet->writePrimitive(endNodeCount); for (int i=0; i < endNodeCount; i++) { diff --git a/libraries/octree/src/JurisdictionMap.h b/libraries/octree/src/JurisdictionMap.h index 3f415efba8..18d2bbbeed 100644 --- a/libraries/octree/src/JurisdictionMap.h +++ b/libraries/octree/src/JurisdictionMap.h @@ -52,7 +52,7 @@ public: unsigned char* getRootOctalCode() const { return _rootOctalCode; } unsigned char* getEndNodeOctalCode(int index) const { return _endNodes[index]; } - int getEndNodeCount() const { return _endNodes.size(); } + size_t getEndNodeCount() const { return _endNodes.size(); } void copyContents(unsigned char* rootCodeIn, const std::vector& endNodesIn); diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index aacb57f31d..636d1a9a1a 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -479,12 +479,12 @@ void Octree::readBitstreamToTree(const unsigned char * bitstream, unsigned long } } - int octalCodeBytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInStream); + auto octalCodeBytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInStream); int theseBytesRead = 0; - theseBytesRead += octalCodeBytes; + theseBytesRead += (int)octalCodeBytes; int lowerLevelBytes = readElementData(bitstreamRootElement, bitstreamAt + octalCodeBytes, - bufferSizeBytes - (bytesRead + octalCodeBytes), args); + bufferSizeBytes - (bytesRead + (int)octalCodeBytes), args); theseBytesRead += lowerLevelBytes; @@ -921,7 +921,7 @@ int Octree::encodeTreeBitstream(OctreeElementPointer element, } } else { roomForOctalCode = packetData->startSubTree(element->getOctalCode()); - codeLength = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(element->getOctalCode())); + codeLength = (int)bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(element->getOctalCode())); } // If the octalcode couldn't fit, then we can return, because no nodes below us will fit... diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index df53a0f873..d3a72ce113 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -149,7 +149,7 @@ void OctreeEditPacketSender::queuePendingPacketToNodes(std::unique_ptr _pendingPacketsLock.lock(); _preServerSingleMessagePackets.push_back(std::move(packet)); // if we've saved MORE than our max, then clear out the oldest packet... - int allPendingMessages = _preServerSingleMessagePackets.size() + _preServerEdits.size(); + auto allPendingMessages = _preServerSingleMessagePackets.size() + _preServerEdits.size(); if (allPendingMessages > _maxPendingMessages) { _preServerSingleMessagePackets.pop_front(); } @@ -210,7 +210,7 @@ void OctreeEditPacketSender::queueOctreeEditMessage(PacketType type, QByteArray& _preServerEdits.push_back(messagePair); // if we've saved MORE than out max, then clear out the oldest packet... - int allPendingMessages = _preServerSingleMessagePackets.size() + _preServerEdits.size(); + auto allPendingMessages = _preServerSingleMessagePackets.size() + _preServerEdits.size(); if (allPendingMessages > _maxPendingMessages) { _preServerEdits.pop_front(); } diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp index 811e96fcf4..f063c60fd7 100644 --- a/libraries/octree/src/OctreePacketData.cpp +++ b/libraries/octree/src/OctreePacketData.cpp @@ -149,7 +149,7 @@ bool OctreePacketData::startSubTree(const unsigned char* octcode) { int possibleStartAt = _bytesInUse; int length = 0; if (octcode) { - length = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(octcode)); + length = (int)bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(octcode)); success = append(octcode, length); // handles checking compression } else { // NULL case, means root node, which is 0 diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp index 822fbb2c50..8b9334eafd 100644 --- a/libraries/octree/src/OctreeSceneStats.cpp +++ b/libraries/octree/src/OctreeSceneStats.cpp @@ -123,14 +123,14 @@ void OctreeSceneStats::copyFromOther(const OctreeSceneStats& other) { // Now copy the values from the other if (other._jurisdictionRoot) { - int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(other._jurisdictionRoot)); + auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(other._jurisdictionRoot)); _jurisdictionRoot = new unsigned char[bytes]; memcpy(_jurisdictionRoot, other._jurisdictionRoot, bytes); } for (size_t i = 0; i < other._jurisdictionEndNodes.size(); i++) { unsigned char* endNodeCode = other._jurisdictionEndNodes[i]; if (endNodeCode) { - int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); + auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); unsigned char* endNodeCodeCopy = new unsigned char[bytes]; memcpy(endNodeCodeCopy, endNodeCode, bytes); _jurisdictionEndNodes.push_back(endNodeCodeCopy); @@ -178,7 +178,7 @@ void OctreeSceneStats::sceneStarted(bool isFullScene, bool isMoving, OctreeEleme if (jurisdictionMap) { unsigned char* jurisdictionRoot = jurisdictionMap->getRootOctalCode(); if (jurisdictionRoot) { - int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(jurisdictionRoot)); + auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(jurisdictionRoot)); _jurisdictionRoot = new unsigned char[bytes]; memcpy(_jurisdictionRoot, jurisdictionRoot, bytes); } @@ -187,7 +187,7 @@ void OctreeSceneStats::sceneStarted(bool isFullScene, bool isMoving, OctreeEleme for (int i = 0; i < jurisdictionMap->getEndNodeCount(); i++) { unsigned char* endNodeCode = jurisdictionMap->getEndNodeOctalCode(i); if (endNodeCode) { - int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); + auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); unsigned char* endNodeCodeCopy = new unsigned char[bytes]; memcpy(endNodeCodeCopy, endNodeCode, bytes); _jurisdictionEndNodes.push_back(endNodeCodeCopy); @@ -418,18 +418,18 @@ int OctreeSceneStats::packIntoPacket() { // add the root jurisdiction if (_jurisdictionRoot) { // copy the - int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(_jurisdictionRoot)); + auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(_jurisdictionRoot)); _statsPacket->writePrimitive(bytes); _statsPacket->write(reinterpret_cast(_jurisdictionRoot), bytes); // if and only if there's a root jurisdiction, also include the end elements - int endNodeCount = _jurisdictionEndNodes.size(); + auto endNodeCount = _jurisdictionEndNodes.size(); _statsPacket->writePrimitive(endNodeCount); for (int i=0; i < endNodeCount; i++) { unsigned char* endNodeCode = _jurisdictionEndNodes[i]; - int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); + auto bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); _statsPacket->writePrimitive(bytes); _statsPacket->write(reinterpret_cast(endNodeCode), bytes); } diff --git a/libraries/octree/src/OctreeScriptingInterface.h b/libraries/octree/src/OctreeScriptingInterface.h index 47b01c64f9..86b9730393 100644 --- a/libraries/octree/src/OctreeScriptingInterface.h +++ b/libraries/octree/src/OctreeScriptingInterface.h @@ -51,7 +51,7 @@ public slots: bool hasPacketsToSend() const { return _packetSender->hasPacketsToSend(); } /// how many packets are there in the send queue waiting to be sent - int packetsToSendCount() const { return _packetSender->packetsToSendCount(); } + int packetsToSendCount() const { return (int)_packetSender->packetsToSendCount(); } /// returns the packets per second send rate of this object over its lifetime float getLifetimePPS() const { return _packetSender->getLifetimePPS(); } diff --git a/libraries/physics/src/MeshMassProperties.cpp b/libraries/physics/src/MeshMassProperties.cpp index d18c068d26..a6a33932aa 100644 --- a/libraries/physics/src/MeshMassProperties.cpp +++ b/libraries/physics/src/MeshMassProperties.cpp @@ -271,7 +271,7 @@ void MeshMassProperties::computeMassProperties(const VectorOfPoints& points, con // create some variables to hold temporary results #ifndef NDEBUG - uint32_t numPoints = points.size(); + uint32_t numPoints = (uint32_t)points.size(); #endif const btVector3 p0(0.0f, 0.0f, 0.0f); btMatrix3x3 tetraInertia; @@ -280,7 +280,7 @@ void MeshMassProperties::computeMassProperties(const VectorOfPoints& points, con btVector3 center; // loop over triangles - uint32_t numTriangles = triangleIndices.size() / 3; + uint32_t numTriangles = (uint32_t)triangleIndices.size() / 3; for (uint32_t i = 0; i < numTriangles; ++i) { uint32_t t = 3 * i; #ifndef NDEBUG diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp index 69a433d5e1..b1e4bd53ed 100644 --- a/libraries/procedural/src/procedural/Procedural.cpp +++ b/libraries/procedural/src/procedural/Procedural.cpp @@ -123,7 +123,7 @@ void Procedural::parse(const QJsonObject& proceduralData) { _parsedChannels = channels.toArray(); size_t channelCount = std::min(MAX_PROCEDURAL_TEXTURE_CHANNELS, (size_t)_parsedChannels.size()); for (size_t i = 0; i < channelCount; ++i) { - QString url = _parsedChannels.at(i).toString(); + QString url = _parsedChannels.at((int)i).toString(); _channels[i] = textureCache->getTexture(QUrl(url)); } } @@ -238,7 +238,7 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm gpuTexture->setSampler(sampler); gpuTexture->autoGenerateMips(-1); } - batch.setResourceTexture(i, gpuTexture); + batch.setResourceTexture((gpu::uint32)i, gpuTexture); } } } diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp index d17676fe90..aa366f04b9 100644 --- a/libraries/render-utils/src/AnimDebugDraw.cpp +++ b/libraries/render-utils/src/AnimDebugDraw.cpp @@ -48,7 +48,7 @@ public: batch.setIndexBuffer(gpu::UINT16, _indexBuffer, 0); auto numIndices = _indexBuffer->getSize() / sizeof(uint16_t); - batch.drawIndexed(gpu::LINES, numIndices); + batch.drawIndexed(gpu::LINES, (int)numIndices); } gpu::PipelinePointer _pipeline; @@ -321,12 +321,12 @@ void AnimDebugDraw::update() { const float POSE_RADIUS = 0.1f; // 10 cm // figure out how many verts we will need. - int numVerts = 0; + size_t numVerts = 0; for (auto& iter : _absolutePoses) { AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); numVerts += skeleton->getNumJoints() * VERTICES_PER_BONE; - for (int i = 0; i < skeleton->getNumJoints(); i++) { + for (auto i = 0; i < skeleton->getNumJoints(); i++) { auto parentIndex = skeleton->getParentIndex(i); if (parentIndex >= 0) { numVerts += VERTICES_PER_LINK; diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 342471454d..10b58b156b 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -314,7 +314,7 @@ void DeferredLightingEffect::addPointLight(const glm::vec3& position, float radi void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radius, const glm::vec3& color, float intensity, const glm::quat& orientation, float exponent, float cutoff) { - unsigned int lightID = _pointLights.size() + _spotLights.size() + _globalLights.size(); + unsigned int lightID = (unsigned int)(_pointLights.size() + _spotLights.size() + _globalLights.size()); if (lightID >= _allocatedLights.size()) { _allocatedLights.push_back(std::make_shared()); } diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index b9fdcd95a4..5ae90e2124 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -93,28 +93,28 @@ void GeometryCache::ShapeData::setupBatch(gpu::Batch& batch) const { void GeometryCache::ShapeData::draw(gpu::Batch& batch) const { if (_indexCount) { setupBatch(batch); - batch.drawIndexed(gpu::TRIANGLES, _indexCount, _indexOffset); + batch.drawIndexed(gpu::TRIANGLES, (gpu::uint32)_indexCount, (gpu::uint32)_indexOffset); } } void GeometryCache::ShapeData::drawWire(gpu::Batch& batch) const { if (_wireIndexCount) { setupBatch(batch); - batch.drawIndexed(gpu::LINES, _wireIndexCount, _wireIndexOffset); + batch.drawIndexed(gpu::LINES, (gpu::uint32)_wireIndexCount, (gpu::uint32)_wireIndexOffset); } } void GeometryCache::ShapeData::drawInstances(gpu::Batch& batch, size_t count) const { if (_indexCount) { setupBatch(batch); - batch.drawIndexedInstanced(count, gpu::TRIANGLES, _indexCount, _indexOffset); + batch.drawIndexedInstanced((gpu::uint32)count, gpu::TRIANGLES, (gpu::uint32)_indexCount, (gpu::uint32)_indexOffset); } } void GeometryCache::ShapeData::drawWireInstances(gpu::Batch& batch, size_t count) const { if (_wireIndexCount) { setupBatch(batch); - batch.drawIndexedInstanced(count, gpu::LINES, _wireIndexCount, _wireIndexOffset); + batch.drawIndexedInstanced((gpu::uint32)count, gpu::LINES, (gpu::uint32)_wireIndexCount, (gpu::uint32)_wireIndexOffset); } } @@ -235,7 +235,7 @@ size_t GeometryCache::getCubeTriangleCount() { void GeometryCache::buildShapes() { auto vertexBuffer = std::make_shared(); auto indexBuffer = std::make_shared(); - uint16_t startingIndex = 0; + size_t startingIndex = 0; // Cube startingIndex = _shapeVertices->getSize() / SHAPE_VERTEX_STRIDE; @@ -324,7 +324,7 @@ void GeometryCache::buildShapes() { 20, 21, 22, 22, 23, 20 // back }; for (auto& index : indices) { - index += startingIndex; + index += (uint16_t)startingIndex; } IndexVector wireIndices{ @@ -334,7 +334,7 @@ void GeometryCache::buildShapes() { }; for (size_t i = 0; i < wireIndices.size(); ++i) { - indices[i] += startingIndex; + indices[i] += (uint16_t)startingIndex; } shapeData.setupIndices(_shapeIndices, indices, wireIndices); @@ -375,7 +375,7 @@ void GeometryCache::buildShapes() { for (size_t j = 0; j < VERTICES_PER_TRIANGLE; ++j) { auto triangleVertexIndex = j; auto vertexIndex = triangleStartIndex + triangleVertexIndex; - indices.push_back(vertexIndex + startingIndex); + indices.push_back((uint16_t)(vertexIndex + startingIndex)); } } @@ -385,7 +385,7 @@ void GeometryCache::buildShapes() { }; for (size_t i = 0; i < wireIndices.size(); ++i) { - wireIndices[i] += startingIndex; + wireIndices[i] += (uint16_t)startingIndex; } shapeData.setupIndices(_shapeIndices, indices, wireIndices); @@ -411,7 +411,7 @@ void GeometryCache::buildShapes() { // Spheres use the same values for vertices and normals vertices.push_back(vertex); vertices.push_back(vertex); - indices.push_back(vertexIndex + startingIndex); + indices.push_back((uint16_t)(vertexIndex + startingIndex)); } } } @@ -445,7 +445,7 @@ void GeometryCache::buildShapes() { auto vertexIndex = triangleStartIndex + triangleVertexIndex; vertices.push_back(glm::normalize(originalVertices[vertexIndex])); vertices.push_back(faceNormal); - indices.push_back(vertexIndex + startingIndex); + indices.push_back((uint16_t)(vertexIndex + startingIndex)); } } } @@ -465,8 +465,8 @@ void GeometryCache::buildShapes() { }); IndexVector wireIndices; // Only two indices - wireIndices.push_back(0 + startingIndex); - wireIndices.push_back(1 + startingIndex); + wireIndices.push_back(0 + (uint16_t)startingIndex); + wireIndices.push_back(1 + (uint16_t)startingIndex); shapeData.setupIndices(_shapeIndices, IndexVector(), wireIndices); } diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 08abb74316..2465bd5c29 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -156,7 +156,7 @@ public: } /// Returns the number of joint states in the model. - int getJointStateCount() const { return _rig->getJointStateCount(); } + int getJointStateCount() const { return (int)_rig->getJointStateCount(); } bool getJointPositionInWorldFrame(int jointIndex, glm::vec3& position) const; bool getJointRotationInWorldFrame(int jointIndex, glm::quat& rotation) const; bool getJointCombinedRotation(int jointIndex, glm::quat& rotation) const; diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index 1430651c86..275e8af29c 100755 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -91,12 +91,12 @@ RenderDeferredTask::RenderDeferredTask() : Task() { _jobs.push_back(Job(new AmbientOcclusion::JobModel("AmbientOcclusion"))); _jobs.back().setEnabled(false); - _occlusionJobIndex = _jobs.size() - 1; + _occlusionJobIndex = (int)_jobs.size() - 1; _jobs.push_back(Job(new Antialiasing::JobModel("Antialiasing"))); _jobs.back().setEnabled(false); - _antialiasingJobIndex = _jobs.size() - 1; + _antialiasingJobIndex = (int)_jobs.size() - 1; _jobs.push_back(Job(new FetchItems::JobModel("FetchTransparent", FetchItems( @@ -119,13 +119,13 @@ RenderDeferredTask::RenderDeferredTask() : Task() { _jobs.push_back(Job(new render::DrawStatus::JobModel("DrawStatus", renderedOpaques, DrawStatus(statusIconMap)))); _jobs.back().setEnabled(false); - _drawStatusJobIndex = _jobs.size() - 1; + _drawStatusJobIndex = (int)_jobs.size() - 1; _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D"))); _jobs.push_back(Job(new HitEffect::JobModel("HitEffect"))); _jobs.back().setEnabled(false); - _drawHitEffectJobIndex = _jobs.size() -1; + _drawHitEffectJobIndex = (int)_jobs.size() -1; // Give ourselves 3 frmaes of timer queries @@ -181,7 +181,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend batch.setStateScissorRect(args->_viewport); args->_batch = &batch; - renderContext->_numDrawnOpaqueItems = inItems.size(); + renderContext->_numDrawnOpaqueItems = (int)inItems.size(); glm::mat4 projMat; Transform viewMat; @@ -210,7 +210,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const batch.setStateScissorRect(args->_viewport); args->_batch = &batch; - renderContext->_numDrawnTransparentItems = inItems.size(); + renderContext->_numDrawnTransparentItems = (int)inItems.size(); glm::mat4 projMat; Transform viewMat; @@ -262,8 +262,8 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon inItems.emplace_back(id); } } - renderContext->_numFeedOverlay3DItems = inItems.size(); - renderContext->_numDrawnOverlay3DItems = inItems.size(); + renderContext->_numFeedOverlay3DItems = (int)inItems.size(); + renderContext->_numDrawnOverlay3DItems = (int)inItems.size(); if (!inItems.empty()) { RenderArgs* args = renderContext->args; diff --git a/libraries/render/src/render/DrawTask.h b/libraries/render/src/render/DrawTask.h index 3f628c3a02..5dd61e347f 100755 --- a/libraries/render/src/render/DrawTask.h +++ b/libraries/render/src/render/DrawTask.h @@ -216,7 +216,7 @@ void renderItems(const SceneContextPointer& sceneContext, const RenderContextPoi class FetchItems { public: - typedef std::function ProbeNumItems; + typedef std::function ProbeNumItems; FetchItems(const ProbeNumItems& probe): _probeNumItems(probe) {} FetchItems(const ItemFilter& filter, const ProbeNumItems& probe): _filter(filter), _probeNumItems(probe) {} diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index 6ddd60cce8..1976801c96 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -495,7 +495,7 @@ public: /// WARNING, There is No check on the validity of the ID, so this could return a bad Item const Item& getItem(const ItemID& id) const { return _items[id]; } - unsigned int getNumItems() const { return _items.size(); } + size_t getNumItems() const { return _items.size(); } void processPendingChangesQueue(); diff --git a/libraries/shared/src/BufferParser.h b/libraries/shared/src/BufferParser.h index bf06387a11..74b47cb72f 100644 --- a/libraries/shared/src/BufferParser.h +++ b/libraries/shared/src/BufferParser.h @@ -51,7 +51,7 @@ public: inline void readCompressedCount(T& result) { // FIXME switch to a heapless implementation as soon as Brad provides it. ByteCountCoded codec; - _offset += codec.decode(reinterpret_cast(_data + _offset), remaining()); + _offset += codec.decode(reinterpret_cast(_data + _offset), (int)remaining()); result = codec.data; } diff --git a/libraries/shared/src/PropertyFlags.h b/libraries/shared/src/PropertyFlags.h index 2d512ece61..a4ff193a77 100644 --- a/libraries/shared/src/PropertyFlags.h +++ b/libraries/shared/src/PropertyFlags.h @@ -201,7 +201,7 @@ inline size_t PropertyFlags::decode(const uint8_t* data, size_t size) { clear(); // we are cleared out! size_t bytesConsumed = 0; - int bitCount = BITS_IN_BYTE * size; + auto bitCount = BITS_IN_BYTE * size; int encodedByteCount = 1; // there is at least 1 byte (after the leadBits) int leadBits = 1; // there is always at least 1 lead bit @@ -246,7 +246,7 @@ inline size_t PropertyFlags::decode(const uint8_t* data, size_t size) { break; } } - _encodedLength = bytesConsumed; + _encodedLength = (int)bytesConsumed; return bytesConsumed; } diff --git a/libraries/shared/src/RenderArgs.h b/libraries/shared/src/RenderArgs.h index fcacf7aaed..061e07c600 100644 --- a/libraries/shared/src/RenderArgs.h +++ b/libraries/shared/src/RenderArgs.h @@ -35,8 +35,8 @@ public: }; struct Item { - int _considered = 0; - int _rendered = 0; + size_t _considered = 0; + size_t _rendered = 0; int _outOfView = 0; int _tooSmall = 0; }; diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index 145ec4ec37..298d5f669b 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -334,8 +334,8 @@ unsigned char* pointToVoxel(float x, float y, float z, float s, unsigned char r, voxelSizeInOctets++; } - unsigned int voxelSizeInBytes = bytesRequiredForCodeLength(voxelSizeInOctets); // (voxelSizeInBits/8)+1; - unsigned int voxelBufferSize = voxelSizeInBytes + sizeof(rgbColor); // 3 for color + auto voxelSizeInBytes = bytesRequiredForCodeLength(voxelSizeInOctets); // (voxelSizeInBits/8)+1; + auto voxelBufferSize = voxelSizeInBytes + sizeof(rgbColor); // 3 for color // allocate our resulting buffer unsigned char* voxelOut = new unsigned char[voxelBufferSize]; diff --git a/libraries/shared/src/shared/JSONHelpers.cpp b/libraries/shared/src/shared/JSONHelpers.cpp index c0a8820d95..19d76ec132 100644 --- a/libraries/shared/src/shared/JSONHelpers.cpp +++ b/libraries/shared/src/shared/JSONHelpers.cpp @@ -30,8 +30,8 @@ T glmFromJson(const QJsonValue& json) { T result; if (json.isArray()) { QJsonArray array = json.toArray(); - size_t length = std::min(array.size(), result.length()); - for (size_t i = 0; i < length; ++i) { + auto length = std::min(array.size(), result.length()); + for (auto i = 0; i < length; ++i) { result[i] = (float)array[i].toDouble(); } } diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp index 0cbd354e92..c0e21276d8 100644 --- a/tests/entities/src/main.cpp +++ b/tests/entities/src/main.cpp @@ -121,7 +121,7 @@ void testPropertyFlags(uint32_t value) { { #ifndef QT_NO_DEBUG - int decodeSize = decodeNew.decode((const uint8_t*)encoded.data(), encoded.size()); + int decodeSize = (int)decodeNew.decode((const uint8_t*)encoded.data(), (int)encoded.size()); Q_ASSERT(originalSize == decodeSize); Q_ASSERT(decodeNew == original); #endif diff --git a/tests/gpu-test/src/main.cpp b/tests/gpu-test/src/main.cpp index aa763196d1..0b701887f9 100644 --- a/tests/gpu-test/src/main.cpp +++ b/tests/gpu-test/src/main.cpp @@ -58,7 +58,7 @@ public: } unsigned int count() const { - return times.size() - 1; + return (unsigned int)times.size() - 1; } float elapsed() const { @@ -283,10 +283,10 @@ public: GeometryCache::ShapeData shapeData = geometryCache->_shapes[shape]; { gpu::Batch::DrawIndexedIndirectCommand indirectCommand; - indirectCommand._count = shapeData._indexCount; + indirectCommand._count = (uint)shapeData._indexCount; indirectCommand._instanceCount = ITEM_COUNT; - indirectCommand._baseInstance = i * ITEM_COUNT; - indirectCommand._firstIndex = shapeData._indexOffset / 2; + indirectCommand._baseInstance = (uint)(i * ITEM_COUNT); + indirectCommand._firstIndex = (uint)shapeData._indexOffset / 2; indirectCommand._baseVertex = 0; indirectBuffer->append(indirectCommand); } diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp index 4afb2d4807..c8fa03fec6 100644 --- a/tests/render-utils/src/main.cpp +++ b/tests/render-utils/src/main.cpp @@ -38,7 +38,7 @@ public: } unsigned int count() const { - return times.size() - 1; + return (unsigned int)times.size() - 1; } float elapsed() const { diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index 3879d0b029..18f62dc016 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -49,7 +49,7 @@ public: times.clear(); } - unsigned int count() const { + size_t count() const { return times.size() - 1; } diff --git a/tools/scribe/src/TextTemplate.cpp b/tools/scribe/src/TextTemplate.cpp index 027a73da5d..01567d9255 100755 --- a/tools/scribe/src/TextTemplate.cpp +++ b/tools/scribe/src/TextTemplate.cpp @@ -730,7 +730,7 @@ int TextTemplate::evalBlockGeneration(std::ostream& dst, const BlockPointer& blo BlockPointer funcBlock = _config->_funcs.findFunc(block->command.arguments.front().c_str()); if (funcBlock) { // before diving in the func tree, let's modify the vars with the local defs: - int nbParams = std::min(block->command.arguments.size(), funcBlock->command.arguments.size()); + auto nbParams = std::min(block->command.arguments.size(), funcBlock->command.arguments.size()); std::vector< String > paramCache; paramCache.push_back(""); String val; @@ -839,7 +839,7 @@ int TextTemplate::evalBlockGeneration(std::ostream& dst, const BlockPointer& blo String val; for (unsigned int t = 1; t < block->command.arguments.size(); t++) { // detect if a param is a var - int len = block->command.arguments[t].length(); + auto len = block->command.arguments[t].length(); if ((block->command.arguments[t][0] == Tag::VAR) && (block->command.arguments[t][len - 1] == Tag::VAR)) { String var = block->command.arguments[t].substr(1, len - 2); diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp index d4054527f9..533e6371e9 100644 --- a/tools/udt-test/src/UDTTest.cpp +++ b/tools/udt-test/src/UDTTest.cpp @@ -311,8 +311,8 @@ void UDTTest::sendPacket() { packetList->closeCurrentPacket(); - _totalQueuedBytes += packetList->getDataSize(); - _totalQueuedPackets += packetList->getNumPackets(); + _totalQueuedBytes += (int)packetList->getDataSize(); + _totalQueuedPackets += (int)packetList->getNumPackets(); _socket.writePacketList(std::move(packetList), _target); } diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp index 75a1a9dc3a..d997f63e53 100644 --- a/tools/vhacd-util/src/VHACDUtil.cpp +++ b/tools/vhacd-util/src/VHACDUtil.cpp @@ -95,7 +95,7 @@ void vhacd::VHACDUtil::fattenMeshes(const FBXMesh& mesh, FBXMesh& result, getTrianglesInMeshPart(meshPart, triangles); } - unsigned int triangleCount = triangles.size() / 3; + auto triangleCount = triangles.size() / 3; if (triangleCount == 0) { return; } @@ -230,7 +230,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry, continue; } - int nPoints = vertices.size(); + auto nPoints = vertices.size(); AABox aaBox = getAABoxForMeshPart(mesh, meshPart); const float largestDimension = aaBox.getLargestDimension(); @@ -251,7 +251,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry, // compute approximate convex decomposition - bool res = interfaceVHACD->Compute(&vertices[0].x, 3, nPoints, &triangles[0], 3, triangleCount, params); + bool res = interfaceVHACD->Compute(&vertices[0].x, 3, (uint)nPoints, &triangles[0], 3, triangleCount, params); if (!res){ qDebug() << "V-HACD computation failed for Mesh : " << count; count++;