Skip to content

Commit 1cb9f3d

Browse files
authored
Globe Fixes (#515)
* Don't fail if tiles are not set, yet * Remove required constructor arguments * Remove argument requirement * Fix dom reference * Exit update early if camera is not present
1 parent 5c9221c commit 1cb9f3d

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

src/three/controls/EnvironmentControls.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class EnvironmentControls extends EventDispatcher {
8383
this.adjustHeight = true;
8484

8585
// internal state
86-
this.pointerTracker = new PointerTracker( domElement );
86+
this.pointerTracker = new PointerTracker();
8787
this.needsUpdate = false;
8888
this.actionHeightOffset = 0;
8989

@@ -112,9 +112,9 @@ export class EnvironmentControls extends EventDispatcher {
112112
this._upInitialized = false;
113113

114114
// init
115-
this.attach( domElement );
116-
this.setCamera( camera );
117-
this.setScene( scene );
115+
if ( domElement ) this.attach( domElement );
116+
if ( camera ) this.setCamera( camera );
117+
if ( scene ) this.setScene( scene );
118118

119119
}
120120

@@ -444,6 +444,8 @@ export class EnvironmentControls extends EventDispatcher {
444444

445445
detach() {
446446

447+
this.domElement = null;
448+
447449
if ( this._detachCallback ) {
448450

449451
this._detachCallback();
@@ -493,7 +495,7 @@ export class EnvironmentControls extends EventDispatcher {
493495

494496
update() {
495497

496-
if ( ! this.enabled ) {
498+
if ( ! this.enabled || ! this.camera ) {
497499

498500
return;
499501

src/three/controls/GlobeControls.js

+6
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ export class GlobeControls extends EnvironmentControls {
112112

113113
update() {
114114

115+
if ( ! this.tilesGroup || ! this.camera ) {
116+
117+
return;
118+
119+
}
120+
115121
super.update();
116122

117123
const {

src/three/controls/PointerTracker.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { Vector2 } from 'three';
22

33
export class PointerTracker {
44

5-
constructor( domElement ) {
5+
constructor() {
66

7-
this.domElement = domElement;
7+
this.domElement = null;
88
this.buttons = 0;
99
this.pointerType = null;
1010
this.pointerOrder = [];

0 commit comments

Comments
 (0)