Skip to content

Commit 6877c68

Browse files
mrdoobmrdoob
committed
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
2 parents 938d587 + a7ed6b1 commit 6877c68

27 files changed

+67
-67
lines changed

‎src/audio/AudioContext.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Object.defineProperty( THREE, 'AudioContext', {
88

99
var context;
1010

11-
return function () {
11+
return function get() {
1212

1313
if ( context === undefined ) {
1414

‎src/cameras/Camera.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ THREE.Camera.prototype.getWorldDirection = function () {
2222

2323
var quaternion = new THREE.Quaternion();
2424

25-
return function ( optionalTarget ) {
25+
return function getWorldDirection( optionalTarget ) {
2626

2727
var result = optionalTarget || new THREE.Vector3();
2828

@@ -40,7 +40,7 @@ THREE.Camera.prototype.lookAt = function () {
4040

4141
var m1 = new THREE.Matrix4();
4242

43-
return function ( vector ) {
43+
return function lookAt( vector ) {
4444

4545
m1.lookAt( this.position, vector, this.up );
4646

‎src/cameras/StereoCamera.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Object.assign( THREE.StereoCamera.prototype, {
2727
var eyeRight = new THREE.Matrix4();
2828
var eyeLeft = new THREE.Matrix4();
2929

30-
return function update ( camera ) {
30+
return function update( camera ) {
3131

3232
var needsUpdate = focus !== camera.focus || fov !== camera.fov ||
3333
aspect !== camera.aspect * this.aspect || near !== camera.near ||

‎src/core/Object3D.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
134134

135135
var q1 = new THREE.Quaternion();
136136

137-
return function ( axis, angle ) {
137+
return function rotateOnAxis( axis, angle ) {
138138

139139
q1.setFromAxisAngle( axis, angle );
140140

@@ -150,7 +150,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
150150

151151
var v1 = new THREE.Vector3( 1, 0, 0 );
152152

153-
return function ( angle ) {
153+
return function rotateX( angle ) {
154154

155155
return this.rotateOnAxis( v1, angle );
156156

@@ -162,7 +162,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
162162

163163
var v1 = new THREE.Vector3( 0, 1, 0 );
164164

165-
return function ( angle ) {
165+
return function rotateY( angle ) {
166166

167167
return this.rotateOnAxis( v1, angle );
168168

@@ -174,7 +174,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
174174

175175
var v1 = new THREE.Vector3( 0, 0, 1 );
176176

177-
return function ( angle ) {
177+
return function rotateZ( angle ) {
178178

179179
return this.rotateOnAxis( v1, angle );
180180

@@ -189,7 +189,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
189189

190190
var v1 = new THREE.Vector3();
191191

192-
return function ( axis, distance ) {
192+
return function translateOnAxis( axis, distance ) {
193193

194194
v1.copy( axis ).applyQuaternion( this.quaternion );
195195

@@ -205,7 +205,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
205205

206206
var v1 = new THREE.Vector3( 1, 0, 0 );
207207

208-
return function ( distance ) {
208+
return function translateX( distance ) {
209209

210210
return this.translateOnAxis( v1, distance );
211211

@@ -217,7 +217,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
217217

218218
var v1 = new THREE.Vector3( 0, 1, 0 );
219219

220-
return function ( distance ) {
220+
return function translateY( distance ) {
221221

222222
return this.translateOnAxis( v1, distance );
223223

@@ -229,7 +229,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
229229

230230
var v1 = new THREE.Vector3( 0, 0, 1 );
231231

232-
return function ( distance ) {
232+
return function translateZ( distance ) {
233233

234234
return this.translateOnAxis( v1, distance );
235235

@@ -247,7 +247,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
247247

248248
var m1 = new THREE.Matrix4();
249249

250-
return function ( vector ) {
250+
return function worldToLocal( vector ) {
251251

252252
return vector.applyMatrix4( m1.getInverse( this.matrixWorld ) );
253253

@@ -261,7 +261,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
261261

262262
var m1 = new THREE.Matrix4();
263263

264-
return function ( vector ) {
264+
return function lookAt( vector ) {
265265

266266
m1.lookAt( vector, this.position, this.up );
267267

@@ -389,7 +389,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
389389
var position = new THREE.Vector3();
390390
var scale = new THREE.Vector3();
391391

392-
return function ( optionalTarget ) {
392+
return function getWorldQuaternion( optionalTarget ) {
393393

394394
var result = optionalTarget || new THREE.Quaternion();
395395

@@ -407,7 +407,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
407407

408408
var quaternion = new THREE.Quaternion();
409409

410-
return function ( optionalTarget ) {
410+
return function getWorldRotation( optionalTarget ) {
411411

412412
var result = optionalTarget || new THREE.Euler();
413413

@@ -424,7 +424,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
424424
var position = new THREE.Vector3();
425425
var quaternion = new THREE.Quaternion();
426426

427-
return function ( optionalTarget ) {
427+
return function getWorldScale( optionalTarget ) {
428428

429429
var result = optionalTarget || new THREE.Vector3();
430430

@@ -442,7 +442,7 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
442442

443443
var quaternion = new THREE.Quaternion();
444444

445-
return function ( optionalTarget ) {
445+
return function getWorldDirection( optionalTarget ) {
446446

447447
var result = optionalTarget || new THREE.Vector3();
448448

‎src/extras/ShapeUtils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ THREE.ShapeUtils = {
9191

9292
// takes in an contour array and returns
9393

94-
return function ( contour, indices ) {
94+
return function triangulate( contour, indices ) {
9595

9696
var n = contour.length;
9797

@@ -700,7 +700,7 @@ THREE.ShapeUtils = {
700700

701701
}
702702

703-
return function ( t, p0, p1, p2 ) {
703+
return function b2( t, p0, p1, p2 ) {
704704

705705
return b2p0( t, p0 ) + b2p1( t, p1 ) + b2p2( t, p2 );
706706

@@ -739,7 +739,7 @@ THREE.ShapeUtils = {
739739

740740
}
741741

742-
return function ( t, p0, p1, p2, p3 ) {
742+
return function b3( t, p0, p1, p2, p3 ) {
743743

744744
return b3p0( t, p0 ) + b3p1( t, p1 ) + b3p2( t, p2 ) + b3p3( t, p3 );
745745

‎src/extras/helpers/BoxHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THREE.BoxHelper.prototype.update = ( function () {
2828

2929
var box = new THREE.Box3();
3030

31-
return function ( object ) {
31+
return function update( object ) {
3232

3333
if ( object instanceof THREE.Box3 ) {
3434

‎src/extras/helpers/CameraHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ THREE.CameraHelper.prototype.update = function () {
133133

134134
}
135135

136-
return function () {
136+
return function update() {
137137

138138
geometry = this.geometry;
139139
pointMap = this.pointMap;

‎src/extras/helpers/DirectionalLightHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ THREE.DirectionalLightHelper.prototype.update = function () {
5959
var v2 = new THREE.Vector3();
6060
var v3 = new THREE.Vector3();
6161

62-
return function () {
62+
return function update() {
6363

6464
v1.setFromMatrixPosition( this.light.matrixWorld );
6565
v2.setFromMatrixPosition( this.light.target.matrixWorld );

‎src/extras/helpers/HemisphereLightHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ THREE.HemisphereLightHelper.prototype.update = function () {
4747

4848
var vector = new THREE.Vector3();
4949

50-
return function () {
50+
return function update() {
5151

5252
this.colors[ 0 ].copy( this.light.color ).multiplyScalar( this.light.intensity );
5353
this.colors[ 1 ].copy( this.light.groundColor ).multiplyScalar( this.light.intensity );

‎src/extras/helpers/SpotLightHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ THREE.SpotLightHelper.prototype.update = function () {
6262
var vector = new THREE.Vector3();
6363
var vector2 = new THREE.Vector3();
6464

65-
return function () {
65+
return function update() {
6666

6767
var coneLength = this.light.distance ? this.light.distance : 1000;
6868
var coneWidth = coneLength * Math.tan( this.light.angle );

‎src/loaders/Loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ THREE.Loader.prototype = {
4646

4747
var color, textureLoader, materialLoader;
4848

49-
return function ( m, texturePath, crossOrigin ) {
49+
return function createMaterial( m, texturePath, crossOrigin ) {
5050

5151
if ( color === undefined ) color = new THREE.Color();
5252
if ( textureLoader === undefined ) textureLoader = new THREE.TextureLoader();

‎src/loaders/ObjectLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ Object.assign( THREE.ObjectLoader.prototype, {
415415

416416
var matrix = new THREE.Matrix4();
417417

418-
return function ( data, geometries, materials ) {
418+
return function parseObject( data, geometries, materials ) {
419419

420420
var object;
421421

‎src/math/Box2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ THREE.Box2.prototype = {
4040

4141
var v1 = new THREE.Vector2();
4242

43-
return function ( center, size ) {
43+
return function setFromCenterAndSize( center, size ) {
4444

4545
var halfSize = v1.copy( size ).multiplyScalar( 0.5 );
4646
this.min.copy( center ).sub( halfSize );
@@ -191,7 +191,7 @@ THREE.Box2.prototype = {
191191

192192
var v1 = new THREE.Vector2();
193193

194-
return function ( point ) {
194+
return function distanceToPoint( point ) {
195195

196196
var clampedPoint = v1.copy( point ).clamp( this.min, this.max );
197197
return clampedPoint.sub( point ).length();

‎src/math/Box3.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ THREE.Box3.prototype = {
7272

7373
var v1 = new THREE.Vector3();
7474

75-
return function ( center, size ) {
75+
return function setFromCenterAndSize( center, size ) {
7676

7777
var halfSize = v1.copy( size ).multiplyScalar( 0.5 );
7878

@@ -92,7 +92,7 @@ THREE.Box3.prototype = {
9292

9393
var v1 = new THREE.Vector3();
9494

95-
return function ( object ) {
95+
return function setFromObject( object ) {
9696

9797
var scope = this;
9898

@@ -352,7 +352,7 @@ THREE.Box3.prototype = {
352352

353353
var v1 = new THREE.Vector3();
354354

355-
return function ( point ) {
355+
return function distanceToPoint( point ) {
356356

357357
var clampedPoint = v1.copy( point ).clamp( this.min, this.max );
358358
return clampedPoint.sub( point ).length();
@@ -365,7 +365,7 @@ THREE.Box3.prototype = {
365365

366366
var v1 = new THREE.Vector3();
367367

368-
return function ( optionalTarget ) {
368+
return function getBoundingSphere( optionalTarget ) {
369369

370370
var result = optionalTarget || new THREE.Sphere();
371371

@@ -412,7 +412,7 @@ THREE.Box3.prototype = {
412412
new THREE.Vector3()
413413
];
414414

415-
return function ( matrix ) {
415+
return function applyMatrix4( matrix ) {
416416

417417
// transform of empty box is an empty box.
418418
if( this.isEmpty() ) return this;

‎src/math/Color.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ THREE.Color.prototype = {
8484

8585
}
8686

87-
return function ( h, s, l ) {
87+
return function setHSL( h, s, l ) {
8888

8989
// h,s,l ranges are in 0.0 - 1.0
9090
h = THREE.Math.euclideanModulo( h, 1 );

‎src/math/Euler.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ THREE.Euler.prototype = {
232232

233233
var matrix;
234234

235-
return function ( q, order, update ) {
235+
return function setFromQuaternion( q, order, update ) {
236236

237237
if ( matrix === undefined ) matrix = new THREE.Matrix4();
238238

@@ -256,7 +256,7 @@ THREE.Euler.prototype = {
256256

257257
var q = new THREE.Quaternion();
258258

259-
return function ( newOrder ) {
259+
return function reorder( newOrder ) {
260260

261261
q.setFromEuler( this );
262262

‎src/math/Frustum.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ THREE.Frustum.prototype = {
8282

8383
var sphere = new THREE.Sphere();
8484

85-
return function ( object ) {
85+
return function intersectsObject( object ) {
8686

8787
var geometry = object.geometry;
8888

@@ -102,7 +102,7 @@ THREE.Frustum.prototype = {
102102

103103
var sphere = new THREE.Sphere();
104104

105-
return function ( sprite ) {
105+
return function intersectsSprite( sprite ) {
106106

107107
sphere.center.set( 0, 0, 0 );
108108
sphere.radius = 0.7071067811865476;
@@ -141,7 +141,7 @@ THREE.Frustum.prototype = {
141141
var p1 = new THREE.Vector3(),
142142
p2 = new THREE.Vector3();
143143

144-
return function ( box ) {
144+
return function intersectsBox( box ) {
145145

146146
var planes = this.planes;
147147

‎src/math/Line3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ THREE.Line3.prototype = {
7676
var startP = new THREE.Vector3();
7777
var startEnd = new THREE.Vector3();
7878

79-
return function ( point, clampToLine ) {
79+
return function closestPointToPointParameter( point, clampToLine ) {
8080

8181
startP.subVectors( point, this.start );
8282
startEnd.subVectors( this.end, this.start );

‎src/math/Math.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ THREE.Math = {
1616
var uuid = new Array( 36 );
1717
var rnd = 0, r;
1818

19-
return function () {
19+
return function generateUUID() {
2020

2121
for ( var i = 0; i < 36; i ++ ) {
2222

‎src/math/Matrix3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ THREE.Matrix3.prototype = {
9595

9696
var v1;
9797

98-
return function ( array, offset, length ) {
98+
return function applyToVector3Array( array, offset, length ) {
9999

100100
if ( v1 === undefined ) v1 = new THREE.Vector3();
101101
if ( offset === undefined ) offset = 0;

0 commit comments

Comments
 (0)