Skip to content

Commit fffe45c

Browse files
mrdoobmrdoob
committed
FontLoader now strips typeface.js header. Reverted typeface.js to typeface.json change.
1 parent a6227fd commit fffe45c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+30
-30
lines changed

‎docs/scenes/js/geometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ var guis = {
435435
function generateGeometry() {
436436

437437
var loader = new THREE.FontLoader();
438-
loader.load( '../../examples/fonts/' + data.font + '_' + data.weight + '.typeface.json', function ( font ) {
438+
loader.load( '../../examples/fonts/' + data.font + '_' + data.weight + '.typeface.js', function ( font ) {
439439

440440
var geometry = new THREE.TextGeometry( data.text, {
441441
font: font,

‎examples/canvas_geometry_text.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
var windowHalfY = window.innerHeight / 2;
4343

4444
var loader = new THREE.FontLoader();
45-
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
45+
loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
4646

4747
init( font );
4848
animate();

‎examples/fonts/droid/droid_sans_bold.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/droid/droid_sans_bold.typeface.json

-1
This file was deleted.

‎examples/fonts/droid/droid_sans_mono_regular.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/droid/droid_sans_mono_regular.typeface.json

-1
This file was deleted.

‎examples/fonts/droid/droid_sans_regular.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/droid/droid_sans_regular.typeface.json

-1
This file was deleted.

‎examples/fonts/droid/droid_serif_bold.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/droid/droid_serif_bold.typeface.json

-1
This file was deleted.

‎examples/fonts/droid/droid_serif_regular.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/droid/droid_serif_regular.typeface.json

-1
This file was deleted.

‎examples/fonts/gentilis_bold.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/gentilis_bold.typeface.json

-1
This file was deleted.

‎examples/fonts/gentilis_regular.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/gentilis_regular.typeface.json

-1
This file was deleted.

‎examples/fonts/helvetiker_bold.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/helvetiker_bold.typeface.json

-1
This file was deleted.

‎examples/fonts/helvetiker_regular.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/helvetiker_regular.typeface.json

-1
This file was deleted.

‎examples/fonts/optimer_bold.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/optimer_bold.typeface.json

-1
This file was deleted.

‎examples/fonts/optimer_regular.typeface.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/fonts/optimer_regular.typeface.json

-1
This file was deleted.

‎examples/webgl_camera_logarithmicdepthbuffer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
container = document.getElementById( 'container' );
136136

137137
var loader = new THREE.FontLoader();
138-
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
138+
loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
139139

140140
var scene = initScene( font );
141141

‎examples/webgl_custom_attributes_lines.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
var object, uniforms;
8383

8484
var loader = new THREE.FontLoader();
85-
loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
85+
loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
8686

8787
init( font );
8888
animate();

‎examples/webgl_geometry_normals.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
];
9494

9595
var loader = new THREE.FontLoader();
96-
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
96+
loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
9797

9898
geometriesParams[ 12 ].args[ 1 ].font = font;
9999

‎examples/webgl_geometry_text.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@
353353
function loadFont() {
354354

355355
var loader = new THREE.FontLoader();
356-
loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.json', function ( response ) {
356+
loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.js', function ( response ) {
357357

358358
font = response;
359359

‎examples/webgl_geometry_text_earcut.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
function loadFont() {
391391

392392
var loader = new THREE.FontLoader();
393-
loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.json', function ( response ) {
393+
loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.js', function ( response ) {
394394

395395
font = response;
396396

‎examples/webgl_geometry_text_pnltri.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
function loadFont() {
368368

369369
var loader = new THREE.FontLoader();
370-
loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.json', function ( response ) {
370+
loader.load( 'fonts/' + fontName + '_' + fontWeight + '.typeface.js', function ( response ) {
371371

372372
font = response;
373373

‎examples/webgl_materials_variations_basic.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
var particleLight;
4545

4646
var loader = new THREE.FontLoader();
47-
loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
47+
loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
4848

4949
init( font );
5050
animate();

‎examples/webgl_materials_variations_lambert.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
var particleLight;
4545

4646
var loader = new THREE.FontLoader();
47-
loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
47+
loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
4848

4949
init( font );
5050
animate();

‎examples/webgl_materials_variations_phong.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
var particleLight;
4646

4747
var loader = new THREE.FontLoader();
48-
loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
48+
loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
4949

5050
init( font );
5151
animate();

‎examples/webgl_materials_variations_standard.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
var particleLight;
4545

4646
var loader = new THREE.FontLoader();
47-
loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
47+
loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
4848

4949
init( font );
5050
animate();

‎examples/webgl_materials_variations_standard2.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
var particleLight;
4545

4646
var loader = new THREE.FontLoader();
47-
loader.load( 'fonts/gentilis_regular.typeface.json', function ( font ) {
47+
loader.load( 'fonts/gentilis_regular.typeface.js', function ( font ) {
4848

4949
init( font );
5050
animate();

‎examples/webgl_modifier_subdivision.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
];
8383

8484
var loader = new THREE.FontLoader();
85-
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
85+
loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
8686

8787
geometriesParams[ 8 ].args[ 1 ].font = font;
8888

‎examples/webgl_modifier_tessellation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
HEIGHT = window.innerHeight;
103103

104104
var loader = new THREE.FontLoader();
105-
loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
105+
loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
106106

107107
init( font );
108108
animate();

‎examples/webgl_shaders_vector.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
}
9797

9898
var loader = new THREE.FontLoader();
99-
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
99+
loader.load( 'fonts/helvetiker_regular.typeface.js', function ( font ) {
100100

101101
init( font );
102102
animate();

‎examples/webgl_shadowmap.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
// TEXT
250250

251251
var loader = new THREE.FontLoader();
252-
loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
252+
loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
253253

254254
var textGeo = new THREE.TextGeometry( "THREE.JS", {
255255

‎examples/webgl_shadowmap_performance.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
// TEXT
186186

187187
var loader = new THREE.FontLoader();
188-
loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
188+
loader.load( 'fonts/helvetiker_bold.typeface.js', function ( font ) {
189189

190190
var textGeo = new THREE.TextGeometry( "THREE.JS", {
191191

‎src/loaders/FontLoader.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ THREE.FontLoader.prototype = {
1717
var loader = new THREE.XHRLoader( this.manager );
1818
loader.load( url, function ( text ) {
1919

20-
onLoad( new THREE.Font( JSON.parse( text ) ) );
20+
onLoad( new THREE.Font( JSON.parse( text.substring( 65, text.length - 2 ) ) ) );
2121

2222
}, onProgress, onError );
2323

0 commit comments

Comments
 (0)