メッシュ、オブジェクト両方の選択中要素ハイライトに対魚

diff --git a/Src/LibQtGeoViewerCore/SceneMain.cpp b/Src/LibQtGeoViewerCore/SceneMain.cpp
index 04d7cc2..3eea68c 100644 (file)
--- a/Src/LibQtGeoViewerCore/SceneMain.cpp
+++ b/Src/LibQtGeoViewerCore/SceneMain.cpp
@@ -280,6 +280,26 @@ const GeomObject* SceneMain::GetPrimaryObject(void) const
 }
 
 
+void SceneMain::GetSelectedMeshes(std::vector<MeshBuf*>& meshes)
+{
+       GeomObject* obj = GetPrimaryObject();
+       if (obj == NULL)
+               return;
+
+       if (m_Sels.IsMBufSelected())
+       {
+               meshes.resize(1, &obj->m_MeshAry[m_Sels.GetMBufIdx()]);
+       }
+       else
+       {
+               meshes.reserve(obj->m_MeshAry.size());
+               for (MeshBuf& m : obj->m_MeshAry)
+               {
+                       meshes.push_back(&m);
+               }
+       }
+}
+
 MeshBuf* SceneMain::GetPrimaryMeshbuf(void)
 {
        GeomObject* obj = GetPrimaryObject();

diff --git a/Src/LibQtGeoViewerCore/SceneMain.h b/Src/LibQtGeoViewerCore/SceneMain.h
index d37f05b..e8d86c9 100644 (file)
--- a/Src/LibQtGeoViewerCore/SceneMain.h
+++ b/Src/LibQtGeoViewerCore/SceneMain.h
@@ -87,6 +87,7 @@ public:
        GeomObject* GetPrimaryObject(void);
        const GeomObject* GetPrimaryObject(void) const;
 
+       void GetSelectedMeshes(std::vector<MeshBuf*>& meshes);
        MeshBuf* GetPrimaryMeshbuf(void);
        const MeshBuf* GetPrimaryMeshbuf(void) const;
 

diff --git a/Src/QtGeoViewer/View3D.cpp b/Src/QtGeoViewer/View3D.cpp
index 4812416..db3181f 100644 (file)
--- a/Src/QtGeoViewer/View3D.cpp
+++ b/Src/QtGeoViewer/View3D.cpp
@@ -1155,15 +1155,22 @@ int View3D::QColorToIndex(const QColor& c) const
 
 void View3D::DrawGeomMeshHighlight(void)
 {
-       MeshBuf* mbuf = m_Scene->GetPrimaryMeshbuf();
-       if (mbuf == NULL)
-               return;
+       std::vector<MeshBuf*> meshes;
+       m_Scene->GetSelectedMeshes(meshes);
 
-       GeometryRender& render = GetRender(mbuf);
-       render.DrawGeomHighlight(*mbuf, *m_Scene);
+       for (MeshBuf* mbuf : meshes)
+       {
+               GeometryRender& render = GetRender(mbuf);
+               render.DrawGeomHighlight(*mbuf, *m_Scene);
+       }
 
        if (m_Config.m_DrawPolyline)
-               DrawPolylineHighlight(*mbuf);
+       {
+               for (MeshBuf* mbuf : meshes)
+               {
+                       DrawPolylineHighlight(*mbuf);
+               }
+       }
 }
 
 void View3D::DrawAllGeomCrossSection(void)