lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUFFER_INT;

This commit is contained in:
bjorn 2016-11-14 21:31:17 -08:00
parent 0c86495171
commit 7b81618198
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/buffer.h
View File

@ -19,7 +19,8 @@ typedef enum {
typedef enum {
BUFFER_FLOAT = GL_FLOAT,
BUFFER_BYTE = GL_BYTE
BUFFER_BYTE = GL_BYTE,
BUFFER_INT = GL_INT
} BufferAttributeType;
typedef struct {

11
src/lovr/graphics.c
View File

@ -95,6 +95,7 @@ int l_lovrGraphicsInit(lua_State* L) {
map_init(&BufferAttributeTypes);
map_set(&BufferAttributeTypes, "float", BUFFER_FLOAT);
map_set(&BufferAttributeTypes, "byte", BUFFER_BYTE);
map_set(&BufferAttributeTypes, "int", BUFFER_INT);
map_init(&BufferDrawModes);
map_set(&BufferDrawModes, "points", BUFFER_POINTS);
@ -509,6 +510,16 @@ int l_lovrGraphicsNewBuffer(lua_State* L) {
*((unsigned char*) v) = value;
v = (char*) v + sizeof(unsigned char);
} else if (attribute.type == BUFFER_INT) {
int value = 0;
if (tableIndex <= tableCount) {
lua_rawgeti(L, -1, tableIndex++);
value = lua_tointeger(L, -1);
lua_pop(L, 1);
}
*((int*) v) = value;
v = (int*) v + sizeof(int);
}
}
}

26
src/lovr/types/buffer.c
View File

@ -26,6 +26,9 @@ int luax_pushbuffervertex(lua_State* L, void* vertex, BufferFormat format) {
} else if (attribute.type == BUFFER_BYTE) {
lua_pushnumber(L, *((unsigned char*)vertex));
vertex = (char*) vertex + sizeof(unsigned char);
} else if (attribute.type == BUFFER_INT) {
lua_pushnumber(L, *((int*)vertex));
vertex = (char*) vertex + sizeof(int);
}
count++;
}
@ -160,6 +163,16 @@ int l_lovrBufferSetVertex(lua_State* L) {
*((unsigned char*) v) = value;
v = (char*) v + sizeof(unsigned char);
} else if (attribute.type == BUFFER_INT) {
unsigned char value = 0;
if (tableIndex <= tableCount) {
lua_rawgeti(L, 3, tableIndex++);
value = lua_tointeger(L, -1);
lua_pop(L, 1);
}
*((int*) v) = value;
v = (char*) v + sizeof(int);
}
}
}
@ -178,6 +191,9 @@ int l_lovrBufferSetVertex(lua_State* L) {
} else if (attribute.type == BUFFER_BYTE) {
*((char*) v) = argumentIndex <= argumentCount ? lua_tointeger(L, argumentIndex++) : 255;
v = (char*) v + sizeof(char);
} else if (attribute.type == BUFFER_INT) {
*((int*) v) = argumentIndex <= argumentCount ? lua_tointeger(L, argumentIndex++) : 0;
v = (char*) v + sizeof(int);
}
}
}
@ -223,6 +239,16 @@ int l_lovrBufferSetVertices(lua_State* L) {
*((unsigned char*) v) = value;
v = (char*) v + sizeof(unsigned char);
} else if (attribute.type == BUFFER_INT) {
int value = 0;
if (attributeIndex <= attributeCount) {
lua_rawgeti(L, -1, attributeIndex++);
value = lua_tointeger(L, -1);
lua_pop(L, 1);
}
*((int*) v) = value;
v = (char*) v + sizeof(int);
}
}
}