Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

quiet warnings

Browse source
This commit is contained in:
Seth Alves 2017-03-14 17:49:39 -07:00
parent 3f142b7290
commit 40b87171a9
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -1272,9 +1272,9 @@ void RenderablePolyVoxEntityItem::recomputeMesh() {
gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::RAW)));
std::vector<model::Mesh::Part> parts;
parts.emplace_back(model::Mesh::Part(0, // startIndex
vecIndices.size(), // numIndices
0, // baseVertex
parts.emplace_back(model::Mesh::Part((model::Index)0, // startIndex
(model::Index)vecIndices.size(), // numIndices
(model::Index)0, // baseVertex
model::Mesh::TRIANGLES)); // topology
mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(model::Mesh::Part),
(gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));

3
libraries/fbx/src/FBXReader_Node.cpp
View file

@ -54,7 +54,8 @@ template<class T> QVariant readBinaryArray(QDataStream& in, int& position) {
in.readRawData(compressed.data() + sizeof(quint32), compressedLength);
position += compressedLength;
arrayData = qUncompress(compressed);
if (arrayData.isEmpty() || arrayData.size() != (sizeof(T) * arrayLength)) { // answers empty byte array if corrupt
if (arrayData.isEmpty() ||
(unsigned int)arrayData.size() != (sizeof(T) * arrayLength)) { // answers empty byte array if corrupt
throw QString("corrupt fbx file");
}
} else {

6
libraries/fbx/src/OBJWriter.cpp
View file

@ -75,7 +75,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
const gpu::BufferView& indexBuffer = mesh->getIndexBuffer();
// const gpu::BufferView& vertexBuffer = mesh->getVertexBuffer();
int partCount = mesh->getNumParts();
size_t partCount = mesh->getNumParts();
qDebug() << "writeOBJToTextStream part count is" << partCount;
for (int partIndex = 0; partIndex < partCount; partIndex++) {
const model::Mesh::Part& part = partBuffer.get<model::Mesh::Part>(partIndex);
@ -88,11 +88,11 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
indexItr += part._startIndex;
int indexCount = 0;
while (indexItr != indexBuffer.cend<uint32_t>() && indexItr != part._numIndices) {
while (indexItr != indexBuffer.cend<uint32_t>() && (indexItr != part._numIndices)) {
uint32_t index0 = *indexItr;
indexItr++;
indexCount++;
if (indexItr == indexBuffer.cend<uint32_t>() || indexItr == part._numIndices) {
if (indexItr == indexBuffer.cend<uint32_t>() || (indexItr == part._numIndices)) {
qDebug() << "OBJWriter -- index buffer length isn't multiple of 3";
break;
}

2
libraries/script-engine/src/MeshProxy.h
View file

@ -25,7 +25,7 @@ public:
MeshPointer getMeshPointer() const { return _mesh; }
Q_INVOKABLE int getNumVertices() const { return _mesh->getNumVertices(); }
Q_INVOKABLE int getNumVertices() const { (int)return _mesh->getNumVertices(); }
Q_INVOKABLE glm::vec3 getPos3(int index) const { return _mesh->getPos3(index); }