From 3dbe5d79bb9900f43dd8edfd6e1e8db164d3eb3d Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 26 Feb 2018 06:01:16 -0500 Subject: [PATCH] fix windows punctilious warnings --- .../src/graphics-scripting/ScriptableMesh.cpp | 14 +++++++------- libraries/render-utils/src/Model.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp index e5e58b847a..5ff916275e 100644 --- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp +++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp @@ -131,10 +131,10 @@ QVariantMap scriptable::ScriptableMesh::getBufferFormats() const { auto bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), a.second); result[a.first] = QVariantMap{ { "slot", a.second }, - { "length", (quint32)bufferView.getNumElements() }, - { "byteLength", (quint32)bufferView._size }, - { "offset", (quint32) bufferView._offset }, - { "stride", (quint32)bufferView._stride }, + { "length", (glm::uint32)bufferView.getNumElements() }, + { "byteLength", (glm::uint32)bufferView._size }, + { "offset", (glm::uint32) bufferView._offset }, + { "stride", (glm::uint32)bufferView._stride }, { "element", scriptable::toVariant(bufferView._element) }, }; } @@ -171,7 +171,7 @@ glm::uint32 scriptable::ScriptableMesh::addAttribute(const QString& attributeNam return values.size(); } else { auto bufferView = buffer_helpers::mesh::getBufferView(mesh, slot); - auto current = bufferView.getNumElements(); + auto current = (glm::uint32)bufferView.getNumElements(); if (current < numVertices) { bufferView = buffer_helpers::resized(bufferView, numVertices); for (glm::uint32 i = current; i < numVertices; i++) { @@ -220,7 +220,7 @@ QVariantList scriptable::ScriptableMesh::queryVertexAttributes(QVariant selector } auto slotNum = _getSlotNumber(attributeName); const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast(slotNum)); - glm::uint32 numElements = bufferView.getNumElements(); + glm::uint32 numElements = (glm::uint32)bufferView.getNumElements(); for (glm::uint32 i = 0; i < numElements; i++) { result << buffer_helpers::getValue(bufferView, i, qUtf8Printable(attributeName)); } @@ -339,7 +339,7 @@ bool scriptable::ScriptableMesh::isValidIndex(glm::uint32 vertexIndex, const QSt return false; } auto view = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast(slotNum)); - if (vertexIndex >= view.getNumElements()) { + if (vertexIndex >= (glm::uint32)view.getNumElements()) { if (context()) { context()->throwError(QString("vertexIndex=%1 out of range (attribute=%2, numElements=%3)").arg(vertexIndex).arg(attributeName).arg(view.getNumElements())); } diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 0abeb70254..f6e3ce20f0 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -635,7 +635,7 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe FBXMesh mesh; mesh._mesh = newMesh.getMeshPointer(); mesh.vertices = buffer_helpers::mesh::attributeToVector(mesh._mesh, gpu::Stream::POSITION); - int numParts = newMesh.getMeshPointer()->getNumParts(); + int numParts = (int)newMesh.getMeshPointer()->getNumParts(); for (int partID = 0; partID < numParts; partID++) { FBXMeshPart part; part.triangleIndices = buffer_helpers::bufferToVector(mesh._mesh->getIndexBuffer(), "part.triangleIndices");