From dfce1f3120b2b83c006880f9c93c7a5d76f18867 Mon Sep 17 00:00:00 2001 From: Alexander Goryushkin Date: Thu, 18 Jan 2024 22:21:44 -0300 Subject: [PATCH 1/6] add new mixins and assets in assets.js --- src/assets.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/assets.js b/src/assets.js index f59bbeb6..270854e6 100644 --- a/src/assets.js +++ b/src/assets.js @@ -53,7 +53,6 @@ function buildAssetHTML (assetUrl, categories) { 'people-rigged': ` - @@ -68,6 +67,22 @@ function buildAssetHTML (assetUrl, categories) { + + + + + + + + + + + + + + + + `, vehicles: ` From be5d2c4a920426a148f4b11eb0c1f8168542cf27 Mon Sep 17 00:00:00 2001 From: Alexander Goryushkin Date: Fri, 19 Jan 2024 15:39:48 -0300 Subject: [PATCH 2/6] delete old static characters --- src/assets.js | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/assets.js b/src/assets.js index 270854e6..514653e0 100644 --- a/src/assets.js +++ b/src/assets.js @@ -29,28 +29,7 @@ function buildAssetHTML (assetUrl, categories) { `, - people: ` - - - - - - - - - - - - - - - - - - - - `, - 'people-rigged': ` + people: ` From aa34197720062466cc5bb9d2d928ffcd26d10f81 Mon Sep 17 00:00:00 2001 From: Alexander Goryushkin Date: Fri, 19 Jan 2024 15:42:43 -0300 Subject: [PATCH 3/6] change random variantName for all chars --- src/aframe-streetmix-parsers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js index 204ed00a..1344cda4 100644 --- a/src/aframe-streetmix-parsers.js +++ b/src/aframe-streetmix-parsers.js @@ -207,7 +207,7 @@ function createSidewalkClonedVariants (segmentWidthInMeters, density, elevationP 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; From 8608ee6465a8928928be943164c9f7002006b5c0 Mon Sep 17 00:00:00 2001 From: Alexander Goryushkin Date: Fri, 19 Jan 2024 17:47:02 -0300 Subject: [PATCH 4/6] add pause for animation-mixer if not animated --- src/aframe-streetmix-parsers.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js index 1344cda4..afe4ecf6 100644 --- a/src/aframe-streetmix-parsers.js +++ b/src/aframe-streetmix-parsers.js @@ -224,6 +224,9 @@ function createSidewalkClonedVariants (segmentWidthInMeters, density, elevationP if (animated) { addLinearStreetAnimation(placedObjectEl, 1.4, streetLength, xVal, yVal, zVal, animationDirection); + } else { + // solution for pause animation-mixer animation from donmccurdy + placedObjectEl.setAttribute('animation-mixer', {timeScale: 0}); } dividerParentEl.append(placedObjectEl); } From 1facdb336af0ffdb0d5ce8cb113c6e37fcbc1c90 Mon Sep 17 00:00:00 2001 From: Alexander Goryushkin Date: Fri, 19 Jan 2024 22:13:03 -0300 Subject: [PATCH 5/6] add different speed for new chars --- src/aframe-streetmix-parsers.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js index afe4ecf6..d93ab964 100644 --- a/src/aframe-streetmix-parsers.js +++ b/src/aframe-streetmix-parsers.js @@ -202,6 +202,24 @@ 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 }); @@ -223,7 +241,8 @@ 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}); From 2a56e70f93d5a4de6ae23521cc4e9de449fe4e51 Mon Sep 17 00:00:00 2001 From: Alexander Goryushkin Date: Sat, 20 Jan 2024 12:17:03 -0300 Subject: [PATCH 6/6] change ?? operator to || node v12 on server doesn't support (??) operator --- src/aframe-streetmix-parsers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js index d93ab964..03b383cd 100644 --- a/src/aframe-streetmix-parsers.js +++ b/src/aframe-streetmix-parsers.js @@ -241,7 +241,7 @@ function createSidewalkClonedVariants (segmentWidthInMeters, density, elevationP } if (animated) { - const speed = charSpeed[variantName] ?? 1.4; + const speed = charSpeed[variantName] || 1.4; addLinearStreetAnimation(placedObjectEl, speed, streetLength, xVal, yVal, zVal, animationDirection); } else { // solution for pause animation-mixer animation from donmccurdy