benkyd/SMH-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a bit more

Browse Source
This commit is contained in:
Benjamin Kyd
2019-02-23 17:59:52 +00:00
parent cf7b72df2a
commit baf6f2aea5
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesh.cpp
View File

@@ -5,17 +5,26 @@ Mesh::Mesh() {
}
Mesh::Mesh(std::string objPath) {
Logger logger;
objl::Loader loader;
bool canLoad = loader.LoadFile(objPath);
if (!canLoad) {
logger << LOGGER_ERROR << "Cannot load obj '" << objPath << "'" << LOGGER_ENDL;
return;
}
OBJLtoGLM(loader.LoadedMeshes[0].Vertices, vertices, normals, texCoords);
}
Mesh::Mesh(objl::Mesh objMesh) {
OBJLtoGLM(objMesh.Vertices, vertices, normals, texCoords);
// objMesh.Vertices includes normals, positions and texcoords
// it must convert them to the neccesary GLM shit
UintToGLuint(objMesh.Indices, indices);
}
void Mesh::loadFromObj(objl::Mesh objmesh) {
void Mesh::loadFromObj(objl::Mesh objMesh) {
OBJLtoGLM(objMesh.Vertices, vertices, normals, texCoords);
UintToGLuint(objMesh.Indices, indices);
}
void Mesh::settup() {