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

Utility/MaterialData: Remove CustomDefined

Browse Source 
Former-commit-id: 3dc61fac4aa014daa8ccb2732bd3010c9b7a3013 [formerly 911c0c99570971d97e69d4a7d544ec1666432c26] [formerly cd5daaf8eb34d687da378f2531714d794b193a42 [formerly 5f58954832a234a14396585247dd18e1101f2918]]
Former-commit-id: 22a69eb53fb4e400203bcbf0222a7b338de70ab1 [formerly 3f66b581a5b1c55c288a9226a7791981877ea68e]
Former-commit-id: 921e4fe70ce1240e92c0c057ffe4a7678fc58a0b
This commit is contained in:
Lynix
2016-08-04 01:12:06 +02:00
parent e4211b13a0
commit 0c533d378f
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)