Skip to content

Replace deprecated MemoryResource -> ResourceSharedPtr #263

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

Merged
merged 1 commit into from
Jun 6, 2025
Merged

Replace deprecated MemoryResource -> ResourceSharedPtr #263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions src/mesh_operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
#include <resource_retriever/retriever.h>
#endif

#if __has_include(<resource_retriever/resource.hpp>)
#define NEW_RESOURCE_RETRIEVER
#endif

#include <assimp/scene.h>
#include <assimp/Importer.hpp>
#include <assimp/postprocess.h>
Expand Down Expand Up @@ -267,24 +271,40 @@ Mesh* createMeshFromBinary(const char* buffer, std::size_t size, const Eigen::Ve
Mesh* createMeshFromResource(const std::string& resource, const Eigen::Vector3d& scale)
{
resource_retriever::Retriever retriever;
#ifdef NEW_RESOURCE_RETRIEVER
resource_retriever::ResourceSharedPtr res;
#else
resource_retriever::MemoryResource res;
#endif
try
{
#ifdef NEW_RESOURCE_RETRIEVER
res = retriever.get_shared(resource);
#else
res = retriever.get(resource);
#endif
}
catch (resource_retriever::Exception& e)
{
CONSOLE_BRIDGE_logError("%s", e.what());
return nullptr;
}

#ifdef NEW_RESOURCE_RETRIEVER
if (res->data.empty())
#else
if (res.size == 0)
#endif
{
CONSOLE_BRIDGE_logWarn("Retrieved empty mesh for resource '%s'", resource.c_str());
return nullptr;
}

#ifdef NEW_RESOURCE_RETRIEVER
Mesh* m = createMeshFromBinary(reinterpret_cast<const char*>(res->data.data()), res->data.size(), scale, resource);
#else
Mesh* m = createMeshFromBinary(reinterpret_cast<const char*>(res.data.get()), res.size, scale, resource);
#endif
if (!m)
{
CONSOLE_BRIDGE_logWarn("Assimp reports no scene in %s.", resource.c_str());
Expand Down
Loading