LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 20:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed love.graphics.newMesh(vertexcount, ...) trying to use glDrawArraysInstanced sometimes, fixed Mesh:getVertexMap.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-05-23 13:46:13 -03:00
parent fd5b5aad65
commit a028f94ff2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Mesh.cpp
+6 -5
View File
@@ -55,6 +55,7 @@ Mesh::Mesh(int vertexcount, Mesh::DrawMode mode)
, ibo(nullptr) , ibo(nullptr)
, element_count(0) , element_count(0)
, element_data_type(getGLDataTypeFromMax(vertexcount)) , element_data_type(getGLDataTypeFromMax(vertexcount))
, instance_count(1)
, draw_mode(mode) , draw_mode(mode)
, range_min(-1) , range_min(-1)
, range_max(-1) , range_max(-1)
@@ -232,10 +233,10 @@ void Mesh::setVertexMap(const std::vector<uint32> &map)
* Copies index data from a mapped buffer to a vector. * Copies index data from a mapped buffer to a vector.
**/ **/
template <typename T> template <typename T>
static void copyFromIndexBuffer(void *buffer, std::vector<uint32> &indices, size_t maxval) static void copyFromIndexBuffer(void *buffer, size_t count, std::vector<uint32> &indices)
{ {
T *elems = (T *) buffer; T *elems = (T *) buffer;
for (size_t i = 0; i < maxval; i++) for (size_t i = 0; i < count; i++)
indices.push_back((uint32) elems[i]); indices.push_back((uint32) elems[i]);
} }
@@ -256,14 +257,14 @@ void Mesh::getVertexMap(std::vector<uint32> &map) const
switch (element_data_type) switch (element_data_type)
{ {
case GL_UNSIGNED_BYTE: case GL_UNSIGNED_BYTE:
copyFromIndexBuffer<uint8>(buffer, map, vertex_count); copyFromIndexBuffer<uint8>(buffer, element_count, map);
break; break;
case GL_UNSIGNED_SHORT: case GL_UNSIGNED_SHORT:
copyFromIndexBuffer<uint16>(buffer, map, vertex_count); copyFromIndexBuffer<uint16>(buffer, element_count, map);
break; break;
case GL_UNSIGNED_INT: case GL_UNSIGNED_INT:
default: default:
copyFromIndexBuffer<uint32>(buffer, map, vertex_count); copyFromIndexBuffer<uint32>(buffer, element_count, map);
break; break;
} }
} }