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

Kinda layed out models

Browse Source
This commit is contained in:
Benjamin Kyd
2019-02-23 21:31:11 +00:00
parent baf6f2aea5
commit efca94ee54
10 changed files with 196 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/util.cpp
View File

@@ -3,7 +3,7 @@
void OBJLtoGLM(std::vector<objl::Vertex>& inVertArr,
std::vector<glm::vec3>& outVert,
std::vector<glm::vec3>& outNorm,
std::vector<glm::vec2>& outTexCoord) {
std::vector<glm::vec3>& outTexCoord) {
for (int i = 0; i < inVertArr.size(); i++) {
@@ -13,7 +13,7 @@ void OBJLtoGLM(std::vector<objl::Vertex>& inVertArr,
glm::vec3 tempNorm {inVertArr[i].Normal.X, inVertArr[i].Normal.Y, inVertArr[i].Normal.Z};
outNorm.push_back(tempNorm);
glm::vec2 tempTexCoord {inVertArr[i].TextureCoordinate.X, inVertArr[i].TextureCoordinate.Y};
glm::vec3 tempTexCoord {inVertArr[i].TextureCoordinate.X, inVertArr[i].TextureCoordinate.Y, 1.0f};
outTexCoord.push_back(tempTexCoord);
}
@@ -28,3 +28,11 @@ void UintToGLuint(std::vector<unsigned int>& inIndices,
}
}
void OBJLVec3toGLM(objl::Vector3& inVec, glm::vec3& outVec) {
outVec.x = inVec.X;
outVec.y = inVec.Y;
outVec.z = inVec.Z;
}