2DViewのメッシュ表示の不具合を修正

diff --git a/Src/QtGeoViewer/View2D.cpp b/Src/QtGeoViewer/View2D.cpp
index 49cd2fc..caa0d5d 100644 (file)
--- a/Src/QtGeoViewer/View2D.cpp
+++ b/Src/QtGeoViewer/View2D.cpp
@@ -188,19 +188,29 @@ void View2D::DrawObjects(void)
 {
        glDisable(GL_LIGHTING);
 
-       std::vector<MeshBuf*> mv = m_Scene->GetCurSelMeshes();
-       for (MeshBuf* mbuf : mv)
+       MeshBuf* mbuf = m_Scene->GetPrimaryMeshbuf();
+       if (mbuf != NULL)
        {
-               lib_geo::BaseMesh& mesh = mbuf->m_Mesh;
-
-               DrawObjectWire(mbuf);
-               DrawObjectSelVerts(*mbuf);
+               DrawMeshBuf(mbuf);
+               return;
+       }
 
-               if (m_DrawVerts)
-                       DrawObjectVerts(mesh);
+       GeomObject* geo = m_Scene->GetPrimaryObject();
+       for (MeshBuf& m : geo->m_MeshAry)
+       {
+               DrawMeshBuf(&m);
        }
 }
 
+void View2D::DrawMeshBuf(MeshBuf* mbuf)
+{
+       DrawObjectWire(mbuf);
+       DrawObjectSelVerts(*mbuf);
+
+       if (m_DrawVerts)
+               DrawObjectVerts(mbuf->m_Mesh);
+}
+
 void View2D::DrawObjectWire(MeshBuf* mbuf)
 {
        lib_geo::BaseMesh& mesh = mbuf->m_Mesh;

diff --git a/Src/QtGeoViewer/View2D.h b/Src/QtGeoViewer/View2D.h
index 38ea803..e321abc 100644 (file)
--- a/Src/QtGeoViewer/View2D.h
+++ b/Src/QtGeoViewer/View2D.h
@@ -53,6 +53,7 @@ private:
        void DrawBackTexture(void);
        void DrawOptions(void);
        void DrawObjects(void);
+       void DrawMeshBuf(MeshBuf* mbuf);
 
        void GetObjRange(const GeomObject* obj, lm::range2f& r) const;