Merge pull request #836 from 3DStreet/use-bollards-instead-of-safehit

Use bollards instead of safehit
3DStreet · Sep 5, 2024 · 54a2fa1 · 54a2fa1
2 parents acbd23d + 74d4fe3
commit 54a2fa1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/assets b/assets
diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js
@@ -214,9 +214,9 @@ function createTracksParentElement(length, objectMixinId) {
   return placedObjectEl;
 }
 
-function createSafehitsParentElement() {
+function createBollardsParentElement() {
   const placedObjectEl = document.createElement('a-entity');
-  placedObjectEl.setAttribute('class', 'safehit-parent');
+  placedObjectEl.setAttribute('class', 'bollard-parent');
   return placedObjectEl;
 }
 
@@ -1163,16 +1163,16 @@ function processSegments(
       }
     } else if (segments[i].type === 'divider' && variantList[0] === 'bollard') {
       groundMixinId = 'divider';
-      // make some safehits
-      const safehitsParentEl = createSafehitsParentElement();
+      // make some bollards
+      const bollardsParentEl = createBollardsParentElement();
       cloneMixinAsChildren({
-        objectMixinId: 'safehit',
-        parentEl: safehitsParentEl,
+        objectMixinId: 'bollard',
+        parentEl: bollardsParentEl,
         step: 4,
         radius: clonedObjectRadius
       });
-      // add the safehits to the segment parent
-      segmentParentEl.append(safehitsParentEl);
+      // add the bollards to the segment parent
+      segmentParentEl.append(bollardsParentEl);
       repeatCount[0] = 1;
       repeatCount[1] = parseInt(length) / 4;
     } else if (segments[i].type === 'divider' && variantList[0] === 'flowers') {

diff --git a/src/assets.js b/src/assets.js
@@ -201,7 +201,8 @@ function buildAssetHTML(assetUrl, categories) {
         <a-mixin shadow id="dividers-planter-box" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: planter-box"></a-mixin>
         <a-mixin shadow id="dividers-bush" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: bush"></a-mixin>
         <a-mixin shadow id="dividers-dome" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: dome"></a-mixin>
-        <a-mixin shadow id="safehit" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: bollard"></a-mixin>
+        <a-mixin shadow id="safehit" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: safehit"></a-mixin>
+        <a-mixin shadow id="bollard" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: bollard"></a-mixin>
         <a-mixin shadow id="temporary-barricade" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: barricade"></a-mixin>
         <a-mixin shadow id="temporary-traffic-cone" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: traffic-cone"></a-mixin>
         <a-mixin shadow id="temporary-jersey-barrier-plastic" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: jersey-barrier-plastic"></a-mixin>