From d244cd458a5b1a5fc363ffce99a1fbb92531bc08 Mon Sep 17 00:00:00 2001
From: kovacsv <viktorkovacs@gmail.com>
Date: Sun, 8 Aug 2021 13:50:24 +0200
Subject: [PATCH] Use common function in rhino importer.

---
 source/import/importer3dm.js | 49 +++---------------------------------
 source/threejs/threeutils.js |  5 ++--
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/source/import/importer3dm.js b/source/import/importer3dm.js
index 3d200e4..0c662ed 100644
--- a/source/import/importer3dm.js
+++ b/source/import/importer3dm.js
@@ -181,7 +181,9 @@ OV.Importer3dm = class extends OV.ImporterBase
 	{
 		let rhinoAttributes = rhinoObject.attributes ();
 
-		let mesh = new OV.Mesh ();
+		let materialIndex = this.GetMaterialIndex (rhinoDoc, rhinoObject, rhinoInstanceReferences);
+		let threeJson = rhinoMesh.toThreejsJSON ();
+		let mesh = OV.ConvertThreeGeometryToMesh (threeJson.data, materialIndex);
 		mesh.SetName (rhinoAttributes.name);
 
 		let userStrings = rhinoAttributes.getUserStrings ();
@@ -194,51 +196,6 @@ OV.Importer3dm = class extends OV.ImporterBase
 			mesh.AddPropertyGroup (propertyGroup);
 		}
 
-		let materialIndex = this.GetMaterialIndex (rhinoDoc, rhinoObject, rhinoInstanceReferences);
-		let threeJson = rhinoMesh.toThreejsJSON ();
-		let vertices = threeJson.data.attributes.position.array;
-		for (let i = 0; i < vertices.length; i += 3) {
-			let x = vertices[i];
-			let y = vertices[i + 1];
-			let z = vertices[i + 2];
-			mesh.AddVertex (new OV.Coord3D (x, y, z));
-		}
-		let hasNormals = (threeJson.data.attributes.normal !== undefined);
-		if (hasNormals) {
-			let normals = threeJson.data.attributes.normal.array;
-			for (let i = 0; i < normals.length; i += 3) {
-				let x = normals[i];
-				let y = normals[i + 1];
-				let z = normals[i + 2];
-				mesh.AddNormal (new OV.Coord3D (x, y, z));
-			}		
-		}
-		let hasUVs = (threeJson.data.attributes.uv !== undefined);
-		if (hasUVs) {
-			let uvs = threeJson.data.attributes.uv.array;
-			for (let i = 0; i < uvs.length; i += 2) {
-				let x = uvs[i];
-				let y = uvs[i + 1];
-				mesh.AddTextureUV (new OV.Coord2D (x, y));
-			}		
-		}
-		let indices = threeJson.data.index.array;
-		for (let i = 0; i < indices.length; i += 3) {
-			let v0 = indices[i];
-			let v1 = indices[i + 1];
-			let v2 = indices[i + 2];
-			let triangle = new OV.Triangle (v0, v1, v2);
-			if (hasNormals) {
-				triangle.SetNormals (v0, v1, v2);
-			}
-			if (hasUVs) {
-				triangle.SetTextureUVs (v0, v1, v2);
-			}
-			if (materialIndex !== null) {
-				triangle.SetMaterial (materialIndex);
-			}
-			mesh.AddTriangle (triangle);
-		}
 		if (rhinoInstanceReferences.length !== 0) {
 			let matrix = new OV.Matrix ().CreateIdentity ();
 			for (let i = rhinoInstanceReferences.length - 1; i >= 0; i--) {
diff --git a/source/threejs/threeutils.js b/source/threejs/threeutils.js
index ac2b62e..4cc8174 100644
--- a/source/threejs/threeutils.js
+++ b/source/threejs/threeutils.js
@@ -57,9 +57,10 @@ OV.HasHighpDriverIssue = function ()
 
 OV.ConvertThreeGeometryToMesh = function (threeGeometry, materialIndex)
 {
-    // TODO: check if buffergeometry
     let mesh = new OV.Mesh ();
-    mesh.SetName (threeGeometry.name);
+    if (threeGeometry.name !== undefined && threeGeometry.name !== null) {
+        mesh.SetName (threeGeometry.name);
+    }
     let vertices = threeGeometry.attributes.position.array;
     for (let i = 0; i < vertices.length; i += 3) {
         let x = vertices[i];