benkyd/inferno-cpu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPECULARRR

Browse Source
This commit is contained in:
Ben Kyd
2019-09-06 17:15:08 +01:00
parent 801629796c
commit d48265a31c
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/assetloader.cpp
View File

@@ -66,9 +66,10 @@ std::vector<Triangle*> LoadTrianglesBasic(std::string path, std::string basePath
anz[v] = attrib.normals[3 * idx.normal_index + 2];
}
tinyobj::material_t material = materials[shapes[s].mesh.material_ids[f]];
// tinyobj::material_t material = materials[shapes[s].mesh.material_ids[f]];
Material* mat = new Material({ material.diffuse[0], material.diffuse[1], material.diffuse[2] }, 0.0f, material.illum);
// Material* mat = new Material({ material.diffuse[0], material.diffuse[1], material.diffuse[2] }, 0.6f, material.illum);
Material* mat = new Material({ 1.0f, 1.0f, 1.0f }, 0.4f);
// glm::vec3 normal = getNormal(
// {avx[0], avy[0], avz[0]},