FontLoader: Deprecated typeface.js support. See #8262.

docs/api/extras/geometries/TextGeometry.html

@@ -44,7 +44,7 @@
 		<h2>Available Fonts</h2>
 
 		<div>
-		TextGeometry uses <a href='http://gero3.github.io/facetype.js/' target="_top">typeface.js</a> generated fonts.
+		TextGeometry uses <a href='http://gero3.github.io/facetype.js/' target="_top">typeface.json</a> generated fonts.
 		Some existing fonts can be found located in <b>/examples/fonts</b> and must be included in the page.
 		</div>
 		<table>
@@ -58,61 +58,61 @@
 				<td>helvetiker</td>
 				<td>normal</td>
 				<td>normal</td>
-				<td>/examples/fonts/helvetiker_regular.typeface.js</td>
+				<td>/examples/fonts/helvetiker_regular.typeface.json</td>
 			</tr>
 			<tr>
 				<td>helvetiker</td>
 				<td>bold</td>
 				<td>normal</td>
-				<td>/examples/fonts/helvetiker_bold.typeface.js</td>
+				<td>/examples/fonts/helvetiker_bold.typeface.json</td>
 			</tr>
 			<tr>
 				<td>optimer</td>
 				<td>normal</td>
 				<td>normal</td>
-				<td>/examples/fonts/optimer_regular.typeface.js</td>
+				<td>/examples/fonts/optimer_regular.typeface.json</td>
 			</tr>
 			<tr>
 				<td>optimer</td>
 				<td>bold</td>
 				<td>normal</td>
-				<td>/examples/fonts/optimer_bold.typeface.js</td>
+				<td>/examples/fonts/optimer_bold.typeface.json</td>
 			</tr>
 			<tr>
 				<td>gentilis</td>
 				<td>normal</td>
 				<td>normal</td>
-				<td>/examples/fonts/gentilis_regular.typeface.js</td>
+				<td>/examples/fonts/gentilis_regular.typeface.json</td>
 			</tr>
 			<tr>
 				<td>gentilis</td>
 				<td>bold</td>
 				<td>normal</td>
-				<td>/examples/fonts/gentilis_bold.typeface.js</td>
+				<td>/examples/fonts/gentilis_bold.typeface.json</td>
 			</tr>
 			<tr>
 				<td>droid sans</td>
 				<td>normal</td>
 				<td>normal</td>
-				<td>/examples/fonts/droid/droid_sans_regular.typeface.js</td>
+				<td>/examples/fonts/droid/droid_sans_regular.typeface.json</td>
 			</tr>
 			<tr>
 				<td>droid sans</td>
 				<td>bold</td>
 				<td>normal</td>
-				<td>/examples/fonts/droid/droid_sans_bold.typeface.js</td>
+				<td>/examples/fonts/droid/droid_sans_bold.typeface.json</td>
 			</tr>
 			<tr>
 				<td>droid serif</td>
 				<td>normal</td>
 				<td>normal</td>
-				<td>/examples/fonts/droid/droid_serif_regular.typeface.js</td>
+				<td>/examples/fonts/droid/droid_serif_regular.typeface.json</td>
 			</tr>
 			<tr>
 				<td>droid serif</td>
 				<td>bold</td>
 				<td>normal</td>
-				<td>/examples/fonts/droid/droid_serif_bold.typeface.js</td>
+				<td>/examples/fonts/droid/droid_serif_bold.typeface.json</td>
 			</tr>
 		</table>
 

docs/scenes/js/geometry.js

