Merge pull request #497 from 3DStreet/3dtiles-research

3dtiles research
3DStreet · Mar 28, 2024 · 91ce1b2 · 91ce1b2
2 parents 2dccef9 + 649d188
commit 91ce1b2
Show file tree

Hide file tree

Showing 8 changed files with 728 additions and 383 deletions.
diff --git a/dist/aframe-street-component.js b/dist/aframe-street-component.js
diff --git a/examples/cesium-3dtiles/index.html b/examples/cesium-3dtiles/index.html
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <!-- aframe -->
+    <script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
+
+    <!-- 3dstreet -->
+    <script src="/dist/aframe-street-component.js"></script>
+
+    <!-- vr teleport�controls -->
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script>
+    <script src="/src/lib/aframe-loader-3dtiles-component.js"></script>
+
+    <script>
+      // this makes the same camera rig setup work in VR and desktop modes
+      // this could be a new component, such as "swap desktop and vr controls" and put in init section
+      window.addEventListener("DOMContentLoaded", function() {
+        const sceneEl = document.querySelector("a-scene");
+        sceneEl.addEventListener("enter-vr", function() {
+          document.querySelector('#cameraRig').removeAttribute('look-controls')
+          document.querySelector('#cameraRig').removeAttribute('wasd-controls')
+          document.querySelector('#cameraRig').removeAttribute('cursor-teleport')
+          document.querySelector('#cameraRig').setAttribute('position', '0 0 0')
+        });
+        sceneEl.addEventListener("exit-vr", function() {
+          document.querySelector('#cameraRig').setAttribute('cursor-teleport', "cameraRig: #cameraRig; cameraHead: #camera;")
+          document.querySelector('#cameraRig').setAttribute('look-controls', "reverseMouseDrag: true;")
+          document.querySelector('#cameraRig').setAttribute('wasd-controls', "enabled: true")
+        });
+      })
+    </script>
+    <title>3DStreet</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="icon" type="image/x-icon" href="/ui_assets/favicon.ico">
+    <link rel="stylesheet" href="/src/viewer-styles.css">
+  </head>
+
+  <body>
+    <!-- loading animation start -->
+    <div class="loader__wrapper">
+      <div class="loader">
+        <div class="entities">
+          <img src="/ui_assets/loader/entities.svg" alt="entities" />
+        </div>
+        <div class="transport">
+          <div class="wrapper__transport">
+            <img src="/ui_assets/loader/car.svg" class="car" alt="car" />
+            <img src="/ui_assets/loader/bus.svg" class="bus" alt="bus" />
+            <img src="/ui_assets/loader/bike.svg" class="bike" alt="bike" />
+          </div>
+        </div>
+        <div class="road">Loading 3DStreet</div>
+      </div>
+    </div>
+
+    <!-- viewer ui start -->
+    <div class="viewer-header-wrapper">
+      <button class="viewer-logo-start-editor-button" onclick="startEditor()">
+        <img class="viewer-logo-img" alt="3DStreet Viewer" src="/ui_assets/3DStreet-Viewer-Start-Editor.svg">
+      </button>
+    </div>
+
+    <div class="right-fixed">
+      <ul class="right-menu">
+        <li onclick="buttonScreenshotTock()"> <a class="camera"  href="#"> <span> Capture image as PNG </span> <img src="/ui_assets/camera-icon.svg"> </a></li>
+        <li onclick="STREET.utils.inputStreetmix()"> <a class="load"  href="#"> <span> Load Streetmix URL </span> <img src="/ui_assets/streetmix-logo.svg"> </a></li>
+        <!-- <li onclick="inputJSON()"> <a class="load"  href="#"> <span> Load JSON String </span> <img src="assets/ui_assets/upload-icon.svg"> </a></li> -->
+        <li><a class="load"> <label for="inputfile" style="display: inherit; align-items: center; cursor: pointer"> <input type="file" id="inputfile" style="display:none" accept=".js, .json, .txt"> <span> Load JSON File </span> <img src="/ui_assets/upload-icon.svg"></label></a></li>
+      </ul>
+    </div>
+
+    <a-scene
+      renderer="colorManagement: true; physicallyCorrectLights: true; anisotropy: 16;"
+      inspector="url: //3dstreet.app/dist/3dstreet-editor.js"
+      notify
+      metadata
+      scene-title
+      reflection
+      >
+      <a-assets>
+        <!-- uncomment the line below to load assets from local github submodule -->
+        <!-- <street-assets url="/assets/"></street-assets>   -->
+        <!-- uncomment the line below to load all possible asset categories -->
+        <!-- <street-assets categories="sidewalk-props people people-rigged vehicles vehicles-rigged buildings intersection-props segment-textures segment-colors lane-separator stencils vehicles-transit dividers sky grounds"></street-assets>   -->
+        <!-- a reduced set of assets for non-animated streetmix streets without intersections -->
+        <street-assets categories="loud-bicycle sidewalk-props people vehicles vehicles-rigged buildings segment-textures segment-colors lane-separator stencils vehicles-transit dividers sky grounds"></street-assets>
+      </a-assets>
+
+      <a-entity id="cameraRig" position="0 10 30" data-layer-name="Viewer" cursor-teleport="cameraRig: #cameraRig; cameraHead: #camera;" look-controls="reverseMouseDrag: true" wasd-controls="enabled: true">
+        <a-entity id="camera" camera="far: 600" position="0 1.6 0" ></a-entity>
+        <a-entity id="leftHand" hand-controls="hand: left;" blink-controls="cameraRig: #cameraRig; teleportOrigin: #camera; rotateOnTeleport:false;"></a-entity>
+        <a-entity id="rightHand"  hand-controls="hand: right" blink-controls="cameraRig: #cameraRig; teleportOrigin: #camera; rotateOnTeleport:false;"></a-entity>
+        <a-entity id="screenshot" class="no-pause" screentock visible="false"></a-entity>
+      </a-entity>  
+      <a-entity id="street-container" data-layer-name="3D Street Layers" data-layer-show-children>
+        <a-entity id="default-street" street streetmix-loader set-loader-from-hash></a-entity>
+      </a-entity>
+
+      <a-entity id="reference-layers" data-layer-name="Reference Layers" data-layer-show-children>
+
+      </a-entity>
+
+      <a-entity id="environment" data-layer-name="Environment" street-environment="preset: day;"></a-entity>
+
+
+    </a-scene>
+  </body>
+  <script>
+    /* loading animation script */
+    document.addEventListener('DOMContentLoaded', function () {
+      const scene = document.querySelector('a-scene');
+      const splash = document.querySelector('.loader__wrapper');
+      scene.addEventListener('loaded', function (e) {
+        setTimeout(() => {
+          splash.style.display = 'none';
+        }, 1000);        
+      });
+    });
+  </script>
+  <script>
+
+    document.getElementById('inputfile')
+            .addEventListener('change', STREET.utils.fileJSON);
+
+    function buttonScreenshotTock() {
+      const screenshotEl = document.getElementById('screenshot');
+      screenshotEl.play(); // double check playing in case we're in editor mode
+      screenshotEl.setAttribute('screentock', 'type', 'jpg');
+      screenshotEl.setAttribute('screentock', 'takeScreenshot', true);
+    }
+
+    function startEditor() {
+      var sceneEl = document.querySelector('a-scene');
+      sceneEl.components.inspector.openInspector();
+      document.querySelector('.viewer-header-wrapper').style.display = 'none';
+    }
+
+    AFRAME.registerComponent('timed-inspector', {
+      init: function() {
+        setTimeout( function () {
+          window.postMessage('INJECT_AFRAME_INSPECTOR')
+        }, this.data * 1000)
+      }
+    });  
+
+  </script>
+</html>
diff --git a/examples/google-tiles/index.html b/examples/google-tiles/index.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <!-- aframe -->
+    <script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
+
+    <!-- 3dstreet -->
+    <script src="/dist/aframe-street-component.js"></script>
+
+    <!-- mapbox and google tiles -->
+    <script src="/src/lib/aframe-mapbox-component.min.js"></script>
+    <script src="/src/lib/aframe-loader-3dtiles-component.js"></script>
+
+    <!-- vr teleport controls -->
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script>
+
+    <script>
+      // this makes the same camera rig setup work in VR and desktop modes
+      // this could be a new component, such as "swap desktop and vr controls" and put in init section
+      window.addEventListener("DOMContentLoaded", function() {
+        const sceneEl = document.querySelector("a-scene");
+        sceneEl.addEventListener("enter-vr", function() {
+          document.querySelector('#cameraRig').removeAttribute('look-controls')
+          document.querySelector('#cameraRig').removeAttribute('wasd-controls')
+          document.querySelector('#cameraRig').removeAttribute('cursor-teleport')
+          document.querySelector('#cameraRig').setAttribute('position', '0 0 0')
+        });
+        sceneEl.addEventListener("exit-vr", function() {
+          document.querySelector('#cameraRig').setAttribute('cursor-teleport', "cameraRig: #cameraRig; cameraHead: #camera;")
+          document.querySelector('#cameraRig').setAttribute('look-controls', "reverseMouseDrag: true;")
+          document.querySelector('#cameraRig').setAttribute('wasd-controls', "enabled: true")
+        });
+      })
+    </script>
+    <title>3DStreet</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="icon" type="image/x-icon" href="/ui_assets/favicon.ico">
+    <link rel="stylesheet" href="/src/viewer-styles.css">
+  </head>
+
+  <body>
+    <!-- loading animation start -->
+    <div class="loader__wrapper">
+      <div class="loader">
+        <div class="entities">
+          <img src="/ui_assets/loader/entities.svg" alt="entities" />
+        </div>
+        <div class="transport">
+          <div class="wrapper__transport">
+            <img src="/ui_assets/loader/car.svg" class="car" alt="car" />
+            <img src="/ui_assets/loader/bus.svg" class="bus" alt="bus" />
+            <img src="/ui_assets/loader/bike.svg" class="bike" alt="bike" />
+          </div>
+        </div>
+        <div class="road">Loading 3DStreet</div>
+      </div>
+    </div>
+
+    <!-- viewer ui start -->
+    <div class="viewer-header-wrapper">
+      <button class="viewer-logo-start-editor-button" onclick="startEditor()">
+        <img class="viewer-logo-img" alt="3DStreet Viewer" src="/ui_assets/3DStreet-Viewer-Start-Editor.svg">
+      </button>
+    </div>
+
+    <div class="right-fixed">
+      <ul class="right-menu">
+        <li onclick="buttonScreenshotTock()"> <a class="camera"  href="#"> <span> Capture image as PNG </span> <img src="/ui_assets/camera-icon.svg"> </a></li>
+        <li onclick="STREET.utils.inputStreetmix()"> <a class="load"  href="#"> <span> Load Streetmix URL </span> <img src="/ui_assets/streetmix-logo.svg"> </a></li>
+        <!-- <li onclick="inputJSON()"> <a class="load"  href="#"> <span> Load JSON String </span> <img src="assets/ui_assets/upload-icon.svg"> </a></li> -->
+        <li><a class="load"> <label for="inputfile" style="display: inherit; align-items: center; cursor: pointer"> <input type="file" id="inputfile" style="display:none" accept=".js, .json, .txt"> <span> Load JSON File </span> <img src="/ui_assets/upload-icon.svg"></label></a></li>
+      </ul>
+    </div>
+
+    <a-scene
+      renderer="colorManagement: true; physicallyCorrectLights: true; anisotropy: 16;"
+      inspector="url: //3dstreet.app/dist/3dstreet-editor.js"
+      notify
+      metadata
+      scene-title
+      reflection
+      >
+      <a-assets>
+        <!-- uncomment the line below to load assets from local github submodule -->
+        <!-- <street-assets url="./assets/"></street-assets>   -->
+        <!-- uncomment the line below to load all possible asset categories -->
+        <!-- <street-assets categories="sidewalk-props people people-rigged vehicles vehicles-rigged buildings intersection-props segment-textures segment-colors lane-separator stencils vehicles-transit dividers sky grounds"></street-assets>   -->
+        <!-- a reduced set of assets for non-animated streetmix streets without intersections -->
+        <street-assets categories="loud-bicycle sidewalk-props people vehicles vehicles-rigged buildings segment-textures segment-colors lane-separator stencils vehicles-transit dividers sky grounds"></street-assets>
+      </a-assets>
+
+      <a-entity id="street-container" data-layer-name="3D Street Layers" data-layer-show-children>
+        <a-entity id="default-street" street streetmix-loader="streetmixStreetURL: https://streetmix.net/kfarr/3/" set-loader-from-hash
+        position="-52.815 0 -45.027" rotation="0 45 0"></a-entity>
+      </a-entity>
+
+      <a-entity id="cameraRig" position="0 10 30" data-layer-name="Viewer" cursor-teleport="cameraRig: #cameraRig; cameraHead: #camera;" look-controls="reverseMouseDrag: true" wasd-controls="enabled: true">
+        <a-entity id="camera" camera="far: 1000" position="0 1.6 0" ></a-entity>
+        <a-entity id="leftHand" hand-controls="hand: left;" blink-controls="cameraRig: #cameraRig; teleportOrigin: #camera; rotateOnTeleport:false;"></a-entity>
+        <a-entity id="rightHand"  hand-controls="hand: right" blink-controls="cameraRig: #cameraRig; teleportOrigin: #camera; rotateOnTeleport:false;"></a-entity>
+        <a-entity id="screenshot" class="no-pause" screentock visible="false"></a-entity>
+      </a-entity>
+      <a-entity id="reference-layers" data-layer-name="Reference Layers" data-layer-show-children>
+        <a-entity
+        id="tileset"
+        loader-3dtiles="
+          url: https://tile.googleapis.com/v1/3dtiles/root.json; 
+          lat: 37.77522354250163;
+          long: -122.41931773049723;
+          height: -16.5;
+          googleApiKey: AIzaSyAQshwLVKTpwTfPJxFEkEzOdP_cgmixTCQ;
+          geoTransform: WGS84Cartesian;
+          maximumSSE: 48;
+          maximumMem: 400;
+          cameraEl: #camera">
+        </a-entity>
+
+      </a-entity>
+
+      <a-entity id="environment" data-layer-name="Environment" street-environment="preset: day;"></a-entity>
+
+
+
+    </a-scene>
+  </body>
+  <script>
+    /* loading animation script */
+    document.addEventListener('DOMContentLoaded', function () {
+      const scene = document.querySelector('a-scene');
+      const splash = document.querySelector('.loader__wrapper');
+      scene.addEventListener('loaded', function (e) {
+        setTimeout(() => {
+          splash.style.display = 'none';
+        }, 1000);        
+      });
+    });
+  </script>
+  <script>
+
+    document.getElementById('inputfile')
+            .addEventListener('change', STREET.utils.fileJSON);
+
+    function buttonScreenshotTock() {
+      const screenshotEl = document.getElementById('screenshot');
+      screenshotEl.play(); // double check playing in case we're in editor mode
+      screenshotEl.setAttribute('screentock', 'type', 'jpg');
+      screenshotEl.setAttribute('screentock', 'takeScreenshot', true);
+    }
+
+    function startEditor() {
+      var sceneEl = document.querySelector('a-scene');
+      sceneEl.components.inspector.openInspector();
+      document.querySelector('.viewer-header-wrapper').style.display = 'none';
+    }
+
+    AFRAME.registerComponent('timed-inspector', {
+      init: function() {
+        setTimeout( function () {
+          window.postMessage('INJECT_AFRAME_INSPECTOR')
+        }, this.data * 1000)
+      }
+    });  
+
+  </script>
+</html>