diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js
index 204ed00a5..03b383cd5 100644
--- a/src/aframe-streetmix-parsers.js
+++ b/src/aframe-streetmix-parsers.js
@@ -202,12 +202,30 @@ function createSidewalkClonedVariants (segmentWidthInMeters, density, elevationP
normal: 0.125,
dense: 0.25
};
+
+ // the speed for some pedestrian models is different
+ const charSpeed = {
+ // baby-stroller-walk
+ a_char10: 1,
+ // wheel-chair
+ a_char11: 1,
+ // walker-walk
+ a_char12: 0.2,
+ // kid-scooter
+ a_char13: 2,
+ // kid-walk
+ a_char14: 0.8,
+ // blind-cane-walk
+ a_char15: 1,
+ // cart-walk
+ a_char16: 1.2
+ }
const totalPedestrianNumber = parseInt(densityFactors[density] * streetLength, 10);
const dividerParentEl = createParentElement('pedestrians-parent');
dividerParentEl.setAttribute('position', { y: elevationPosY });
// Randomly generate avatars
for (let i = 0; i < totalPedestrianNumber; i++) {
- const variantName = (animated === true) ? 'a_char' + String(getRandomIntInclusive(1, 8)) : 'char' + String(getRandomIntInclusive(1, 16));
+ const variantName = 'a_char' + String(getRandomIntInclusive(1, 16));
const xVal = getRandomArbitrary(xValueRange[0], xValueRange[1]);
const zVal = zValueRange.pop();
const yVal = 0;
@@ -223,7 +241,11 @@ function createSidewalkClonedVariants (segmentWidthInMeters, density, elevationP
}
if (animated) {
- addLinearStreetAnimation(placedObjectEl, 1.4, streetLength, xVal, yVal, zVal, animationDirection);
+ const speed = charSpeed[variantName] || 1.4;
+ addLinearStreetAnimation(placedObjectEl, speed, streetLength, xVal, yVal, zVal, animationDirection);
+ } else {
+ // solution for pause animation-mixer animation from donmccurdy
+ placedObjectEl.setAttribute('animation-mixer', {timeScale: 0});
}
dividerParentEl.append(placedObjectEl);
}
diff --git a/src/assets.js b/src/assets.js
index f59bbeb68..514653e02 100644
--- a/src/assets.js
+++ b/src/assets.js
@@ -29,31 +29,9 @@ function buildAssetHTML (assetUrl, categories) {
`,
- people: `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- `,
- 'people-rigged': `
+ people: `
-
@@ -68,6 +46,22 @@ function buildAssetHTML (assetUrl, categories) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`,
vehicles: `