Skip to content

Commit ea09bc7

Browse files
mrdoobmrdoob
committed
Updated builds.
1 parent 60b4af6 commit ea09bc7

File tree

2 files changed

+84
-42
lines changed

2 files changed

+84
-42
lines changed

‎build/three.js

Lines changed: 72 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8597,7 +8597,7 @@ THREE.BufferAttribute.prototype = {
85978597

85988598
constructor: THREE.BufferAttribute,
85998599

8600-
get length () {
8600+
get length() {
86018601

86028602
console.warn( 'THREE.BufferAttribute: .length has been deprecated. Please use .count.' );
86038603
return this.array.length;
@@ -8942,6 +8942,16 @@ THREE.Float64Attribute = function ( array, itemSize ) {
89428942

89438943
};
89448944

8945+
8946+
// Deprecated
8947+
8948+
THREE.DynamicBufferAttribute = function ( array, itemSize ) {
8949+
8950+
console.warn( 'THREE.DynamicBufferAttribute has been removed. Use new THREE.BufferAttribute().setDynamic( true ) instead.' );
8951+
return new THREE.BufferAttribute( array, itemSize ).setDynamic( true );
8952+
8953+
};
8954+
89458955
// File:src/core/InstancedBufferAttribute.js
89468956

89478957
/**
@@ -12610,7 +12620,7 @@ THREE.Loader.prototype = {
1261012620
// defaults
1261112621

1261212622
var mtype = 'MeshLambertMaterial';
12613-
var mpars = { color: 0xeeeeee, opacity: 1.0, map: null, lightMap: null, normalMap: null, bumpMap: null, wireframe: false };
12623+
var mpars = {};
1261412624

1261512625
// parameters from model file
1261612626

@@ -12703,15 +12713,25 @@ THREE.Loader.prototype = {
1270312713

1270412714
}
1270512715

12706-
if ( m.colorSpecular ) {
12716+
if ( m.colorEmissive ) {
1270712717

12708-
mpars.specular = rgb2hex( m.colorSpecular );
12718+
mpars.emissive = rgb2hex( m.colorEmissive );
1270912719

1271012720
}
1271112721

12712-
if ( m.colorEmissive ) {
12722+
if ( mtype === 'MeshPhongMaterial' ) {
1271312723

12714-
mpars.emissive = rgb2hex( m.colorEmissive );
12724+
if ( m.colorSpecular ) {
12725+
12726+
mpars.specular = rgb2hex( m.colorSpecular );
12727+
12728+
}
12729+
12730+
if ( m.specularCoef ) {
12731+
12732+
mpars.shininess = m.specularCoef;
12733+
12734+
}
1271512735

1271612736
}
1271712737

@@ -12730,53 +12750,51 @@ THREE.Loader.prototype = {
1273012750

1273112751
}
1273212752

12733-
if ( m.specularCoef ) {
12734-
12735-
mpars.shininess = m.specularCoef;
12753+
// textures
1273612754

12737-
}
12755+
if ( texturePath ) {
1273812756

12739-
// textures
12757+
if ( m.mapDiffuse ) {
1274012758

12741-
if ( m.mapDiffuse && texturePath ) {
12759+
create_texture( mpars, 'map', m.mapDiffuse, m.mapDiffuseRepeat, m.mapDiffuseOffset, m.mapDiffuseWrap, m.mapDiffuseAnisotropy );
1274212760

12743-
create_texture( mpars, 'map', m.mapDiffuse, m.mapDiffuseRepeat, m.mapDiffuseOffset, m.mapDiffuseWrap, m.mapDiffuseAnisotropy );
12761+
}
1274412762

12745-
}
12763+
if ( m.mapLight ) {
1274612764

12747-
if ( m.mapLight && texturePath ) {
12765+
create_texture( mpars, 'lightMap', m.mapLight, m.mapLightRepeat, m.mapLightOffset, m.mapLightWrap, m.mapLightAnisotropy );
1274812766

12749-
create_texture( mpars, 'lightMap', m.mapLight, m.mapLightRepeat, m.mapLightOffset, m.mapLightWrap, m.mapLightAnisotropy );
12767+
}
1275012768

12751-
}
12769+
if ( m.mapAO ) {
1275212770

12753-
if ( m.mapAO && texturePath ) {
12771+
create_texture( mpars, 'aoMap', m.mapAO, m.mapAORepeat, m.mapAOOffset, m.mapAOWrap, m.mapAOAnisotropy );
1275412772

12755-
create_texture( mpars, 'aoMap', m.mapAO, m.mapAORepeat, m.mapAOOffset, m.mapAOWrap, m.mapAOAnisotropy );
12773+
}
1275612774

12757-
}
12775+
if ( m.mapBump ) {
1275812776

12759-
if ( m.mapBump && texturePath ) {
12777+
create_texture( mpars, 'bumpMap', m.mapBump, m.mapBumpRepeat, m.mapBumpOffset, m.mapBumpWrap, m.mapBumpAnisotropy );
1276012778

12761-
create_texture( mpars, 'bumpMap', m.mapBump, m.mapBumpRepeat, m.mapBumpOffset, m.mapBumpWrap, m.mapBumpAnisotropy );
12779+
}
1276212780

12763-
}
12781+
if ( m.mapNormal ) {
1276412782

12765-
if ( m.mapNormal && texturePath ) {
12783+
create_texture( mpars, 'normalMap', m.mapNormal, m.mapNormalRepeat, m.mapNormalOffset, m.mapNormalWrap, m.mapNormalAnisotropy );
1276612784

12767-
create_texture( mpars, 'normalMap', m.mapNormal, m.mapNormalRepeat, m.mapNormalOffset, m.mapNormalWrap, m.mapNormalAnisotropy );
12785+
}
1276812786

12769-
}
12787+
if ( m.mapSpecular ) {
1277012788

12771-
if ( m.mapSpecular && texturePath ) {
12789+
create_texture( mpars, 'specularMap', m.mapSpecular, m.mapSpecularRepeat, m.mapSpecularOffset, m.mapSpecularWrap, m.mapSpecularAnisotropy );
1277212790

12773-
create_texture( mpars, 'specularMap', m.mapSpecular, m.mapSpecularRepeat, m.mapSpecularOffset, m.mapSpecularWrap, m.mapSpecularAnisotropy );
12791+
}
1277412792

12775-
}
12793+
if ( m.mapAlpha ) {
1277612794

12777-
if ( m.mapAlpha && texturePath ) {
12795+
create_texture( mpars, 'alphaMap', m.mapAlpha, m.mapAlphaRepeat, m.mapAlphaOffset, m.mapAlphaWrap, m.mapAlphaAnisotropy );
1277812796

12779-
create_texture( mpars, 'alphaMap', m.mapAlpha, m.mapAlphaRepeat, m.mapAlphaOffset, m.mapAlphaWrap, m.mapAlphaAnisotropy );
12797+
}
1278012798

1278112799
}
1278212800

@@ -13050,6 +13068,8 @@ THREE.JSONLoader.prototype = {
1305013068

1305113069
constructor: THREE.JSONLoader,
1305213070

13071+
// Deprecated
13072+
1305313073
get statusDomElement () {
1305413074

1305513075
if ( this._statusDomElement === undefined ) {
@@ -14977,6 +14997,27 @@ THREE.Material.prototype = {
1497714997

1497814998
this.dispatchEvent( { type: 'dispose' } );
1497914999

15000+
},
15001+
15002+
// Deprecated
15003+
15004+
get wrapAround () {
15005+
15006+
console.warn( 'THREE.' + this.type + ': .wrapAround has been removed.' );
15007+
15008+
},
15009+
15010+
set wrapAround ( boolean ) {
15011+
15012+
console.warn( 'THREE.' + this.type + ': .wrapAround has been removed.' );
15013+
15014+
},
15015+
15016+
get wrapRGB () {
15017+
15018+
console.warn( 'THREE.' + this.type + ': .wrapRGB has been removed.' );
15019+
return new THREE.Color();
15020+
1498015021
}
1498115022

1498215023
};

0 commit comments

Comments
 (0)