Merge pull request #26 from TheNexusCity/footsteps-vehicle-metabot-25

Disable Footsteps sound while on vehicle #25
webaverse · Apr 18, 2022 · 40dbea0 · 40dbea0
2 parents 7239341 + 3236db4
commit 40dbea0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/character-controller.js b/character-controller.js
@@ -1091,8 +1091,10 @@ class LocalPlayer extends UninterpolatedPlayer {
   updateAvatar(timestamp, timeDiff) {
     if (this.avatar) {
       const timeDiffS = timeDiff / 1000;
-      this.characterSfx?.update(timestamp, timeDiffS);
-      this.characterFx?.update(timestamp, timeDiffS);
+
+      const actions = this.getActionsState()
+      this.characterSfx.update(timestamp, timeDiffS, actions);
+      this.characterFx.update(timestamp, timeDiffS);
 
       this.updateInterpolation(timeDiff);
 

diff --git a/character-sfx.js b/character-sfx.js
@@ -77,11 +77,19 @@ class CharacterSfx {
 
     this.oldNarutoRunSound = null;
   }
-  update(timestamp, timeDiffS) {
+  update(timestamp, timeDiffS, actions = []) {
     if (!this.player.avatar) {
       return;
     }
 
+    //check current actions has sit action
+    let hasSitAction = false
+    for (const action of actions) {
+      if (action.type === 'sit') {
+        hasSitAction = true
+      }
+    }
+
     const timeSeconds = timestamp/1000;
     const currentSpeed = localVector.set(this.player.avatar.velocity.x, 0, this.player.avatar.velocity.z).length();
 
@@ -190,7 +198,10 @@ class CharacterSfx {
         this.lastWalkTime = timeSeconds;
       }
     };
-    _handleStep();
+
+    if (!hasSitAction) {
+      _handleStep();
+    }
 
     const _handleNarutoRun = () => {