@hytopia.com/server-protocol 1.4.48 → 1.4.49-dev1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hytopia.com/server-protocol",
-  "version": "1.4.48",
+  "version": "1.4.49-dev1",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/schemas/Chunk.ts

@@ -5,7 +5,7 @@ import type { VectorSchema } from './Vector';
 export type ChunkSchema = {
   c: VectorSchema;           // chunk origin coordinate [ 16n, 16n, 16n ]
   b?: Uint8Array | number[]; // block ids in chunk, 16^3 entries, registry block ids 1-255, 0 = none
-  r?: number[];              // block rotations, sparse array of block ids index -> rotation enum (0-23)
+  r?: number[];              // block rotations, sparse array of block id index -> block rotation index
   rm?: boolean;              // removed/remove
 };
 
@@ -28,7 +28,7 @@ export const chunkSchema: JSONSchemaType<ChunkSchema> = {
       type: 'array',
       items: { type: 'number' },
       minItems: 0,
-      maxItems: 8192, // 4096 blocks per chunk, multiples of 2 for index,blockId
+      maxItems: 8192, // 4096 blocks per chunk, multiples of 2 for block id index, block rotation index
       nullable: true,
     },
     rm: { type: 'boolean', nullable: true },

package/schemas/Entity.ts

@@ -1,8 +1,10 @@
 import { rgbColorSchema } from './RgbColor';
+import { modelAnimationSchema } from './ModelAnimation';
 import { modelNodeOverrideSchema } from './ModelNodeOverride';
 import { quaternionSchema } from './Quaternion';
 import { vectorSchema } from './Vector';
 import type { JSONSchemaType } from 'ajv';
+import type { ModelAnimationSchema } from './ModelAnimation';
 import type { ModelNodeOverrideSchema } from './ModelNodeOverride';
 import type { QuaternionSchema } from './Quaternion';
 import type { RgbColorSchema } from './RgbColor';
@@ -10,10 +12,6 @@ import type { VectorSchema } from './Vector';
 
 export type EntitySchema = {
   i: number;                      // entity id
-  al?: string[];                  // model animations looped
-  ao?: string[];                  // model animations one shot
-  ap?: number;                    // model animations playback rate
-  as?: string[];                  // model animations stop
   bh?: VectorSchema;              // block half extents
   bt?: string;                    // block texture uri
   e?: boolean;                    // environmental
@@ -21,6 +19,7 @@ export type EntitySchema = {
   ei?: number;                    // emissive intensity
   h?: string[];                   // model nodes to hide by partial case insensitive match of gltf node names - merge into node overrides?
   m?: string;                     // model uri
+  ma?: ModelAnimationSchema[];    // model animations
   mo?: ModelNodeOverrideSchema[]; // model node overrides
   mt?: string;                    // model texture uri (custom override)
   n?: string;                     // name
@@ -51,6 +50,7 @@ export const entitySchema: JSONSchemaType<EntitySchema> = {
     ei: { type: 'number', nullable: true },
     h: { type: 'array', items: { type: 'string' }, nullable: true },
     m: { type: 'string', nullable: true },
+    ma: { type: 'array', items: { ...modelAnimationSchema }, nullable: true },
     mo: { type: 'array', items: { ...modelNodeOverrideSchema }, nullable: true },
     mt: { type: 'string', nullable: true },
     n: { type: 'string', nullable: true },

package/schemas/ModelAnimation.ts

@@ -0,0 +1,28 @@
+import { JSONSchemaType } from 'ajv';
+
+export type ModelAnimationSchema = {
+  n: string;                 // animation name
+  b?: 'normal' | 'additive'; // blend mode
+  l?: boolean;               // loop
+  p?: boolean;               // pause
+  pr?: number;               // playback rate
+  r?: boolean;               // restart
+  s?: boolean;               // stop
+  w?: number;                // weight
+}
+
+export const modelAnimationSchema: JSONSchemaType<ModelAnimationSchema> = {
+  type: 'object',
+  properties: {
+    n: { type: 'string' },
+    b: { type: 'string', enum: [ 'normal', 'additive' ], nullable: true },
+    l: { type: 'boolean', nullable: true },
+    p: { type: 'boolean', nullable: true },
+    pr: { type: 'number', nullable: true },
+    r: { type: 'boolean', nullable: true },
+    s: { type: 'boolean', nullable: true },
+    w: { type: 'number', nullable: true },
+  },
+  required: [ 'n' ],
+  additionalProperties: false,
+}

package/schemas/index.ts

@@ -18,6 +18,7 @@ export * from './HexColor';
 export * from './Input';
 export * from './Light';
 export * from './Lights';
+export * from './ModelAnimation';
 export * from './ModelNodeOverride';
 export * from './NotificationPermissionRequest';
 export * from './ParticleEmitter';