@@ -804,7 +804,7 @@ var guis = {
 		function generateGeometry() {
 
 			var loader = new THREE.FontLoader();
-			loader.load( '../../examples/fonts/' + data.font + '_' + data.weight + '.typeface.js', function ( font ) {
+			loader.load( '../../examples/fonts/' + data.font + '_' + data.weight + '.typeface.json', function ( font ) {
 
 				var geometry = new THREE.TextGeometry( data.text, {
 					font: font,

examples/canvas_geometry_text.html

@@ -42,7 +42,7 @@
 			var windowHalfY = window.innerHeight / 2;
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
 
 				init( font );
 				animate();

examples/fonts/README

@@ -1,2 +1,2 @@
-Use Facetype.js to generate typeface.js fonts.
+Use Facetype.js to generate typeface.json fonts.
 http://gero3.github.io/facetype.js/

examples/webgl_camera_logarithmicdepthbuffer.html

@@ -133,7 +133,7 @@
 				container = document.getElementById( 'container' );
 
 				var loader = new THREE.FontLoader();
-				loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
+				loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
 
 					var scene = initScene( font );
 

examples/webgl_custom_attributes_lines.html

@@ -82,7 +82,7 @@
 		var object, uniforms;
 
 		var loader = new THREE.FontLoader();
-		loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
+		loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
 
 			init( font );
 			animate();

examples/webgl_geometry_normals.html

@@ -93,7 +93,7 @@
 			];
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
 
 				geometriesParams[ 12 ].args[ 1 ].font = font;
 

examples/webgl_geometry_text.html

@@ -351,7 +351,7 @@
 			function loadFont() {
 
 				var loader = new THREE.FontLoader();
-				loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.js', function ( response ) {
+				loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.json', function ( response ) {
 
 					font = response;
 

examples/webgl_geometry_text_earcut.html

@@ -388,7 +388,7 @@
 			function loadFont() {
 
 				var loader = new THREE.FontLoader();
-				loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.js', function ( response ) {
+				loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.json', function ( response ) {
 
 					font = response;
 

examples/webgl_geometry_text_pnltri.html

@@ -365,7 +365,7 @@
 			function loadFont() {
 
 				var loader = new THREE.FontLoader();
-				loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.js', function ( response ) {
+				loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.json', function ( response ) {
 
 					font = response;
 

examples/webgl_materials_variations_basic.html

@@ -44,7 +44,7 @@
 			var particleLight;
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
 
 				init( font );
 				animate();

examples/webgl_materials_variations_lambert.html

@@ -44,7 +44,7 @@
 			var particleLight;
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
 
 				init( font );
 				animate();

examples/webgl_materials_variations_phong.html

@@ -45,7 +45,7 @@
 			var particleLight;
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
 
 				init( font );
 				animate();

examples/webgl_materials_variations_standard.html

@@ -44,7 +44,7 @@
 			var particleLight;
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
 
 				init( font );
 				animate();

examples/webgl_modifier_subdivision.html

@@ -82,7 +82,7 @@
 			];
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
 
 				geometriesParams[ 8 ].args[ 1 ].font = font;
 

examples/webgl_modifier_tessellation.html

@@ -97,7 +97,7 @@
 			HEIGHT = window.innerHeight;
 
 		var loader = new THREE.FontLoader();
-		loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
+		loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
 
 			init( font );
 			animate();

examples/webgl_shaders_vector.html

@@ -96,7 +96,7 @@
 			}
 
 			var loader = new THREE.FontLoader();
-			loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
+			loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
 
 				init( font );
 				animate();

examples/webgl_shadowmap.html

@@ -207,7 +207,7 @@
 				// TEXT
 
 				var loader = new THREE.FontLoader();
-				loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
+				loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
 
 					var textGeo = new THREE.TextGeometry( "THREE.JS", {
 

examples/webgl_shadowmap_performance.html

@@ -178,7 +178,7 @@
 				// TEXT
 
 				var loader = new THREE.FontLoader();
-				loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
+				loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
 
 					var textGeo = new THREE.TextGeometry( "THREE.JS", {
 

src/loaders/FontLoader.js

@@ -19,7 +19,20 @@ THREE.FontLoader.prototype = {
 		var loader = new THREE.XHRLoader( this.manager );
 		loader.load( url, function ( text ) {
 
-			var font = scope.parse( JSON.parse( text.substring( 65, text.length - 2 ) ) );
+			var 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 ) );
+
+			}
+
+			var font = scope.parse( json );
 
 			if ( onLoad ) onLoad( font );