diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..925776f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "collab-vm-1.2-binary-protocol"] + path = collab-vm-1.2-binary-protocol + url = https://github.com/computernewb/collab-vm-1.2-binary-protocol diff --git a/collab-vm-1.2-binary-protocol b/collab-vm-1.2-binary-protocol new file mode 160000 index 0000000..cfe9acc --- /dev/null +++ b/collab-vm-1.2-binary-protocol @@ -0,0 +1 @@ +Subproject commit cfe9acc60b87ab26cf8612398c734c8caad426b8 diff --git a/src/ts/protocol/CollabVMClient.ts b/src/ts/protocol/CollabVMClient.ts index baa8309..7b0e0e3 100644 --- a/src/ts/protocol/CollabVMClient.ts +++ b/src/ts/protocol/CollabVMClient.ts @@ -10,7 +10,8 @@ import VoteStatus from './VoteStatus.js'; import MuteState from './MuteState.js'; import { StringLike } from '../StringLike.js'; import * as msgpack from 'msgpackr'; -import { CollabVMProtocolMessage, CollabVMProtocolMessageType } from './binaryprotocol/CollabVMProtocolMessage.js'; +// TODO: Properly workspaceify this +import { CollabVMProtocolMessage, CollabVMProtocolMessageType } from '../../../collab-vm-1.2-binary-protocol/src/index.js'; const w = window as any; export interface CollabVMClientEvents { diff --git a/src/ts/protocol/binaryprotocol/CollabVMCapabilities.ts b/src/ts/protocol/binaryprotocol/CollabVMCapabilities.ts deleted file mode 100644 index c94106f..0000000 --- a/src/ts/protocol/binaryprotocol/CollabVMCapabilities.ts +++ /dev/null @@ -1,8 +0,0 @@ -export default class CollabVMCapabilities { - // Support for JPEG screen rects in binary msgpack format - bin: boolean; - - constructor() { - this.bin = false; - } -} \ No newline at end of file diff --git a/src/ts/protocol/binaryprotocol/CollabVMProtocolMessage.ts b/src/ts/protocol/binaryprotocol/CollabVMProtocolMessage.ts deleted file mode 100644 index 544a7e7..0000000 --- a/src/ts/protocol/binaryprotocol/CollabVMProtocolMessage.ts +++ /dev/null @@ -1,11 +0,0 @@ -import CollabVMRectMessage from "./CollabVMRectMessage.js"; - -export interface CollabVMProtocolMessage { - type: CollabVMProtocolMessageType; - rect?: CollabVMRectMessage | undefined; -} - -export enum CollabVMProtocolMessageType { - // JPEG Dirty Rectangle - rect = 0, -} \ No newline at end of file diff --git a/src/ts/protocol/binaryprotocol/CollabVMRectMessage.ts b/src/ts/protocol/binaryprotocol/CollabVMRectMessage.ts deleted file mode 100644 index f2a8668..0000000 --- a/src/ts/protocol/binaryprotocol/CollabVMRectMessage.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default interface CollabVMRectMessage { - x: number; - y: number; - data: Uint8Array; -} \ No newline at end of file