Pulled Mesh:set/getInstanceCount from 0.9.1 for now.

The feature is difficult to use well unless custom vertex attributes are added.
This commit is contained in:
Alex Szpakowski
2014-03-29 16:30:48 -03:00
parent 146b3cff19
commit e7947d9d2e
2 changed files with 6 additions and 3 deletions
-1
View File
@@ -9,7 +9,6 @@ LOVE 0.9.1 [Baby Inspector]
* Added ParticleSystem:setRelativeRotation.
* Added love.graphics.setWireframe for debugging.
* Added Mesh:setDrawRange and Mesh:getDrawRange.
* Added instancing support to Meshes with Mesh:setInstanceCount.
* Added CircleShape:getPoint and CircleShape:setPoint.
* Added Mesh/SpriteBatch/ParticleSystem:setTexture, accepts Canvases and Images.
* Added high-dpi window support for Retina displays in OS X, via the 'highdpi' window flag.
+6 -2
View File
@@ -371,8 +371,12 @@ static const luaL_Reg functions[] =
{ "getVertexCount", w_Mesh_getVertexCount },
{ "setVertexMap", w_Mesh_setVertexMap },
{ "getVertexMap", w_Mesh_getVertexMap },
{ "setInstanceCount", w_Mesh_setInstanceCount },
{ "getInstanceCount", w_Mesh_getInstanceCount },
// Disabled for now, since implementation is incomplete and might change
// if/when VertexBuffers / custom vertex attributes are added.
// { "setInstanceCount", w_Mesh_setInstanceCount },
// { "getInstanceCount", w_Mesh_getInstanceCount },
{ "setTexture", w_Mesh_setTexture },
{ "getTexture", w_Mesh_getTexture },
{ "setDrawMode", w_Mesh_setDrawMode },