Merge pull request #1001 from 3DStreet/Converting-default-streets-to-…

…Managed-Street-format Converting default streets to managed street format
3DStreet · Jan 2, 2025 · 455705d · 455705d
2 parents 73566e0 + 76a0c0f
commit 455705d
Show file tree

Hide file tree

Showing 7 changed files with 1,256 additions and 22 deletions.
diff --git a/src/assets.js b/src/assets.js
@@ -147,6 +147,7 @@ function buildAssetHTML(assetUrl, categories) {
         <img id="striping-dashed-stripe" src="${assetUrl}materials/striping-dashed-stripe-128-1024.webp" crossorigin="anonymous" />
         <img id="striping-solid-double" src="${assetUrl}materials/striping-solid-double-256-1024.webp" crossorigin="anonymous" />
         <img id="striping-solid-dashed" src="${assetUrl}materials/striping-solid-dashed-256-1024.webp" crossorigin="anonymous" />
+        <img id="striping-solid-dashed-mirror" src="${assetUrl}materials/striping-solid-dashed-mirror-256-1024.webp" crossorigin="anonymous" />
         <img id="striping-crosswalk-zebra" src="${assetUrl}materials/striping-solid-dashed-256-1024.webp" crossorigin="anonymous" />
         <!-- legacy lane separator markings using atlas uv -->
         <img id="markings-atlas" src="${assetUrl}materials/lane-markings-atlas_1024.png" crossorigin="anonymous" />

diff --git a/src/components/street-generated-striping.js b/src/components/street-generated-striping.js
@@ -116,6 +116,10 @@ AFRAME.registerComponent('street-generated-striping', {
       stripingTextureId = 'striping-solid-dashed';
       color = '#f7d117';
       stripingWidth = 0.4;
+    } else if (stripingName === 'solid-dashed-yellow-mirror') {
+      stripingTextureId = 'striping-solid-dashed-mirror';
+      color = '#f7d117';
+      stripingWidth = 0.4;
     }
     return { stripingTextureId, repeatY, color, stripingWidth };
   }

diff --git a/src/components/street-segment.js b/src/components/street-segment.js
@@ -223,20 +223,23 @@ AFRAME.registerComponent('street-segment', {
     if (componentsToGenerate?.stencil?.length > 0) {
       componentsToGenerate.stencil.forEach((clone, index) => {
         if (clone?.stencils?.length > 0) {
+          // case where there are multiple stencils such as bus-only
           this.el.setAttribute(`street-generated-stencil__${index}`, {
             stencils: clone.stencils,
             length: this.data.length,
             spacing: clone.spacing,
-            direction: this.data.direction,
-            padding: clone.padding
+            direction: clone.direction ?? this.data.direction,
+            padding: clone.padding,
+            cycleOffset: clone.cycleOffset
           });
         } else {
           this.el.setAttribute(`street-generated-stencil__${index}`, {
             model: clone.model,
             length: this.data.length,
             spacing: clone.spacing,
-            direction: this.data.direction,
-            count: clone.count
+            direction: clone.direction ?? this.data.direction,
+            count: clone.count,
+            cycleOffset: clone.cycleOffset
           });
         }
       });

diff --git a/src/editor/components/components/AddLayerPanel/AddLayerPanel.module.scss b/src/editor/components/components/AddLayerPanel/AddLayerPanel.module.scss
@@ -74,6 +74,10 @@
 
     .description {
       color: rgba(182, 182, 182, 1);
+      max-width: 182px; // Same as image width
+      word-wrap: break-word;
+      overflow-wrap: break-word;
+      white-space: normal;
     }
   }
 

diff --git a/src/editor/components/components/AddLayerPanel/createLayerFunctions.js b/src/editor/components/components/AddLayerPanel/createLayerFunctions.js
@@ -151,6 +151,50 @@ export function create60ftRightOfWayManagedStreet(position) {
   );
 }
 
+export function create40ftRightOfWayManagedStreet(position) {
+  console.log(
+    'create40ftRightOfWayManagedStreet',
+    defaultStreetObjects.stroad40ftROW
+  );
+  createManagedStreetFromStreetObject(
+    position,
+    defaultStreetObjects.stroad40ftROW
+  );
+}
+
+export function create80ftRightOfWayManagedStreet(position) {
+  console.log(
+    'create80ftRightOfWayManagedStreet',
+    defaultStreetObjects.stroad80ftROW
+  );
+  createManagedStreetFromStreetObject(
+    position,
+    defaultStreetObjects.stroad80ftROW
+  );
+}
+
+export function create94ftRightOfWayManagedStreet(position) {
+  console.log(
+    'create94ftRightOfWayManagedStreet',
+    defaultStreetObjects.stroad94ftROW
+  );
+  createManagedStreetFromStreetObject(
+    position,
+    defaultStreetObjects.stroad94ftROW
+  );
+}
+
+export function create150ftRightOfWayManagedStreet(position) {
+  console.log(
+    'create150ftRightOfWayManagedStreet',
+    defaultStreetObjects.stroad150ftROW
+  );
+  createManagedStreetFromStreetObject(
+    position,
+    defaultStreetObjects.stroad150ftROW
+  );
+}
+
 export function create80ftRightOfWay(position) {
   createStreetmixStreet(
     position,