Fix up LLAnimation to do the right thing - 0.8.7

Author: casperwardensl

lib/classes/LLAnimation.ts

@@ -61,7 +61,7 @@ export class LLAnimation
         for (let x = 0; x < this.jointCount; x++)
         {
             const joint = new LLAnimationJoint();
-            joint.readFromBuffer(buf, this.inPoint, this.outPoint);
+            joint.readFromBuffer(buf, this.length);
             this.joints.push(joint);
         }
 
@@ -101,11 +101,11 @@ export class LLAnimation
         writer.writeFloatLE(this.easeInTime);
         writer.writeFloatLE(this.easeOutTime);
         writer.writeUInt32LE(this.handPose);
-        writer.writeUInt32LE(this.jointCount);
+        writer.writeUInt32LE(this.joints.length);
 
         for (const joint of this.joints)
         {
-            joint.writeToBuffer(writer, this.inPoint, this.outPoint);
+            joint.writeToBuffer(writer, this.length);
         }
 
         writer.writeInt32LE(this.constraints.length);

lib/classes/LLAnimationJoint.ts

@@ -1,9 +1,12 @@
-import { LLAnimationJointKeyFrame } from "./LLAnimationJointKeyFrame";
+import { LLAnimationJointKeyFrame } from './LLAnimationJointKeyFrame';
 import type { BinaryReader } from './BinaryReader';
-import { Utils } from "./Utils";
+import { Utils } from './Utils';
 import { Vector3 } from './Vector3';
+import { Quaternion } from './Quaternion';
 import type { BinaryWriter } from './BinaryWriter';
 
+const LL_MAX_PELVIS_OFFSET = 5.0;
+
 export class LLAnimationJoint
 {
     public name: string;
@@ -16,7 +19,7 @@ export class LLAnimationJoint
     public positionKeyframes: LLAnimationJointKeyFrame[] = [];
 
 
-    public readFromBuffer(buf: BinaryReader, inPoint: number, outPoint: number): void
+    public readFromBuffer(buf: BinaryReader, duration: number): void
     {
         this.name = buf.readCString();
         this.priority = buf.readInt32LE();
@@ -25,11 +28,13 @@ export class LLAnimationJoint
         for (let frameNum = 0; frameNum < this.rotationKeyframeCount; frameNum++)
         {
             const jointKF = new LLAnimationJointKeyFrame();
-            jointKF.time = Utils.UInt16ToFloat(buf.readUInt16LE(), inPoint, outPoint);
-            const x = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0);
-            const y = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0);
-            const z = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0);
-            jointKF.transform = new Vector3([x, y, z]);
+            jointKF.time = Utils.UInt16ToFloat(buf.readUInt16LE(), 0.0, duration, false);
+            const x = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0, false);
+            const y = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0, false);
+            const z = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0, false);
+            const remainder = 1.0 - (x * x) - (y * y) - (z * z);
+            const w = remainder > 0.0 ? Math.sqrt(remainder) : 0.0;
+            jointKF.transform = new Quaternion([x, y, z, w]);
             this.rotationKeyframes.push(jointKF);
         }
 
@@ -38,35 +43,35 @@ export class LLAnimationJoint
         for (let frameNum = 0; frameNum < this.positionKeyframeCount; frameNum++)
         {
             const jointKF = new LLAnimationJointKeyFrame();
-            jointKF.time = Utils.UInt16ToFloat(buf.readUInt16LE(), inPoint, outPoint);
-            const x = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0);
-            const y = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0);
-            const z = Utils.UInt16ToFloat(buf.readUInt16LE(), -1.0, 1.0);
+            jointKF.time = Utils.UInt16ToFloat(buf.readUInt16LE(), 0.0, duration, false);
+            const x = Utils.UInt16ToFloat(buf.readUInt16LE(), -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET, false);
+            const y = Utils.UInt16ToFloat(buf.readUInt16LE(), -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET, false);
+            const z = Utils.UInt16ToFloat(buf.readUInt16LE(), -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET, false);
             jointKF.transform = new Vector3([x, y, z]);
             this.positionKeyframes.push(jointKF);
         }
     }
 
-    public writeToBuffer(writer: BinaryWriter, inPoint: number, outPoint: number): void
+    public writeToBuffer(writer: BinaryWriter, duration: number): void
     {
         writer.writeCString(this.name);
         writer.writeInt32LE(this.priority);
-        writer.writeInt32LE(this.rotationKeyframeCount);
+        writer.writeInt32LE(this.rotationKeyframes.length);
         for (const keyframe of this.rotationKeyframes)
         {
-            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.time, inPoint, outPoint));
+            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.time, 0.0, duration));
             writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.x, -1.0, 1.0));
             writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.y, -1.0, 1.0));
             writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.z, -1.0, 1.0));
         }
 
-        writer.writeInt32LE(this.positionKeyframeCount);
+        writer.writeInt32LE(this.positionKeyframes.length);
         for (const keyframe of this.positionKeyframes)
         {
-            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.time, inPoint, outPoint));
-            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.x, -1.0, 1.0));
-            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.y, -1.0, 1.0));
-            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.z, -1.0, 1.0));
+            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.time, 0.0, duration));
+            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.x, -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET));
+            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.y, -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET));
+            writer.writeUInt16LE(Utils.FloatToUInt16(keyframe.transform.z, -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET));
         }
     }
 }

lib/classes/LLAnimationJointKeyFrame.ts

@@ -1,8 +1,8 @@
 import type { Vector3 } from './Vector3';
