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

lovr.graphics.plane uv arguments;

This commit is contained in:
bjorn 2019-04-05 05:34:28 -07:00
parent 0b62960472
commit a5891bad92
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/graphics.c
View File

@ -763,8 +763,12 @@ static int l_lovrGraphicsPlane(lua_State* L) {
style = luaL_checkoption(L, 1, NULL, DrawStyles);
}
float transform[16];
luax_readmat4(L, 2, transform, 2);
lovrGraphicsPlane(style, material, transform);
int index = luax_readmat4(L, 2, transform, 2);
float u = luax_optfloat(L, index, 0.f);
float v = luax_optfloat(L, index, 0.f);
float w = luax_optfloat(L, index, 1.f - u);
float h = luax_optfloat(L, index, 1.f - v);
lovrGraphicsPlane(style, material, transform, u, v, w, h);
return 0;
}

55
src/graphics/graphics.c
View File

@ -764,7 +764,7 @@ void lovrGraphicsTriangle(DrawStyle style, Material* material, uint32_t count, f
}
}
void lovrGraphicsPlane(DrawStyle style, Material* material, mat4 transform) {
void lovrGraphicsPlane(DrawStyle style, Material* material, mat4 transform, float u, float v, float w, float h) {
float* vertices = NULL;
uint16_t* indices = NULL;
uint16_t baseVertex;
@ -779,41 +779,38 @@ void lovrGraphicsPlane(DrawStyle style, Material* material, mat4 transform) {
.indexCount = style == STYLE_LINE ? 5 : 6,
.vertices = &vertices,
.indices = &indices,
.baseVertex = &baseVertex,
.instanced = true
.baseVertex = &baseVertex
});
if (vertices) {
if (style == STYLE_LINE) {
static float vertexData[] = {
-.5, .5, 0, 0, 0, 0, 0, 0,
.5, .5, 0, 0, 0, 0, 0, 0,
.5, -.5, 0, 0, 0, 0, 0, 0,
-.5, -.5, 0, 0, 0, 0, 0, 0
};
if (style == STYLE_LINE) {
static float vertexData[] = {
-.5f, .5f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
.5f, .5f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
.5f, -.5f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
-.5f, -.5f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f
};
memcpy(vertices, vertexData, sizeof(vertexData));
memcpy(vertices, vertexData, sizeof(vertexData));
indices[0] = 0xffff;
indices[1] = 0 + baseVertex;
indices[2] = 1 + baseVertex;
indices[3] = 2 + baseVertex;
indices[4] = 3 + baseVertex;
} else {
static float vertexData[] = {
-.5, .5, 0, 0, 0, -1, 0, 1,
-.5, -.5, 0, 0, 0, -1, 0, 0,
.5, .5, 0, 0, 0, -1, 1, 1,
.5, -.5, 0, 0, 0, -1, 1, 0
};
indices[0] = 0xffff;
indices[1] = 0 + baseVertex;
indices[2] = 1 + baseVertex;
indices[3] = 2 + baseVertex;
indices[4] = 3 + baseVertex;
} else {
float vertexData[] = {
-.5, .5, 0, 0, 0, -1, u, v + h,
-.5, -.5, 0, 0, 0, -1, u, v,
.5, .5, 0, 0, 0, -1, u + w, v + h,
.5, -.5, 0, 0, 0, -1, u + w, v
};
memcpy(vertices, vertexData, sizeof(vertexData));
memcpy(vertices, vertexData, sizeof(vertexData));
static uint16_t indexData[] = { 0, 1, 2, 2, 1, 3 };
static uint16_t indexData[] = { 0, 1, 2, 2, 1, 3 };
for (size_t i = 0; i < sizeof(indexData) / sizeof(indexData[0]); i++) {
indices[i] = indexData[i] + baseVertex;
}
for (size_t i = 0; i < sizeof(indexData) / sizeof(indexData[0]); i++) {
indices[i] = indexData[i] + baseVertex;
}
}
}

2
src/graphics/graphics.h
View File

@ -267,7 +267,7 @@ void lovrGraphicsFlushMesh(struct Mesh* mesh);
void lovrGraphicsPoints(uint32_t count, float** vertices);
void lovrGraphicsLine(uint32_t count, float** vertices);
void lovrGraphicsTriangle(DrawStyle style, struct Material* material, uint32_t count, float** vertices);
void lovrGraphicsPlane(DrawStyle style, struct Material* material, mat4 transform);
void lovrGraphicsPlane(DrawStyle style, struct Material* material, mat4 transform, float u, float v, float w, float h);
void lovrGraphicsBox(DrawStyle style, struct Material* material, mat4 transform);
void lovrGraphicsArc(DrawStyle style, ArcMode mode, struct Material* material, mat4 transform, float r1, float r2, int segments);
void lovrGraphicsCircle(DrawStyle style, struct Material* material, mat4 transform, int segments);