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

Remove Nz::String and Nz::StringStream

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-09-25 19:31:01 +02:00
parent d665af1f9d
commit 2b6a463a45
212 changed files with 1877 additions and 8721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,11 +101,8 @@ namespace Nz
{
const ParameterList& matData = mesh.GetMaterialData(i);
String nzname;
std::string name;
if (matData.GetStringParameter(MaterialData::Name, &nzname))
name = nzname.ToStdString();
else
if (!matData.GetStringParameter(MaterialData::Name, &name))
name = "material_" + std::to_string(i);
// Makes sure we only have one material of that name
@@ -117,10 +114,7 @@ namespace Nz
MTLParser::Material* material = mtlFormat.AddMaterial(name);
String strVal;
if (matData.GetStringParameter(MaterialData::FilePath, &strVal))
material->diffuseMap = strVal.ToStdString();
else
if (!matData.GetStringParameter(MaterialData::FilePath, &material->diffuseMap))
{
Color colorVal;
double dValue;
@@ -137,14 +131,9 @@ namespace Nz
if (matData.GetDoubleParameter(MaterialData::Shininess, &dValue))
material->shininess = float(dValue);
if (matData.GetStringParameter(MaterialData::AlphaTexturePath, &strVal))
material->alphaMap = strVal.ToStdString();
if (matData.GetStringParameter(MaterialData::DiffuseTexturePath, &strVal))
material->diffuseMap = strVal.ToStdString();
if (matData.GetStringParameter(MaterialData::SpecularTexturePath, &strVal))
material->specularMap = strVal.ToStdString();
matData.GetStringParameter(MaterialData::AlphaTexturePath, &material->alphaMap);
matData.GetStringParameter(MaterialData::DiffuseTexturePath, &material->diffuseMap);
matData.GetStringParameter(MaterialData::SpecularTexturePath, &material->specularMap);
}
}