Update versions

demos/assets/FontLoader.js

@@ -1,183 +0,0 @@
-( function () {
-
-	class FontLoader extends THREE.Loader {
-
-		constructor( manager ) {
-
-			super( manager );
-
-		}
-
-		load( url, onLoad, onProgress, onError ) {
-
-			const scope = this;
-			const loader = new THREE.FileLoader( this.manager );
-			loader.setPath( this.path );
-			loader.setRequestHeader( this.requestHeader );
-			loader.setWithCredentials( scope.withCredentials );
-			loader.load( url, function ( text ) {
-
-				let json;
-
-				try {
-
-					json = JSON.parse( text );
-
-				} catch ( e ) {
-
-					console.warn( 'THREE.FontLoader: typeface.js support is being deprecated. Use typeface.json instead.' );
-					json = JSON.parse( text.substring( 65, text.length - 2 ) );
-
-				}
-
-				const font = scope.parse( json );
-				if ( onLoad ) onLoad( font );
-
-			}, onProgress, onError );
-
-		}
-
-		parse( json ) {
-
-			return new Font( json );
-
-		}
-
-	} //
-
-
-	class Font {
-
-		constructor( data ) {
-
-			this.type = 'Font';
-			this.data = data;
-
-		}
-
-		generateShapes( text, size = 100 ) {
-
-			const shapes = [];
-			const paths = createPaths( text, size, this.data );
-
-			for ( let p = 0, pl = paths.length; p < pl; p ++ ) {
-
-				Array.prototype.push.apply( shapes, paths[ p ].toShapes() );
-
-			}
-
-			return shapes;
-
-		}
-
-	}
-
-	function createPaths( text, size, data ) {
-
-		const chars = Array.from( text );
-		const scale = size / data.resolution;
-		const line_height = ( data.boundingBox.yMax - data.boundingBox.yMin + data.underlineThickness ) * scale;
-		const paths = [];
-		let offsetX = 0,
-			offsetY = 0;
-
-		for ( let i = 0; i < chars.length; i ++ ) {
-
-			const char = chars[ i ];
-
-			if ( char === '\n' ) {
-
-				offsetX = 0;
-				offsetY -= line_height;
-
-			} else {
-
-				const ret = createPath( char, scale, offsetX, offsetY, data );
-				offsetX += ret.offsetX;
-				paths.push( ret.path );
-
-			}
-
-		}
-
-		return paths;
-
-	}
-
-	function createPath( char, scale, offsetX, offsetY, data ) {
-
-		const glyph = data.glyphs[ char ] || data.glyphs[ '?' ];
-
-		if ( ! glyph ) {
-
-			console.error( 'THREE.Font: character "' + char + '" does not exists in font family ' + data.familyName + '.' );
-			return;
-
-		}
-
-		const path = new THREE.ShapePath();
-		let x, y, cpx, cpy, cpx1, cpy1, cpx2, cpy2;
-
-		if ( glyph.o ) {
-
-			const outline = glyph._cachedOutline || ( glyph._cachedOutline = glyph.o.split( ' ' ) );
-
-			for ( let i = 0, l = outline.length; i < l; ) {
-
-				const action = outline[ i ++ ];
-
-				switch ( action ) {
-
-					case 'm':
-						// moveTo
-						x = outline[ i ++ ] * scale + offsetX;
-						y = outline[ i ++ ] * scale + offsetY;
-						path.moveTo( x, y );
-						break;
-
-					case 'l':
-						// lineTo
-						x = outline[ i ++ ] * scale + offsetX;
-						y = outline[ i ++ ] * scale + offsetY;
-						path.lineTo( x, y );
-						break;
-
-					case 'q':
-						// quadraticCurveTo
-						cpx = outline[ i ++ ] * scale + offsetX;
-						cpy = outline[ i ++ ] * scale + offsetY;
-						cpx1 = outline[ i ++ ] * scale + offsetX;
-						cpy1 = outline[ i ++ ] * scale + offsetY;
-						path.quadraticCurveTo( cpx1, cpy1, cpx, cpy );
-						break;
-
-					case 'b':
-						// bezierCurveTo
-						cpx = outline[ i ++ ] * scale + offsetX;
-						cpy = outline[ i ++ ] * scale + offsetY;
-						cpx1 = outline[ i ++ ] * scale + offsetX;
-						cpy1 = outline[ i ++ ] * scale + offsetY;
-						cpx2 = outline[ i ++ ] * scale + offsetX;
-						cpy2 = outline[ i ++ ] * scale + offsetY;
-						path.bezierCurveTo( cpx1, cpy1, cpx2, cpy2, cpx, cpy );
-						break;
-
-				}
-
-			}
-
-		}
-
-		return {
-			offsetX: glyph.ha * scale,
-			path: path
-		};
-
-	}
-
-	Font.prototype.isFont = true;
-
-	THREE.Font = Font;
-	THREE.FontLoader = FontLoader;
-
-} )();

demos/assets/TextGeometry.js

@@ -1,51 +0,0 @@
-( function () {
-
-	/**
- * Text = 3D Text
- *
- * parameters = {
- *  font: <THREE.Font>, // font
- *
- *  size: <float>, // size of the text
- *  height: <float>, // thickness to extrude text
- *  curveSegments: <int>, // number of points on the curves
- *
- *  bevelEnabled: <bool>, // turn on bevel
- *  bevelThickness: <float>, // how deep into text bevel goes
- *  bevelSize: <float>, // how far from text outline (including bevelOffset) is bevel
- *  bevelOffset: <float> // how far from text outline does bevel start
- * }
- */
-
-	class TextGeometry extends THREE.ExtrudeGeometry {
-
-		constructor( text, parameters = {} ) {
-
-			const font = parameters.font;
-
-			if ( font === undefined ) {
-
-				super(); // generate default extrude geometry
-
-			} else {
-
-				const shapes = font.generateShapes( text, parameters.size ); // translate parameters to THREE.ExtrudeGeometry API
-
-				parameters.depth = parameters.height !== undefined ? parameters.height : 50; // defaults
-
-				if ( parameters.bevelThickness === undefined ) parameters.bevelThickness = 10;
-				if ( parameters.bevelSize === undefined ) parameters.bevelSize = 8;
-				if ( parameters.bevelEnabled === undefined ) parameters.bevelEnabled = false;
-				super( shapes, parameters );
-
-			}
-
-			this.type = 'TextGeometry';
-
-		}
-
-	}
-
-	THREE.TextGeometry = TextGeometry;
-
-} )();

