diff --git a/src/js/clip/Selection.js b/src/js/clip/Selection.js index 608965f..564aa65 100644 --- a/src/js/clip/Selection.js +++ b/src/js/clip/Selection.js @@ -2,7 +2,6 @@ import { BoxGeometry } from 'three/src/geometries/BoxGeometry'; import { Mesh } from 'three/src/objects/Mesh'; import * as material from './material'; import { Vector3 } from 'three/src/math/Vector3'; -import { Object3D } from 'three/src/core/Object3D'; import { uniforms } from "./uniforms"; import { SelectionBoxFace } from './SelectionBoxFace'; import { SelectionBoxLine } from './SelectionBoxLine'; diff --git a/src/js/core/BaseEditor.js b/src/js/core/BaseEditor.js index 7abbe1e..93848ea 100644 --- a/src/js/core/BaseEditor.js +++ b/src/js/core/BaseEditor.js @@ -113,12 +113,12 @@ export class BaseEditor { this._processDrawingClick(e); } - _processDrawingClick (e) { + _processDrawingClick(e) { this.fireAndForward('editable:drawing:clicked', e); this._commitDrawing(e); } - _commitDrawing (e) { + _commitDrawing(e) { this._onCommitDrawing(e); } @@ -134,11 +134,11 @@ export class BaseEditor { this._endDrawing(); } - _onCancelDrawing () { + _onCancelDrawing() { this.fireAndForward('editable:drawing:cancel'); } - _endDrawing () { + _endDrawing() { this._drawing = false; this.mapTool.unregisterForDrawing(this); this._onEndDrawing(); diff --git a/src/js/tasks/BoreholeIdentify.js b/src/js/tasks/BoreholeIdentify.js new file mode 100644 index 0000000..d77470b --- /dev/null +++ b/src/js/tasks/BoreholeIdentify.js @@ -0,0 +1,177 @@ +import { Vector3 } from 'three/src/math/Vector3'; +import { Raycaster } from 'three/src/core/Raycaster'; + +export class BoreholeIdentify { + + type; + searchUrl; + camera; + domElement; + highlightMaterial; + layers; + + constructor(defaults) { + this.type = "DxfIdentify"; + this.searchUrl = ""; + this.camera = defaults.camera; + this.domElement = defaults.domElement; + //this.layer = defaults.layer; + this.highlightMaterial = defaults.highlightMaterial; + this.layers = defaults.layers; + } + + execute(params) { + let canvasOffset = $(this.domElement).offset(); + let xClickedOnCanvas = params.clientX - canvasOffset.left; + let yClickedonCanvas = params.clientY - canvasOffset.top; + //this.camera = params.camera; + + let eventsResponse = this._intersectObjects(xClickedOnCanvas, yClickedonCanvas, params.width, params.height); + //if (objs.length == 0) { + // // + //} + return eventsResponse.then( + function (response) { + return response; + }); + } + + _intersectObjects(offsetX, offsetY, width, height) { + // let deferred = $.Deferred(); + return new Promise( + (resolve, reject) => { // (A) + if (offsetX === undefined || offsetY === undefined) { + reject(new Error('Must provide two parameters')); + } else { + // resolve(x + y); + // calculate mouse position in normalized device coordinates + let mouseXForRay = (offsetX / width) * 2 - 1; + let mouseYForRay = -(offsetY / height) * 2 + 1; + let z = 0.5; + + let vector = new Vector3(mouseXForRay, mouseYForRay, z); + vector.unproject(this.camera); + vector.sub(this.camera.position); + vector.normalize(); + let raycaster = new Raycaster(this.camera.position, vector); + //var raycaster = new THREE.Raycaster(vector, new THREE.Vector3(0, 1, 0).normalize()); + //var direction = new THREE.Vector3(0, 0, 1); + //var raycaster = new THREE.Raycaster(); + //raycaster.set(vector, direction); + + //raycaster.setFromCamera(mouse, this.camera); + let a = this._getQueryableObjects();//nur die sichtbar sind + let b = this._getQueryableObjects2();//alle + let intersects = []; + let intersects1 = raycaster.intersectObjects(a, true); + if (intersects1.length > 0) { + this.start = intersects1[0].point.clone(); + let startPosition = intersects1[0].point; + startPosition.z = 60;// += 0.5; + let direction = new Vector3(0, 0, -1); + let raycaster = new Raycaster(startPosition, direction); + intersects = raycaster.intersectObjects(b, false); + } + + let resultObjects = []; + //for (var i = objs.length - 1; i >= 0; i--) { + for (let i = 0; i < intersects.length; i++) { + let obj = intersects[i]; + if (!obj.object.visible) continue; + // get layerId and featureId of clicked object + //var object = obj.object; + //var layerId = object.userData.layerId; + //var featureId = obj.faceIndex; + let layer = obj.object; + let layerId = layer.userData.layerId; + let objectGroup = layer.parent; + let featureId = obj.index;// obj.faceIndex; + let scaleFactor = parseFloat(objectGroup.scale.z); + + if (scaleFactor > 1) { + obj.point.z = obj.point.z / scaleFactor; + } + + + //var feature = this._highlightFeature((layerId === undefined) ? null : layerId, (featureId === undefined) ? null : featureId); + let result = { + //highlightFeature: feature, + point: obj.point, + distance: obj.distance, + layerId: layerId, + featureId: featureId + }; + resultObjects.push(result); + } // for + + + //// resolve the deferred with the result of the slow process + resolve({ features: resultObjects, aufschlag: this.start }); + } + }); + } + + _highlightFeature(layerId, featureId) { + //if (app.highlightObject) { + // // remove highlight object from the scene + // app.scene.remove(app.highlightObject); + // app.selectedLayerId = null; + // app.selectedFeatureId = null; + // app.highlightObject = null; + //} + + if (layerId === null) return; + var layer = this.layers[layerId]; + if (layer === undefined) return; + + var f = layer.features[featureId]; + if (f === undefined) return; + + var high_mat = this.highlightMaterial; + //var setMaterial = function (obj) { + // obj.material = high_mat; + //}; + + // create a highlight object (if layer type is Point, slightly bigger than the object) + var highlightObject = new THREE.Group(); + //var clone; + //var s = (layer.type == Q3D.LayerType.Point) ? 1.01 : 1; + + var geo = new THREE.Geometry(); + var v1 = new THREE.Vector3(f.Punkt0.x, f.Punkt0.y, f.Punkt0.z); + var v2 = new THREE.Vector3(f.Punkt1.x, f.Punkt1.y, f.Punkt1.z); + var v3 = new THREE.Vector3(f.Punkt2.x, f.Punkt2.y, f.Punkt2.z); + geo.vertices.push(v1); + geo.vertices.push(v2); + geo.vertices.push(v3); + var face = new THREE.Face3(0, 1, 2); + geo.faces.push(face); + //clone.traverse(setMaterial); + var clone = new THREE.Mesh(geo, high_mat); + + return clone; + } + + _getQueryableObjects() { + let _queryableObjects = []; + this.layers.forEach(function (layer) { + if (layer.visible && layer.queryableObjects.length) { + _queryableObjects = _queryableObjects.concat(layer.queryableObjects); + } + }); + return _queryableObjects; + } + + _getQueryableObjects2() { + let _queryableObjects = []; + this.layers.forEach(function (layer) { + //if (layer.visible && layer.queryableObjects.length) { + if (layer.queryableObjects.length) { + _queryableObjects = _queryableObjects.concat(layer.queryableObjects); + } + }); + return _queryableObjects; + } + + +} \ No newline at end of file