Merge branch 'main' into update-aframe

3DStreet · Sep 5, 2024 · 8de46fd · 8de46fd
2 parents 1552b2e + a32e96b
commit 8de46fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/components/street-environment.js b/src/components/street-environment.js
@@ -22,13 +22,15 @@ AFRAME.registerComponent('street-environment', {
 
   init: function () {
     this.textureLoader = new THREE.TextureLoader();
-    this.light1 =
-      this.el.sceneEl.querySelector('#env-light1') ||
-      this.createLight('env-light1', { type: 'ambient', color: '#FFF' });
+    this.light1 = this.createLight('env-light1', {
+      type: 'ambient',
+      color: '#FFF'
+    });
     this.light1.setAttribute('data-layer-name', 'Ambient Light');
-    this.light2 =
-      this.el.sceneEl.querySelector('#env-light2') ||
-      this.createLight('env-light2', { type: 'directional', castShadow: true });
+    this.light2 = this.createLight('env-light2', {
+      type: 'directional',
+      castShadow: true
+    });
     this.light2.setAttribute(
       'data-layer-name',
       'Directional Light • Shadow Caster'
@@ -132,5 +134,10 @@ AFRAME.registerComponent('street-environment', {
     light.setAttribute('light', attributes);
     this.el.appendChild(light);
     return light;
+  },
+
+  remove() {
+    this.light1.remove();
+    this.light2.remove();
   }
 });
diff --git a/src/street-utils.js b/src/street-utils.js
@@ -31,19 +31,23 @@ function newScene(
   clearUrlHash = true,
   addDefaultStreet = true
 ) {
-  const environmentEl = checkOrCreateEntity(
+  let environmentEl = document.getElementById('environment');
+  if (environmentEl) environmentEl.removeAttribute('street-environment');
+  environmentEl = checkOrCreateEntity(
     'environment',
     AFRAME.scenes[0],
     'Environment'
   );
-  // Use third param clobber to true to reset to default values
-  environmentEl.setAttribute('street-environment', '', true);
-  const geoLayer = checkOrCreateEntity(
+  environmentEl.setAttribute('street-environment', '');
+
+  let geoLayer = document.getElementById('reference-layers');
+  if (geoLayer) geoLayer.removeAttribute('street-geo');
+  geoLayer = checkOrCreateEntity(
     'reference-layers',
     AFRAME.scenes[0],
     'Geospatial Layers'
   );
-  geoLayer.removeAttribute('street-geo');
+
   const streetContainerEl = checkOrCreateEntity(
     'street-container',
     AFRAME.scenes[0],