mirror
/
vizicities
kopia lustrzana https://github.com/robhawkes/vizicities
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #205 from UDST/bug/ImageTileLayer-destroy 

Remove remaining image tile mesh references
feature/threejs-update
Matthew Harrison-Jones 2017-01-13 13:47:01 +00:00 zatwierdzone przez GitHub
rodzic 2127122d85 57027e4703
commit 8bbaf26182
1 zmienionych plików z 11 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
src/layer/tile/ImageTileLayer.js
Wyświetl plik

@ -107,9 +107,8 @@ class ImageTileLayer extends TileLayer {
setTimeout(() => { setTimeout(() => {
this._calculateLOD(); this._calculateLOD();
this._initEvents(); this._initEvents();
resolve(this);
}, 0); }, 0);
resolve(this);
}).catch(reject); }).catch(reject);
}); });
} }
@ -130,7 +129,7 @@ class ImageTileLayer extends TileLayer {
} }
_onWorldMove(latlon, point) { _onWorldMove(latlon, point) {
this._moveBaseLayer(point); // this._moveBaseLayer(point);
} }
_moveBaseLayer(point) { _moveBaseLayer(point) {
@ -150,18 +149,18 @@ class ImageTileLayer extends TileLayer {
this._throttledWorldUpdate = null; this._throttledWorldUpdate = null;
// Dispose of mesh and materials // Dispose of mesh and materials
this._baseLayer.geometry.dispose(); // this._baseLayer.geometry.dispose();
this._baseLayer.geometry = null; // this._baseLayer.geometry = null;
if (this._baseLayer.material.map) { // if (this._baseLayer.material.map) {
this._baseLayer.material.map.dispose(); // this._baseLayer.material.map.dispose();
this._baseLayer.material.map = null; // this._baseLayer.material.map = null;
} // }
this._baseLayer.material.dispose(); // this._baseLayer.material.dispose();
this._baseLayer.material = null; // this._baseLayer.material = null;
this._baseLayer = null; // this._baseLayer = null;
// Run common destruction logic from parent // Run common destruction logic from parent
super.destroy(); super.destroy();