From ea78f857551e011cdb81f3d5bb3d4409c818dbb9 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 21 Sep 2018 13:42:39 +0200
Subject: [PATCH] #3343 Holo Lens : Add role (geometry or mesh_lines)

---
 .../RicHoloLensExportImpl.cpp                 |  3 ++-
 .../HoloLensCommands/RicHoloLensExportImpl.h  |  3 +--
 .../HoloLensCommands/VdeExportPart.cpp        | 19 ++++++++++++++++++-
 .../Commands/HoloLensCommands/VdeExportPart.h | 10 +++++++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
index 12b2ce9a40..6aa1db27bc 100644
--- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
+++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
@@ -158,7 +158,7 @@ std::vector<VdeExportPart> RicHoloLensExportImpl::partsForExport(const RimGridVi
             else if (RicHoloLensExportImpl::isMeshLines(visiblePart.p()))
             {
                 VdeExportPart exportPart(visiblePart.p());
-                exportPart.setSourceObjectType(VdeExportPart::OBJ_TYPE_GRID_MESH);
+                exportPart.setSourceObjectType(VdeExportPart::OBJ_TYPE_GRID);
 
                 cvf::Color3f lineColor = RiaApplication::instance()->preferences()->defaultGridLineColors();
 
@@ -172,6 +172,7 @@ std::vector<VdeExportPart> RicHoloLensExportImpl::partsForExport(const RimGridVi
                 }
 
                 exportPart.setColor(lineColor);
+                exportPart.setRole(VdeExportPart::MESH_LINES);
 
                 appendTextureImage(exportPart, visiblePart.p());
 
diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h
index c5fd8cf9cc..d95913bc1d 100644
--- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h
+++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h
@@ -41,9 +41,8 @@ class RicHoloLensExportImpl
 public:
     static std::vector<VdeExportPart> partsForExport(const RimGridView& view);
 
-    static void appendTextureImage(VdeExportPart& exportPart, cvf::Part* part);
-
 private:
+    static void    appendTextureImage(VdeExportPart& exportPart, cvf::Part* part);
     static QString gridCellSetTypeText(RivCellSetEnum cellSetType);
 
     static bool isGrid(const cvf::Part* part);
diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.cpp b/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.cpp
index 5fa79d18b7..a89544c69b 100644
--- a/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.cpp
+++ b/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.cpp
@@ -26,8 +26,9 @@ VdeExportPart::VdeExportPart(cvf::Part* part)
     , m_sourceObjectName("Unnamed Object")
     , m_sourceObjectType(OBJ_TYPE_UNKNOWN)
     , m_color(cvf::Color3f::MAGENTA)
-    , m_winding(COUNTERCLOCKWISE)
     , m_opacity(1.0)
+    , m_winding(COUNTERCLOCKWISE)
+    , m_role(GEOMETRY)
 {
 }
 
@@ -87,6 +88,14 @@ void VdeExportPart::setWinding(Winding winding)
     m_winding = winding;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void VdeExportPart::setRole(Role role)
+{
+    m_role = role;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -150,3 +159,11 @@ VdeExportPart::Winding VdeExportPart::winding() const
 {
     return m_winding;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+VdeExportPart::Role VdeExportPart::role() const
+{
+    return m_role;
+}
diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h b/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h
index ad6d1085d9..50fa469a70 100644
--- a/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h
+++ b/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h
@@ -35,7 +35,6 @@ public:
     {
         OBJ_TYPE_GRID,
         OBJ_TYPE_PIPE,
-        OBJ_TYPE_GRID_MESH,
         OBJ_TYPE_UNKNOWN
     };
 
@@ -45,6 +44,12 @@ public:
         COUNTERCLOCKWISE
     };
 
+    enum Role
+    {
+        GEOMETRY,
+        MESH_LINES
+    };
+
 public:
     VdeExportPart(cvf::Part* part);
 
@@ -55,6 +60,7 @@ public:
     void setColor(const cvf::Color3f& color);
     void setOpacity(float opacity);
     void setWinding(Winding winding);
+    void setRole(Role role);
 
     const cvf::Part*         part() const;
     const cvf::TextureImage* textureImage() const;
@@ -65,6 +71,7 @@ public:
     cvf::Color3f     color() const;
     float            opacity() const;
     Winding          winding() const;
+    Role             role() const;
 
 private:
     cvf::cref<cvf::Part>         m_part;
@@ -76,4 +83,5 @@ private:
     cvf::Color3f     m_color;
     float            m_opacity;
     Winding          m_winding;
+    Role             m_role;
 };