mirror of https://github.com/bjornbytes/lovr.git
Remove some weird Mesh return codes;
This commit is contained in:
parent
2c0d85a84a
commit
65c26e47f2
|
@ -339,10 +339,7 @@ int l_lovrMeshSetDrawRange(lua_State* L) {
|
|||
lovrMeshSetRangeEnabled(mesh, 1);
|
||||
int rangeStart = luaL_checkinteger(L, 2) - 1;
|
||||
int rangeCount = luaL_checkinteger(L, 3);
|
||||
if (lovrMeshSetDrawRange(mesh, rangeStart, rangeCount)) {
|
||||
return luaL_error(L, "Invalid mesh draw range (%d, %d)", rangeStart + 1, rangeCount);
|
||||
}
|
||||
|
||||
lovrMeshSetDrawRange(mesh, rangeStart, rangeCount);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -150,9 +150,8 @@ MeshDrawMode lovrMeshGetDrawMode(Mesh* mesh) {
|
|||
return mesh->drawMode;
|
||||
}
|
||||
|
||||
int lovrMeshSetDrawMode(Mesh* mesh, MeshDrawMode drawMode) {
|
||||
void lovrMeshSetDrawMode(Mesh* mesh, MeshDrawMode drawMode) {
|
||||
mesh->drawMode = drawMode;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int lovrMeshGetVertexCount(Mesh* mesh) {
|
||||
|
@ -230,16 +229,12 @@ void lovrMeshGetDrawRange(Mesh* mesh, int* start, int* count) {
|
|||
*count = mesh->rangeCount;
|
||||
}
|
||||
|
||||
int lovrMeshSetDrawRange(Mesh* mesh, int start, int count) {
|
||||
void lovrMeshSetDrawRange(Mesh* mesh, int start, int count) {
|
||||
size_t limit = mesh->indexCount > 0 ? mesh->indexCount : mesh->count;
|
||||
|
||||
if (start < 0 || count < 0 || (size_t) start + count > limit) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
int isValidRange = start >= 0 && count >= 0 && (size_t) start + count <= limit;
|
||||
lovrAssert(isValidRange, "Invalid mesh draw range [%d, %d]", start + 1, start + count + 1);
|
||||
mesh->rangeStart = start;
|
||||
mesh->rangeCount = count;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void* lovrMeshMap(Mesh* mesh, int start, size_t count, int read, int write) {
|
||||
|
|
|
@ -63,7 +63,7 @@ void lovrMeshDestroy(const Ref* ref);
|
|||
void lovrMeshDraw(Mesh* mesh, mat4 transform);
|
||||
MeshFormat lovrMeshGetVertexFormat(Mesh* mesh);
|
||||
MeshDrawMode lovrMeshGetDrawMode(Mesh* mesh);
|
||||
int lovrMeshSetDrawMode(Mesh* mesh, MeshDrawMode drawMode);
|
||||
void lovrMeshSetDrawMode(Mesh* mesh, MeshDrawMode drawMode);
|
||||
int lovrMeshGetVertexCount(Mesh* mesh);
|
||||
int lovrMeshGetVertexSize(Mesh* mesh);
|
||||
void* lovrMeshGetVertexMap(Mesh* mesh, size_t* count);
|
||||
|
@ -73,7 +73,7 @@ void lovrMeshSetAttributeEnabled(Mesh* mesh, const char* name, int enabled);
|
|||
int lovrMeshIsRangeEnabled(Mesh* mesh);
|
||||
void lovrMeshSetRangeEnabled(Mesh* mesh, char isEnabled);
|
||||
void lovrMeshGetDrawRange(Mesh* mesh, int* start, int* count);
|
||||
int lovrMeshSetDrawRange(Mesh* mesh, int start, int count);
|
||||
void lovrMeshSetDrawRange(Mesh* mesh, int start, int count);
|
||||
Texture* lovrMeshGetTexture(Mesh* mesh);
|
||||
void lovrMeshSetTexture(Mesh* mesh, Texture* texture);
|
||||
void* lovrMeshMap(Mesh* mesh, int start, size_t count, int read, int write);
|
||||
|
|
Loading…
Reference in New Issue