Commit ce133354 authored by Robert Menzel's avatar Robert Menzel

reduced warnings

parent 06ea7ae9
......@@ -131,7 +131,7 @@ public:
uint32_t _arrayBufferAttribute,
GLint _attributeLocation = -1)
{
Attribute newAttribute = { _arrayBuffer, _arrayBufferAttribute };
Attribute newAttribute = { _arrayBuffer, (int32_t) _arrayBufferAttribute };
attachAttribute( newAttribute, _attributeLocation );
}
......
......@@ -157,7 +157,7 @@ bool GeometryDataControlFileATB::load(SharedGeometryData& _geometry) const
std::memcpy(data, &dataVector[0], dataVector.size() * sizeof(GLfloat));
// Name the attribute according to the filename
ArrayBuffer::Attribute attr = { mAttributeName, GL_FLOAT, attributeDimension, 0, GL_FALSE, 0, GL_FALSE };
ArrayBuffer::Attribute attr = { mAttributeName, GL_FLOAT, (int_t)attributeDimension, 0, GL_FALSE, 0, GL_FALSE };
_geometry->mAttributes.push_back(attr);
// Tell the _geometry object where it finds the data
......
......@@ -291,7 +291,7 @@ bool GeometryDataControlFileOBJ::load(SharedGeometryData& geometry) const
if (texCoordDimension > 0) {
int offset = (hasNormals?7:4);
offset *= sizeof(float);
ArrayBuffer::Attribute atex = { "aTexCoord", GL_FLOAT, texCoordDimension, offset, GL_FALSE, 0, GL_FALSE };
ArrayBuffer::Attribute atex = { "aTexCoord", GL_FLOAT, (int_t)texCoordDimension, (GLuint) offset, GL_FALSE, 0, GL_FALSE };
geometry->mAttributes.push_back( atex );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment