add support for arcade and compound-wall

3DStreet · Nov 12, 2023 · 883f0c6 · 883f0c6
1 parent 913bf1e
commit 883f0c6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js
@@ -1143,6 +1143,8 @@ function processBuildings (left, right, streetWidth, showGround, length) {
         residential: 'ground-grass-material',
         narrow: 'ground-asphalt-material',
         wide: 'ground-asphalt-material',
+        arcade: 'ground-tiled-concrete-material',
+        'compound-wall': 'ground-asphalt-material'
       }
 
       if (currentValue === 'waterfront') {
@@ -1208,15 +1210,22 @@ function processBuildings (left, right, streetWidth, showGround, length) {
     newBuildings.setAttribute('position', buildingPos);
     buildingElement.append(newBuildings);
 
-    if (currentValue === 'waterfront') {
+    if (currentValue === 'waterfront' || currentValue === 'compound-wall') {
       const objectPositionX = buildingPositionX - (sideMultiplier * 150 / 2);
       const placedObjectEl = document.createElement('a-entity');
       placedObjectEl.setAttribute('class', 'seawall-parent');
-      placedObjectEl.setAttribute('position', objectPositionX + ' 0 4.5'); // position="1.043 0.100 -3.463"
+      placedObjectEl.setAttribute('position', {x: objectPositionX, z: 4.5}); // position="1.043 0.100 -3.463"
+      let rotationCloneY;
+      if (currentValue === 'compound-wall') {
+        placedObjectEl.setAttribute('position', {y: 3});
+        placedObjectEl.setAttribute('position', {x: objectPositionX + 1.5 * sideMultiplier});
+        rotationCloneY = (side === 'left') ? 90 : -90;
+      } else {
+        rotationCloneY = (side === 'left') ? -90 : 90;
+      }
       placedObjectEl.classList.add('seawall-parent-' + side);
       buildingElement.appendChild(placedObjectEl);
       // clone a bunch of seawalls under the parent
-      const rotationCloneY = (side === 'left') ? -90 : 90;
       cloneMixinAsChildren({ objectMixinId: 'seawall', parentEl: placedObjectEl, rotation: '0 ' + rotationCloneY + ' 0', step: 15, radius: clonedObjectRadius });
     }
 

diff --git a/src/assets.js b/src/assets.js
@@ -217,7 +217,7 @@ function buildAssetHTML (assetUrl, categories) {
         <a-mixin shadow id="ground-grass-material" material="src:#grass-texture;repeat:2.5 5;roughness:${surfacesRoughness}"></a-mixin>
         <a-mixin shadow id="ground-parking-lot-material" material="src:#parking-lot-texture;repeat:.5 2;roughness:${surfacesRoughness}"></a-mixin>
         <a-mixin shadow id="ground-asphalt-material" material="src:#asphalt-texture;repeat:5 5;roughness:${surfacesRoughness}"></a-mixin>
-        <a-mixin shadow id="ground-tiled-concrete-material" material="src:#seamless-sidewalk;repeat:5 5;roughness:${surfacesRoughness}"></a-mixin>
+        <a-mixin shadow id="ground-tiled-concrete-material" material="src:#seamless-sidewalk;repeat:10 20;roughness:${surfacesRoughness}"></a-mixin>
 
         <a-asset-item id="fence-model" src="${assetUrl}sets/fences/gltf-exports/draco/fence4.glb"></a-asset-item>
         <a-mixin shadow id="fence" gltf-model="#fence-model" scale="0.1 0.1 0.1"></a-mixin>