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

Ignore Tr parameter when d exists in MTL(#43)

Browse Source
This commit is contained in:
Syoyo Fujita
2016-12-31 21:05:37 +09:00
parent 4886eebbf4
commit 7c3206f919
5 changed files with 948 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/tester.cc
View File

@@ -307,7 +307,8 @@ std::string matStream(
{
(void)matId;
(void)err;
LoadMtl(matMap, materials, &m_matSStream);
std::string warning;
LoadMtl(matMap, materials, &m_matSStream, &warning);
return true;
}
@@ -545,6 +546,24 @@ TEST_CASE("mtllib_multiple_filenames", "[Issue112]") {
REQUIRE(1 == materials.size());
}
TEST_CASE("tr_and_d", "[Issue43]") {
tinyobj::attrib_t attrib;
std::vector<tinyobj::shape_t> shapes;
std::vector<tinyobj::material_t> materials;
std::string err;
bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, "../models/tr-and-d-issue-43.obj", gMtlBasePath);
if (!err.empty()) {
std::cerr << err << std::endl;
}
REQUIRE(true == ret);
REQUIRE(2 == materials.size());
REQUIRE(0.75 == Approx(materials[0].dissolve));
REQUIRE(0.75 == Approx(materials[1].dissolve));
}
#if 0
int
main(