use full byte for each bool
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
abstract class Serializable<T> {
|
abstract class Serializable<T> {
|
||||||
|
|
||||||
|
static boolFlag = 0x80;
|
||||||
private static depth = 0;
|
private static depth = 0;
|
||||||
private static maxDisplayedJsonLength = 160;
|
private static maxDisplayedJsonLength = 160;
|
||||||
private static enableDump = true;
|
private static enableDump = true;
|
||||||
@@ -45,6 +46,15 @@ abstract class Serializable<T> {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* should have assert uint8? */
|
||||||
|
binToBool(bin: number) {
|
||||||
|
return (bin & Serializable.boolFlag) !== 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolToBin(bool: boolean) {
|
||||||
|
return bool ? Serializable.boolFlag : 0;
|
||||||
|
}
|
||||||
|
|
||||||
abstract _fromJsObject(jsObject: any): Serializable<T>;
|
abstract _fromJsObject(jsObject: any): Serializable<T>;
|
||||||
abstract _fromBinary(buffer: UhkBuffer): Serializable<T>;
|
abstract _fromBinary(buffer: UhkBuffer): Serializable<T>;
|
||||||
abstract _toJsObject(): any;
|
abstract _toJsObject(): any;
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
class KeyMap extends Serializable<KeyMap> {
|
class KeyMap extends Serializable<KeyMap> {
|
||||||
|
|
||||||
static defaultFlag = 0x80;
|
|
||||||
|
|
||||||
// @assertUInt8
|
// @assertUInt8
|
||||||
id: number;
|
id: number;
|
||||||
|
|
||||||
@@ -23,10 +21,8 @@ class KeyMap extends Serializable<KeyMap> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_fromBinary(buffer: UhkBuffer): KeyMap {
|
_fromBinary(buffer: UhkBuffer): KeyMap {
|
||||||
let map = buffer.readUInt8();
|
this.id = buffer.readUInt8();
|
||||||
/* saves almost a byte but limits number of keymaps... */
|
this.isDefault = this.binToBool(buffer.readUInt8());
|
||||||
this.isDefault = (map & KeyMap.defaultFlag) !== 0;
|
|
||||||
this.id = map & ~KeyMap.defaultFlag; // Clear isDefault bit.;
|
|
||||||
this.abbreviation = buffer.readString();
|
this.abbreviation = buffer.readString();
|
||||||
this.name = buffer.readString();
|
this.name = buffer.readString();
|
||||||
this.layers = new Layers().fromBinary(buffer);
|
this.layers = new Layers().fromBinary(buffer);
|
||||||
@@ -44,7 +40,8 @@ class KeyMap extends Serializable<KeyMap> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_toBinary(buffer: UhkBuffer): void {
|
_toBinary(buffer: UhkBuffer): void {
|
||||||
buffer.writeUInt8(this.id | this.getDefaultFlag());
|
buffer.writeUInt8(this.id);
|
||||||
|
buffer.writeUInt8(this.boolToBin(this.isDefault));
|
||||||
buffer.writeString(this.abbreviation);
|
buffer.writeString(this.abbreviation);
|
||||||
buffer.writeString(this.name);
|
buffer.writeString(this.name);
|
||||||
this.layers.toBinary(buffer);
|
this.layers.toBinary(buffer);
|
||||||
@@ -53,8 +50,4 @@ class KeyMap extends Serializable<KeyMap> {
|
|||||||
toString(): string {
|
toString(): string {
|
||||||
return `<KeyMap id="${this.id}" name="${this.name}">`;
|
return `<KeyMap id="${this.id}" name="${this.name}">`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private getDefaultFlag() {
|
|
||||||
return this.isDefault ? KeyMap.defaultFlag : 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
class Macro extends Serializable<Macro> {
|
class Macro extends Serializable<Macro> {
|
||||||
|
|
||||||
static loopedFlag = 0x80;
|
|
||||||
static privateFlag = 0x08;
|
|
||||||
|
|
||||||
// @assertUInt8
|
// @assertUInt8
|
||||||
id: number;
|
id: number;
|
||||||
|
|
||||||
@@ -25,10 +22,8 @@ class Macro extends Serializable<Macro> {
|
|||||||
|
|
||||||
_fromBinary(buffer: UhkBuffer): Macro {
|
_fromBinary(buffer: UhkBuffer): Macro {
|
||||||
this.id = buffer.readUInt8();
|
this.id = buffer.readUInt8();
|
||||||
let bools = buffer.readUInt8();
|
this.isLooped = this.binToBool(buffer.readUInt8());
|
||||||
/* saves almost a byte but limits number of keymaps... */
|
this.isPrivate = this.binToBool(buffer.readUInt8());
|
||||||
this.isLooped = (bools & Macro.loopedFlag) !== 0;
|
|
||||||
this.isPrivate = (bools & Macro.privateFlag) !== 0;
|
|
||||||
this.name = buffer.readString();
|
this.name = buffer.readString();
|
||||||
this.macroActions = new MacroActions().fromBinary(buffer);
|
this.macroActions = new MacroActions().fromBinary(buffer);
|
||||||
return this;
|
return this;
|
||||||
@@ -46,7 +41,8 @@ class Macro extends Serializable<Macro> {
|
|||||||
|
|
||||||
_toBinary(buffer: UhkBuffer): void {
|
_toBinary(buffer: UhkBuffer): void {
|
||||||
buffer.writeUInt8(this.id);
|
buffer.writeUInt8(this.id);
|
||||||
buffer.writeUInt8(this.getLoopedFlag() | this.getPrivateFlag());
|
buffer.writeUInt8(this.boolToBin(this.isLooped));
|
||||||
|
buffer.writeUInt8(this.boolToBin(this.isPrivate));
|
||||||
buffer.writeString(this.name);
|
buffer.writeString(this.name);
|
||||||
this.macroActions.toBinary(buffer);
|
this.macroActions.toBinary(buffer);
|
||||||
}
|
}
|
||||||
@@ -54,12 +50,4 @@ class Macro extends Serializable<Macro> {
|
|||||||
toString(): string {
|
toString(): string {
|
||||||
return `<Macro id="${this.id}" name="${this.name}">`;
|
return `<Macro id="${this.id}" name="${this.name}">`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private getLoopedFlag() {
|
|
||||||
return this.isLooped ? Macro.loopedFlag : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getPrivateFlag() {
|
|
||||||
return this.isPrivate ? Macro.privateFlag : 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,6 @@ enum LayerName {
|
|||||||
|
|
||||||
class SwitchLayerAction extends KeyAction {
|
class SwitchLayerAction extends KeyAction {
|
||||||
|
|
||||||
static toggleFlag = 0x80;
|
|
||||||
|
|
||||||
isLayerToggleable: boolean;
|
isLayerToggleable: boolean;
|
||||||
|
|
||||||
// @assertEnum(LayerName)
|
// @assertEnum(LayerName)
|
||||||
@@ -22,9 +20,8 @@ class SwitchLayerAction extends KeyAction {
|
|||||||
|
|
||||||
_fromBinary(buffer: UhkBuffer): SwitchLayerAction {
|
_fromBinary(buffer: UhkBuffer): SwitchLayerAction {
|
||||||
this.readAndAssertKeyActionId(buffer);
|
this.readAndAssertKeyActionId(buffer);
|
||||||
let layer = buffer.readUInt8();
|
this.layer = buffer.readUInt8();
|
||||||
this.isLayerToggleable = (layer & SwitchLayerAction.toggleFlag) !== 0;
|
this.isLayerToggleable = this.binToBool(buffer.readUInt8());
|
||||||
this.layer = layer & ~SwitchLayerAction.toggleFlag; // Clear toggle bit.
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,14 +35,11 @@ class SwitchLayerAction extends KeyAction {
|
|||||||
|
|
||||||
_toBinary(buffer: UhkBuffer) {
|
_toBinary(buffer: UhkBuffer) {
|
||||||
buffer.writeUInt8(KeyActionId.SwitchLayerAction);
|
buffer.writeUInt8(KeyActionId.SwitchLayerAction);
|
||||||
buffer.writeUInt8(this.layer | this.getToggleFlag());
|
buffer.writeUInt8(this.layer);
|
||||||
|
buffer.writeUInt8(this.boolToBin(this.isLayerToggleable));
|
||||||
}
|
}
|
||||||
|
|
||||||
toString(): string {
|
toString(): string {
|
||||||
return `<SwitchLayerAction layer="${this.layer}" toggle="${this.isLayerToggleable}">`;
|
return `<SwitchLayerAction layer="${this.layer}" toggle="${this.isLayerToggleable}">`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private getToggleFlag() {
|
|
||||||
return this.isLayerToggleable ? SwitchLayerAction.toggleFlag : 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user