Skip to content

Ignore comments when loading MTL #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BachiLi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ignore comments when loading MTL #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions include/core-mesh/material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class Material {

std::string token;
ss >> token;
if (token == "newmtl") {
if (token == "newmtl") {
if (!found) {
found = true;
} else {
Expand All @@ -82,12 +82,10 @@ class Material {
ss >> activeMaterial.m_TextureFilename_Ks;
} else if (token == "map_Ke") {
ss >> activeMaterial.m_TextureFilename_Ke;
}
else if (token == "d") {
// d token not implemented
} else if (token == "d") {
// d token not implemented
//MLIB_WARNING("d token not implemented");
}
else if (token != "") {
} else if (token != "" || (token.size() > 0 && token[0] == '#')) {
MLIB_WARNING("unknown token: " + line);
}
}
Expand Down Expand Up @@ -168,22 +166,22 @@ typedef Material<double> Materiald;

template<class BinaryDataBuffer, class BinaryDataCompressor, class FloatType>
inline BinaryDataStream<BinaryDataBuffer, BinaryDataCompressor>& operator<< (BinaryDataStream<BinaryDataBuffer, BinaryDataCompressor>& s, const Material<FloatType> &m) {
s << m.m_name << m.m_ambient << m.m_diffuse << m.m_specular << m.m_shiny << m.m_emission;
s << m.m_TextureFilename_Ka;
s << m.m_TextureFilename_Kd;
s << m.m_TextureFilename_Ks;
s << m.m_name << m.m_ambient << m.m_diffuse << m.m_specular << m.m_shiny << m.m_emission;
s << m.m_TextureFilename_Ka;
s << m.m_TextureFilename_Kd;
s << m.m_TextureFilename_Ks;
s << m.m_TextureFilename_Ke;
return s;
return s;
}

template<class BinaryDataBuffer, class BinaryDataCompressor, class FloatType>
inline BinaryDataStream<BinaryDataBuffer, BinaryDataCompressor>& operator>> (BinaryDataStream<BinaryDataBuffer, BinaryDataCompressor>& s, Material<FloatType> &m) {
s >> m.m_name >> m.m_ambient >> m.m_diffuse >> m.m_specular >> m.m_shiny >> m.m_emission;
s >> m.m_TextureFilename_Ka;
s >> m.m_TextureFilename_Kd;
s >> m.m_TextureFilename_Ks;
s >> m.m_name >> m.m_ambient >> m.m_diffuse >> m.m_specular >> m.m_shiny >> m.m_emission;
s >> m.m_TextureFilename_Ka;
s >> m.m_TextureFilename_Kd;
s >> m.m_TextureFilename_Ks;
s >> m.m_TextureFilename_Ke;
return s;
return s;
}

}
Expand Down