Merge pull request #214 from ctrlaltdavid/fix/skeleton-data

Fix avatar skeleton data handling
vircadia · Sep 26, 2022 · b76ee0f · b76ee0f
2 parents 2650612 + 57f7ada
commit b76ee0f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/domain/avatars/AvatarData.ts b/src/domain/avatars/AvatarData.ts
@@ -375,7 +375,7 @@ class AvatarData extends SpatiallyNestable {
 
         // Need to call markTraitUpdated() here because there is no equivalent of C++'s Rig and sendSkeletonData().
         if (this._clientTraitsHandler) {
-            this._clientTraitsHandler.markTraitUpdated(AvatarTraits.SkeletonModelURL);
+            this._clientTraitsHandler.markTraitUpdated(AvatarTraits.SkeletonData);
         }
 
         this.#_avatarSkeletonData = skeletonData;

diff --git a/src/domain/avatars/AvatarTraits.ts b/src/domain/avatars/AvatarTraits.ts
@@ -128,7 +128,7 @@ const AvatarTraits = new class {
      *  An avatar trait.
      *  @typedef {object} AvatarTraits.AvatarTraitValue
      *  @property {AvatarTraits.TraitType} type - The type of trait.
-     *  @property {number} version - The version number of the trait value for the avatar's connection to the avcatar mixer.
+     *  @property {number} version - The version number of the trait value for the avatar's connection to the avatar mixer.
      *      This is incremented each time that the trait value is changed.
      *  @property {AvatarTraits.TraitValue} value - The trait value.
      */

diff --git a/src/domain/avatars/ClientTraitsHandler.ts b/src/domain/avatars/ClientTraitsHandler.ts
@@ -96,7 +96,7 @@ class ClientTraitsHandler {
         // C++ void markTraitUpdated(AvatarTraits::TraitType updatedTrait)
 
         // WEBRTC TODO: Enable other trait types.
-        if (updatedTrait !== AvatarTraits.SkeletonModelURL) {
+        if (updatedTrait !== AvatarTraits.SkeletonModelURL && updatedTrait !== AvatarTraits.SkeletonData) {
             console.error("Trait not implemented for updating:", updatedTrait);
             return;
         }

diff --git a/src/domain/networking/packets/SetAvatarTraits.ts b/src/domain/networking/packets/SetAvatarTraits.ts
@@ -36,6 +36,7 @@ const SetAvatarTraits = new class {
      *  @property {number} currentTraitVersion - Trait sending sequence number. This should be incremented for each
      *      <code>SetAvatarTraits</code> packet written.
      *  @property {string} skeletonModelURL - The URL of the avatar's FST, glTF, or FBX model file.
+     *  @property {SkeletonJoint[]} skeletonData - The avatar's skeleton.
      *  @property {ClientTraitStatus[]} traitStatuses - The status of each avatar trait.
      *  @property {boolean} initialSend - <code>true</code> to send all traits, <code>false</code> to send only those that have
      *      been updated.