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

Handle missing textures better;

This commit is contained in:
bjorn 2019-01-18 13:28:17 -08:00 committed by Bjorn Swenson
parent 0add9526ad
commit d25f59582e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/data/modelData.c
View File

@ -618,6 +618,11 @@ ModelData* lovrModelDataInit(ModelData* model, Blob* source, ModelDataIO io) {
material->scalars[SCALAR_ROUGHNESS] = 1.f;
material->colors[COLOR_DIFFUSE] = (Color) { 1.f, 1.f, 1.f, 1.f };
material->colors[COLOR_EMISSIVE] = (Color) { 1.f, 1.f, 1.f, 1.f };
for (int j = 0; j < MAX_MATERIAL_TEXTURES; j++) {
material->textures[j] = -1;
}
for (int k = (token++)->size; k > 0; k--) {
gltfString key = NOM_STR(json, token);
if (STR_EQ(key, "pbrMetallicRoughness")) {

20
src/graphics/model.c
View File

@ -154,16 +154,18 @@ Model* lovrModelInit(Model* model, ModelData* data) {
for (int j = 0; j < MAX_MATERIAL_TEXTURES; j++) {
int index = data->materials[i].textures[j];
if (!model->textures[index]) {
ModelTexture* texture = &data->textures[index];
TextureData* image = data->images[texture->imageIndex];
bool srgb = j == TEXTURE_DIFFUSE || j == TEXTURE_EMISSIVE;
model->textures[index] = lovrTextureCreate(TEXTURE_2D, &image, 1, srgb, texture->mipmaps, 0);
lovrTextureSetFilter(model->textures[index], texture->filter);
lovrTextureSetWrap(model->textures[index], texture->wrap);
}
if (index != -1) {
if (!model->textures[index]) {
ModelTexture* texture = &data->textures[index];
TextureData* image = data->images[texture->imageIndex];
bool srgb = j == TEXTURE_DIFFUSE || j == TEXTURE_EMISSIVE;
model->textures[index] = lovrTextureCreate(TEXTURE_2D, &image, 1, srgb, texture->mipmaps, 0);
lovrTextureSetFilter(model->textures[index], texture->filter);
lovrTextureSetWrap(model->textures[index], texture->wrap);
}
lovrMaterialSetTexture(material, j, model->textures[index]);
lovrMaterialSetTexture(material, j, model->textures[index]);
}
}
model->materials[i] = material;