Bug fixing

- Add method to cast an enum to unsigned int (DiBenedetto)
- Add inline
- Fix bug in the read and write of the texture filename
This commit is contained in:
Gianpaolo Palma 2016-07-22 15:41:39 +02:00
parent f20540d563
commit dbf3e0f6c9
2 changed files with 194 additions and 183 deletions

File diff suppressed because it is too large Load Diff

View File

@ -496,7 +496,7 @@ namespace nanoply
for (int i = 0; i < faceDescr.dataDescriptor.size(); i++) for (int i = 0; i < faceDescr.dataDescriptor.size(); i++)
if (faceDescr.dataDescriptor[i]->elem != NNP_UNKNOWN_ENTITY) if (faceDescr.dataDescriptor[i]->elem != NNP_UNKNOWN_ENTITY)
delete faceDescr.dataDescriptor[i]; delete faceDescr.dataDescriptor[i];
mesh.textures = info.textureFile;
return info.errInfo; return info.errInfo;
} }
@ -687,6 +687,7 @@ namespace nanoply
infoSave.AddPlyElement(vertexElem); infoSave.AddPlyElement(vertexElem);
infoSave.AddPlyElement(edgeElem); infoSave.AddPlyElement(edgeElem);
infoSave.AddPlyElement(faceElem); infoSave.AddPlyElement(faceElem);
infoSave.textureFile = mesh.textures;
std::vector<ElementDescriptor*> meshDescr; std::vector<ElementDescriptor*> meshDescr;
meshDescr.push_back(&cameraDescr); meshDescr.push_back(&cameraDescr);
meshDescr.push_back(&vertexDescr); meshDescr.push_back(&vertexDescr);