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

Commit

Permalink
predeploy index update
Browse files Browse the repository at this point in the history
  • Loading branch information
@kfarr
kfarr committed Mar 29, 2024
1 parent 7913e0d commit 829409b
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 55 deletions.
20 changes: 7 additions & 13 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!doctype html><html><head><script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script><script src="https://cdn.jsdelivr.net/npm/3dstreet@0.4.11/dist/aframe-street-component.min.js"></script><script src="https://github.3dstreet.org/src/lib/aframe-mapbox-component.min.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="STREET.utils.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; logarithmicDepthBuffer: true;" 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 */
<!doctype html><html><head><script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script><script src="https://cdn.jsdelivr.net/npm/3dstreet@0.4.12/dist/aframe-street-component.min.js"></script><script src="https://cdn.jsdelivr.net/npm/3dstreet@0.4.12/src/lib/aframe-mapbox-component.min.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="STREET.utils.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; logarithmicDepthBuffer: true;" 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');
scene.addEventListener('loaded', function (e) {
setTimeout(() => {
splash.style.display = 'none';
}, 1000);
}, 1000);
});
});</script><script>document.getElementById('inputfile')
.addEventListener('change', STREET.utils.fileJSON);
Expand All @@ -24,15 +24,9 @@
}

AFRAME.registerComponent('timed-inspector', {
init: function() {
setTimeout( function () {
window.postMessage('INJECT_AFRAME_INSPECTOR')
}, this.data * 1000)
init: function () {
setTimeout(function () {
window.postMessage('INJECT_AFRAME_INSPECTOR');
}, this.data * 1000);
}
});</script><script async src="https://www.googletagmanager.com/gtag/js?id=G-T65XPDLZ3F"></script><script>window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-T65XPDLZ3F');

gtag('event', 'ga_init');</script></html>
});</script></html>
140 changes: 98 additions & 42 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,45 @@
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>

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

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

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

<title>3DStreet</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/x-icon" href="./assets/favicon.ico">
<link rel="stylesheet" href="//github.3dstreet.org/src/viewer-styles.css">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/x-icon" href="./assets/favicon.ico" />
<link rel="stylesheet" href="//github.3dstreet.org/src/viewer-styles.css" />
</head>

<body>
<div class="loader__wrapper">
<div class="loader">
<div class="entities">
<img src="//github.3dstreet.org/ui_assets/loader/entities.svg" alt="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" />
<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>
Expand All @@ -38,7 +53,11 @@
<!-- 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="./assets/3DStreet-Viewer-Start-Editor.svg">
<img
class="viewer-logo-img"
alt="3DStreet Viewer"
src="./assets/3DStreet-Viewer-Start-Editor.svg"
/>
</button>
</div>

Expand All @@ -47,7 +66,22 @@
<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="STREET.utils.inputStreetmix()"> <a class="load" href="#"> <span> Load Streetmix URL </span> <img src="//github.3dstreet.org/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="//github.3dstreet.org/ui_assets/upload-icon.svg"></label></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>

Expand All @@ -66,21 +100,56 @@
<!-- <streetmix-assets url="./assets/"></streetmix-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
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="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
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>
Expand All @@ -91,7 +160,7 @@
scene.addEventListener('loaded', function (e) {
setTimeout(() => {
splash.style.display = 'none';
}, 1000);
}, 1000);
});
});
</script>
Expand All @@ -113,25 +182,12 @@
}

AFRAME.registerComponent('timed-inspector', {
init: function() {
setTimeout( function () {
window.postMessage('INJECT_AFRAME_INSPECTOR')
}, this.data * 1000)
init: function () {
setTimeout(function () {
window.postMessage('INJECT_AFRAME_INSPECTOR');
}, this.data * 1000);
}
});

});
</script>
<!-- <script src="./dist/3dstreet-editor.js"></script> -->

<!-- Google Analytics - Global site tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-T65XPDLZ3F"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-T65XPDLZ3F');

gtag('event', 'ga_init');
</script>
</html>

0 comments on commit 829409b

Please sign in to comment.