refactor(rhino): removes DirectShapeToNative conversion (#3042)

* uses basegeometries instead of displayvalue for ds rhino receive * removes directshape conversion
specklesystems · Nov 14, 2023 · e780b2d · e780b2d
1 parent d9c9594
commit e780b2d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 44 deletions.
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.Receive.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/UI/ConnectorBindingsRhino.Receive.cs
@@ -480,12 +480,16 @@ private void BakeObject(
           var attributes = new ObjectAttributes();
 
           // handle display style
-          if (obj[@"displayStyle"] is Base display)
+          Base display = obj["displayStyle"] as Base ?? obj["@displayStyle"] as Base;
+          Base render = obj["renderMaterial"] as Base ?? obj["@renderMaterial"] as Base;
+          if (display != null)
           {
             if (converter.ConvertToNative(display) is ObjectAttributes displayAttribute)
+            {
               attributes = displayAttribute;
+            }
           }
-          else if (obj[@"renderMaterial"] is Base renderMaterial)
+          else if (render != null)
           {
             attributes.ColorSource = ObjectColorSource.ColorFromMaterial;
           }
@@ -527,23 +531,28 @@ private void BakeObject(
           }
 
           if (parent != null)
+          {
             parent.Update(id.ToString());
+          }
           else
+          {
             appObj.Update(id.ToString());
+          }
 
           bakedCount++;
 
           // handle render material
-          if (obj[@"renderMaterial"] is Base render)
+          if (render != null)
           {
-            var convertedMaterial = converter.ConvertToNative(render); //Maybe wrap in try catch in case no conversion exists?
-            if (convertedMaterial is RenderMaterial rm)
+            var convertedMaterial = converter.ConvertToNative(render) as RenderMaterial; //Maybe wrap in try catch in case no conversion exists?
+            if (convertedMaterial != null)
             {
-              var rhinoObject = Doc.Objects.FindId(id);
-              rhinoObject.RenderMaterial = rm;
+              RhinoObject rhinoObject = Doc.Objects.FindId(id);
+              rhinoObject.RenderMaterial = convertedMaterial;
               rhinoObject.CommitChanges();
             }
           }
+
           break;
 
         case RhinoObject o: // this was prbly a block instance, baked during conversion

diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.BuiltElements.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.BuiltElements.cs
@@ -151,37 +151,6 @@ private RhinoViewport SetViewParams(RhinoViewport viewport, Base speckleView)
     return viewport;
   }
 
-  // direct shape
-  public List<object> DirectShapeToNative(RV.DirectShape directShape, out List<string> log)
-  {
-    log = new List<string>();
-    if (directShape.displayValue == null)
-    {
-      log.Add($"Skipping DirectShape {directShape.id} because it has no {nameof(directShape.displayValue)}");
-      return null;
-    }
-
-    if (directShape.displayValue.Count == 0)
-    {
-      log.Add($"Skipping DirectShape {directShape.id} because {nameof(directShape.displayValue)} was empty");
-      return null;
-    }
-
-    IEnumerable<object> subObjects = directShape.displayValue.Select(ConvertToNative).Where(e => e != null);
-
-    var nativeObjects = subObjects.ToList();
-
-    if (nativeObjects.Count == 0)
-    {
-      log.Add(
-        $"Skipping DirectShape {directShape.id} because {nameof(directShape.displayValue)} contained no convertable elements"
-      );
-      return null;
-    }
-
-    return nativeObjects;
-  }
-
   // level
   public ApplicationObject LevelToNative(Level level)
   {

diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhinoGhShared/ConverterRhinoGh.cs
@@ -473,10 +473,6 @@ public object ConvertToNative(Base @object)
           rhinoObj = CurveToNative(o.baseCurve);
           break;
 
-        case DirectShape o:
-          rhinoObj = DirectShapeToNative(o, out notes);
-          break;
-
         case View3D o:
           rhinoObj = ViewToNative(o);
           break;
@@ -675,7 +671,6 @@ public bool CanConvertToNative(Base @object)
       // This types are not supported in GH!
       case Pointcloud _:
       case ModelCurve _:
-      case DirectShape _:
       case View3D _:
       case Instance _:
       case GridLine _:

diff --git a/Objects/Objects/BuiltElements/Revit/DirectShape.cs b/Objects/Objects/BuiltElements/Revit/DirectShape.cs
@@ -47,7 +47,7 @@ public DirectShape(string name, string builtInCategory, List<Base> baseGeometrie
   public string elementId { get; set; }
 
   [DetachProperty]
-  public List<Base> baseGeometries { get; set; }
+  public List<Base> baseGeometries { get; set; } = new();
 
   public string units { get; set; }