Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

Commit

Permalink
build for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@kfarr
kfarr committed Feb 21, 2024
1 parent 18e0cc3 commit 3d79e12
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dist/3dstreet-editor.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/3dstreet-editor.js.map
View file

Large diffs are not rendered by default.

12 changes: 1 addition & 11 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html><html><head><script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script><script src="https://github.3dstreet.org/dist/aframe-street-component.js"></script><script src="https://github.3dstreet.org/src/lib/aframe-mapbox-component.min.js"></script><script src="https://github.3dstreet.org/src/json-utils.js"></script><script src="https://github.3dstreet.org/src/components/ocean-plane.js"></script><title>3DStreet</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="./assets/favicon.ico"><link rel="stylesheet" href="//github.3dstreet.org/src/viewer-styles.css"><script defer="defer" src="/3dstreet-editor.js"></script></head><body><div class="loader__wrapper"><div class="loader"><div class="entities"><img src="//github.3dstreet.org/ui_assets/loader/entities.svg" alt="entities"/></div><div class="transport"><div class="wrapper__transport"><img src="//github.3dstreet.org/ui_assets/loader/car.svg" class="car" alt="car"/> <img src="//github.3dstreet.org/ui_assets/loader/bus.svg" class="bus" alt="bus"/> <img src="//github.3dstreet.org/ui_assets/loader/bike.svg" class="bike" alt="bike"/></div></div><div class="road">Loading 3DStreet</div></div></div><div class="viewer-header-wrapper"><button class="viewer-logo-start-editor-button" onclick="startEditor()"><img class="viewer-logo-img" alt="3DStreet Viewer" src="./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 JPG </span><img src="//github.3dstreet.org/ui_assets/camera-icon.svg"></a></li><li onclick="inputStreetmix()"><a class="load" href="#"><span>Load Streetmix URL </span><img src="//github.3dstreet.org/ui_assets/streetmix-logo.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="//github.3dstreet.org/ui_assets/upload-icon.svg"></label></a></li><li><a id="custom-enter-vr-button" class="vr" href="#"><span class="vr">Enter VR mode</span> <img src="//github.3dstreet.org/ui_assets/vr-icon.svg"></a></li></ul></div><a-scene vr-mode-ui="enterVRButton: #custom-enter-vr-button;" vr-mode-ui-if-headset renderer="colorManagement: true; physicallyCorrectLights: true;" inspector="url: ./dist/3dstreet-editor.js" timed-inspector="1" loading-screen="enabled: false" notify="ripple: false" metadata><a-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 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-entity id="cameraRig" 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; handModelStyle: lowPoly; color: #ffccff" teleport-controls="cameraRig: #cameraRig; button: trigger"></a-entity><a-entity id="rightHand" hand-controls="hand: right; handModelStyle: lowPoly; color: #ffccff" teleport-controls="cameraRig: #cameraRig; button: trigger"></a-entity><a-entity id="screenshot" class="no-pause" screentock visible="false"></a-entity></a-entity></a-scene></body><script>/* loading animation script */
<!doctype html><html><head><script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script><script src="https://github.3dstreet.org/dist/aframe-street-component.js"></script><script src="https://github.3dstreet.org/src/lib/aframe-mapbox-component.min.js"></script><script src="https://github.3dstreet.org/src/json-utils.js"></script><title>3DStreet</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="./assets/favicon.ico"><link rel="stylesheet" href="//github.3dstreet.org/src/viewer-styles.css"><script defer="defer" src="/3dstreet-editor.js"></script></head><body><div class="loader__wrapper"><div class="loader"><div class="entities"><img src="//github.3dstreet.org/ui_assets/loader/entities.svg" alt="entities"/></div><div class="transport"><div class="wrapper__transport"><img src="//github.3dstreet.org/ui_assets/loader/car.svg" class="car" alt="car"/> <img src="//github.3dstreet.org/ui_assets/loader/bus.svg" class="bus" alt="bus"/> <img src="//github.3dstreet.org/ui_assets/loader/bike.svg" class="bike" alt="bike"/></div></div><div class="road">Loading 3DStreet</div></div></div><div class="viewer-header-wrapper"><button class="viewer-logo-start-editor-button" onclick="startEditor()"><img class="viewer-logo-img" alt="3DStreet Viewer" src="./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 JPG </span><img src="//github.3dstreet.org/ui_assets/camera-icon.svg"></a></li><li onclick="inputStreetmix()"><a class="load" href="#"><span>Load Streetmix URL </span><img src="//github.3dstreet.org/ui_assets/streetmix-logo.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="//github.3dstreet.org/ui_assets/upload-icon.svg"></label></a></li></ul></div><a-scene renderer="colorManagement: true; physicallyCorrectLights: true; anisotropy: 16;" inspector="url: ./dist/3dstreet-editor.js" timed-inspector="1" loading-screen="enabled: false" notify metadata scene-title reflection><a-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 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-entity id="cameraRig" 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; handModelStyle: lowPoly; color: #ffccff" teleport-controls="cameraRig: #cameraRig; button: trigger"></a-entity><a-entity id="rightHand" hand-controls="hand: right; handModelStyle: lowPoly; color: #ffccff" teleport-controls="cameraRig: #cameraRig; button: trigger"></a-entity><a-entity id="screenshot" class="no-pause" screentock visible="false"></a-entity></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');
Expand All @@ -10,16 +10,6 @@
});</script><script>document.getElementById('inputfile')
.addEventListener('change', fileJSON);

// only show VR button if headset connected
AFRAME.registerComponent('vr-mode-ui-if-headset', {
dependencies: ['vr-mode-ui'],
init: function () {
if (!AFRAME.utils.device.checkHeadsetConnected()) {
this.el.setAttribute('vr-mode-ui', 'enabled', false);
}
}
})

function buttonScreenshotTock() {
const screenshotEl = document.getElementById('screenshot');
screenshotEl.play(); // double check playing in case we're in editor mode
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>

<!-- 3dstreet -->
<script src="https://github.3dstreet.org/dist/aframe-street-component.js"></script>
<script src="https://cdn.jsdelivr.net/npm/3dstreet@0.4.6/dist/aframe-street-component.min.js"></script>

<!-- user controls - vr teleport -->

Expand Down

0 comments on commit 3d79e12

Please sign in to comment.