Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement pbrSpecularGlossiness property as Nullable

Browse Source
This commit is contained in:
Daniel Hritzkiv
2017-09-05 16:29:00 -04:00
parent 03cfa04ee4
commit 44757af34a
5 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/glTF2Exporter.cpp
View File

@@ -439,12 +439,15 @@ void glTF2Exporter::ExportMaterials()
KHR_materials_pbrSpecularGlossiness = true;
}
m->pbrSpecularGlossiness.on = true;
GetMatColor(mat, m->pbrSpecularGlossiness.diffuseFactor, "$clr.diffuse", 0, 1);
GetMatColor(mat, m->pbrSpecularGlossiness.specularFactor, "$clr.specular", 0, 1);
mat->Get("$mat.gltf.glossinessFactor", 0, 0, m->pbrSpecularGlossiness.glossinessFactor);
GetMatTex(mat, m->pbrSpecularGlossiness.diffuseTexture, aiTextureType_DIFFUSE, 1);
GetMatTex(mat, m->pbrSpecularGlossiness.specularGlossinessTexture, aiTextureType_UNKNOWN, 1);
PbrSpecularGlossiness pbrSG;
GetMatColor(mat, pbrSG.diffuseFactor, "$clr.diffuse", 0, 1);
GetMatColor(mat, pbrSG.specularFactor, "$clr.specular", 0, 1);
mat->Get("$mat.gltf.glossinessFactor", 0, 0, pbrSG.glossinessFactor);
GetMatTex(mat, pbrSG.diffuseTexture, aiTextureType_DIFFUSE, 1);
GetMatTex(mat, pbrSG.specularGlossinessTexture, aiTextureType_UNKNOWN, 1);
m->pbrSpecularGlossiness = Nullable<PbrSpecularGlossiness>(pbrSG);
}
}
}