huanld/speckle-server
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(viewer): double tapping ✅

Browse Source
This commit is contained in:
Dimitrie Stefanescu
2021-01-13 22:52:28 +02:00
parent 83234b9741
commit 39f0e827a0
6 changed files with 83 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/viewer/example/demo.js
+45 -19
View File
@@ -230,7 +230,7 @@ window.v = v;
window.LoadData = /*#__PURE__*/function () {
var _LoadData = _asyncToGenerator(function* (id) {
v.sceneManager.removeAllObjects();
// v.sceneManager.removeAllObjects()
id = id || document.getElementById('objectIdInput').value;
var loader = new _modules_ObjectLoader__WEBPACK_IMPORTED_MODULE_1__.default({
serverUrl: 'https://staging.speckle.dev',
@@ -370,8 +370,12 @@ var Coverter = /*#__PURE__*/function () {
var type = this.getSpeckleType(obj);
if (this[type + "ToBufferGeometry"]) {
callback(yield this[type + "ToBufferGeometry"](obj.data || obj));
return;
try {
callback(yield this[type + "ToBufferGeometry"](obj.data || obj));
return;
} catch (e) {
console.warn("(Traversing - direct) Failed to convert " + type + " with id: " + obj.id);
}
}
var target = obj.data || obj; // Check if the object has a display value of sorts
@@ -391,8 +395,6 @@ var Coverter = /*#__PURE__*/function () {
return;
} catch (e) {
console.warn("(Traversing) Failed to convert obj with id: " + obj.id);
console.warn(obj);
throw e;
}
} // Last attempt: iterate through all object keys and see if we can display anything!
// traverses the object in case there's any sub-objects we can convert.
@@ -988,7 +990,7 @@ var SceneObjectManager = /*#__PURE__*/function () {
envMap: this.viewer.cubeCamera.renderTarget.texture
});
this.objectIds = [];
this.zoomExtentsDebounce = lodash_debounce__WEBPACK_IMPORTED_MODULE_1___default()(() => {
this.postLoad = lodash_debounce__WEBPACK_IMPORTED_MODULE_1___default()(() => {
this._postLoadFunction();
}, 200);
}
@@ -1047,7 +1049,7 @@ var SceneObjectManager = /*#__PURE__*/function () {
break;
}
this.zoomExtentsDebounce();
this.postLoad();
}
}, {
key: "addSolid",
@@ -1077,15 +1079,7 @@ var SceneObjectManager = /*#__PURE__*/function () {
}
}, {
key: "removeObject",
value: function removeObject(id) {
var obj = this.userObjects.children.find(o => o.uuid === id);
if (obj) {
obj.geometry.dispose();
this.userObjects.remove(obj);
} else {
console.warn("Failed to remove object with id: " + id + ": no object found.");
}
value: function removeObject(id) {// TODO
}
}, {
key: "removeAllObjects",
@@ -1442,12 +1436,42 @@ var SelectionHelper = /*#__PURE__*/function (_EventEmitter) {
var selectionObjects = _this.getClickedObjects(e);
_this.handleSelection(selectionObjects);
}); // TODO: figure out doubleclicks on touch devices
}); // Doubleclicks on touch devices
// ref: http://jsfiddle.net/brettwp/J4djY/
_this.tapTimeout;
_this.lastTap = 0;
_this.touchLocation;
_this.viewer.renderer.domElement.addEventListener('touchstart', e => {
_this.touchLocation = e.targetTouches[0];
});
_this.viewer.renderer.domElement.addEventListener('touchend', e => {
var currentTime = new Date().getTime();
var tapLength = currentTime - _this.lastTap;
clearTimeout(_this.tapTimeout);
if (tapLength < 500 && tapLength > 0) {
var selectionObjects = _this.getClickedObjects(_this.touchLocation);
_this.emit('object-doubleclicked', selectionObjects);
_this.handleDoubleClick(selectionObjects);
event.preventDefault();
} else {
_this.tapTimeout = setTimeout(function () {
clearTimeout(this.tapTimeout);
}, 500);
}
_this.lastTap = currentTime;
});
_this.viewer.renderer.domElement.addEventListener('dblclick', e => {
if (_this.orbiting) return;
// if ( this.orbiting ) return // not needed for zoom to thing?
var selectionObjects = _this.getClickedObjects(e);
_this.emit('object-doubleclicked', selectionObjects);
@@ -1894,6 +1918,8 @@ var Viewer = /*#__PURE__*/function () {
this.controls.dampingFactor = 0.05;
this.controls.screenSpacePanning = true;
this.controls.maxPolarAngle = Math.PI / 2;
this.controls.panSpeed = 0.8;
this.controls.rotateSpeed = 0.5;
this.composer = new three_examples_jsm_postprocessing_EffectComposer_js__WEBPACK_IMPORTED_MODULE_2__.EffectComposer(this.renderer);
this.ssaoPass = new three_examples_jsm_postprocessing_SSAOPass_js__WEBPACK_IMPORTED_MODULE_3__.SSAOPass(this.scene, this.camera, this.container.offsetWidth, this.container.offsetHeight);
this.ssaoPass.kernelRadius = 0.03;
packages/viewer/src/app.js
+1 -1
View File
@@ -8,7 +8,7 @@ window.v = v
window.LoadData = async function LoadData( id ) {
v.sceneManager.removeAllObjects()
// v.sceneManager.removeAllObjects()
id = id || document.getElementById( 'objectIdInput' ).value
let loader = new ObjectLoader( {
packages/viewer/src/modules/Converter.js
+6 -4
View File
@@ -39,8 +39,12 @@ export default class Coverter {
// If we can convert it, we should invoke the respective conversion routine.
const type = this.getSpeckleType( obj )
if ( this[`${type}ToBufferGeometry`] ) {
callback( await this[`${type}ToBufferGeometry`]( obj.data || obj ) )
return
try {
callback( await this[`${type}ToBufferGeometry`]( obj.data || obj ) )
return
} catch ( e ) {
console.warn( `(Traversing - direct) Failed to convert ${type} with id: ${obj.id}` )
}
}
let target = obj.data || obj
@@ -57,8 +61,6 @@ export default class Coverter {
return
} catch ( e ) {
console.warn( `(Traversing) Failed to convert obj with id: ${obj.id}` )
console.warn( obj )
throw e
}
}
packages/viewer/src/modules/SceneObjectManager.js
+5 -9
View File
@@ -39,7 +39,7 @@ export default class SceneObjectManager {
this.objectIds = []
this.zoomExtentsDebounce = debounce( () => { this._postLoadFunction() }, 200 )
this.postLoad = debounce( () => { this._postLoadFunction() }, 200 )
}
get objects() {
@@ -52,6 +52,8 @@ export default class SceneObjectManager {
// efficient approach.
addObject( wrapper ) {
if ( !wrapper || !wrapper.bufferGeometry ) return
switch ( wrapper.geometryType ) {
case 'solid':
// Do we have a defined material?
@@ -91,7 +93,7 @@ export default class SceneObjectManager {
break
}
this.zoomExtentsDebounce()
this.postLoad()
}
addSolid( wrapper, material ) {
@@ -119,13 +121,7 @@ export default class SceneObjectManager {
}
removeObject( id ) {
let obj = this.userObjects.children.find( o => o.uuid === id )
if ( obj ){
obj.geometry.dispose()
this.userObjects.remove( obj )
} else {
console.warn( `Failed to remove object with id: ${id}: no object found.` )
}
// TODO
}
removeAllObjects() {
packages/viewer/src/modules/SelectionHelper.js
+24 -2
View File
@@ -30,9 +30,31 @@ export default class SelectionHelper extends EventEmitter {
this.handleSelection( selectionObjects )
} )
// TODO: figure out doubleclicks on touch devices
// Doubleclicks on touch devices
// ref: http://jsfiddle.net/brettwp/J4djY/
this.tapTimeout
this.lastTap = 0
this.touchLocation
this.viewer.renderer.domElement.addEventListener( 'touchstart', ( e ) => { this.touchLocation = e.targetTouches[0] } )
this.viewer.renderer.domElement.addEventListener( 'touchend', ( e ) => {
var currentTime = new Date().getTime()
var tapLength = currentTime - this.lastTap
clearTimeout( this.tapTimeout )
if ( tapLength < 500 && tapLength > 0 ) {
let selectionObjects = this.getClickedObjects( this.touchLocation )
this.emit( 'object-doubleclicked', selectionObjects )
this.handleDoubleClick( selectionObjects )
event.preventDefault()
} else {
this.tapTimeout = setTimeout( function() {
clearTimeout( this.tapTimeout )
}, 500 )
}
this.lastTap = currentTime
} )
this.viewer.renderer.domElement.addEventListener( 'dblclick', ( e ) => {
if ( this.orbiting ) return
// if ( this.orbiting ) return // not needed for zoom to thing?
let selectionObjects = this.getClickedObjects( e )
packages/viewer/src/modules/Viewer.js
+2
View File
@@ -36,6 +36,8 @@ export default class Viewer {
this.controls.dampingFactor = 0.05
this.controls.screenSpacePanning = true
this.controls.maxPolarAngle = Math.PI / 2
this.controls.panSpeed = 0.8
this.controls.rotateSpeed = 0.5
this.composer = new EffectComposer( this.renderer )