Merge pull request #207 from UDST/bug/world-destroy

Fix world.destroy
feature/threejs-update
Matthew Harrison-Jones 2017-02-14 14:56:32 +00:00 zatwierdzone przez GitHub
commit e2e9ad367b
2 zmienionych plików z 8 dodań i 4 usunięć

Wyświetl plik

@ -153,7 +153,9 @@ class World extends EventEmitter {
_removeAttribution(id) {
var elem = document.querySelectorAll('#attribution-container [data-layer="' + id + '"]')[0];
elem.remove();
if (elem) {
elem.remove();
}
}
// Set world view

Wyświetl plik

@ -129,9 +129,11 @@ class EnvironmentLayer extends Layer {
destroy() {
this._skyboxLight = null;
this.remove(this._skybox._mesh);
this._skybox.destroy();
this._skybox = null;
if (this._skybox) {
this.remove(this._skybox._mesh);
this._skybox.destroy();
this._skybox = null;
}
super.destroy();
}