Skip to content

Commit

Permalink
wow it's working!
Browse files Browse the repository at this point in the history
  • Loading branch information
kfarr committed May 18, 2024
1 parent cc06b9b commit 0444562
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 210 deletions.
45 changes: 28 additions & 17 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<!-- mapbox -->
<script src="./src/lib/aframe-mapbox-component.min.js"></script>

<!-- vr teleport controls -->
<!-- viewer controls - vr teleport -->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script>

<script>
// TODO: This should be inside of Viewer Wrapper component logic
// 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() {
Expand All @@ -32,7 +33,7 @@
})
</script>
<title>3DStreet</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<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>
Expand Down Expand Up @@ -72,34 +73,44 @@
</div>

<a-scene
renderer="colorManagement: true; physicallyCorrectLights: true; anisotropy: 16;"
inspector="url: /dist/3dstreet-editor.js"
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>
<!-- TODO: Add this to repo documentation -->
<!-- you can specify a custom asset path using below syntax -->

<!-- uncomment the line below to load assets from local github submodule -->
<!-- <street-assets url="./assets/"></street-assets> -->

<!-- you can specify a subset of categories of objects to load using below syntax -->

<!-- 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>
<!-- <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="street-container" data-layer-name="User 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="reference-layers" data-layer-name="Geospatial 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" 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="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;" 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="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>

Expand All @@ -120,7 +131,7 @@
<script>

document.getElementById('inputfile')
.addEventListener('change', STREET.utils.fileJSON);
.addEventListener('change', STREET.utils.fileJSON);

function buttonScreenshotTock() {
const screenshotEl = document.getElementById('screenshot');
Expand All @@ -136,12 +147,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> -->
</html>
193 changes: 0 additions & 193 deletions legacy-editor-repo/index.html

This file was deleted.

0 comments on commit 0444562

Please sign in to comment.