Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix windows punctilious warnings

Browse source
This commit is contained in:
humbletim 2018-02-26 06:01:16 -05:00
parent 54dc0240b0
commit 3dbe5d79bb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
View file

@ -131,10 +131,10 @@ QVariantMap scriptable::ScriptableMesh::getBufferFormats() const {
auto bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), a.second); auto bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), a.second);
result[a.first] = QVariantMap{ result[a.first] = QVariantMap{
{ "slot", a.second }, { "slot", a.second },
{ "length", (quint32)bufferView.getNumElements() }, { "length", (glm::uint32)bufferView.getNumElements() },
{ "byteLength", (quint32)bufferView._size }, { "byteLength", (glm::uint32)bufferView._size },
{ "offset", (quint32) bufferView._offset }, { "offset", (glm::uint32) bufferView._offset },
{ "stride", (quint32)bufferView._stride }, { "stride", (glm::uint32)bufferView._stride },
{ "element", scriptable::toVariant(bufferView._element) }, { "element", scriptable::toVariant(bufferView._element) },
}; };
} }
@ -171,7 +171,7 @@ glm::uint32 scriptable::ScriptableMesh::addAttribute(const QString& attributeNam
return values.size(); return values.size();
} else { } else {
auto bufferView = buffer_helpers::mesh::getBufferView(mesh, slot); auto bufferView = buffer_helpers::mesh::getBufferView(mesh, slot);
auto current = bufferView.getNumElements(); auto current = (glm::uint32)bufferView.getNumElements();
if (current < numVertices) { if (current < numVertices) {
bufferView = buffer_helpers::resized(bufferView, numVertices); bufferView = buffer_helpers::resized(bufferView, numVertices);
for (glm::uint32 i = current; i < numVertices; i++) { for (glm::uint32 i = current; i < numVertices; i++) {
@ -220,7 +220,7 @@ QVariantList scriptable::ScriptableMesh::queryVertexAttributes(QVariant selector
} }
auto slotNum = _getSlotNumber(attributeName); auto slotNum = _getSlotNumber(attributeName);
const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum)); const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
glm::uint32 numElements = bufferView.getNumElements(); glm::uint32 numElements = (glm::uint32)bufferView.getNumElements();
for (glm::uint32 i = 0; i < numElements; i++) { for (glm::uint32 i = 0; i < numElements; i++) {
result << buffer_helpers::getValue<QVariant>(bufferView, i, qUtf8Printable(attributeName)); result << buffer_helpers::getValue<QVariant>(bufferView, i, qUtf8Printable(attributeName));
} }
@ -339,7 +339,7 @@ bool scriptable::ScriptableMesh::isValidIndex(glm::uint32 vertexIndex, const QSt
return false; return false;
} }
auto view = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum)); auto view = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
if (vertexIndex >= view.getNumElements()) { if (vertexIndex >= (glm::uint32)view.getNumElements()) {
if (context()) { if (context()) {
context()->throwError(QString("vertexIndex=%1 out of range (attribute=%2, numElements=%3)").arg(vertexIndex).arg(attributeName).arg(view.getNumElements())); context()->throwError(QString("vertexIndex=%1 out of range (attribute=%2, numElements=%3)").arg(vertexIndex).arg(attributeName).arg(view.getNumElements()));
} }

2
libraries/render-utils/src/Model.cpp
View file

@ -635,7 +635,7 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
FBXMesh mesh; FBXMesh mesh;
mesh._mesh = newMesh.getMeshPointer(); mesh._mesh = newMesh.getMeshPointer();
mesh.vertices = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh._mesh, gpu::Stream::POSITION); mesh.vertices = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh._mesh, gpu::Stream::POSITION);
int numParts = newMesh.getMeshPointer()->getNumParts(); int numParts = (int)newMesh.getMeshPointer()->getNumParts();
for (int partID = 0; partID < numParts; partID++) { for (int partID = 0; partID < numParts; partID++) {
FBXMeshPart part; FBXMeshPart part;
part.triangleIndices = buffer_helpers::bufferToVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices"); part.triangleIndices = buffer_helpers::bufferToVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");