From 72e45a80307ec8d66767b1b73d9192702695b667 Mon Sep 17 00:00:00 2001
From: Viktor Kovacs <viktorkovacs@gmail.com>
Date: Fri, 30 Apr 2021 07:49:36 +0200
Subject: [PATCH] Separate class to store geometry.

---
 source/viewer/viewer.js | 113 +++++++++++++++++++++++++---------------
 website/o3dv/website.js |   2 +-
 2 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/source/viewer/viewer.js b/source/viewer/viewer.js
index 6003bd6..abd2798 100644
--- a/source/viewer/viewer.js
+++ b/source/viewer/viewer.js
@@ -74,6 +74,64 @@ OV.UpVector = class
     }
 };
 
+OV.ViewerGeometry = class
+{
+    constructor (scene)
+    {
+        this.scene = scene;
+        this.modelMeshes = [];
+    }
+
+    AddModelMeshes (meshes)
+    {
+        for (let i = 0; i < meshes.length; i++) {
+            let mesh = meshes[i];
+            this.modelMeshes.push (mesh);
+            this.scene.add (mesh);
+        }
+    }
+
+    GetModelMeshes ()
+    {
+        return this.modelMeshes;
+    }
+
+    ClearModelMeshes ()
+    {
+        for (let i = 0; i < this.modelMeshes.length; i++) {
+            let mesh = this.modelMeshes[i];
+            mesh.geometry.dispose ();
+            this.scene.remove (mesh);
+        }
+        this.modelMeshes = [];
+    }
+
+    EnumerateModelMeshes (enumerator)
+    {
+        for (let i = 0; i < this.modelMeshes.length; i++) {
+            let mesh = this.modelMeshes[i];
+            enumerator (mesh);
+        }
+    }
+
+    GetModelMeshUnderMouse (mouseCoords, camera, width, height)
+    {
+        let raycaster = new THREE.Raycaster ();
+        let mousePos = new THREE.Vector2 ();
+        mousePos.x = (mouseCoords.x / width) * 2 - 1;
+        mousePos.y = -(mouseCoords.y / height) * 2 + 1;
+        raycaster.setFromCamera (mousePos, camera);
+        let iSectObjects = raycaster.intersectObjects (this.modelMeshes);
+        for (let i = 0; i < iSectObjects.length; i++) {
+            let iSectObject = iSectObjects[i];
+            if (iSectObject.object.type === 'Mesh' && iSectObject.object.visible) {
+                return iSectObject.object;
+            }
+        }
+        return null;
+    }    
+};
+
 OV.Viewer = class
 {
     constructor ()
@@ -81,6 +139,7 @@ OV.Viewer = class
         this.canvas = null;
         this.renderer = null;
         this.scene = null;
+        this.geometry = null;
         this.camera = null;
         this.light = null;
         this.navigation = null;
@@ -111,6 +170,7 @@ OV.Viewer = class
         this.renderer.setSize (this.canvas.width, this.canvas.height);
         
         this.scene = new THREE.Scene ();
+        this.geometry = new OV.ViewerGeometry (this.scene);
 
         this.InitCamera ();
         this.InitLights ();
@@ -236,22 +296,19 @@ OV.Viewer = class
 
     AddMeshes (meshes)
     {
-        for (let i = 0; i < meshes.length; i++) {
-            let mesh = meshes[i];
-            this.scene.add (mesh);
-        }
+        this.geometry.AddModelMeshes (meshes);
         this.Render ();
     }
 
     Clear ()
     {
-        this.ClearMeshes ();
+        this.geometry.ClearModelMeshes ();
         this.Render ();
     }
 
     SetMeshesVisibility (isVisible)
     {
-        this.EnumerateMeshes (function (mesh) {
+        this.geometry.EnumerateModelMeshes (function (mesh) {
             let visible = isVisible (mesh.userData);
             if (mesh.visible !== visible) {
                 mesh.visible = visible;
@@ -271,7 +328,7 @@ OV.Viewer = class
             return highlightMaterials;
         }
 
-        this.EnumerateMeshes (function (mesh) {
+        this.geometry.EnumerateModelMeshes (function (mesh) {
             let highlighted = isHighlighted (mesh.userData);
             if (highlighted) {
                 if (mesh.userData.threeMaterials === null) {
@@ -288,28 +345,20 @@ OV.Viewer = class
         this.Render ();
     }    
 
-    GetMeshUnderMouse (mouseCoords)
+    GetMeshUserDataUnderMouse (mouseCoords)
     {
-        let raycaster = new THREE.Raycaster ();
-        let mousePos = new THREE.Vector2 ();
-        mousePos.x = (mouseCoords.x / this.canvas.width) * 2 - 1;
-        mousePos.y = -(mouseCoords.y / this.canvas.height) * 2 + 1;
-        raycaster.setFromCamera (mousePos, this.camera);
-        let iSectObjects = raycaster.intersectObjects (this.scene.children);
-        for (let i = 0; i < iSectObjects.length; i++) {
-            let iSectObject = iSectObjects[i];
-            if (iSectObject.object.type === 'Mesh' && iSectObject.object.visible) {
-                return iSectObject.object.userData;
-            }
+        let mesh = this.geometry.GetModelMeshUnderMouse (mouseCoords, this.camera, this.canvas.width, this.canvas.height);
+        if (mesh === null) {
+            return null;
         }
-        return null;
+        return mesh.userData;
     }
 
     GetBoundingBox (needToProcess)
     {
         let hasMesh = false;
         let boundingBox = new THREE.Box3 ();
-        this.EnumerateMeshes (function (mesh) {
+        this.geometry.EnumerateModelMeshes (function (mesh) {
             if (needToProcess (mesh.userData)) {
                 boundingBox.union (new THREE.Box3 ().setFromObject (mesh));
                 hasMesh = true;
@@ -336,31 +385,11 @@ OV.Viewer = class
 
     EnumerateMeshesUserData (enumerator)
     {
-        this.EnumerateMeshes (function (mesh) {
+        this.geometry.EnumerateModelMeshes (function (mesh) {
             enumerator (mesh.userData);
         });
     }
 
-    EnumerateMeshes (enumerator)
-    {
-        this.scene.traverse (function (object) {
-            if (object.isMesh) {
-                enumerator (object);
-            }
-        });
-    }
-
-    ClearMeshes ()
-    {
-        for (let i = this.scene.children.length - 1; i >= 0; i--) {
-            let object = this.scene.children[i];
-            if (object.isMesh) {
-                object.geometry.dispose ();
-                this.scene.remove (object);
-            }
-        }
-    }
-
     InitCamera ()
     {
         this.camera = new THREE.PerspectiveCamera (45.0, this.canvas.width / this.canvas.height, 0.1, 1000.0);
diff --git a/website/o3dv/website.js b/website/o3dv/website.js
index 2108949..7685f22 100644
--- a/website/o3dv/website.js
+++ b/website/o3dv/website.js
@@ -97,7 +97,7 @@ OV.Website = class
     OnModelClicked (button, isCtrlPressed, mouseCoordinates)
     {
         if (button === 1) {
-            let meshUserData = this.viewer.GetMeshUnderMouse (mouseCoordinates);
+            let meshUserData = this.viewer.GetMeshUserDataUnderMouse (mouseCoordinates);
             if (meshUserData === null) {
                 this.menu.SetSelection (null);
             } else {