v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into kimkulling-patch-8

pull/3486/head
Kim Kulling 2020-11-10 15:32:04 +01:00 committed by GitHub
parent 6873d79505 5da3e633e3
commit ab34b25a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 446 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/AssetLib/Obj/ObjFileMtlImporter.cpp
View File

@ -137,10 +137,14 @@ void ObjFileMtlImporter::load() {
} break; } break;
case 'T': { case 'T': {
++m_DataIt; ++m_DataIt;
if (*m_DataIt == 'f') // Material transmission // Material transmission color
{ if (*m_DataIt == 'f') {
++m_DataIt; ++m_DataIt;
getColorRGBA(&m_pModel->m_pCurrentMaterial->transparent); getColorRGBA(&m_pModel->m_pCurrentMaterial->transparent);
} else if (*m_DataIt == 'r') {
// Material transmission alpha value
++m_DataIt;
getFloatValue(m_pModel->m_pCurrentMaterial->alpha);
} }
m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine); m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
} break; } break;

2
code/Material/MaterialSystem.cpp
View File

@ -402,7 +402,7 @@ aiMaterial::~aiMaterial() {
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
aiString aiMaterial::GetName() { aiString aiMaterial::GetName() const {
aiString name; aiString name;
Get(AI_MATKEY_NAME, name); Get(AI_MATKEY_NAME, name);

915
include/assimp/material.h
View File

File diff suppressed because it is too large Load Diff

2
include/assimp/material.inl
View File

@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team Copyright (c) 2006-2020, assimp team
All rights reserved. All rights reserved.
Redistribution and use of this software in source and binary forms, Redistribution and use of this software in source and binary forms,