Dynamitos/RayTracer
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

reorganizing mesh data

Browse Source
This commit is contained in:
Dynamitos
2025-01-25 19:14:22 +01:00
parent a73f43bb31
commit 60e8548c7d
5 changed files with 108 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/ModelLoader.cpp
+21 -24
View File
@@ -7,30 +7,27 @@
std::vector<PModel> ModelLoader::loadModel(std::string_view filename)
{
Assimp::Importer importer;
const aiScene* scene = importer.ReadFile(std::string(filename), aiProcess_Triangulate);
std::vector<PModel> result;
for (int m = 0; m < scene->mNumMeshes; ++m)
Assimp::Importer importer;
const aiScene* scene = importer.ReadFile(std::string(filename), aiProcess_Triangulate);
std::vector<PModel> result;
for (int m = 0; m < scene->mNumMeshes; ++m)
{
PModel model = std::make_unique<Model>();
const aiMesh* mesh = scene->mMeshes[m];
AABB aabb;
for (int v = 0; v < mesh->mNumVertices; ++v)
{
PModel model = std::make_unique<Model>();
const aiMesh* mesh = scene->mMeshes[m];
AABB aabb;
for (int v = 0; v < mesh->mNumVertices; ++v)
{
auto aiVert = mesh->mVertices[v];
model->positions.push_back(glm::vec3(aiVert.x, aiVert.y, aiVert.z));
aabb.adjust(model->positions.back());
}
for (int i = 0; i < mesh->mNumFaces; ++i)
{
auto face = mesh->mFaces[i];
model->indices.push_back(face.mIndices[0]);
model->indices.push_back(face.mIndices[1]);
model->indices.push_back(face.mIndices[2]);
}
model->boundingBox = aabb;
result.push_back(std::move(model));
auto aiVert = mesh->mVertices[v];
model->positions.push_back(glm::vec3(aiVert.x, aiVert.y, aiVert.z));
aabb.adjust(model->positions.back());
}
return result;
for (int i = 0; i < mesh->mNumFaces; ++i)
{
auto face = mesh->mFaces[i];
model->indices.push_back(glm::uvec3(face.mIndices[0], face.mIndices[1], face.mIndices[2]));
}
model->boundingBox = aabb;
result.push_back(std::move(model));
}
return result;
}