mirror of
https://github.com/jwetzell/osc-js.git
synced 2026-09-08 15:48:59 +00:00
add support for osc color type
This commit is contained in:
@@ -1,11 +1,18 @@
|
|||||||
export type OSCType = 's' | 'i' | 'f' | 'b' | 'T' | 'F' | 't';
|
export type OSCType = 's' | 'i' | 'f' | 'b' | 'T' | 'F' | 't' | 'r';
|
||||||
export type OSCArg = {
|
export type OSCArg = {
|
||||||
type: OSCType;
|
type: OSCType;
|
||||||
value: string | number | Uint8Array | boolean | OSCTimeTag;
|
value: string | number | Uint8Array | boolean | OSCTimeTag | OSCColor;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type OSCTimeTag = [number, number];
|
export type OSCTimeTag = [number, number];
|
||||||
|
|
||||||
|
export type OSCColor = {
|
||||||
|
r: number;
|
||||||
|
g: number;
|
||||||
|
b: number;
|
||||||
|
a: number;
|
||||||
|
};
|
||||||
|
|
||||||
export type OSCBundle = {
|
export type OSCBundle = {
|
||||||
timeTag: OSCTimeTag;
|
timeTag: OSCTimeTag;
|
||||||
contents: (OSCBundle | OSCMessage)[];
|
contents: (OSCBundle | OSCMessage)[];
|
||||||
@@ -17,6 +24,8 @@ export type OSCMessage = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export type OSCTypeConverter = {
|
export type OSCTypeConverter = {
|
||||||
toBuffer: (value: string | number | Uint8Array | boolean | OSCTimeTag) => Uint8Array | undefined;
|
toBuffer: (value: string | number | Uint8Array | boolean | OSCTimeTag | OSCColor) => Uint8Array | undefined;
|
||||||
fromBuffer: (buffer: Uint8Array) => [string | number | Uint8Array | boolean | OSCTimeTag | undefined, Uint8Array];
|
fromBuffer: (
|
||||||
|
buffer: Uint8Array
|
||||||
|
) => [string | number | Uint8Array | boolean | OSCTimeTag | OSCColor | undefined, Uint8Array];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -171,4 +171,49 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
|
|||||||
return [undefined, bytesAfterFractional];
|
return [undefined, bytesAfterFractional];
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
r: {
|
||||||
|
toBuffer: (color) => {
|
||||||
|
if (typeof color === 'object' && 'r' in color && 'g' in color && 'b' in color && 'a' in color) {
|
||||||
|
const view = new DataView(new ArrayBuffer(4));
|
||||||
|
|
||||||
|
view.setUint8(0, color.r);
|
||||||
|
view.setUint8(1, color.g);
|
||||||
|
view.setUint8(2, color.b);
|
||||||
|
view.setUint8(3, color.a);
|
||||||
|
|
||||||
|
return new Uint8Array(view.buffer);
|
||||||
|
}
|
||||||
|
throw new TypeError('osc type r called with non OSCColor object');
|
||||||
|
},
|
||||||
|
fromBuffer: (buffer) => {
|
||||||
|
if (buffer.length < 4) {
|
||||||
|
throw new Error('osc color must be at least 4 bytes');
|
||||||
|
}
|
||||||
|
|
||||||
|
const red = buffer[0];
|
||||||
|
const green = buffer[1];
|
||||||
|
const blue = buffer[2];
|
||||||
|
const alpha = buffer[3];
|
||||||
|
|
||||||
|
if (red !== undefined && green !== undefined && blue !== undefined && alpha !== undefined) {
|
||||||
|
if (
|
||||||
|
typeof red === 'number' &&
|
||||||
|
typeof green === 'number' &&
|
||||||
|
typeof blue === 'number' &&
|
||||||
|
typeof alpha === 'number'
|
||||||
|
) {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
r: red,
|
||||||
|
g: green,
|
||||||
|
b: blue,
|
||||||
|
a: alpha,
|
||||||
|
},
|
||||||
|
buffer.subarray(4),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Error('problem converting osc ');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user