demos/assets/aframe-particle-system-component.js

@@ -2281,7 +2281,7 @@
 	    options.texture = utils.ensureTypedArg( options.texture, types.OBJECT, {} );
 
 	    // Assign a UUID to this instance
-	    this.uuid = THREE.Math.generateUUID();
+	    this.uuid = THREE.MathUtils.generateUUID();
 
 	    // If no `deltaTime` value is passed to the `SPE.Group.tick` function,
 	    // the value of this property will be used to advance the simulation.
@@ -3143,7 +3143,7 @@
 	        console.warn( 'onParticleSpawn has been removed. Please set properties directly to alter values at runtime.' );
 	    }
 
-	    this.uuid = THREE.Math.generateUUID();
+	    this.uuid = THREE.MathUtils.generateUUID();
 
 	    this.type = utils.ensureTypedArg( options.type, types.NUMBER, SPE.distributions.BOX );
 

demos/assets/aframe-with-martins.js

@@ -7,8 +7,8 @@
 
 /* Usage of the indicated versions is encouraged */
 __THIS_GLUE_CODE_HAS_BEEN_TESTED_WITH__({
-    'MARTINS.js': { version: '0.1.2' },
-        'AFRAME': { version: '1.3.0' }
+    'MARTINS.js': { version: '0.2.0' },
+        'AFRAME': { version: '1.4.2' }
 });
 
 /**

demos/assets/three-with-martins.js

@@ -7,8 +7,8 @@
 
 /* Usage of the indicated versions is encouraged */
 __THIS_GLUE_CODE_HAS_BEEN_TESTED_WITH__({
-    'MARTINS.js': { version: '0.1.2' },
-      'THREE.js': { version: '138' }
+    'MARTINS.js': { version: '0.2.0' },
+      'THREE.js': { version: '147' }
 });
 
 /**

demos/hello-aframe/index.html

@@ -6,7 +6,7 @@
         <title>MARTINS.js WebAR demo with A-Frame</title>
         <link href="demo.css" rel="stylesheet">
         <script src="../../dist/martins.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/aframe@1.3.0/dist/aframe-v1.3.0.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/aframe@1.4.2/dist/aframe-v1.4.2.min.js"></script>
         <script src="../assets/aframe-particle-system-component.min.js"></script>
         <script src="demo.js"></script>
         <script src="../assets/aframe-with-martins.js"></script>

demos/hello-aframe/video.html

@@ -6,7 +6,7 @@
         <title>MARTINS.js WebAR demo with A-Frame</title>
         <link href="demo.css" rel="stylesheet">
         <script src="../../dist/martins.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/aframe@1.3.0/dist/aframe-v1.3.0.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/aframe@1.4.2/dist/aframe-v1.4.2.min.js"></script>
         <script src="../assets/aframe-particle-system-component.min.js"></script>
         <script src="demo.js"></script>
         <script src="../assets/aframe-with-martins.js"></script>

demos/hello-three/index.html

@@ -6,8 +6,8 @@
         <title>MARTINS.js WebAR demo with three.js</title>
         <link href="demo.css" rel="stylesheet">
         <script src="../../dist/martins.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/build/three.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/examples/js/loaders/GLTFLoader.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/build/three.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/examples/js/loaders/GLTFLoader.js"></script>
         <script src="../assets/three-with-martins.js"></script>
         <script src="demo.js"></script>
     </head>

demos/hello-three/video.html

@@ -6,8 +6,8 @@
         <title>MARTINS.js WebAR demo with three.js</title>
         <link href="demo.css" rel="stylesheet">
         <script src="../../dist/martins.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/build/three.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/examples/js/loaders/GLTFLoader.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/build/three.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/examples/js/loaders/GLTFLoader.js"></script>
         <script src="../assets/three-with-martins.js"></script>
         <script src="demo.js"></script>
     </head>

demos/touch-three/index.html

@@ -6,9 +6,9 @@
         <title>MARTINS.js WebAR demo with three.js and touch interaction</title>
         <link href="demo.css" rel="stylesheet">
         <script src="../../dist/martins.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/build/three.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/examples/js/loaders/FontLoader.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/examples/js/geometries/TextGeometry.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/build/three.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/examples/js/loaders/FontLoader.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/examples/js/geometries/TextGeometry.js"></script>
         <script src="../assets/three-with-martins.js"></script>
         <script src="demo.js"></script>
     </head>

demos/touch-three/video.html

@@ -6,9 +6,9 @@
         <title>MARTINS.js WebAR demo with three.js and touch interaction</title>
         <link href="demo.css" rel="stylesheet">
         <script src="../../dist/martins.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/build/three.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/examples/js/loaders/FontLoader.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/three@0.138.3/examples/js/geometries/TextGeometry.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/build/three.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/examples/js/loaders/FontLoader.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/three@0.147.0/examples/js/geometries/TextGeometry.js"></script>
         <script src="../assets/three-with-martins.js"></script>
         <script src="demo.js"></script>
     </head>