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

1
src/Nazara/Utility/Formats/MD2Loader.cpp
View File

@@ -102,7 +102,6 @@ namespace Nz
stream.Read(skin, 68*sizeof(char));
ParameterList matData;
matData.SetParameter(MaterialData::CustomDefined);
matData.SetParameter(MaterialData::DiffuseTexturePath, baseDir + skin);
mesh->SetMaterialData(i, std::move(matData));

2
src/Nazara/Utility/Formats/OBJLoader.cpp
View File

@@ -73,8 +73,6 @@ namespace Nz
{
ParameterList data;
data.SetParameter(MaterialData::CustomDefined);
UInt8 alphaValue = static_cast<UInt8>(mtlMat->alpha*255.f);
Color ambientColor(mtlMat->ambient);

6
src/Nazara/Utility/Formats/OBJSaver.cpp
View File

@@ -121,7 +121,9 @@ namespace Nz
MTLParser::Material* material = mtlFormat.AddMaterial(name);
String strVal;
if (matData.HasParameter(MaterialData::CustomDefined))
if (matData.GetStringParameter(MaterialData::FilePath, &strVal))
material->diffuseMap = strVal;
else
{
Color colorVal;
float fValue;
@@ -147,8 +149,6 @@ namespace Nz
if (matData.GetStringParameter(MaterialData::SpecularTexturePath, &strVal))
material->specularMap = strVal;
}
else if (matData.GetStringParameter(MaterialData::FilePath, &strVal))
material->diffuseMap = strVal;
}
// Meshes