Merge pull request #395 from 3DStreet/creator-usability-epic-v1

Creator usability epic v1
3DStreet · Nov 30, 2023 · a83de64 · a83de64
2 parents 911d732 + 2fe79f1
commit a83de64
Show file tree

Hide file tree

Showing 15 changed files with 817 additions and 536 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,13 +3,20 @@
 We welcome community contributions to 3DStreet.
 
 ## Release checklist for this repo:
-- Bump the version on package.json & package-lock.json (for example from 0.4.1 to 0.4.2)
-- Update CHANGELOG.md with "Major improvement" changes summary (low level commits will be automatically generated by github in a later step) you can see notes of changes since last release on [this view](https://github.com/3DStreet/3dstreet/releases/tag/0.4.1)
+- After all testing is done and things work well enough for a release.
+- Bump the version on package.json & package-lock.json (for example from 0.4.2 to 0.4.4)
 - Re-run npm run dist (rerun the build, it hardcodes the version into global var used for console log)
 - Commit this all to the repo
-- Create a new release here: https://github.com/3DStreet/3dstreet/releases/new. Choose a tag, type in the new version such as "0.4.2" and for the title simply use the new version such as "0.4.2". Click "generate release notes." Copy and paste the "Major improvements" from the above summary above the generated release notes below.
+- Use command line to create new tag for new version `git tag 0.4.4` and `git push --tags`
+- Create a new release here: https://github.com/3DStreet/3dstreet/releases/new. Choose the tag you just created. (If needed for the title simply use the new version such as "0.4.4")
+- Click to automatically "generate release notes." Consider summarizing a few key changes to put at the top.
+- Use those summaries to update CHANGELOG.md in this repo with "Major improvement" changes summary and link to the new release for detailed changes
+- Update https://www.3dstreet.org/docs/development/releases/ with summary of major improvements and linking back to the new release on github.
 - Then to run npm publish after all github version stuff works
 
+## Updating assets submodule:
+- from the repo's root directory run `git submodule update --remote` to update the assets submodule
+
 ## Contribution Instructions
 * fork the repo
 * make your contribution

diff --git a/assets b/assets
diff --git a/dist/aframe-street-component.js b/dist/aframe-street-component.js
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <!-- aframe -->
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
 
     <!-- 3dstreet -->
     <script src="./dist/aframe-street-component.js"></script>
@@ -14,7 +14,7 @@
     <script src="./src/json-utils.js"></script>
 
     <!-- ocean -->
-    <script src="./src/components/ocean-plane.js"></script>
+    <script src="./src/components/ocean.js"></script>
 
     <!-- vr teleport controls -->
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script>
@@ -74,19 +74,16 @@
         <li onclick="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>
-        <li> <a id="custom-enter-vr-button" class="vr" href="#"> <span class="vr">Enter VR mode</span> <img src="ui_assets/vr.svg"> </a></li>
-        <li> <a id="custom-enter-ar-button" class="ar" href="#"> <span class="ar">Enter AR mode</span> <img src="ui_assets/ar.svg"> </a></li>
       </ul>
     </div>
 
     <a-scene
-      vr-mode-ui="enterVRButton: #custom-enter-vr-button; enterARButton: #custom-enter-ar-button;"
-      vr-mode-ui-if-headset
       renderer="colorManagement: true; physicallyCorrectLights: true;"
       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 -->
@@ -97,21 +94,21 @@
         <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 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" 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="environment" data-layer-name="Environment" street-environment="preset: day;"></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-scene>
   </body>
   <script>
@@ -131,16 +128,6 @@
     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

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "3dstreet",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Web-based 3D visualization of streets using A-Frame and WebXR",
   "main": "dist/aframe-street-component.js",
   "scripts": {