Merge branch 'creator-usability-epic-v1' into new-street-parser-struc…

…ture
3DStreet · Nov 6, 2023 · 013584c · 013584c
2 parents 3b3e9e8 + d5103e7
commit 013584c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/assets b/assets
diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js
@@ -388,6 +388,7 @@ function createDriveLaneElement (variantList, segmentWidthInMeters, streetLength
   let [lineVariant, direction, carType] = variantList;
   if (variantList.length === 2) {
     carType = direction;
+    direction = lineVariant;
   }
 
   const rotationVariants = {
@@ -438,6 +439,13 @@ function createDriveLaneElement (variantList, segmentWidthInMeters, streetLength
       wheelDiameter: 1.05,
       length: 6.95,
       width: 2.5
+    },
+    // autonomous vehicle
+    av: {
+      mixin: 'self-driving-cruise-car-rig',
+      wheelDiameter: 0.76,
+      length: 5.17,
+      width: 2      
     }
   };
 
@@ -489,7 +497,7 @@ function createDriveLaneElement (variantList, segmentWidthInMeters, streetLength
       }
     });
   } else {
-    createCar();
+    createCar(undefined, carType);
   }
 
   return driveLaneParentEl;

diff --git a/src/assets.js b/src/assets.js
@@ -87,6 +87,7 @@ function buildAssetHTML (assetUrl, categories) {
         <a-mixin shadow id="box-truck-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/isuzu-truck-rig.glb)"></a-mixin>
         <a-mixin shadow id="food-trailer-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/food-trailer-rig.glb)"></a-mixin>
         <a-mixin shadow id="fire-truck-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/fire-truck-pumper-rig.glb)"></a-mixin>
+        <a-mixin id="self-driving-cruise-car-rig" gltf-model="url(${assetUrl}sets/vehicles-rig/gltf-exports/draco/self-driving-cruise-car-rig.glb)"></a-mixin>
       `,
     buildings: `
         <!-- blocks -->
+ −		images/skies/2048-kloofendal_43d_clear_puresky-sdr.jpeg
+ −		images/skies/2048-kloofendal_48d_partly_cloudy_puresky-sdr.jpeg
+ −		images/skies/2048-kloofendal_misty_morning_puresky-sdr.jpeg
+ −		images/skies/2048-kloppenheim_05_puresky-sdr.jpeg
+ −		images/skies/2048-mud_road_puresky-sdr.jpeg
+ −		images/skies/2048-polyhaven-qwantani_puresky-sdr.jpeg
+ −		images/skies/2048-polyhaven-wasteland_clouds_puresky.jpeg
+ −		sets/cycles/gltf-exports/draco/cycle_1.glb
+ −		sets/cycles/gltf-exports/draco/dutch_cycle.glb
+ −		sets/cycles/gltf-exports/draco/kid_bike.glb
+ −		sets/cyclist-animation/gltf-exports/draco/cyclist-1-animation-v1.glb
+ −		sets/cyclist-animation/gltf-exports/draco/cyclist-2-animation-v1.glb
+ −		sets/cyclist-animation/gltf-exports/draco/cyclist-3-animation-v1.glb
+ −		sets/cyclist-animation/gltf-exports/draco/cyclist-4-animation-v1.glb
+ −		sets/cyclist-animation/gltf-exports/draco/cyclist-5-animation-v1.glb
+ −		sets/irish-bar-building/gltf-exports/draco/irish-bar-building.glb
+ −		sets/street-props-parklet/gltf-exports/draco/parklet.glb
+ −		sets/street-props/gltf-exports/draco/street-props.glb