Skip to content
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

Jump to bottom

--Refactor Semantic Mesh loading/flattening to remove deprecated functionality and improve efficiency #2079

Merged
merged 3 commits into from
Apr 21, 2023
Merged

--Refactor Semantic Mesh loading/flattening to remove deprecated functionality and improve efficiency #2079

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f67ae1
--refactor to remove deprecated functionality
jturner65 Apr 20, 2023
c7e5d4c
--reviewer suggestions;
jturner65 Apr 20, 2023
f72c840
--fixed inappropriate alloc
jturner65 Apr 20, 2023
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
23 changes: 16 additions & 7 deletions src/esp/assets/ResourceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <Magnum/MeshTools/Transform.h>
#include <Magnum/PixelFormat.h>
#include <Magnum/SceneGraph/Object.h>
#include <Magnum/SceneTools/FlattenMeshHierarchy.h>
#include <Magnum/SceneTools/FlattenTransformationHierarchy.h>
#include <Magnum/Trade/AbstractImporter.h>
#include <Magnum/Trade/FlatMaterialData.h>
#include <Magnum/Trade/ImageData.h>
Expand Down Expand Up @@ -1464,16 +1464,25 @@ ResourceManager::flattenImportedMeshAndBuildSemantic(Importer& fileImporter,
Cr::Containers::Optional<Mn::Trade::SceneData> scene =
fileImporter.scene(sceneID);

// To access the mesh id
Cr::Containers::Array<Cr::Containers::Pair<
Mn::UnsignedInt, Cr::Containers::Pair<Mn::UnsignedInt, Mn::Int>>>
meshesMaterials = scene->meshesMaterialsAsArray();
// All the transformations, flattened and indexed by mesh id, with
// reframeTransform applied to each
Cr::Containers::Array<Mn::Matrix4> transformations =
Mn::SceneTools::flattenTransformationHierarchy3D(
*scene, Mn::Trade::SceneField::Mesh, reframeTransform);

Cr::Containers::Array<Mn::Trade::MeshData> flattenedMeshes;
jturner65 marked this conversation as resolved.
Show resolved Hide resolved
for (const Cr::Containers::Triple<Mn::UnsignedInt, Mn::Int, Mn::Matrix4>&
meshTransformation :
Mn::SceneTools::flattenMeshHierarchy3D(*scene)) {
int iMesh = meshTransformation.first();
Cr::Containers::arrayReserve(flattenedMeshes, meshesMaterials.size());

for (std::size_t i = 0; i != meshesMaterials.size(); ++i) {
Mn::UnsignedInt iMesh = meshesMaterials[i].second().first();
if (Cr::Containers::Optional<Mn::Trade::MeshData> mesh =
fileImporter.mesh(iMesh)) {
const auto transform = reframeTransform * meshTransformation.third();
arrayAppend(flattenedMeshes,
Mn::MeshTools::transform3D(*mesh, transform));
Mn::MeshTools::transform3D(*mesh, transformations[i]));
}
}

Expand Down