benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:syoyo/tinyobjloader

Browse Source
This commit is contained in:
Syoyo Fujita
2016-01-29 19:50:29 +09:00
parent 6e711298a7 66d96ab3c2
commit b3eed44b3e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tiny_obj_loader.h
View File

@@ -1,7 +1,7 @@
// //
// Copyright 2012-2015, Syoyo Fujita. // Copyright 2012-2015, Syoyo Fujita.
// //
// Licensed under 2-clause BSD liecense. // Licensed under 2-clause BSD license.
// //
// //
@@ -21,7 +21,7 @@
// Parse transmittance material parameter correctly. // Parse transmittance material parameter correctly.
// version 0.9.5 : Parse multiple group name. // version 0.9.5 : Parse multiple group name.
// Add support of specifying the base path to load material file. // Add support of specifying the base path to load material file.
// version 0.9.4 : Initial suupport of group tag(g) // version 0.9.4 : Initial support of group tag(g)
// version 0.9.3 : Fix parsing triple 'x/y/z' // version 0.9.3 : Fix parsing triple 'x/y/z'
// version 0.9.2 : Add more .mtl load support // version 0.9.2 : Add more .mtl load support
// version 0.9.1 : Add initial .mtl load support // version 0.9.1 : Add initial .mtl load support
@@ -57,7 +57,7 @@ typedef struct {
// illumination model (see http://www.fileformat.info/format/material/) // illumination model (see http://www.fileformat.info/format/material/)
int illum; int illum;
int dummy; // Supress padding warning. int dummy; // Suppress padding warning.
std::string ambient_texname; // map_Ka std::string ambient_texname; // map_Ka
std::string diffuse_texname; // map_Kd std::string diffuse_texname; // map_Kd