Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add helper function for color conversion.

Browse Source
This commit is contained in:
kovacsv 2021-12-28 17:25:25 +01:00
parent 5c40815a7d
commit 53d30d0b64
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/threejs/threemodelloader.js
View File

@ -68,7 +68,7 @@ OV.ThreeModelLoader = class
ReplaceDefaultMaterialColor (defaultColor) ReplaceDefaultMaterialColor (defaultColor)
{ {
if (this.defaultMaterial !== null) { 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);
} }
} }
}; };

13
source/viewer/viewergeometry.js
View File

@ -91,11 +91,8 @@ OV.ViewerGeometry = class
this.ClearMainEdgeObject (); this.ClearMainEdgeObject ();
this.GenerateMainEdgeObject (); this.GenerateMainEdgeObject ();
} else { } else {
let edgeColor = new THREE.Color (
this.edgeSettings.edgeColor.r / 255.0, let edgeColor = OV.ConvertColorToThreeColor (this.edgeSettings.edgeColor);
this.edgeSettings.edgeColor.g / 255.0,
this.edgeSettings.edgeColor.b / 255.0
);
this.EnumerateEdges ((edge) => { this.EnumerateEdges ((edge) => {
edge.material.color = edgeColor; edge.material.color = edgeColor;
}); });
@ -168,11 +165,7 @@ OV.ViewerGeometry = class
GenerateMainEdgeObject () GenerateMainEdgeObject ()
{ {
let edgeColor = new THREE.Color ( let edgeColor = OV.ConvertColorToThreeColor (this.edgeSettings.edgeColor);
this.edgeSettings.edgeColor.r / 255.0,
this.edgeSettings.edgeColor.g / 255.0,
this.edgeSettings.edgeColor.b / 255.0
);
this.mainEdgeObject = new THREE.Object3D (); this.mainEdgeObject = new THREE.Object3D ();
this.UpdateWorldMatrix (); this.UpdateWorldMatrix ();