From 215b201bdc4d2ddcc36c83c86b6e8133d5ad4add Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 27 Jan 2019 18:22:05 +0100 Subject: copy in dataset libraries for now --- client/splash/datasetList.js | 1 + client/splash/datasets.js | 86 ++++++ client/splash/faceMarkers.js | 254 ++++++++++++++++ client/splash/index.js | 13 +- client/splash/vendor/DRACOLoader.js | 518 --------------------------------- client/splash/vendor/geometryHelper.js | 106 ------- client/splash/vendor/oktween.js | 159 ---------- client/splash/vendor/three.meshline.js | 467 ----------------------------- client/util/vendor/DRACOLoader.js | 518 +++++++++++++++++++++++++++++++++ client/util/vendor/geometryHelper.js | 106 +++++++ client/util/vendor/oktween.js | 159 ++++++++++ package-lock.json | 18 ++ package.json | 4 +- 13 files changed, 1152 insertions(+), 1257 deletions(-) create mode 100644 client/splash/datasetList.js create mode 100644 client/splash/datasets.js create mode 100644 client/splash/faceMarkers.js delete mode 100644 client/splash/vendor/DRACOLoader.js delete mode 100644 client/splash/vendor/geometryHelper.js delete mode 100644 client/splash/vendor/oktween.js delete mode 100644 client/splash/vendor/three.meshline.js create mode 100644 client/util/vendor/DRACOLoader.js create mode 100644 client/util/vendor/geometryHelper.js create mode 100644 client/util/vendor/oktween.js diff --git a/client/splash/datasetList.js b/client/splash/datasetList.js new file mode 100644 index 00000000..88058de7 --- /dev/null +++ b/client/splash/datasetList.js @@ -0,0 +1 @@ +export default ["10K US Adult Faces","3D-RMA","3D Dynamic","3DPeS","4DFAB","50 People One Question","aPascal","Aberdeen","Adience","AFAD","AFEW-VA","AffectNet","AFLW","AFW","AgeDB","ALERT Airport","AM-FED","APiS1.0","AR Face","AWE Ears","B3D(AC)","BBC Pose","BPAD","BFM","BioID Face","BJUT-3D","The Bosphorus","BP4D+","BP4D-Spontanous","Brainwash","BU-3DFE","BUHMAP-DB ","CAFE","Caltech 10K Web Faces","Caltech Faces","Caltech Pedestrians","CAMEL","CAS-PEAL","Casablanca","CASIA Webface","CAVIAR4REID","CelebA","CelebFaces+","CFD","ChaLearn","ChokePoint","Cityscapes","CCP","CMDP","CMU PIE","COCO","COCO-a","COCO QA","COFW","CK","CK+","Columbia Gaze","Ongoing Complex Activities","CUHK01","CUHK02","CUHK03","CVC-01","UFI","D3DFACS","Dartmouth Children","Data61 Pedestrian","DeepFashion","DISFA","Long Distance Heterogeneous Face","Duke MTMC","EmotioNet Database","ETHZ Pedestrian","EuroCity Persons","ExpW","Face Research Lab London","FaceScrub","FaceTracer","SFC","Facebook100","Face Place","Faces94","Faces95","Faces96","FIW","FDDB","FEI","FERET","FER+","CMU FiA","300-W","Florida Inmate","FRAV2D","FRAV3D","GRIMACE","FRGC","Gallagher","Gavab","GeoFaces","Georgia Tech Face","Google Makeup","Google (private)","Graz Pedestrian","H3D","HDA+","Helen","Hi4D-ADSIP","HID","Hipsterwars","HollywoodHeads","HRT Transgender","IFAD","IFDB","IIT Dehli Ear","IJB-A","IJB-B","IJB-C","","iLIDS-VID","Images of Groups","IMDB","IMFDB","IMM Face Dataset","Immediacy","imSitu","INRIA Pedestrian","iQIYI-VID dataset ","JAFFE","Jiku Mobile Video Dataset","JPL-Interaction dataset","Karpathy Instagram","KDEF","UB KinFace","KinectFaceDB","KITTI","LAG","Large Scale Person Search","Leeds Sports Pose","Leeds Sports Pose Extended","LFW","LFW-a","LFWP","m2vts","xm2vtsdb","MAFL","MALF","Mapillary","Market 1501","Market 1203","MARS","McGill Real World","Multiple Encounter Dataset","MegaAge","MegaFace","MIFS","MIKKI dataset","MIT CBCL","CBCL","CBCLSS","MIW","MMI Facial Expression Dataset","Moments in Time","MORPH Commercial","MORPH Non-Commercial","MOT","Large MPI Facial Expression","Small MPI Facial Expression","MPIIGaze","MPII Human Pose","MR2","MRP Drone","MsCeleb","MSMT17","MUCT","MUG Faces","MULTIPIE","MTFL","News Dataset","ND-2006","MID","Novaemötions Dataset","Nude Detection","ORL","Penn Fudan","PETA","PETS 2017","PPB","PIPA","PKU","PKU-Reid","Pornography DB","Precarious","PRID","PRW","PSU","PubFig","pubfig83","Put Face","GRID","QMUL-iLIDS","QMUL-SurvFace","RaFD","RAiD","RAP","ReSEED","SAIVT SoftBio","SAMM","Sarc3D","SCface","SCUT-FBP","SCUT HEAD","SDU-VID","SED Dataset","Sheffield Face","Shinpuhkan 2014","Social Relation","SOTON HiD","SVW","STAIR Action","Stanford Drone","Buffy Stickmen","We Are Family Stickmen","Stickmen PASCAL","Stirling/ESRC 3D Face","SUN","SVS","Texas 3DFRD","TinyFace","Tiny Images","TownCenter","TUD-Brussels","TUD-Campus","TUD-Crossing","TUD-Motionparis","TUD-Multiview","TUD-Pedestrian","TUD-Stadtmitte","TVHI","ND-TWINS-2009-2010","UCCS","UCF101","UCF-CC-50","UCF Selfie","UFDD","UMB","UMD","UNBC-McMaster Pain","Urban Tribes","USED Social Event Dataset","UTKFace","V47","VADANA","CIP","VGG Face","VGG Face2","Violent Flows","VIPeR","Phrasal Recognition","VMU","VOC","VQA","WARD","WGT","WIDER","WIDER FACE","WIDER Attribute","WildTrack","YaleFaces","Yale Face Database B","Extended Yale Face Database B ","YawDD","YFCC100M","UOY 3D Face Database","YouTubeFaces","YMU","YouTube Pose","WLFDB","SAL","Semaine","Belfast naturalistic","Belfast induced","VAM-faces","MAHNOB-HCI","DEAP","AMFED","Recola","AVEC13","AVEC14","Mimicry","Meissner Caucasian and African American","Nottingham Scans","Nottingham Originals","Stirling Pain","Utrecht ECVP","Mooney","Visual Commonsense Reasoning","HUFRD Pilgrims Dataset"] diff --git a/client/splash/datasets.js b/client/splash/datasets.js new file mode 100644 index 00000000..e7842511 --- /dev/null +++ b/client/splash/datasets.js @@ -0,0 +1,86 @@ + +import datasetList from './datasetList' +import { choice } from '../util' + +// var getRandomText = function() { +// return choice(datasets) +// }; +// var getRandomFontFamily = function() { +// return 'Helvetica, Arial, sans-serif' +// // return choice([ +// // 'Georgia, serif', +// // '"Palatino Linotype", "Book Antiqua", Palatino, serif', +// // '"Times New Roman", Times, serif', +// // 'Helvetica, Arial, sans-serif', +// // '"Arial Black", Gadget, sans-serif', +// // '"Comic Sans MS", cursive, sans-serif', +// // 'Impact, Charcoal, sans-serif', +// // '"Lucida Sans Unicode", "Lucida Grande", sans-serif', +// // 'Tahoma, Geneva, sans-serif', +// // '"Trebuchet MS", Helvetica, sans-serif', +// // 'Verdana, Geneva, sans-serif', +// // '"Courier New", Courier, monospace', +// // '"Lucida Console", Monaco, monospace', +// // ]); +// }; +// var getRandomColor = function() { +// return choice([ 0xffffff, 0xffffff, 0xffffff, 0xdddde6, 0x888896 ]) +// }; +// var getRandomTextSize = function() { +// return (1 + Math.random()) * 1/8; +// }; +// var renderer = new THREE.WebGLRenderer({antialias: true, alpha: true}); +// renderer.setPixelRatio(devicePixelRatio); +// renderer.setClearColor(0x000000, 0); +// document.body.appendChild(renderer.domElement); +// var scene = new THREE.Scene(); +// var camera = new THREE.PerspectiveCamera(75, 1, 1/128, 128); +// camera.position.set(4, 0, 10); +// var redrawInterval = 1; +// var sprites = Array.from({length: datasets.length}, function(t, i) { +// // console.log(i) +// var sprite = new THREE.TextSprite({ +// textSize: getRandomTextSize(), +// redrawInterval: redrawInterval, +// material: { +// color: getRandomColor(), +// }, +// texture: { +// text: datasets[i], +// fontFamily: getRandomFontFamily(), +// }, +// }); +// sprite.position +// .setX(Math.random()) +// .setY(Math.random()) +// .setZ(Math.random()) +// .subScalar(1/2) +// .setLength(1 + Math.random()) +// .multiplyScalar(6); +// scene.add(sprite); +// return sprite; +// }); +// var controls = new THREE.OrbitControls(camera, renderer.domElement); +// controls.maxDistance = camera.far/2; +// controls.enableDamping = true; +// controls.dampingFactor = 1/8; +// controls.rotateSpeed = 1/4; +// controls.zoomSpeed = 1; +// controls.keyPanSpeed = 1/2; +// var renderScene = function() { +// renderer.setSize(document.body.offsetWidth, document.body.offsetHeight); +// camera.aspect = renderer.domElement.width / renderer.domElement.height; +// camera.updateProjectionMatrix(); +// // controls.update(); +// camera.position.z += -0.0025 +// camera.rotation.y += 0.00001 +// renderer.render(scene, camera); +// }; +// window.addEventListener('resize', renderScene, false); +// var startSceneRenderer = function() { +// requestAnimationFrame(function() { +// setTimeout(startSceneRenderer, 1000/60); +// }); +// renderScene(); +// }; +// startSceneRenderer(); diff --git a/client/splash/faceMarkers.js b/client/splash/faceMarkers.js new file mode 100644 index 00000000..0a87d2b2 --- /dev/null +++ b/client/splash/faceMarkers.js @@ -0,0 +1,254 @@ +/* eslint-disable */ +var faceInit = function () { + var container = document.querySelector("#face_container") + var camera, controls, scene, renderer + var mouse = new THREE.Vector2(0.5, 0.5) + var mouseTarget = new THREE.Vector2(0.5, 0.5) + var POINT_SCALE = 1.8 + var FACE_POINT_COUNT = 68 + var SWAP_TIME = 500 + var cubes = [], meshes = [] + var currentFace = document.querySelector('.currentFace') + var introEl = document.querySelector('.intro') + var faceBuffer = (function () { + var a = new Array(FACE_POINT_COUNT) + for (let i = 0; i < FACE_POINT_COUNT; i++) { + a[i] = new THREE.Vector3() + } + return a + })() + var lastSprite + var last_t = 0, start_t = 0 + var bgColor = 0x000000 // 0x191919 + var colors = [ + 0xff3333, + 0xff8833, + 0xffff33, + 0x338833, + 0x3388ff, + 0x3333ff, + 0x8833ff, + 0xff3388, + 0xffffff, + ] + var swapping = false, swap_count = 0, swapFrom, swapTo, face_names, faces + init() + + function init() { + fetch("/assets/data/3dlm_0_10.json") + .then(req => req.json()) + .then(data => { + face_names = Object.keys(data) + faces = face_names.map(name => recenter(data[name])) + setup() + build(faces[0]) + updateFace(faces[0]) + setCurrentFace(face_names[0]) + swapTo = faces[0] + animate() + }) + } + function setup() { + var w = window.innerWidth * 2/3 + var h = Math.min(window.innerWidth / 2, window.innerHeight * 0.7) + camera = new THREE.PerspectiveCamera(70, w/h, 1, 10000) + camera.position.x = 0 + camera.position.y = 0 + camera.position.z = 200 + + scene = new THREE.Scene() + // scene.background = new THREE.Color(bgColor) + + renderer = new THREE.WebGLRenderer({ antialias: true, alpha: true }) + renderer.setPixelRatio(window.devicePixelRatio) + renderer.setSize(w, h) + renderer.setClearColor(0x000000, 0); + container.appendChild(renderer.domElement) + document.body.addEventListener('mousemove', onMouseMove) + // renderer.domElement.addEventListener('mousedown', swap) + // oktween.add({ + // obj: el.style, + // units: "px", + // from: { left: 0 }, + // to: { left: 100 }, + // duration: 1000, + // easing: oktween.easing.circ_out, + // update: function(obj){ + // console.log(obj.left) + // } + // finished: function(){ + // console.log("done") + // } + // }) + swap() + } + function build(points) { + var matrix = new THREE.Matrix4() + var quaternion = new THREE.Quaternion() + + for (var i = 0; i < FACE_POINT_COUNT; i++) { + var p = points[i] + var geometry = new THREE.BoxBufferGeometry() + var position = new THREE.Vector3(p[0], p[1], p[2]) + var rotation = new THREE.Euler() + var scale = new THREE.Vector3() + var color = new THREE.Color() + scale.x = scale.y = scale.z = POINT_SCALE + quaternion.setFromEuler(rotation, false) + matrix.compose(position, quaternion, scale) + geometry.applyMatrix(matrix) + material = new THREE.MeshBasicMaterial({ color: color.setHex(0xffffff) }) + cube = new THREE.Mesh(geometry, material) + scene.add(cube) + cubes.push(cube) + } + + meshes = getLineGeometry(points).map((geometry, i) => { + var color = new THREE.Color() + var material = new MeshLineMaterial({ + color: color.setHex(colors[i % colors.length]), + }) + var line = new MeshLine() + line.setGeometry(geometry, _ => 1.5) + var mesh = new THREE.Mesh(line.geometry, material) + mesh.geometry.dynamic = true + scene.add(mesh) + return [line, mesh] + }) + } + function lerpPoints(n, A, B, C) { + for (let i = 0, len = A.length; i < len; i++) { + lerpPoint(n, A[i], B[i], C[i]) + } + } + function lerpPoint(n, A, B, C) { + C.x = lerp(n, A.x, B.x) + C.y = lerp(n, A.y, B.y) + C.z = lerp(n, A.z, B.z) + } + function lerp(n, a, b) { + return (b-a) * n + a + } + function swap(){ + swap_count = (swap_count + 1) % faces.length + swapFrom = swapTo || faces[0] + swapTo = faces[swap_count] + setCurrentFace(face_names[swap_count]) + oktween.add({ + from: { n: 0 }, + to: { n: 1 }, + duration: 1000, + easing: oktween.easing.quad_in_out, + update: function(obj){ + lerpPoints(obj.n, swapFrom, swapTo, faceBuffer) + updateFace(faceBuffer) + }, + finished: function(){ + setTimeout(swap, 2000) + } + }) + } + function setCurrentFace(name) { + name = name.replace('.png', '').split('_').filter(s => !s.match(/\d+/)).join(' ') + currentFace.innerHTML = name + // if (lastSprite) { + // scene.remove(lastSprite) + // } + // var sprite = new THREE.TextSprite({ + // textSize: 12, + // redrawInterval: 1000, + // material: { + // color: 0xcccccc, + // }, + // texture: { + // text: name, + // fontFamily: '"Roboto", "Helvetica", sans-serif', + // }, + // }); + // sprite.position + // .setX(0) + // .setY(0) + // .setZ(0) + // scene.add(sprite); + // lastSprite = sprite + } + function updateFace(points) { + updateCubeGeometry(points) + updateLineGeometry(points) + } + function updateCubeGeometry(points) { + cubes.forEach((cube, i) => { + const p = points[i] + cube.position.set(p.x, p.y, p.z) + }) + } + function updateLineGeometry(points) { + getLineGeometry(points).map((geometry, i) => { + var [line, mesh] = meshes[i] + line.setGeometry(geometry, _ => 1.5) + mesh.geometry.vertices = line.geometry.vertices + mesh.geometry.verticesNeedUpdate = true + }) + } + function getLineGeometry(points) { + return [ + points.slice(0, 17), + points.slice(17, 22), + points.slice(22, 27), + points.slice(27, 31), + points.slice(31, 36), + points.slice(36, 42), + points.slice(42, 48), + points.slice(48) + ].map((a, i) => { + var geometry = new THREE.Geometry() + a.forEach(p => geometry.vertices.push(p)) + if (i > 4) { + geometry.vertices.push(a[0]) + } + return geometry + }) + } + function getBounds(obj) { + return obj.reduce((a, p) => { + return [ + Math.min(a[0], p[0]), + Math.max(a[1], p[0]), + Math.min(a[2], p[1]), + Math.max(a[3], p[1]), + Math.min(a[4], p[2]), + Math.max(a[5], p[2]), + ] + }, [Infinity, -Infinity, Infinity, -Infinity, Infinity, -Infinity]) + } + function recenter(obj) { + const bounds = getBounds(obj) + const x_width = (bounds[1] - bounds[0]) / 2 + const y_width = (bounds[3] - bounds[2]) / -3 + const z_width = (bounds[5] - bounds[4]) / 2 + return obj.map(p => { + p[0] = p[0] - bounds[0] - x_width + p[1] = -p[1] + bounds[1] + y_width + p[2] = p[2] - bounds[2] + z_width + return new THREE.Vector3(p[0], p[1], p[2]) + }) + } + // + function onMouseMove(e) { + mouse.x = e.clientX / window.innerWidth + mouse.y = e.clientY / window.innerHeight + } + function animate(t) { + requestAnimationFrame(animate) + renderer.render(scene, camera) + // scene.rotation.y += 0.01 * Math.PI + mouseTarget.x += (mouse.x - mouseTarget.x) * 0.1 + mouseTarget.y += (mouse.y - mouseTarget.y) * 0.1 + scene.rotation.x = (mouseTarget.y - 0.5) * Math.PI / 2 + scene.rotation.y = (mouseTarget.x - 0.5) * Math.PI + currentFace.style.transform = "translateZ(0) rotateY(" + (scene.rotation.y/2) + "rad)" + // scene.rotation.y += 0.01 + last_t = t + } +} +faceInit() \ No newline at end of file diff --git a/client/splash/index.js b/client/splash/index.js index e32df29f..aee394bf 100644 --- a/client/splash/index.js +++ b/client/splash/index.js @@ -1,9 +1,10 @@ -import oktween from './vendor/oktween' - -import { MeshLine, MeshLineMaterial } from './vendor/three.meshline' - -import DRACOLoader from './vendor/DRACOLoader' -import GeometryHelper from './vendor/geometryHelper' +import * as THREE from 'three' +import { MeshLine, MeshLineMaterial } from 'three.meshline' +import TextSprite from 'three.textsprite' +import oktween from '../util/vendor/oktween' +import DRACOLoader from '../util/vendor/DRACOLoader' +import GeometryHelper from '../util/vendor/geometryHelper' DRACOLoader.setDecoderPath('/assets/js/vendor/draco/') + diff --git a/client/splash/vendor/DRACOLoader.js b/client/splash/vendor/DRACOLoader.js deleted file mode 100644 index 64e6d801..00000000 --- a/client/splash/vendor/DRACOLoader.js +++ /dev/null @@ -1,518 +0,0 @@ -// Copyright 2016 The Draco Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import * as THREE from 'three'; - -/** - * @param {THREE.LoadingManager} manager - */ -DRACOLoader = function(manager) { - this.timeLoaded = 0; - this.manager = manager || THREE.DefaultLoadingManager; - this.materials = null; - this.verbosity = 0; - this.attributeOptions = {}; - this.drawMode = THREE.TrianglesDrawMode; - // Native Draco attribute type to Three.JS attribute type. - this.nativeAttributeMap = { - 'position' : 'POSITION', - 'normal' : 'NORMAL', - 'color' : 'COLOR', - 'uv' : 'TEX_COORD' - }; -}; - -DRACOLoader.prototype = { - - constructor: DRACOLoader, - - load: function(url, onLoad, onProgress, onError) { - var scope = this; - var loader = new THREE.FileLoader(scope.manager); - loader.setPath(this.path); - loader.setResponseType('arraybuffer'); - if (this.crossOrigin !== undefined) { - loader.crossOrigin = this.crossOrigin; - } - loader.load(url, function(blob) { - scope.decodeDracoFile(blob, onLoad); - }, onProgress, onError); - }, - - setPath: function(value) { - this.path = value; - }, - - setCrossOrigin: function(value) { - this.crossOrigin = value; - }, - - setVerbosity: function(level) { - this.verbosity = level; - }, - - /** - * Sets desired mode for generated geometry indices. - * Can be either: - * THREE.TrianglesDrawMode - * THREE.TriangleStripDrawMode - */ - setDrawMode: function(drawMode) { - this.drawMode = drawMode; - }, - - /** - * Skips dequantization for a specific attribute. - * |attributeName| is the THREE.js name of the given attribute type. - * The only currently supported |attributeName| is 'position', more may be - * added in future. - */ - setSkipDequantization: function(attributeName, skip) { - var skipDequantization = true; - if (typeof skip !== 'undefined') - skipDequantization = skip; - this.getAttributeOptions(attributeName).skipDequantization = - skipDequantization; - }, - - /** - * |attributeUniqueIdMap| specifies attribute unique id for an attribute in - * the geometry to be decoded. The name of the attribute must be one of the - * supported attribute type in Three.JS, including: - * 'position', - * 'color', - * 'normal', - * 'uv', - * 'uv2', - * 'skinIndex', - * 'skinWeight'. - * The format is: - * attributeUniqueIdMap[attributeName] = attributeId - */ - decodeDracoFile: function(rawBuffer, callback, attributeUniqueIdMap, - attributeTypeMap) { - var scope = this; - DRACOLoader.getDecoderModule() - .then( function ( module ) { - scope.decodeDracoFileInternal( rawBuffer, module.decoder, callback, - attributeUniqueIdMap || {}, attributeTypeMap || {}); - }); - }, - - decodeDracoFileInternal: function(rawBuffer, dracoDecoder, callback, - attributeUniqueIdMap, attributeTypeMap) { - /* - * Here is how to use Draco Javascript decoder and get the geometry. - */ - var buffer = new dracoDecoder.DecoderBuffer(); - buffer.Init(new Int8Array(rawBuffer), rawBuffer.byteLength); - var decoder = new dracoDecoder.Decoder(); - - /* - * Determine what type is this file: mesh or point cloud. - */ - var geometryType = decoder.GetEncodedGeometryType(buffer); - if (geometryType == dracoDecoder.TRIANGULAR_MESH) { - if (this.verbosity > 0) { - console.log('Loaded a mesh.'); - } - } else if (geometryType == dracoDecoder.POINT_CLOUD) { - if (this.verbosity > 0) { - console.log('Loaded a point cloud.'); - } - } else { - var errorMsg = 'THREE.DRACOLoader: Unknown geometry type.' - console.error(errorMsg); - throw new Error(errorMsg); - } - callback(this.convertDracoGeometryTo3JS(dracoDecoder, decoder, - geometryType, buffer, attributeUniqueIdMap, attributeTypeMap)); - }, - - addAttributeToGeometry: function(dracoDecoder, decoder, dracoGeometry, - attributeName, attributeType, attribute, - geometry, geometryBuffer) { - if (attribute.ptr === 0) { - var errorMsg = 'THREE.DRACOLoader: No attribute ' + attributeName; - console.error(errorMsg); - throw new Error(errorMsg); - } - - var numComponents = attribute.num_components(); - var numPoints = dracoGeometry.num_points(); - var numValues = numPoints * numComponents; - var attributeData; - var TypedBufferAttribute; - - switch ( attributeType ) { - - case Float32Array: - attributeData = new dracoDecoder.DracoFloat32Array(); - decoder.GetAttributeFloatForAllPoints( - dracoGeometry, attribute, attributeData); - geometryBuffer[ attributeName ] = new Float32Array( numValues ); - TypedBufferAttribute = THREE.Float32BufferAttribute; - break; - - case Int8Array: - attributeData = new dracoDecoder.DracoInt8Array(); - decoder.GetAttributeInt8ForAllPoints( - dracoGeometry, attribute, attributeData ); - geometryBuffer[ attributeName ] = new Int8Array( numValues ); - TypedBufferAttribute = THREE.Int8BufferAttribute; - break; - - case Int16Array: - attributeData = new dracoDecoder.DracoInt16Array(); - decoder.GetAttributeInt16ForAllPoints( - dracoGeometry, attribute, attributeData); - geometryBuffer[ attributeName ] = new Int16Array( numValues ); - TypedBufferAttribute = THREE.Int16BufferAttribute; - break; - - case Int32Array: - attributeData = new dracoDecoder.DracoInt32Array(); - decoder.GetAttributeInt32ForAllPoints( - dracoGeometry, attribute, attributeData); - geometryBuffer[ attributeName ] = new Int32Array( numValues ); - TypedBufferAttribute = THREE.Int32BufferAttribute; - break; - - case Uint8Array: - attributeData = new dracoDecoder.DracoUInt8Array(); - decoder.GetAttributeUInt8ForAllPoints( - dracoGeometry, attribute, attributeData); - geometryBuffer[ attributeName ] = new Uint8Array( numValues ); - TypedBufferAttribute = THREE.Uint8BufferAttribute; - break; - - case Uint16Array: - attributeData = new dracoDecoder.DracoUInt16Array(); - decoder.GetAttributeUInt16ForAllPoints( - dracoGeometry, attribute, attributeData); - geometryBuffer[ attributeName ] = new Uint16Array( numValues ); - TypedBufferAttribute = THREE.Uint16BufferAttribute; - break; - - case Uint32Array: - attributeData = new dracoDecoder.DracoUInt32Array(); - decoder.GetAttributeUInt32ForAllPoints( - dracoGeometry, attribute, attributeData); - geometryBuffer[ attributeName ] = new Uint32Array( numValues ); - TypedBufferAttribute = THREE.Uint32BufferAttribute; - break; - - default: - var errorMsg = 'THREE.DRACOLoader: Unexpected attribute type.'; - console.error( errorMsg ); - throw new Error( errorMsg ); - - } - - // Copy data from decoder. - for (var i = 0; i < numValues; i++) { - geometryBuffer[attributeName][i] = attributeData.GetValue(i); - } - // Add attribute to THREEJS geometry for rendering. - geometry.addAttribute(attributeName, - new TypedBufferAttribute(geometryBuffer[attributeName], - numComponents)); - dracoDecoder.destroy(attributeData); - }, - - convertDracoGeometryTo3JS: function(dracoDecoder, decoder, geometryType, - buffer, attributeUniqueIdMap, - attributeTypeMap) { - if (this.getAttributeOptions('position').skipDequantization === true) { - decoder.SkipAttributeTransform(dracoDecoder.POSITION); - } - var dracoGeometry; - var decodingStatus; - const start_time = performance.now(); - if (geometryType === dracoDecoder.TRIANGULAR_MESH) { - dracoGeometry = new dracoDecoder.Mesh(); - decodingStatus = decoder.DecodeBufferToMesh(buffer, dracoGeometry); - } else { - dracoGeometry = new dracoDecoder.PointCloud(); - decodingStatus = - decoder.DecodeBufferToPointCloud(buffer, dracoGeometry); - } - if (!decodingStatus.ok() || dracoGeometry.ptr == 0) { - var errorMsg = 'THREE.DRACOLoader: Decoding failed: '; - errorMsg += decodingStatus.error_msg(); - console.error(errorMsg); - dracoDecoder.destroy(decoder); - dracoDecoder.destroy(dracoGeometry); - throw new Error(errorMsg); - } - - var decode_end = performance.now(); - dracoDecoder.destroy(buffer); - /* - * Example on how to retrieve mesh and attributes. - */ - var numFaces; - if (geometryType == dracoDecoder.TRIANGULAR_MESH) { - numFaces = dracoGeometry.num_faces(); - if (this.verbosity > 0) { - console.log('Number of faces loaded: ' + numFaces.toString()); - } - } else { - numFaces = 0; - } - - var numPoints = dracoGeometry.num_points(); - var numAttributes = dracoGeometry.num_attributes(); - if (this.verbosity > 0) { - console.log('Number of points loaded: ' + numPoints.toString()); - console.log('Number of attributes loaded: ' + - numAttributes.toString()); - } - - // Verify if there is position attribute. - var posAttId = decoder.GetAttributeId(dracoGeometry, - dracoDecoder.POSITION); - if (posAttId == -1) { - var errorMsg = 'THREE.DRACOLoader: No position attribute found.'; - console.error(errorMsg); - dracoDecoder.destroy(decoder); - dracoDecoder.destroy(dracoGeometry); - throw new Error(errorMsg); - } - var posAttribute = decoder.GetAttribute(dracoGeometry, posAttId); - - // Structure for converting to THREEJS geometry later. - var geometryBuffer = {}; - // Import data to Three JS geometry. - var geometry = new THREE.BufferGeometry(); - - // Add native Draco attribute type to geometry. - for (var attributeName in this.nativeAttributeMap) { - // The native attribute type is only used when no unique Id is - // provided. For example, loading .drc files. - if (attributeUniqueIdMap[attributeName] === undefined) { - var attId = decoder.GetAttributeId(dracoGeometry, - dracoDecoder[this.nativeAttributeMap[attributeName]]); - if (attId !== -1) { - if (this.verbosity > 0) { - console.log('Loaded ' + attributeName + ' attribute.'); - } - var attribute = decoder.GetAttribute(dracoGeometry, attId); - this.addAttributeToGeometry(dracoDecoder, decoder, dracoGeometry, - attributeName, Float32Array, attribute, geometry, geometryBuffer); - } - } - } - - // Add attributes of user specified unique id. E.g. GLTF models. - for (var attributeName in attributeUniqueIdMap) { - var attributeType = attributeTypeMap[attributeName] || Float32Array; - var attributeId = attributeUniqueIdMap[attributeName]; - var attribute = decoder.GetAttributeByUniqueId(dracoGeometry, - attributeId); - this.addAttributeToGeometry(dracoDecoder, decoder, dracoGeometry, - attributeName, attributeType, attribute, geometry, geometryBuffer); - } - - // For mesh, we need to generate the faces. - if (geometryType == dracoDecoder.TRIANGULAR_MESH) { - if (this.drawMode === THREE.TriangleStripDrawMode) { - var stripsArray = new dracoDecoder.DracoInt32Array(); - var numStrips = decoder.GetTriangleStripsFromMesh( - dracoGeometry, stripsArray); - geometryBuffer.indices = new Uint32Array(stripsArray.size()); - for (var i = 0; i < stripsArray.size(); ++i) { - geometryBuffer.indices[i] = stripsArray.GetValue(i); - } - dracoDecoder.destroy(stripsArray); - } else { - var numIndices = numFaces * 3; - geometryBuffer.indices = new Uint32Array(numIndices); - var ia = new dracoDecoder.DracoInt32Array(); - for (var i = 0; i < numFaces; ++i) { - decoder.GetFaceFromMesh(dracoGeometry, i, ia); - var index = i * 3; - geometryBuffer.indices[index] = ia.GetValue(0); - geometryBuffer.indices[index + 1] = ia.GetValue(1); - geometryBuffer.indices[index + 2] = ia.GetValue(2); - } - dracoDecoder.destroy(ia); - } - } - - geometry.drawMode = this.drawMode; - if (geometryType == dracoDecoder.TRIANGULAR_MESH) { - geometry.setIndex(new(geometryBuffer.indices.length > 65535 ? - THREE.Uint32BufferAttribute : THREE.Uint16BufferAttribute) - (geometryBuffer.indices, 1)); - } - var posTransform = new dracoDecoder.AttributeQuantizationTransform(); - if (posTransform.InitFromAttribute(posAttribute)) { - // Quantized attribute. Store the quantization parameters into the - // THREE.js attribute. - geometry.attributes['position'].isQuantized = true; - geometry.attributes['position'].maxRange = posTransform.range(); - geometry.attributes['position'].numQuantizationBits = - posTransform.quantization_bits(); - geometry.attributes['position'].minValues = new Float32Array(3); - for (var i = 0; i < 3; ++i) { - geometry.attributes['position'].minValues[i] = - posTransform.min_value(i); - } - } - dracoDecoder.destroy(posTransform); - dracoDecoder.destroy(decoder); - dracoDecoder.destroy(dracoGeometry); - - this.decode_time = decode_end - start_time; - this.import_time = performance.now() - decode_end; - - if (this.verbosity > 0) { - console.log('Decode time: ' + this.decode_time); - console.log('Import time: ' + this.import_time); - } - return geometry; - }, - - isVersionSupported: function(version, callback) { - DRACOLoader.getDecoderModule() - .then( function ( module ) { - callback( module.decoder.isVersionSupported( version ) ); - }); - }, - - getAttributeOptions: function(attributeName) { - if (typeof this.attributeOptions[attributeName] === 'undefined') - this.attributeOptions[attributeName] = {}; - return this.attributeOptions[attributeName]; - } -}; - -DRACOLoader.decoderPath = './'; -DRACOLoader.decoderConfig = {}; -DRACOLoader.decoderModulePromise = null; - -/** - * Sets the base path for decoder source files. - * @param {string} path - */ -DRACOLoader.setDecoderPath = function ( path ) { - DRACOLoader.decoderPath = path; -}; - -/** - * Sets decoder configuration and releases singleton decoder module. Module - * will be recreated with the next decoding call. - * @param {Object} config - */ -DRACOLoader.setDecoderConfig = function ( config ) { - var wasmBinary = DRACOLoader.decoderConfig.wasmBinary; - DRACOLoader.decoderConfig = config || {}; - DRACOLoader.releaseDecoderModule(); - - // Reuse WASM binary. - if ( wasmBinary ) DRACOLoader.decoderConfig.wasmBinary = wasmBinary; -}; - -/** - * Releases the singleton DracoDecoderModule instance. Module will be recreated - * with the next decoding call. - */ -DRACOLoader.releaseDecoderModule = function () { - DRACOLoader.decoderModulePromise = null; -}; - -/** - * Gets WebAssembly or asm.js singleton instance of DracoDecoderModule - * after testing for browser support. Returns Promise that resolves when - * module is available. - * @return {Promise<{decoder: DracoDecoderModule}>} - */ -DRACOLoader.getDecoderModule = function () { - var scope = this; - var path = DRACOLoader.decoderPath; - var config = DRACOLoader.decoderConfig; - var promise = DRACOLoader.decoderModulePromise; - - if ( promise ) return promise; - - // Load source files. - if ( typeof DracoDecoderModule !== 'undefined' ) { - // Loaded externally. - promise = Promise.resolve(); - } else if ( typeof WebAssembly !== 'object' || config.type === 'js' ) { - // Load with asm.js. - promise = DRACOLoader._loadScript( path + 'draco_decoder.js' ); - } else { - // Load with WebAssembly. - config.wasmBinaryFile = path + 'draco_decoder.wasm'; - promise = DRACOLoader._loadScript( path + 'draco_wasm_wrapper.js' ) - .then( function () { - return DRACOLoader._loadArrayBuffer( config.wasmBinaryFile ); - } ) - .then( function ( wasmBinary ) { - config.wasmBinary = wasmBinary; - } ); - } - - // Wait for source files, then create and return a decoder. - promise = promise.then( function () { - return new Promise( function ( resolve ) { - config.onModuleLoaded = function ( decoder ) { - scope.timeLoaded = performance.now(); - // Module is Promise-like. Wrap before resolving to avoid loop. - resolve( { decoder: decoder } ); - }; - DracoDecoderModule( config ); - } ); - } ); - - DRACOLoader.decoderModulePromise = promise; - return promise; -}; - -/** - * @param {string} src - * @return {Promise} - */ -DRACOLoader._loadScript = function ( src ) { - var prevScript = document.getElementById( 'decoder_script' ); - if ( prevScript !== null ) { - prevScript.parentNode.removeChild( prevScript ); - } - var head = document.getElementsByTagName( 'head' )[ 0 ]; - var script = document.createElement( 'script' ); - script.id = 'decoder_script'; - script.type = 'text/javascript'; - script.src = src; - return new Promise( function ( resolve ) { - script.onload = resolve; - head.appendChild( script ); - }); -}; - -/** - * @param {string} src - * @return {Promise} - */ -DRACOLoader._loadArrayBuffer = function ( src ) { - var loader = new THREE.FileLoader(); - loader.setResponseType( 'arraybuffer' ); - return new Promise( function( resolve, reject ) { - loader.load( src, resolve, undefined, reject ); - }); -}; - -export default DRACOLoader diff --git a/client/splash/vendor/geometryHelper.js b/client/splash/vendor/geometryHelper.js deleted file mode 100644 index 1ac88f3b..00000000 --- a/client/splash/vendor/geometryHelper.js +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2017 The Draco Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import * as THREE from 'three'; - -/** - * @fileoverview Helper class implementing various utilities for THREE.js - * geometry. - */ - -function GeometryHelper() {} - -GeometryHelper.prototype = { - constructor: GeometryHelper, - - // Computes vertex normals on THREE.js buffer geometry, even when the mesh - // uses triangle strip connectivity. - computeVertexNormals: function (bufferGeometry) { - if (bufferGeometry.drawMode === THREE.TrianglesDrawMode) { - bufferGeometry.computeVertexNormals(); - return; - } else if (bufferGeometry.drawMode === THREE.TriangleStripDrawMode) { - if (bufferGeometry.attributes.position === undefined) { - return; - } - const inPositions = bufferGeometry.attributes.position.array; - if (bufferGeometry.attributes.normal === undefined) { - bufferGeometry.addAttribute( - 'normal', - new THREE.BufferAttribute(new Float32Array(inPositions.length), - 3)); - } else { - // Reset existing normals to zero. - const array = bufferGeometry.attributes.normal.array; - for (let i = 0; i < array.length; ++i) { - array[ i ] = 0; - } - } - let outNormals = bufferGeometry.attributes.normal.array; - - let pos0 = new THREE.Vector3(); - let pos1 = new THREE.Vector3(); - let pos2 = new THREE.Vector3(); - let posDif0 = new THREE.Vector3(), posDif1 = new THREE.Vector3(); - let localNormal = new THREE.Vector3(); - - const stripIndices = bufferGeometry.index.array; - for (let i = 2; i < stripIndices.length; ++i) { - let index0 = stripIndices[i - 2] * 3; - let index1 = stripIndices[i - 1] * 3; - let index2 = stripIndices[i] * 3; - // Skip degenerate triangles. - if (index0 === index1 || index0 === index2 || index1 === index2) { - continue; - } - if ((i & 1) !== 0) { - // Swap index 1 and 0 on odd indexed triangles. - const tmpIndex = index1; - index1 = index2; - index2 = tmpIndex; - } - - // Get position values. - pos0.fromArray(inPositions, index0); - pos1.fromArray(inPositions, index1); - pos2.fromArray(inPositions, index2); - - // Position differences - posDif0.subVectors(pos2, pos0); - posDif1.subVectors(pos1, pos0); - - // Weighted normal. - localNormal.crossVectors(posDif1, posDif0); - - // Update normals on vertices - outNormals[index0] += localNormal.x; - outNormals[index0 + 1] += localNormal.y; - outNormals[index0 + 2] += localNormal.z; - - outNormals[index1] += localNormal.x; - outNormals[index1 + 1] += localNormal.y; - outNormals[index1 + 2] += localNormal.z; - - outNormals[index2] += localNormal.x; - outNormals[index2 + 1] += localNormal.y; - outNormals[index2 + 2] += localNormal.z; - } - bufferGeometry.normalizeNormals(); - bufferGeometry.attributes.normal.needsUpdate = true; - } - }, -}; - -export default GeometryHelper diff --git a/client/splash/vendor/oktween.js b/client/splash/vendor/oktween.js deleted file mode 100644 index cbf5d835..00000000 --- a/client/splash/vendor/oktween.js +++ /dev/null @@ -1,159 +0,0 @@ -/* - oktween.add({ - obj: el.style, - units: "px", - from: { left: 0 }, - to: { left: 100 }, - duration: 1000, - easing: oktween.easing.circ_out, - update: function(obj){ - console.log(obj.left) - } - finished: function(){ - console.log("done") - } - }) -*/ - -import { lerp } from '../../util/math' - -const oktween = {} -let tweens = [] - -let last_t = 0 -let id = 0 - -oktween.speed = 1 -oktween.add = (tween) => { - tween.id = id++ - tween.obj = tween.obj || {} - if (tween.easing) { - if (typeof tween.easing === "string") { - tween.easing = oktween.easing[tween.easing] - } - } else { - tween.easing = oktween.easing.linear - } - if (!('from' in tween) && !('to' in tween)) { - tween.keys = [] - } else if (!('from' in tween)) { - tween.from = {} - tween.keys = Object.keys(tween.to) - tween.keys.forEach(function(prop) { - tween.from[prop] = parseFloat(tween.obj[prop]) - }) - } else { - tween.keys = Object.keys(tween.from) - } - tween.delay = tween.delay || 0 - tween.start = last_t + tween.delay - tween.done = false - tween.after = tween.after || [] - tween.then = (fn) => { tween.after.push(fn); return tween } - tween.tick = 0 - tween.skip = tween.skip || 1 - tween.dt = 0 - tweens.push(tween) - return tween -} -oktween.update = (t) => { - let done = false - requestAnimationFrame(oktween.update) - last_t = t * oktween.speed - if (tweens.length === 0) return - tweens.forEach((tween, i) => { - const dt = Math.min(1.0, (t - tween.start) / tween.duration) - tween.tick++ - if (dt < 0 || (dt < 1 && (tween.tick % tween.skip != 0))) return - const ddt = tween.easing(dt) - tween.dt = ddt - tween.keys.forEach((prop) => { - let val = lerp(ddt, tween.from[prop], tween.to[prop]) - if (tween.round) val = Math.round(val) - if (tween.units) val = (Math.round(val)) + tween.units - tween.obj[prop] = val - }) - tween.update && tween.update(tween.obj, dt) - if (dt == 1) { - tween.finished && tween.finished(tween) - if (tween.after.length) { - var twn = tween.after.shift() - twn.obj = twn.obj || tween.obj - twn.after = tween.after - oktween.add(twn) - } - if (tween.loop) { - tween.start = t + tween.delay - } - else { - done = true - tween.done = true - } - } - }) - if (done) { - tweens = tweens.filter(function(tween){ return ! tween.done }) - } -} - -requestAnimationFrame(oktween.update) - -oktween.easing = { - linear: (t) => { - return t - }, - circ_out: (t) => { - return Math.sqrt(1 - (t = t - 1) * t) - }, - circ_in: (t) => { - return -(Math.sqrt(1 - (t * t)) - 1) - }, - circ_in_out: (t) => { - return ((t*=2) < 1) ? -0.5 * (Math.sqrt(1 - t * t) - 1) : 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1) - }, - quad_in: (n) => { - return Math.pow(n, 2) - }, - quad_out: (n) => { - return n * (n - 2) * -1 - }, - quad_in_out: (n) => { - n = n * 2 - if (n < 1) { return Math.pow(n, 2) / 2 } - return -1 * ((--n) * (n - 2) - 1) / 2 - }, - cubic_bezier: (mX1, mY1, mX2, mY2) => { - function A(aA1, aA2) { return 1.0 - 3.0 * aA2 + 3.0 * aA1 } - function B(aA1, aA2) { return 3.0 * aA2 - 6.0 * aA1 } - function C(aA1) { return 3.0 * aA1 } - - // Returns x(t) given t, x1, and x2, or y(t) given t, y1, and y2. - function CalcBezier(aT, aA1, aA2) { - return ((A(aA1, aA2)*aT + B(aA1, aA2))*aT + C(aA1))*aT - } - - // Returns dx/dt given t, x1, and x2, or dy/dt given t, y1, and y2. - function GetSlope(aT, aA1, aA2) { - return 3.0 * A(aA1, aA2)*aT*aT + 2.0 * B(aA1, aA2) * aT + C(aA1) - } - - function GetTForX(aX) { - // Newton raphson iteration - let aGuessT = aX - for (let i = 0; i < 10; ++i) { - const currentSlope = GetSlope(aGuessT, mX1, mX2) - if (currentSlope == 0.0) return aGuessT - const currentX = CalcBezier(aGuessT, mX1, mX2) - aX - aGuessT -= currentX / currentSlope - } - return aGuessT - } - - return function (aX) { - if (mX1 == mY1 && mX2 == mY2) return aX // linear - return CalcBezier(aX, mY1, mY2) - } - } -} - -export default oktween diff --git a/client/splash/vendor/three.meshline.js b/client/splash/vendor/three.meshline.js deleted file mode 100644 index 00096f58..00000000 --- a/client/splash/vendor/three.meshline.js +++ /dev/null @@ -1,467 +0,0 @@ -import * as THREE from 'three'; - -function MeshLine() { - - this.positions = []; - - this.previous = []; - this.next = []; - this.side = []; - this.width = []; - this.indices_array = []; - this.uvs = []; - this.counters = []; - this.geometry = new THREE.BufferGeometry(); - - this.widthCallback = null; - -} - -MeshLine.prototype.setGeometry = function( g, c ) { - - this.widthCallback = c; - - this.positions = []; - this.counters = []; - - if( g instanceof THREE.Geometry ) { - for( var j = 0; j < g.vertices.length; j++ ) { - var v = g.vertices[ j ]; - var c = j/g.vertices.length; - this.positions.push( v.x, v.y, v.z ); - this.positions.push( v.x, v.y, v.z ); - this.counters.push(c); - this.counters.push(c); - } - } - - if( g instanceof THREE.BufferGeometry ) { - // read attribute positions ? - } - - if( g instanceof Float32Array || g instanceof Array ) { - for( var j = 0; j < g.length; j += 3 ) { - var c = j/g.length; - this.positions.push( g[ j ], g[ j + 1 ], g[ j + 2 ] ); - this.positions.push( g[ j ], g[ j + 1 ], g[ j + 2 ] ); - this.counters.push(c); - this.counters.push(c); - } - } - - this.process(); - -} - -MeshLine.prototype.compareV3 = function( a, b ) { - - var aa = a * 6; - var ab = b * 6; - return ( this.positions[ aa ] === this.positions[ ab ] ) && ( this.positions[ aa + 1 ] === this.positions[ ab + 1 ] ) && ( this.positions[ aa + 2 ] === this.positions[ ab + 2 ] ); - -} - -MeshLine.prototype.copyV3 = function( a ) { - - var aa = a * 6; - return [ this.positions[ aa ], this.positions[ aa + 1 ], this.positions[ aa + 2 ] ]; - -} - -MeshLine.prototype.process = function() { - - var l = this.positions.length / 6; - - this.previous = []; - this.next = []; - this.side = []; - this.width = []; - this.indices_array = []; - this.uvs = []; - - for( var j = 0; j < l; j++ ) { - this.side.push( 1 ); - this.side.push( -1 ); - } - - var w; - for( var j = 0; j < l; j++ ) { - if( this.widthCallback ) w = this.widthCallback( j / ( l -1 ) ); - else w = 1; - this.width.push( w ); - this.width.push( w ); - } - - for( var j = 0; j < l; j++ ) { - this.uvs.push( j / ( l - 1 ), 0 ); - this.uvs.push( j / ( l - 1 ), 1 ); - } - - var v; - - if( this.compareV3( 0, l - 1 ) ){ - v = this.copyV3( l - 2 ); - } else { - v = this.copyV3( 0 ); - } - this.previous.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - this.previous.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - for( var j = 0; j < l - 1; j++ ) { - v = this.copyV3( j ); - this.previous.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - this.previous.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - } - - for( var j = 1; j < l; j++ ) { - v = this.copyV3( j ); - this.next.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - this.next.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - } - - if( this.compareV3( l - 1, 0 ) ){ - v = this.copyV3( 1 ); - } else { - v = this.copyV3( l - 1 ); - } - this.next.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - this.next.push( v[ 0 ], v[ 1 ], v[ 2 ] ); - - for( var j = 0; j < l - 1; j++ ) { - var n = j * 2; - this.indices_array.push( n, n + 1, n + 2 ); - this.indices_array.push( n + 2, n + 1, n + 3 ); - } - - if (!this.attributes) { - this.attributes = { - position: new THREE.BufferAttribute( new Float32Array( this.positions ), 3 ), - previous: new THREE.BufferAttribute( new Float32Array( this.previous ), 3 ), - next: new THREE.BufferAttribute( new Float32Array( this.next ), 3 ), - side: new THREE.BufferAttribute( new Float32Array( this.side ), 1 ), - width: new THREE.BufferAttribute( new Float32Array( this.width ), 1 ), - uv: new THREE.BufferAttribute( new Float32Array( this.uvs ), 2 ), - index: new THREE.BufferAttribute( new Uint16Array( this.indices_array ), 1 ), - counters: new THREE.BufferAttribute( new Float32Array( this.counters ), 1 ) - } - } else { - this.attributes.position.copyArray(new Float32Array(this.positions)); - this.attributes.position.needsUpdate = true; - this.attributes.previous.copyArray(new Float32Array(this.previous)); - this.attributes.previous.needsUpdate = true; - this.attributes.next.copyArray(new Float32Array(this.next)); - this.attributes.next.needsUpdate = true; - this.attributes.side.copyArray(new Float32Array(this.side)); - this.attributes.side.needsUpdate = true; - this.attributes.width.copyArray(new Float32Array(this.width)); - this.attributes.width.needsUpdate = true; - this.attributes.uv.copyArray(new Float32Array(this.uvs)); - this.attributes.uv.needsUpdate = true; - this.attributes.index.copyArray(new Uint16Array(this.indices_array)); - this.attributes.index.needsUpdate = true; - } - - this.geometry.addAttribute( 'position', this.attributes.position ); - this.geometry.addAttribute( 'previous', this.attributes.previous ); - this.geometry.addAttribute( 'next', this.attributes.next ); - this.geometry.addAttribute( 'side', this.attributes.side ); - this.geometry.addAttribute( 'width', this.attributes.width ); - this.geometry.addAttribute( 'uv', this.attributes.uv ); - this.geometry.addAttribute( 'counters', this.attributes.counters ); - - this.geometry.setIndex( this.attributes.index ); - -} - -function memcpy (src, srcOffset, dst, dstOffset, length) { - var i - - src = src.subarray || src.slice ? src : src.buffer - dst = dst.subarray || dst.slice ? dst : dst.buffer - - src = srcOffset ? src.subarray ? - src.subarray(srcOffset, length && srcOffset + length) : - src.slice(srcOffset, length && srcOffset + length) : src - - if (dst.set) { - dst.set(src, dstOffset) - } else { - for (i=0; i 0) { + console.log('Loaded a mesh.'); + } + } else if (geometryType == dracoDecoder.POINT_CLOUD) { + if (this.verbosity > 0) { + console.log('Loaded a point cloud.'); + } + } else { + var errorMsg = 'THREE.DRACOLoader: Unknown geometry type.' + console.error(errorMsg); + throw new Error(errorMsg); + } + callback(this.convertDracoGeometryTo3JS(dracoDecoder, decoder, + geometryType, buffer, attributeUniqueIdMap, attributeTypeMap)); + }, + + addAttributeToGeometry: function(dracoDecoder, decoder, dracoGeometry, + attributeName, attributeType, attribute, + geometry, geometryBuffer) { + if (attribute.ptr === 0) { + var errorMsg = 'THREE.DRACOLoader: No attribute ' + attributeName; + console.error(errorMsg); + throw new Error(errorMsg); + } + + var numComponents = attribute.num_components(); + var numPoints = dracoGeometry.num_points(); + var numValues = numPoints * numComponents; + var attributeData; + var TypedBufferAttribute; + + switch ( attributeType ) { + + case Float32Array: + attributeData = new dracoDecoder.DracoFloat32Array(); + decoder.GetAttributeFloatForAllPoints( + dracoGeometry, attribute, attributeData); + geometryBuffer[ attributeName ] = new Float32Array( numValues ); + TypedBufferAttribute = THREE.Float32BufferAttribute; + break; + + case Int8Array: + attributeData = new dracoDecoder.DracoInt8Array(); + decoder.GetAttributeInt8ForAllPoints( + dracoGeometry, attribute, attributeData ); + geometryBuffer[ attributeName ] = new Int8Array( numValues ); + TypedBufferAttribute = THREE.Int8BufferAttribute; + break; + + case Int16Array: + attributeData = new dracoDecoder.DracoInt16Array(); + decoder.GetAttributeInt16ForAllPoints( + dracoGeometry, attribute, attributeData); + geometryBuffer[ attributeName ] = new Int16Array( numValues ); + TypedBufferAttribute = THREE.Int16BufferAttribute; + break; + + case Int32Array: + attributeData = new dracoDecoder.DracoInt32Array(); + decoder.GetAttributeInt32ForAllPoints( + dracoGeometry, attribute, attributeData); + geometryBuffer[ attributeName ] = new Int32Array( numValues ); + TypedBufferAttribute = THREE.Int32BufferAttribute; + break; + + case Uint8Array: + attributeData = new dracoDecoder.DracoUInt8Array(); + decoder.GetAttributeUInt8ForAllPoints( + dracoGeometry, attribute, attributeData); + geometryBuffer[ attributeName ] = new Uint8Array( numValues ); + TypedBufferAttribute = THREE.Uint8BufferAttribute; + break; + + case Uint16Array: + attributeData = new dracoDecoder.DracoUInt16Array(); + decoder.GetAttributeUInt16ForAllPoints( + dracoGeometry, attribute, attributeData); + geometryBuffer[ attributeName ] = new Uint16Array( numValues ); + TypedBufferAttribute = THREE.Uint16BufferAttribute; + break; + + case Uint32Array: + attributeData = new dracoDecoder.DracoUInt32Array(); + decoder.GetAttributeUInt32ForAllPoints( + dracoGeometry, attribute, attributeData); + geometryBuffer[ attributeName ] = new Uint32Array( numValues ); + TypedBufferAttribute = THREE.Uint32BufferAttribute; + break; + + default: + var errorMsg = 'THREE.DRACOLoader: Unexpected attribute type.'; + console.error( errorMsg ); + throw new Error( errorMsg ); + + } + + // Copy data from decoder. + for (var i = 0; i < numValues; i++) { + geometryBuffer[attributeName][i] = attributeData.GetValue(i); + } + // Add attribute to THREEJS geometry for rendering. + geometry.addAttribute(attributeName, + new TypedBufferAttribute(geometryBuffer[attributeName], + numComponents)); + dracoDecoder.destroy(attributeData); + }, + + convertDracoGeometryTo3JS: function(dracoDecoder, decoder, geometryType, + buffer, attributeUniqueIdMap, + attributeTypeMap) { + if (this.getAttributeOptions('position').skipDequantization === true) { + decoder.SkipAttributeTransform(dracoDecoder.POSITION); + } + var dracoGeometry; + var decodingStatus; + const start_time = performance.now(); + if (geometryType === dracoDecoder.TRIANGULAR_MESH) { + dracoGeometry = new dracoDecoder.Mesh(); + decodingStatus = decoder.DecodeBufferToMesh(buffer, dracoGeometry); + } else { + dracoGeometry = new dracoDecoder.PointCloud(); + decodingStatus = + decoder.DecodeBufferToPointCloud(buffer, dracoGeometry); + } + if (!decodingStatus.ok() || dracoGeometry.ptr == 0) { + var errorMsg = 'THREE.DRACOLoader: Decoding failed: '; + errorMsg += decodingStatus.error_msg(); + console.error(errorMsg); + dracoDecoder.destroy(decoder); + dracoDecoder.destroy(dracoGeometry); + throw new Error(errorMsg); + } + + var decode_end = performance.now(); + dracoDecoder.destroy(buffer); + /* + * Example on how to retrieve mesh and attributes. + */ + var numFaces; + if (geometryType == dracoDecoder.TRIANGULAR_MESH) { + numFaces = dracoGeometry.num_faces(); + if (this.verbosity > 0) { + console.log('Number of faces loaded: ' + numFaces.toString()); + } + } else { + numFaces = 0; + } + + var numPoints = dracoGeometry.num_points(); + var numAttributes = dracoGeometry.num_attributes(); + if (this.verbosity > 0) { + console.log('Number of points loaded: ' + numPoints.toString()); + console.log('Number of attributes loaded: ' + + numAttributes.toString()); + } + + // Verify if there is position attribute. + var posAttId = decoder.GetAttributeId(dracoGeometry, + dracoDecoder.POSITION); + if (posAttId == -1) { + var errorMsg = 'THREE.DRACOLoader: No position attribute found.'; + console.error(errorMsg); + dracoDecoder.destroy(decoder); + dracoDecoder.destroy(dracoGeometry); + throw new Error(errorMsg); + } + var posAttribute = decoder.GetAttribute(dracoGeometry, posAttId); + + // Structure for converting to THREEJS geometry later. + var geometryBuffer = {}; + // Import data to Three JS geometry. + var geometry = new THREE.BufferGeometry(); + + // Add native Draco attribute type to geometry. + for (var attributeName in this.nativeAttributeMap) { + // The native attribute type is only used when no unique Id is + // provided. For example, loading .drc files. + if (attributeUniqueIdMap[attributeName] === undefined) { + var attId = decoder.GetAttributeId(dracoGeometry, + dracoDecoder[this.nativeAttributeMap[attributeName]]); + if (attId !== -1) { + if (this.verbosity > 0) { + console.log('Loaded ' + attributeName + ' attribute.'); + } + var attribute = decoder.GetAttribute(dracoGeometry, attId); + this.addAttributeToGeometry(dracoDecoder, decoder, dracoGeometry, + attributeName, Float32Array, attribute, geometry, geometryBuffer); + } + } + } + + // Add attributes of user specified unique id. E.g. GLTF models. + for (var attributeName in attributeUniqueIdMap) { + var attributeType = attributeTypeMap[attributeName] || Float32Array; + var attributeId = attributeUniqueIdMap[attributeName]; + var attribute = decoder.GetAttributeByUniqueId(dracoGeometry, + attributeId); + this.addAttributeToGeometry(dracoDecoder, decoder, dracoGeometry, + attributeName, attributeType, attribute, geometry, geometryBuffer); + } + + // For mesh, we need to generate the faces. + if (geometryType == dracoDecoder.TRIANGULAR_MESH) { + if (this.drawMode === THREE.TriangleStripDrawMode) { + var stripsArray = new dracoDecoder.DracoInt32Array(); + var numStrips = decoder.GetTriangleStripsFromMesh( + dracoGeometry, stripsArray); + geometryBuffer.indices = new Uint32Array(stripsArray.size()); + for (var i = 0; i < stripsArray.size(); ++i) { + geometryBuffer.indices[i] = stripsArray.GetValue(i); + } + dracoDecoder.destroy(stripsArray); + } else { + var numIndices = numFaces * 3; + geometryBuffer.indices = new Uint32Array(numIndices); + var ia = new dracoDecoder.DracoInt32Array(); + for (var i = 0; i < numFaces; ++i) { + decoder.GetFaceFromMesh(dracoGeometry, i, ia); + var index = i * 3; + geometryBuffer.indices[index] = ia.GetValue(0); + geometryBuffer.indices[index + 1] = ia.GetValue(1); + geometryBuffer.indices[index + 2] = ia.GetValue(2); + } + dracoDecoder.destroy(ia); + } + } + + geometry.drawMode = this.drawMode; + if (geometryType == dracoDecoder.TRIANGULAR_MESH) { + geometry.setIndex(new(geometryBuffer.indices.length > 65535 ? + THREE.Uint32BufferAttribute : THREE.Uint16BufferAttribute) + (geometryBuffer.indices, 1)); + } + var posTransform = new dracoDecoder.AttributeQuantizationTransform(); + if (posTransform.InitFromAttribute(posAttribute)) { + // Quantized attribute. Store the quantization parameters into the + // THREE.js attribute. + geometry.attributes['position'].isQuantized = true; + geometry.attributes['position'].maxRange = posTransform.range(); + geometry.attributes['position'].numQuantizationBits = + posTransform.quantization_bits(); + geometry.attributes['position'].minValues = new Float32Array(3); + for (var i = 0; i < 3; ++i) { + geometry.attributes['position'].minValues[i] = + posTransform.min_value(i); + } + } + dracoDecoder.destroy(posTransform); + dracoDecoder.destroy(decoder); + dracoDecoder.destroy(dracoGeometry); + + this.decode_time = decode_end - start_time; + this.import_time = performance.now() - decode_end; + + if (this.verbosity > 0) { + console.log('Decode time: ' + this.decode_time); + console.log('Import time: ' + this.import_time); + } + return geometry; + }, + + isVersionSupported: function(version, callback) { + DRACOLoader.getDecoderModule() + .then( function ( module ) { + callback( module.decoder.isVersionSupported( version ) ); + }); + }, + + getAttributeOptions: function(attributeName) { + if (typeof this.attributeOptions[attributeName] === 'undefined') + this.attributeOptions[attributeName] = {}; + return this.attributeOptions[attributeName]; + } +}; + +DRACOLoader.decoderPath = './'; +DRACOLoader.decoderConfig = {}; +DRACOLoader.decoderModulePromise = null; + +/** + * Sets the base path for decoder source files. + * @param {string} path + */ +DRACOLoader.setDecoderPath = function ( path ) { + DRACOLoader.decoderPath = path; +}; + +/** + * Sets decoder configuration and releases singleton decoder module. Module + * will be recreated with the next decoding call. + * @param {Object} config + */ +DRACOLoader.setDecoderConfig = function ( config ) { + var wasmBinary = DRACOLoader.decoderConfig.wasmBinary; + DRACOLoader.decoderConfig = config || {}; + DRACOLoader.releaseDecoderModule(); + + // Reuse WASM binary. + if ( wasmBinary ) DRACOLoader.decoderConfig.wasmBinary = wasmBinary; +}; + +/** + * Releases the singleton DracoDecoderModule instance. Module will be recreated + * with the next decoding call. + */ +DRACOLoader.releaseDecoderModule = function () { + DRACOLoader.decoderModulePromise = null; +}; + +/** + * Gets WebAssembly or asm.js singleton instance of DracoDecoderModule + * after testing for browser support. Returns Promise that resolves when + * module is available. + * @return {Promise<{decoder: DracoDecoderModule}>} + */ +DRACOLoader.getDecoderModule = function () { + var scope = this; + var path = DRACOLoader.decoderPath; + var config = DRACOLoader.decoderConfig; + var promise = DRACOLoader.decoderModulePromise; + + if ( promise ) return promise; + + // Load source files. + if ( typeof DracoDecoderModule !== 'undefined' ) { + // Loaded externally. + promise = Promise.resolve(); + } else if ( typeof WebAssembly !== 'object' || config.type === 'js' ) { + // Load with asm.js. + promise = DRACOLoader._loadScript( path + 'draco_decoder.js' ); + } else { + // Load with WebAssembly. + config.wasmBinaryFile = path + 'draco_decoder.wasm'; + promise = DRACOLoader._loadScript( path + 'draco_wasm_wrapper.js' ) + .then( function () { + return DRACOLoader._loadArrayBuffer( config.wasmBinaryFile ); + } ) + .then( function ( wasmBinary ) { + config.wasmBinary = wasmBinary; + } ); + } + + // Wait for source files, then create and return a decoder. + promise = promise.then( function () { + return new Promise( function ( resolve ) { + config.onModuleLoaded = function ( decoder ) { + scope.timeLoaded = performance.now(); + // Module is Promise-like. Wrap before resolving to avoid loop. + resolve( { decoder: decoder } ); + }; + DracoDecoderModule( config ); + } ); + } ); + + DRACOLoader.decoderModulePromise = promise; + return promise; +}; + +/** + * @param {string} src + * @return {Promise} + */ +DRACOLoader._loadScript = function ( src ) { + var prevScript = document.getElementById( 'decoder_script' ); + if ( prevScript !== null ) { + prevScript.parentNode.removeChild( prevScript ); + } + var head = document.getElementsByTagName( 'head' )[ 0 ]; + var script = document.createElement( 'script' ); + script.id = 'decoder_script'; + script.type = 'text/javascript'; + script.src = src; + return new Promise( function ( resolve ) { + script.onload = resolve; + head.appendChild( script ); + }); +}; + +/** + * @param {string} src + * @return {Promise} + */ +DRACOLoader._loadArrayBuffer = function ( src ) { + var loader = new THREE.FileLoader(); + loader.setResponseType( 'arraybuffer' ); + return new Promise( function( resolve, reject ) { + loader.load( src, resolve, undefined, reject ); + }); +}; + +export default DRACOLoader diff --git a/client/util/vendor/geometryHelper.js b/client/util/vendor/geometryHelper.js new file mode 100644 index 00000000..1ac88f3b --- /dev/null +++ b/client/util/vendor/geometryHelper.js @@ -0,0 +1,106 @@ +// Copyright 2017 The Draco Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import * as THREE from 'three'; + +/** + * @fileoverview Helper class implementing various utilities for THREE.js + * geometry. + */ + +function GeometryHelper() {} + +GeometryHelper.prototype = { + constructor: GeometryHelper, + + // Computes vertex normals on THREE.js buffer geometry, even when the mesh + // uses triangle strip connectivity. + computeVertexNormals: function (bufferGeometry) { + if (bufferGeometry.drawMode === THREE.TrianglesDrawMode) { + bufferGeometry.computeVertexNormals(); + return; + } else if (bufferGeometry.drawMode === THREE.TriangleStripDrawMode) { + if (bufferGeometry.attributes.position === undefined) { + return; + } + const inPositions = bufferGeometry.attributes.position.array; + if (bufferGeometry.attributes.normal === undefined) { + bufferGeometry.addAttribute( + 'normal', + new THREE.BufferAttribute(new Float32Array(inPositions.length), + 3)); + } else { + // Reset existing normals to zero. + const array = bufferGeometry.attributes.normal.array; + for (let i = 0; i < array.length; ++i) { + array[ i ] = 0; + } + } + let outNormals = bufferGeometry.attributes.normal.array; + + let pos0 = new THREE.Vector3(); + let pos1 = new THREE.Vector3(); + let pos2 = new THREE.Vector3(); + let posDif0 = new THREE.Vector3(), posDif1 = new THREE.Vector3(); + let localNormal = new THREE.Vector3(); + + const stripIndices = bufferGeometry.index.array; + for (let i = 2; i < stripIndices.length; ++i) { + let index0 = stripIndices[i - 2] * 3; + let index1 = stripIndices[i - 1] * 3; + let index2 = stripIndices[i] * 3; + // Skip degenerate triangles. + if (index0 === index1 || index0 === index2 || index1 === index2) { + continue; + } + if ((i & 1) !== 0) { + // Swap index 1 and 0 on odd indexed triangles. + const tmpIndex = index1; + index1 = index2; + index2 = tmpIndex; + } + + // Get position values. + pos0.fromArray(inPositions, index0); + pos1.fromArray(inPositions, index1); + pos2.fromArray(inPositions, index2); + + // Position differences + posDif0.subVectors(pos2, pos0); + posDif1.subVectors(pos1, pos0); + + // Weighted normal. + localNormal.crossVectors(posDif1, posDif0); + + // Update normals on vertices + outNormals[index0] += localNormal.x; + outNormals[index0 + 1] += localNormal.y; + outNormals[index0 + 2] += localNormal.z; + + outNormals[index1] += localNormal.x; + outNormals[index1 + 1] += localNormal.y; + outNormals[index1 + 2] += localNormal.z; + + outNormals[index2] += localNormal.x; + outNormals[index2 + 1] += localNormal.y; + outNormals[index2 + 2] += localNormal.z; + } + bufferGeometry.normalizeNormals(); + bufferGeometry.attributes.normal.needsUpdate = true; + } + }, +}; + +export default GeometryHelper diff --git a/client/util/vendor/oktween.js b/client/util/vendor/oktween.js new file mode 100644 index 00000000..cbf5d835 --- /dev/null +++ b/client/util/vendor/oktween.js @@ -0,0 +1,159 @@ +/* + oktween.add({ + obj: el.style, + units: "px", + from: { left: 0 }, + to: { left: 100 }, + duration: 1000, + easing: oktween.easing.circ_out, + update: function(obj){ + console.log(obj.left) + } + finished: function(){ + console.log("done") + } + }) +*/ + +import { lerp } from '../../util/math' + +const oktween = {} +let tweens = [] + +let last_t = 0 +let id = 0 + +oktween.speed = 1 +oktween.add = (tween) => { + tween.id = id++ + tween.obj = tween.obj || {} + if (tween.easing) { + if (typeof tween.easing === "string") { + tween.easing = oktween.easing[tween.easing] + } + } else { + tween.easing = oktween.easing.linear + } + if (!('from' in tween) && !('to' in tween)) { + tween.keys = [] + } else if (!('from' in tween)) { + tween.from = {} + tween.keys = Object.keys(tween.to) + tween.keys.forEach(function(prop) { + tween.from[prop] = parseFloat(tween.obj[prop]) + }) + } else { + tween.keys = Object.keys(tween.from) + } + tween.delay = tween.delay || 0 + tween.start = last_t + tween.delay + tween.done = false + tween.after = tween.after || [] + tween.then = (fn) => { tween.after.push(fn); return tween } + tween.tick = 0 + tween.skip = tween.skip || 1 + tween.dt = 0 + tweens.push(tween) + return tween +} +oktween.update = (t) => { + let done = false + requestAnimationFrame(oktween.update) + last_t = t * oktween.speed + if (tweens.length === 0) return + tweens.forEach((tween, i) => { + const dt = Math.min(1.0, (t - tween.start) / tween.duration) + tween.tick++ + if (dt < 0 || (dt < 1 && (tween.tick % tween.skip != 0))) return + const ddt = tween.easing(dt) + tween.dt = ddt + tween.keys.forEach((prop) => { + let val = lerp(ddt, tween.from[prop], tween.to[prop]) + if (tween.round) val = Math.round(val) + if (tween.units) val = (Math.round(val)) + tween.units + tween.obj[prop] = val + }) + tween.update && tween.update(tween.obj, dt) + if (dt == 1) { + tween.finished && tween.finished(tween) + if (tween.after.length) { + var twn = tween.after.shift() + twn.obj = twn.obj || tween.obj + twn.after = tween.after + oktween.add(twn) + } + if (tween.loop) { + tween.start = t + tween.delay + } + else { + done = true + tween.done = true + } + } + }) + if (done) { + tweens = tweens.filter(function(tween){ return ! tween.done }) + } +} + +requestAnimationFrame(oktween.update) + +oktween.easing = { + linear: (t) => { + return t + }, + circ_out: (t) => { + return Math.sqrt(1 - (t = t - 1) * t) + }, + circ_in: (t) => { + return -(Math.sqrt(1 - (t * t)) - 1) + }, + circ_in_out: (t) => { + return ((t*=2) < 1) ? -0.5 * (Math.sqrt(1 - t * t) - 1) : 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1) + }, + quad_in: (n) => { + return Math.pow(n, 2) + }, + quad_out: (n) => { + return n * (n - 2) * -1 + }, + quad_in_out: (n) => { + n = n * 2 + if (n < 1) { return Math.pow(n, 2) / 2 } + return -1 * ((--n) * (n - 2) - 1) / 2 + }, + cubic_bezier: (mX1, mY1, mX2, mY2) => { + function A(aA1, aA2) { return 1.0 - 3.0 * aA2 + 3.0 * aA1 } + function B(aA1, aA2) { return 3.0 * aA2 - 6.0 * aA1 } + function C(aA1) { return 3.0 * aA1 } + + // Returns x(t) given t, x1, and x2, or y(t) given t, y1, and y2. + function CalcBezier(aT, aA1, aA2) { + return ((A(aA1, aA2)*aT + B(aA1, aA2))*aT + C(aA1))*aT + } + + // Returns dx/dt given t, x1, and x2, or dy/dt given t, y1, and y2. + function GetSlope(aT, aA1, aA2) { + return 3.0 * A(aA1, aA2)*aT*aT + 2.0 * B(aA1, aA2) * aT + C(aA1) + } + + function GetTForX(aX) { + // Newton raphson iteration + let aGuessT = aX + for (let i = 0; i < 10; ++i) { + const currentSlope = GetSlope(aGuessT, mX1, mX2) + if (currentSlope == 0.0) return aGuessT + const currentX = CalcBezier(aGuessT, mX1, mX2) - aX + aGuessT -= currentX / currentSlope + } + return aGuessT + } + + return function (aX) { + if (mX1 == mY1 && mX2 == mY2) return aX // linear + return CalcBezier(aX, mY1, mY2) + } + } +} + +export default oktween diff --git a/package-lock.json b/package-lock.json index 432f49c6..5f0cd9bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8721,6 +8721,24 @@ "resolved": "https://registry.npmjs.org/three/-/three-0.100.0.tgz", "integrity": "sha512-/lN2rdE1OqIwJr4/HcSaOisiCY0uVA0sqPpbCG5nil2uICEdS0LfGwSVYTtZDsIpR76r3++h5H3Hzg5D+SJBRQ==" }, + "three.meshline": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/three.meshline/-/three.meshline-1.1.0.tgz", + "integrity": "sha512-YJmFMKP9udGMCNIxx6ntTu6qMti3y2a8w/Z2Ado/n8N837YAqm5kkJX55E8jGRyc0IWahlRkO+B2i+XXZluVGw==" + }, + "three.textsprite": { + "version": "18.10.24", + "resolved": "https://registry.npmjs.org/three.textsprite/-/three.textsprite-18.10.24.tgz", + "integrity": "sha512-TZhIqJW7rKv/CnzT/GJ9ujlLFeKYdQuMJygy/E7OKf93C5v/VZelEntvRkPKdqb9DpgEGzoZ441mULsS0Tbl0g==", + "requires": { + "three.texttexture": "^18.10.24" + } + }, + "three.texttexture": { + "version": "18.10.24", + "resolved": "https://registry.npmjs.org/three.texttexture/-/three.texttexture-18.10.24.tgz", + "integrity": "sha512-Narq1VtdQWlz9lmZaO5OahUOoDTgVTb9pIbM4Qiq2vWosTGVyt5wLEZ7FWp10rMMOcpqNfRYDwEJ8wnRxnlKHg==" + }, "through": { "version": "2.3.8", "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", diff --git a/package.json b/package.json index 3705efc7..c4554893 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,9 @@ "snapsvg": "^0.5.1", "store2": "^2.7.0", "tabulator-tables": "^4.1.3", - "three": "^0.100.0" + "three": "^0.100.0", + "three.meshline": "^1.1.0", + "three.textsprite": "^18.10.24" }, "devDependencies": { "babel-cli": "^6.24.1", -- cgit v1.2.3-70-g09d2