From 53d30d0b6482968032166f5bd4b9158f7bb5fce9 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Tue, 28 Dec 2021 17:25:25 +0100 Subject: [PATCH] Add helper function for color conversion. --- source/threejs/threemodelloader.js | 2 +- source/viewer/viewergeometry.js | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/source/threejs/threemodelloader.js b/source/threejs/threemodelloader.js index e1bfcae..0d8617f 100644 --- a/source/threejs/threemodelloader.js +++ b/source/threejs/threemodelloader.js @@ -68,7 +68,7 @@ OV.ThreeModelLoader = class ReplaceDefaultMaterialColor (defaultColor) { if (this.defaultMaterial !== null) { - this.defaultMaterial.color = new THREE.Color (defaultColor.r / 255.0, defaultColor.g / 255.0, defaultColor.b / 255.0); + this.defaultMaterial.color = OV.ConvertColorToThreeColor (defaultColor); } } }; diff --git a/source/viewer/viewergeometry.js b/source/viewer/viewergeometry.js index bf2aeeb..e28a3af 100644 --- a/source/viewer/viewergeometry.js +++ b/source/viewer/viewergeometry.js @@ -91,11 +91,8 @@ OV.ViewerGeometry = class this.ClearMainEdgeObject (); this.GenerateMainEdgeObject (); } else { - let edgeColor = new THREE.Color ( - this.edgeSettings.edgeColor.r / 255.0, - this.edgeSettings.edgeColor.g / 255.0, - this.edgeSettings.edgeColor.b / 255.0 - ); + + let edgeColor = OV.ConvertColorToThreeColor (this.edgeSettings.edgeColor); this.EnumerateEdges ((edge) => { edge.material.color = edgeColor; }); @@ -168,11 +165,7 @@ OV.ViewerGeometry = class GenerateMainEdgeObject () { - let edgeColor = new THREE.Color ( - this.edgeSettings.edgeColor.r / 255.0, - this.edgeSettings.edgeColor.g / 255.0, - this.edgeSettings.edgeColor.b / 255.0 - ); + let edgeColor = OV.ConvertColorToThreeColor (this.edgeSettings.edgeColor); this.mainEdgeObject = new THREE.Object3D (); this.UpdateWorldMatrix ();