Skip to content

Commit 1499ef3

Browse files
Mugen87Mugen87
committed
Editor: Use THREE namespace.
1 parent f0e3215 commit 1499ef3

39 files changed

+247
-389
lines changed

‎editor/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<script type="module">
4848

49-
import { FileLoader } from '../build/three.module.js';
49+
import * as THREE from '../build/three.module.js';
5050

5151
import { Editor } from './js/Editor.js';
5252
import { Viewport } from './js/Viewport.js';
@@ -194,7 +194,7 @@
194194

195195
if ( confirm( 'Any unsaved data will be lost. Are you sure?' ) ) {
196196

197-
var loader = new FileLoader();
197+
var loader = new THREE.FileLoader();
198198
loader.crossOrigin = '';
199199
loader.load( file, function ( text ) {
200200

‎editor/js/Editor.js‎

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22
* @author mrdoob / http://mrdoob.com/
33
*/
44

5-
import {
6-
AnimationMixer,
7-
CameraHelper,
8-
Color,
9-
DirectionalLightHelper,
10-
HemisphereLightHelper,
11-
Mesh,
12-
MeshBasicMaterial,
13-
ObjectLoader,
14-
PerspectiveCamera,
15-
PointLightHelper,
16-
Scene,
17-
SkeletonHelper,
18-
SphereBufferGeometry,
19-
SpotLightHelper,
20-
Vector3
21-
} from '../../build/three.module.js';
5+
import * as THREE from '../../build/three.module.js';
226

237
import { Config } from './Config.js';
248
import { Loader } from './Loader.js';
@@ -28,10 +12,10 @@ import { Storage as _Storage } from './Storage.js';
2812

2913
var Editor = function () {
3014

31-
this.DEFAULT_CAMERA = new PerspectiveCamera( 50, 1, 0.01, 1000 );
15+
this.DEFAULT_CAMERA = new THREE.PerspectiveCamera( 50, 1, 0.01, 1000 );
3216
this.DEFAULT_CAMERA.name = 'Camera';
3317
this.DEFAULT_CAMERA.position.set( 0, 5, 10 );
34-
this.DEFAULT_CAMERA.lookAt( new Vector3() );
18+
this.DEFAULT_CAMERA.lookAt( new THREE.Vector3() );
3519

3620
var Signal = signals.Signal;
3721

@@ -106,11 +90,11 @@ var Editor = function () {
10690

10791
this.camera = this.DEFAULT_CAMERA.clone();
10892

109-
this.scene = new Scene();
93+
this.scene = new THREE.Scene();
11094
this.scene.name = 'Scene';
111-
this.scene.background = new Color( 0xaaaaaa );
95+
this.scene.background = new THREE.Color( 0xaaaaaa );
11296

113-
this.sceneHelpers = new Scene();
97+
this.sceneHelpers = new THREE.Scene();
11498

11599
this.object = {};
116100
this.geometries = {};
@@ -119,7 +103,7 @@ var Editor = function () {
119103
this.scripts = {};
120104

121105
this.animations = {};
122-
this.mixer = new AnimationMixer( this.scene );
106+
this.mixer = new THREE.AnimationMixer( this.scene );
123107

124108
this.selected = null;
125109
this.helpers = {};
@@ -332,36 +316,36 @@ Editor.prototype = {
332316

333317
addHelper: function () {
334318

335-
var geometry = new SphereBufferGeometry( 2, 4, 2 );
336-
var material = new MeshBasicMaterial( { color: 0xff0000, visible: false } );
319+
var geometry = new THREE.SphereBufferGeometry( 2, 4, 2 );
320+
var material = new THREE.MeshBasicMaterial( { color: 0xff0000, visible: false } );
337321

338322
return function ( object ) {
339323

340324
var helper;
341325

342326
if ( object.isCamera ) {
343327

344-
helper = new CameraHelper( object );
328+
helper = new THREE.CameraHelper( object );
345329

346330
} else if ( object.isPointLight ) {
347331

348-
helper = new PointLightHelper( object, 1 );
332+
helper = new THREE.PointLightHelper( object, 1 );
349333

350334
} else if ( object.isDirectionalLight ) {
351335

352-
helper = new DirectionalLightHelper( object, 1 );
336+
helper = new THREE.DirectionalLightHelper( object, 1 );
353337

354338
} else if ( object.isSpotLight ) {
355339

356-
helper = new SpotLightHelper( object, 1 );
340+
helper = new THREE.SpotLightHelper( object, 1 );
357341

358342
} else if ( object.isHemisphereLight ) {
359343

360-
helper = new HemisphereLightHelper( object, 1 );
344+
helper = new THREE.HemisphereLightHelper( object, 1 );
361345

362346
} else if ( object.isSkinnedMesh ) {
363347

364-
helper = new SkeletonHelper( object.skeleton.bones[ 0 ] );
348+
helper = new THREE.SkeletonHelper( object.skeleton.bones[ 0 ] );
365349

366350
} else {
367351

@@ -370,7 +354,7 @@ Editor.prototype = {
370354

371355
}
372356

373-
var picker = new Mesh( geometry, material );
357+
var picker = new THREE.Mesh( geometry, material );
374358
picker.name = 'picker';
375359
picker.userData.object = object;
376360
helper.add( picker );
@@ -575,7 +559,7 @@ Editor.prototype = {
575559

576560
fromJSON: function ( json ) {
577561

578-
var loader = new ObjectLoader();
562+
var loader = new THREE.ObjectLoader();
579563

580564
// backwards
581565

‎editor/js/EditorControls.js‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,34 @@
55
* @author WestLangley / http://github.com/WestLangley
66
*/
77

8-
import {
9-
Box3,
10-
EventDispatcher,
11-
Matrix3,
12-
Sphere,
13-
Spherical,
14-
Vector2,
15-
Vector3
16-
} from '../../build/three.module.js';
8+
import * as THREE from '../../build/three.module.js';
179

1810
var EditorControls = function ( object, domElement ) {
1911

2012
// API
2113

2214
this.enabled = true;
23-
this.center = new Vector3();
15+
this.center = new THREE.Vector3();
2416
this.panSpeed = 0.002;
2517
this.zoomSpeed = 0.1;
2618
this.rotationSpeed = 0.005;
2719

2820
// internals
2921

3022
var scope = this;
31-
var vector = new Vector3();
32-
var delta = new Vector3();
33-
var box = new Box3();
23+
var vector = new THREE.Vector3();
24+
var delta = new THREE.Vector3();
25+
var box = new THREE.Box3();
3426

3527
var STATE = { NONE: - 1, ROTATE: 0, ZOOM: 1, PAN: 2 };
3628
var state = STATE.NONE;
3729

3830
var center = this.center;
39-
var normalMatrix = new Matrix3();
40-
var pointer = new Vector2();
41-
var pointerOld = new Vector2();
42-
var spherical = new Spherical();
43-
var sphere = new Sphere();
31+
var normalMatrix = new THREE.Matrix3();
32+
var pointer = new THREE.Vector2();
33+
var pointerOld = new THREE.Vector2();
34+
var spherical = new THREE.Spherical();
35+
var sphere = new THREE.Sphere();
4436

4537
// events
4638

@@ -231,8 +223,8 @@ var EditorControls = function ( object, domElement ) {
231223

232224
// touch
233225

234-
var touches = [ new Vector3(), new Vector3(), new Vector3() ];
235-
var prevTouches = [ new Vector3(), new Vector3(), new Vector3() ];
226+
var touches = [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ];
227+
var prevTouches = [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ];
236228

237229
var prevDistance = null;
238230

@@ -319,7 +311,7 @@ var EditorControls = function ( object, domElement ) {
319311

320312
};
321313

322-
EditorControls.prototype = Object.create( EventDispatcher.prototype );
314+
EditorControls.prototype = Object.create( THREE.EventDispatcher.prototype );
323315
EditorControls.prototype.constructor = EditorControls;
324316

325317
export { EditorControls };

‎editor/js/Loader.js‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,7 @@
22
* @author mrdoob / http://mrdoob.com/
33
*/
44

5-
import {
6-
AnimationMixer,
7-
BufferGeometryLoader,
8-
Group,
9-
LoadingManager,
10-
LoaderUtils,
11-
Mesh,
12-
MeshBasicMaterial,
13-
MeshStandardMaterial,
14-
ObjectLoader,
15-
ShapeBufferGeometry
16-
} from '../../build/three.module.js';
5+
import * as THREE from '../../build/three.module.js';
176

187
import { AMFLoader } from '../../examples/jsm/loaders/AMFLoader.js';
198
import { ColladaLoader } from '../../examples/jsm/loaders/ColladaLoader.js';
@@ -46,7 +35,7 @@ var Loader = function ( editor ) {
4635

4736
var filesMap = createFileMap( files );
4837

49-
var manager = new LoadingManager();
38+
var manager = new THREE.LoadingManager();
5039
manager.setURLModifier( function ( url ) {
5140

5241
var file = filesMap[ url ];
@@ -147,9 +136,9 @@ var Loader = function ( editor ) {
147136
loader.setDecoderPath( '../examples/js/libs/draco/' );
148137
loader.decodeDracoFile( contents, function ( geometry ) {
149138

150-
var material = new MeshStandardMaterial();
139+
var material = new THREE.MeshStandardMaterial();
151140

152-
var mesh = new Mesh( geometry, material );
141+
var mesh = new THREE.Mesh( geometry, material );
153142
mesh.name = filename;
154143

155144
editor.execute( new AddObjectCommand( editor, mesh ) );
@@ -317,13 +306,13 @@ var Loader = function ( editor ) {
317306
var contents = event.target.result;
318307

319308
var geometry = new MD2Loader().parse( contents );
320-
var material = new MeshStandardMaterial( {
309+
var material = new THREE.MeshStandardMaterial( {
321310
morphTargets: true,
322311
morphNormals: true
323312
} );
324313

325-
var mesh = new Mesh( geometry, material );
326-
mesh.mixer = new AnimationMixer( mesh );
314+
var mesh = new THREE.Mesh( geometry, material );
315+
mesh.mixer = new THREE.AnimationMixer( mesh );
327316
mesh.name = filename;
328317

329318
editor.addAnimation( mesh, geometry.animations );
@@ -360,9 +349,9 @@ var Loader = function ( editor ) {
360349
geometry.sourceType = "ply";
361350
geometry.sourceFile = file.name;
362351

363-
var material = new MeshStandardMaterial();
352+
var material = new THREE.MeshStandardMaterial();
364353

365-
var mesh = new Mesh( geometry, material );
354+
var mesh = new THREE.Mesh( geometry, material );
366355
mesh.name = filename;
367356

368357
editor.execute( new AddObjectCommand( editor, mesh ) );
@@ -382,9 +371,9 @@ var Loader = function ( editor ) {
382371
geometry.sourceType = "stl";
383372
geometry.sourceFile = file.name;
384373

385-
var material = new MeshStandardMaterial();
374+
var material = new THREE.MeshStandardMaterial();
386375

387-
var mesh = new Mesh( geometry, material );
376+
var mesh = new THREE.Mesh( geometry, material );
388377
mesh.name = filename;
389378

390379
editor.execute( new AddObjectCommand( editor, mesh ) );
@@ -414,15 +403,15 @@ var Loader = function ( editor ) {
414403

415404
//
416405

417-
var group = new Group();
406+
var group = new THREE.Group();
418407
group.scale.multiplyScalar( 0.1 );
419408
group.scale.y *= - 1;
420409

421410
for ( var i = 0; i < paths.length; i ++ ) {
422411

423412
var path = paths[ i ];
424413

425-
var material = new MeshBasicMaterial( {
414+
var material = new THREE.MeshBasicMaterial( {
426415
color: path.color,
427416
depthWrite: false
428417
} );
@@ -433,8 +422,8 @@ var Loader = function ( editor ) {
433422

434423
var shape = shapes[ j ];
435424

436-
var geometry = new ShapeBufferGeometry( shape );
437-
var mesh = new Mesh( geometry, material );
425+
var geometry = new THREE.ShapeBufferGeometry( shape );
426+
var mesh = new THREE.Mesh( geometry, material );
438427

439428
group.add( mesh );
440429

@@ -459,9 +448,9 @@ var Loader = function ( editor ) {
459448
geometry.sourceType = "vtk";
460449
geometry.sourceFile = file.name;
461450

462-
var material = new MeshStandardMaterial();
451+
var material = new THREE.MeshStandardMaterial();
463452

464-
var mesh = new Mesh( geometry, material );
453+
var mesh = new THREE.Mesh( geometry, material );
465454
mesh.name = filename;
466455

467456
editor.execute( new AddObjectCommand( editor, mesh ) );
@@ -531,10 +520,10 @@ var Loader = function ( editor ) {
531520

532521
case 'buffergeometry':
533522

534-
var loader = new BufferGeometryLoader();
523+
var loader = new THREE.BufferGeometryLoader();
535524
var result = loader.parse( data );
536525

537-
var mesh = new Mesh( result );
526+
var mesh = new THREE.Mesh( result );
538527

539528
editor.execute( new AddObjectCommand( editor, mesh ) );
540529

@@ -548,7 +537,7 @@ var Loader = function ( editor ) {
548537

549538
case 'object':
550539

551-
var loader = new ObjectLoader();
540+
var loader = new THREE.ObjectLoader();
552541
loader.setResourcePath( scope.texturePath );
553542

554543
var result = loader.parse( data );
@@ -608,7 +597,7 @@ var Loader = function ( editor ) {
608597

609598
zip.filter( function ( path, file ) {
610599

611-
var manager = new LoadingManager();
600+
var manager = new THREE.LoadingManager();
612601
manager.setURLModifier( function ( url ) {
613602

614603
var file = zip.files[ url ];
@@ -684,7 +673,7 @@ var Loader = function ( editor ) {
684673

685674
} else {
686675

687-
var magic = LoaderUtils.decodeText( new Uint8Array( contents, 0, 4 ) );
676+
var magic = THREE.LoaderUtils.decodeText( new Uint8Array( contents, 0, 4 ) );
688677

689678
if ( magic === 'glTF' ) {
690679

@@ -696,7 +685,7 @@ var Loader = function ( editor ) {
696685
} else {
697686

698687
// contents is a .gltf file
699-
resultContent = LoaderUtils.decodeText( new Uint8Array( contents ) );
688+
resultContent = THREE.LoaderUtils.decodeText( new Uint8Array( contents ) );
700689

701690
}
702691

0 commit comments

Comments
 (0)