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

Modify marker color.

Browse Source
This commit is contained in:
kovacsv 2022-02-20 18:33:18 +01:00
parent c165242ad6
commit 4a363b2d23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/website/measuretool.js
View File

@ -12,10 +12,10 @@ function GetFaceWorldNormal (intersection)
return faceNormal; return faceNormal;
} }
function CreateMaterial (color) function CreateMaterial ()
{ {
return new THREE.LineBasicMaterial ({ return new THREE.LineBasicMaterial ({
color : color, color : 0x000000,
depthTest : false depthTest : false
}); });
} }
@ -28,12 +28,12 @@ function CreateLineFromPoints (points, material)
class Marker class Marker
{ {
constructor (intersection, color, radius) constructor (intersection, radius)
{ {
this.intersection = null; this.intersection = null;
this.markerObject = new THREE.Object3D (); this.markerObject = new THREE.Object3D ();
let material = CreateMaterial (color); let material = CreateMaterial ();
let circleCurve = new THREE.EllipseCurve (0.0, 0.0, radius, radius, 0.0, 2.0 * Math.PI, false, 0.0); let circleCurve = new THREE.EllipseCurve (0.0, 0.0, radius, radius, 0.0, 2.0 * Math.PI, false, 0.0);
this.markerObject.add (CreateLineFromPoints (circleCurve.getPoints (50), material)); this.markerObject.add (CreateLineFromPoints (circleCurve.getPoints (50), material));
this.markerObject.add (CreateLineFromPoints ([new THREE.Vector3 (-radius, 0.0, 0.0), new THREE.Vector3 (radius, 0.0, 0.0)], material)); this.markerObject.add (CreateLineFromPoints ([new THREE.Vector3 (-radius, 0.0, 0.0), new THREE.Vector3 (radius, 0.0, 0.0)], material));
@ -157,7 +157,7 @@ export class MeasureTool
return; return;
} }
if (this.tempMarker === null) { if (this.tempMarker === null) {
this.tempMarker = this.GenerateMarker (intersection, 0x00cc00); this.tempMarker = this.GenerateMarker (intersection);
} }
this.tempMarker.UpdatePosition (intersection); this.tempMarker.UpdatePosition (intersection);
this.tempMarker.Show (true); this.tempMarker.Show (true);
@ -166,24 +166,24 @@ export class MeasureTool
AddMarker (intersection) AddMarker (intersection)
{ {
let marker = this.GenerateMarker (intersection, 0xcc0000); let marker = this.GenerateMarker (intersection);
this.markers.push (marker); this.markers.push (marker);
if (this.markers.length === 2) { if (this.markers.length === 2) {
let material = CreateMaterial (0x0000cc); let material = CreateMaterial ();
let aPoint = this.markers[0].GetIntersection ().point; let aPoint = this.markers[0].GetIntersection ().point;
let bPoint = this.markers[1].GetIntersection ().point; let bPoint = this.markers[1].GetIntersection ().point;
this.viewer.AddExtraObject (CreateLineFromPoints ([aPoint, bPoint], material)); this.viewer.AddExtraObject (CreateLineFromPoints ([aPoint, bPoint], material));
} }
} }
GenerateMarker (intersection, color) GenerateMarker (intersection)
{ {
let boundingSphere = this.viewer.GetBoundingSphere ((meshUserData) => { let boundingSphere = this.viewer.GetBoundingSphere ((meshUserData) => {
return true; return true;
}); });
let radius = boundingSphere.radius / 20.0; let radius = boundingSphere.radius / 20.0;
let marker = new Marker (intersection, color, radius); let marker = new Marker (intersection, radius);
this.viewer.AddExtraObject (marker.GetObject ()); this.viewer.AddExtraObject (marker.GetObject ());
return marker; return marker;
} }