mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfixes

metadata
Wenzel Jakob 2014-05-19 20:45:14 +02:00
parent 868b0ea866
commit c99d568c9c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shapes/obj.cpp
View File

@ -265,7 +265,8 @@ public:
if (triangles.size() > 0) { if (triangles.size() > 0) {
/// make sure that we have unique names /// make sure that we have unique names
if (geomNames.find(targetName) != geomNames.end()) if (geomNames.find(targetName) != geomNames.end())
targetName = formatString("%s_%i", targetName.c_str(), geomIndex++); targetName = formatString("%s_%i", targetName.c_str(), geomIndex);
geomIndex += 1;
geomNames.insert(targetName); geomNames.insert(targetName);
if (shapeIndex < 0 || geomIndex-1 == shapeIndex) if (shapeIndex < 0 || geomIndex-1 == shapeIndex)
createMesh(targetName, vertices, normals, texcoords, createMesh(targetName, vertices, normals, texcoords,
@ -280,7 +281,8 @@ public:
if (triangles.size() > 0 && !m_collapse) { if (triangles.size() > 0 && !m_collapse) {
/// make sure that we have unique names /// make sure that we have unique names
if (geomNames.find(name) != geomNames.end()) if (geomNames.find(name) != geomNames.end())
name = formatString("%s_%i", name.c_str(), geomIndex++); name = formatString("%s_%i", name.c_str(), geomIndex);
geomIndex += 1;
geomNames.insert(name); geomNames.insert(name);
if (shapeIndex < 0 || geomIndex-1 == shapeIndex) if (shapeIndex < 0 || geomIndex-1 == shapeIndex)
createMesh(name, vertices, normals, texcoords, createMesh(name, vertices, normals, texcoords,
@ -406,6 +408,7 @@ public:
} }
Properties props("bitmap"); Properties props("bitmap");
props.setString("filename", path.string()); props.setString("filename", path.string());
props.setFloat("gamma", 1.0f);
ref<Texture> texture = static_cast<Texture *> (PluginManager::getInstance()-> ref<Texture> texture = static_cast<Texture *> (PluginManager::getInstance()->
createObject(MTS_CLASS(Texture), props)); createObject(MTS_CLASS(Texture), props));
texture->configure(); texture->configure();