Commit 434a0ed1 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'obj_mat_file' into 'master'

Fix OBJ material files and face color (Thanks to Sven-Kristofer Pilz for the patch)

closes #20 

See merge request !50
parents 30d88d06 57c0ec08
Pipeline #929 passed with stage
...@@ -54,6 +54,11 @@ ...@@ -54,6 +54,11 @@
<li>PLY Reader: Fixed CR LF newline handling for binary file headers.</li> <li>PLY Reader: Fixed CR LF newline handling for binary file headers.</li>
</ul> </ul>
<b>IO</b>
<ul>
<li>Obj writer: Fix OBJ material files and face color (Thanks to Sven-Kristofer Pilz for the patch) </li>
</ul>
<b>Build System</b> <b>Build System</b>
<ul> <ul>
......
...@@ -118,7 +118,7 @@ write(const std::string& _filename, BaseExporter& _be, Options _opt, std::stream ...@@ -118,7 +118,7 @@ write(const std::string& _filename, BaseExporter& _be, Options _opt, std::stream
dot = _filename.find_last_of("."); dot = _filename.find_last_of(".");
if(dot != std::string::npos) if(dot != std::string::npos)
objName_ = objName_.substr(0,dot-1); objName_ = objName_.substr(0,dot);
} }
bool result = write(out, _be, _opt, _precision); bool result = write(out, _be, _opt, _precision);
...@@ -184,7 +184,7 @@ writeMaterial(std::ostream& _out, BaseExporter& _be, Options _opt) const ...@@ -184,7 +184,7 @@ writeMaterial(std::ostream& _out, BaseExporter& _be, Options _opt) const
for (size_t i=0; i < materialA_.size(); i++){ for (size_t i=0; i < materialA_.size(); i++){
_out << "newmtl " << "mat" << i << '\n'; _out << "newmtl " << "mat" << i << '\n';
_out << "Ka 0.5000 0.5000 0.5000" << '\n'; _out << "Ka 0.5000 0.5000 0.5000" << '\n';
_out << "Kd " << materialA_[i][0] << materialA_[i][1] << materialA_[i][2] << '\n';; _out << "Kd " << materialA_[i][0] << ' ' << materialA_[i][1] << ' ' << materialA_[i][2] << '\n';
_out << "Tr " << materialA_[i][3] << '\n'; _out << "Tr " << materialA_[i][3] << '\n';
_out << "illum 1" << '\n'; _out << "illum 1" << '\n';
} }
...@@ -192,7 +192,7 @@ writeMaterial(std::ostream& _out, BaseExporter& _be, Options _opt) const ...@@ -192,7 +192,7 @@ writeMaterial(std::ostream& _out, BaseExporter& _be, Options _opt) const
for (size_t i=0; i < material_.size(); i++){ for (size_t i=0; i < material_.size(); i++){
_out << "newmtl " << "mat" << i << '\n'; _out << "newmtl " << "mat" << i << '\n';
_out << "Ka 0.5000 0.5000 0.5000" << '\n'; _out << "Ka 0.5000 0.5000 0.5000" << '\n';
_out << "Kd " << material_[i][0] << material_[i][1] << material_[i][2] << '\n';; _out << "Kd " << material_[i][0] << ' ' << material_[i][1] << ' ' << material_[i][2] << '\n';
_out << "illum 1" << '\n'; _out << "illum 1" << '\n';
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment