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

Sort out texture coordinates; 

I hope
This commit is contained in:
bjorn 2017-01-15 13:49:24 -08:00
parent 797da11480
commit 38768afda1
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/graphics/graphics.c
View File

@ -489,10 +489,10 @@ void lovrGraphicsPlane(DrawMode mode, Texture* texture, float x, float y, float
void lovrGraphicsPlaneFullscreen(Texture* texture) {
float data[] = {
-1, 1, 0, 0, 0,
-1, -1, 0, 0, 1,
1, 1, 0, 1, 0,
1, -1, 0, 1, 1
-1, 1, 0, 0, 1,
-1, -1, 0, 0, 0,
1, 1, 0, 1, 1,
1, -1, 0, 1, 0
};
Shader* lastShader = lovrGraphicsGetShader();
@ -540,44 +540,44 @@ void lovrGraphicsCube(DrawMode mode, Texture* texture, float x, float y, float z
} else {
float data[] = {
// Front
-.5, -.5, -.5, 0, 0, -1, 0, 1,
.5, -.5, -.5, 0, 0, -1, 1, 1,
-.5, .5, -.5, 0, 0, -1, 0, 0,
.5, .5, -.5, 0, 0, -1, 1, 0,
-.5, -.5, -.5, 0, 0, -1, 0, 0,
.5, -.5, -.5, 0, 0, -1, 1, 0,
-.5, .5, -.5, 0, 0, -1, 0, 1,
.5, .5, -.5, 0, 0, -1, 1, 1,
// Right
.5, .5, -.5, 1, 0, 0, 0, 0,
.5, -.5, -.5, 1, 0, 0, 0, 1,
.5, .5, .5, 1, 0, 0, 1, 0,
.5, -.5, .5, 1, 0, 0, 1, 1,
.5, .5, -.5, 1, 0, 0, 0, 1,
.5, -.5, -.5, 1, 0, 0, 0, 0,
.5, .5, .5, 1, 0, 0, 1, 1,
.5, -.5, .5, 1, 0, 0, 1, 0,
// Back
.5, -.5, .5, 0, 0, 1, 0, 1,
-.5, -.5, .5, 0, 0, 1, 1, 1,
.5, .5, .5, 0, 0, 1, 0, 0,
-.5, .5, .5, 0, 0, 1, 1, 0,
.5, -.5, .5, 0, 0, 1, 0, 0,
-.5, -.5, .5, 0, 0, 1, 1, 0,
.5, .5, .5, 0, 0, 1, 0, 1,
-.5, .5, .5, 0, 0, 1, 1, 1,
// Left
-.5, .5, .5, -1, 0, 0, 0, 0,
-.5, -.5, .5, -1, 0, 0, 0, 1,
-.5, .5, -.5, -1, 0, 0, 1, 0,
-.5, -.5, -.5, -1, 0, 0, 1, 1,
-.5, .5, .5, -1, 0, 0, 0, 1,
-.5, -.5, .5, -1, 0, 0, 0, 0,
-.5, .5, -.5, -1, 0, 0, 1, 1,
-.5, -.5, -.5, -1, 0, 0, 1, 0,
// Bottom
-.5, -.5, -.5, 0, -1, 0, 0, 1,
-.5, -.5, .5, 0, -1, 0, 0, 0,
.5, -.5, -.5, 0, -1, 0, 1, 1,
.5, -.5, .5, 0, -1, 0, 1, 0,
-.5, -.5, -.5, 0, -1, 0, 0, 0,
-.5, -.5, .5, 0, -1, 0, 0, 1,
.5, -.5, -.5, 0, -1, 0, 1, 0,
.5, -.5, .5, 0, -1, 0, 1, 1,
// Adjust
.5, -.5, .5, 0, 1, 0, 0, 0,
-.5, .5, -.5, 0, 1, 0, 0, 0,
.5, -.5, .5, 0, 1, 0, 0, 1,
-.5, .5, -.5, 0, 1, 0, 0, 1,
// Top
-.5, .5, -.5, 0, 1, 0, 0, 0,
.5, .5, -.5, 0, 1, 0, 1, 0,
-.5, .5, .5, 0, 1, 0, 0, 1,
.5, .5, .5, 0, 1, 0, 1, 1
-.5, .5, -.5, 0, 1, 0, 0, 1,
.5, .5, -.5, 0, 1, 0, 1, 1,
-.5, .5, .5, 0, 1, 0, 0, 0,
.5, .5, .5, 0, 1, 0, 1, 0
};
vec_clear(&state.shapeData);

2
src/loaders/model.c
View File

@ -31,7 +31,7 @@ ModelData* lovrModelDataFromFile(void* data, int size) {
modelData->hasNormals = 0;
modelData->hasTexCoords = 0;
unsigned int flags = aiProcessPreset_TargetRealtime_MaxQuality | aiProcess_OptimizeGraph | aiProcess_FlipUVs;
unsigned int flags = aiProcessPreset_TargetRealtime_MaxQuality | aiProcess_OptimizeGraph;
const struct aiScene* scene = aiImportFileFromMemory(data, size, flags, NULL);
// Meshes

1
src/util.c
View File

@ -20,6 +20,7 @@ void error(const char* format, ...) {
}
unsigned char* loadImage(void* data, size_t size, int* w, int* h, int* n, int channels) {
stbi_set_flip_vertically_on_load(1);
return stbi_load_from_memory(data, size, w, h, n, channels);
}