mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-05-29 17:44:36 +08:00
Raycaster can now handle multiple volumes
This is necessary for future FDM supports gizmo. SLA objects only have one volume, so it wasn't needed until now.
This commit is contained in:
parent
bf734c8f68
commit
d9e5721cb7
@ -198,21 +198,41 @@ void Raycaster::on_update()
|
||||
if (! mo)
|
||||
return;
|
||||
|
||||
const TriangleMesh* mesh = &mo->volumes.front()->mesh();
|
||||
const HollowedMesh* hollowed_mesh_tracker = get_pool()->hollowed_mesh();
|
||||
if (hollowed_mesh_tracker && hollowed_mesh_tracker->get_hollowed_mesh())
|
||||
mesh = hollowed_mesh_tracker->get_hollowed_mesh();
|
||||
std::vector<const TriangleMesh*> meshes;
|
||||
const std::vector<ModelVolume*>& mvs = mo->volumes;
|
||||
if (mvs.size() == 1) {
|
||||
assert(mvs.front()->is_model_part());
|
||||
const HollowedMesh* hollowed_mesh_tracker = get_pool()->hollowed_mesh();
|
||||
if (hollowed_mesh_tracker && hollowed_mesh_tracker->get_hollowed_mesh())
|
||||
meshes.push_back(hollowed_mesh_tracker->get_hollowed_mesh());
|
||||
}
|
||||
if (meshes.empty()) {
|
||||
for (const ModelVolume* mv : mvs) {
|
||||
if (mv->is_model_part())
|
||||
meshes.push_back(&mv->mesh());
|
||||
}
|
||||
}
|
||||
|
||||
if (mesh != m_old_mesh) {
|
||||
m_raycaster.reset(new MeshRaycaster(*mesh));
|
||||
m_old_mesh = mesh;
|
||||
if (meshes != m_old_meshes) {
|
||||
m_raycasters.clear();
|
||||
for (const TriangleMesh* mesh : meshes)
|
||||
m_raycasters.emplace_back(new MeshRaycaster(*mesh));
|
||||
m_old_meshes = meshes;
|
||||
}
|
||||
}
|
||||
|
||||
void Raycaster::on_release()
|
||||
{
|
||||
m_raycaster.reset();
|
||||
m_old_mesh = nullptr;
|
||||
m_raycasters.clear();
|
||||
m_old_meshes.clear();
|
||||
}
|
||||
|
||||
std::vector<const MeshRaycaster*> Raycaster::raycasters() const
|
||||
{
|
||||
std::vector<const MeshRaycaster*> mrcs;
|
||||
for (const auto& raycaster_unique_ptr : m_raycasters)
|
||||
mrcs.push_back(raycaster_unique_ptr.get());
|
||||
return mrcs;
|
||||
}
|
||||
|
||||
|
||||
|
@ -188,15 +188,16 @@ public:
|
||||
CommonGizmosDataID get_dependencies() const override { return CommonGizmosDataID::SelectionInfo; }
|
||||
#endif // NDEBUG
|
||||
|
||||
const MeshRaycaster* raycaster() const { return m_raycaster.get(); }
|
||||
const MeshRaycaster* raycaster() const { assert(m_raycasters.size() == 1); return m_raycasters.front().get(); }
|
||||
std::vector<const MeshRaycaster*> raycasters() const;
|
||||
|
||||
protected:
|
||||
void on_update() override;
|
||||
void on_release() override;
|
||||
|
||||
private:
|
||||
std::unique_ptr<MeshRaycaster> m_raycaster;
|
||||
const TriangleMesh* m_old_mesh = nullptr;
|
||||
std::vector<std::unique_ptr<MeshRaycaster>> m_raycasters;
|
||||
std::vector<const TriangleMesh*> m_old_meshes;
|
||||
};
|
||||
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user