sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility/MaterialData: Remove CustomDefined

Browse Source 
Former-commit-id: 4c3c2012ae06bdc4679fed40ee6ad50027664a8f [formerly d0454f47bbecdbb2513d7afc629b00b53543f671] [formerly 07f50ad9e366215fc51280232c26cc8cdbf8236d [formerly 27fbbc6106dc22f72d3ddb382049672e82833cd8]]
Former-commit-id: e45fd2e87fcadbdf0a56c410d6c1ff36d9ea4b4a [formerly 0453e3ba57d326859fc78105b741cd7f1cb97bd6]
Former-commit-id: 9f7082ef9da8e8baefaef5c141e630ba99b32a83
This commit is contained in:
Lynix
2016-08-04 01:12:06 +02:00
parent cf8224b9e1
commit af01e7242c
7 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Assimp/Plugin.cpp
View File

@@ -237,8 +237,6 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
aiColor4D color;
if (aiGetMaterialColor(aiMat, aiKey, aiType, aiIndex, &color) == aiReturn_SUCCESS)
{
matData.SetParameter(MaterialData::CustomDefined);
matData.SetParameter(colorKey, Color(static_cast<UInt8>(color.r * 255), static_cast<UInt8>(color.g * 255), static_cast<UInt8>(color.b * 255), static_cast<UInt8>(color.a * 255)));
}
};
@@ -249,7 +247,6 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
aiTextureMapMode mapMode[3];
if (aiGetMaterialTexture(aiMat, aiType, 0, &path, nullptr, nullptr, nullptr, nullptr, &mapMode[0], nullptr) == aiReturn_SUCCESS)
{
matData.SetParameter(MaterialData::CustomDefined);
matData.SetParameter(textureKey, stream.GetDirectory() + String(path.data, path.length));
if (wrapKey)