+import type { Quaternion } from './Quaternion';
 
 export class LLAnimationJointKeyFrame
 {
     public time: number;
-    public transform: Vector3;
+    public transform: Vector3 | Quaternion;
 }
-

lib/index.ts

@@ -89,6 +89,9 @@ import { LLWearable } from './classes/LLWearable';
 import { ParticleSystem } from './classes/ParticleSystem';
 import { ExtraParams } from './classes/public/ExtraParams';
 import { LLMesh } from './classes/public/LLMesh';
+import { LLAnimation } from './classes/LLAnimation';
+import { LLAnimationJoint } from './classes/LLAnimationJoint';
+import { LLAnimationJointKeyFrame } from './classes/LLAnimationJointKeyFrame';
 import { FolderType } from './enums/FolderType';
 import { InventoryItem } from './classes/InventoryItem';
 import { InventoryType } from './enums/InventoryType';
@@ -109,4 +112,4 @@ import type { LLSettingsHazeConfig, LLSettingsTermConfig } from './classes/LLSet
 import { LLSettings } from './classes/LLSettings';
 
 export type { LLSettingsTermConfig, LLSettingsHazeConfig, GlobalPosition, MapLocation };
-export { Bot, LoginParameters, ClientEvents, BVH, ChatSourceType, UUID, Vector3, Vector2, Utils, TextureEntry, LLWearable, LLLindenText, LLGLTFMaterial, LLGesture, LLGestureAnimationStep, LLGestureSoundStep, LLGestureChatStep, LLGestureWaitStep, LLSettings, ParticleSystem, ExtraParams, AgentFlags, BotOptionFlags, CompressedFlags, ControlFlags, DecodeFlags, InstantMessageEventFlags, InventoryItemFlags, LoginFlags, MessageFlags, ParcelInfoFlags, PacketFlags, RegionProtocolFlags, SoundFlags, TeleportFlags, RegionFlags, RightsFlags, ParticleDataFlags, TextureFlags, PrimFlags, ParcelFlags, SimAccessFlags, TextureAnimFlags, InventoryType, AssetType, FolderType, TransferStatus, SourcePattern, BlendFunc, PCode, Bumpiness, HoleType, LayerType, MappingType, PhysicsShapeType, ProfileShape, SculptType, Shininess, LLGestureStepType, ChatEvent, DisconnectEvent, FriendRequestEvent, FriendResponseEvent, GroupChatEvent, GroupChatSessionAgentListEvent, GroupChatSessionJoinEvent, GroupNoticeEvent, GroupInviteEvent, InstantMessageEvent, InventoryOfferedEvent, LureEvent, MapInfoRangeReplyEvent, MapInfoReplyEvent, ParcelInfoReplyEvent, RegionInfoReplyEvent, TeleportEvent, ScriptDialogEvent, EventQueueStateChangeEvent, FriendOnlineEvent, FriendRightsEvent, FriendRemovedEvent, ObjectPhysicsDataEvent, ParcelPropertiesEvent, NewObjectEvent, ObjectKilledEvent, ObjectUpdatedEvent, GroupProfileReplyEvent, AvatarPropertiesReplyEvent, Avatar, Friend, FlexibleData, LightData, LightImageData, GameObject, Material, Parcel, SculptData, MeshData, LLMesh, InventoryItem, TarReader, TarWriter, ExtendedMeshData, ReflectionProbeData, RenderMaterialData };
+export { Bot, LoginParameters, ClientEvents, BVH, ChatSourceType, UUID, Vector3, Vector2, Utils, TextureEntry, LLWearable, LLLindenText, LLGLTFMaterial, LLGesture, LLGestureAnimationStep, LLGestureSoundStep, LLGestureChatStep, LLGestureWaitStep, LLSettings, ParticleSystem, ExtraParams, AgentFlags, BotOptionFlags, CompressedFlags, ControlFlags, DecodeFlags, InstantMessageEventFlags, InventoryItemFlags, LoginFlags, MessageFlags, ParcelInfoFlags, PacketFlags, RegionProtocolFlags, SoundFlags, TeleportFlags, RegionFlags, RightsFlags, ParticleDataFlags, TextureFlags, PrimFlags, ParcelFlags, SimAccessFlags, TextureAnimFlags, InventoryType, AssetType, FolderType, TransferStatus, SourcePattern, BlendFunc, PCode, Bumpiness, HoleType, LayerType, MappingType, PhysicsShapeType, ProfileShape, SculptType, Shininess, LLGestureStepType, ChatEvent, DisconnectEvent, FriendRequestEvent, FriendResponseEvent, GroupChatEvent, GroupChatSessionAgentListEvent, GroupChatSessionJoinEvent, GroupNoticeEvent, GroupInviteEvent, InstantMessageEvent, InventoryOfferedEvent, LureEvent, MapInfoRangeReplyEvent, MapInfoReplyEvent, ParcelInfoReplyEvent, RegionInfoReplyEvent, TeleportEvent, ScriptDialogEvent, EventQueueStateChangeEvent, FriendOnlineEvent, FriendRightsEvent, FriendRemovedEvent, ObjectPhysicsDataEvent, ParcelPropertiesEvent, NewObjectEvent, ObjectKilledEvent, ObjectUpdatedEvent, GroupProfileReplyEvent, AvatarPropertiesReplyEvent, Avatar, Friend, FlexibleData, LightData, LightImageData, GameObject, Material, Parcel, SculptData, MeshData, LLMesh, LLAnimation, LLAnimationJoint, LLAnimationJointKeyFrame, InventoryItem, TarReader, TarWriter, ExtendedMeshData, ReflectionProbeData, RenderMaterialData };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caspertech/node-metaverse",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "A node.js interface for Second Life.",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",