Skip to content

Commit fc170ec

Browse files
author
Filipe Calaça Barbosa
committed
* Fixed color shift handle
* Changes for better performance
1 parent 9e35c95 commit fc170ec

8 files changed

+168
-236
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
### Requirements
4848

49-
Node.js >= 10
49+
Node.js >= 14
5050

5151
### Installation
5252

‎decoders/copyrect.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
class CopyRect {
22

3-
constructor() {
4-
3+
constructor(debug = false, debugLevel = 1) {
4+
this.debug = debug;
5+
this.debugLevel = debugLevel;
56
}
67

78
getPixelBytePos(x, y, width, height) {
89
return ((y * width) + x) * 4;
910
}
1011

11-
decode(rect, fb, bitsPerPixel, colorMap, screenW, screenH, socket, depth) {
12+
decode(rect, fb, bitsPerPixel, colorMap, screenW, screenH, socket, depth, red, green, blue) {
1213
return new Promise(async (resolve, reject) => {
1314

1415
await socket.waitBytes(4);

‎decoders/hextile.js

+21-68
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
class Hextile {
22

3-
constructor() {
4-
3+
constructor(debug = false, debugLevel = 1) {
4+
this.debug = debug;
5+
this.debugLevel = debugLevel;
56
}
67

78
getPixelBytePos(x, y, width, height) {
89
return ((y * width) + x) * 4;
910
}
1011

11-
decode(rect, fb, bitsPerPixel, colorMap, screenW, screenH, socket, depth) {
12+
decode(rect, fb, bitsPerPixel, colorMap, screenW, screenH, socket, depth, redShift, greenShift, blueShift) {
1213
return new Promise(async (resolve, reject) => {
1314

1415
const initialOffset = socket.offset;
@@ -21,8 +22,8 @@ class Hextile {
2122

2223
let lastSubEncoding;
2324

24-
const backgroundColor = {r: 0, g: 0, b: 0, a: 255};
25-
const foregroundColor = {r: 0, g: 0, b: 0, a: 255};
25+
let backgroundColor = 0;
26+
let foregroundColor = 0;
2627

2728
tilesX = Math.ceil(rect.width / 16);
2829
tilesY = Math.ceil(rect.height / 16);
@@ -61,33 +62,12 @@ class Hextile {
6162
if (bitsPerPixel === 8) {
6263
const index = socket.readUInt8();
6364
const color = colorMap[index];
64-
// RGB
65-
// fb.writeUInt8(color?.r || 255, fbBytePosOffset);
66-
// fb.writeUInt8(color?.g || 255, fbBytePosOffset + 1);
67-
// fb.writeUInt8(color?.b || 255, fbBytePosOffset + 2);
68-
69-
// BGR
70-
fb.writeUInt8(color?.r || 255, fbBytePosOffset + 2);
71-
fb.writeUInt8(color?.g || 255, fbBytePosOffset + 1);
72-
fb.writeUInt8(color?.b || 255, fbBytePosOffset);
65+
fb.writeIntBE(color, fbBytePosOffset, 4);
7366
} else if (bitsPerPixel === 24) {
74-
fb.writeUInt8(socket.readUInt8(), fbBytePosOffset);
75-
fb.writeUInt8(socket.readUInt8(), fbBytePosOffset + 1);
76-
fb.writeUInt8(socket.readUInt8(), fbBytePosOffset + 2);
67+
fb.writeIntBE(socket.readRgbPlusAlpha(redShift, greenShift, blueShift), fbBytePosOffset, 4);
7768
} else if (bitsPerPixel === 32) {
78-
// RGB
79-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset), fbBytePosOffset);
80-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 1), fbBytePosOffset + 1);
81-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 2), fbBytePosOffset + 2);
82-
83-
// BGR
84-
fb.writeUInt8(socket.readUInt8(), fbBytePosOffset + 2);
85-
fb.writeUInt8(socket.readUInt8(), fbBytePosOffset + 1);
86-
fb.writeUInt8(socket.readUInt8(), fbBytePosOffset);
87-
socket.readUInt8();
69+
fb.writeIntBE(socket.readRgba(redShift, greenShift, blueShift), fbBytePosOffset, 4);
8870
}
89-
// Alpha, always 255
90-
fb.writeUInt8(255, fbBytePosOffset + 3);
9171
}
9272
}
9373
lastSubEncoding = subEncoding;
@@ -99,26 +79,19 @@ class Hextile {
9979
await socket.waitBytes(1);
10080
const index = socket.readUInt8();
10181
dataSize++;
102-
backgroundColor.r = colorMap[index].r || 255;
103-
backgroundColor.g = colorMap[index].g || 255;
104-
backgroundColor.b = colorMap[index].b || 255;
82+
backgroundColor = colorMap[index];
10583
break;
10684

10785
case 24:
10886
await socket.waitBytes(3);
10987
dataSize += 3;
110-
backgroundColor.r = socket.readUInt8();
111-
backgroundColor.g = socket.readUInt8();
112-
backgroundColor.b = socket.readUInt8();
88+
backgroundColor = socket.readRgbPlusAlpha(redShift, greenShift, blueShift);
11389
break;
11490

11591
case 32:
11692
await socket.waitBytes(4);
11793
dataSize += 4;
118-
backgroundColor.r = socket.readUInt8();
119-
backgroundColor.g = socket.readUInt8();
120-
backgroundColor.b = socket.readUInt8();
121-
backgroundColor.a = socket.readUInt8();
94+
backgroundColor = socket.readRgba(redShift, greenShift, blueShift);
12295
break;
12396

12497
}
@@ -131,26 +104,19 @@ class Hextile {
131104
await socket.waitBytes(1);
132105
const index = socket.readUInt8();
133106
dataSize++;
134-
foregroundColor.r = colorMap[index].r || 255;
135-
foregroundColor.g = colorMap[index].g || 255;
136-
foregroundColor.b = colorMap[index].b || 255;
107+
foregroundColor = colorMap[index];
137108
break;
138109

139110
case 24:
140111
await socket.waitBytes(3);
141112
dataSize += 3;
142-
foregroundColor.r = socket.readUInt8();
143-
foregroundColor.g = socket.readUInt8();
144-
foregroundColor.b = socket.readUInt8();
113+
foregroundColor = socket.readRgbPlusAlpha(redShift, greenShift, blueShift);
145114
break;
146115

147116
case 32:
148117
await socket.waitBytes(4);
149118
dataSize += 4;
150-
foregroundColor.r = socket.readUInt8();
151-
foregroundColor.g = socket.readUInt8();
152-
foregroundColor.b = socket.readUInt8();
153-
foregroundColor.a = socket.readUInt8();
119+
foregroundColor = socket.readRgba(redShift, greenShift, blueShift);
154120
break;
155121

156122
}
@@ -170,7 +136,7 @@ class Hextile {
170136
while (subRects) {
171137

172138
subRects--;
173-
const color = {r: 0, g: 0, b: 0, a: 255};
139+
let color = 0;
174140

175141
// SubrectsColoured
176142
if (subEncoding & 0x10) {
@@ -181,34 +147,24 @@ class Hextile {
181147
await socket.waitBytes(1);
182148
const index = socket.readUInt8();
183149
dataSize++;
184-
color.r = colorMap[index].r || 255;
185-
color.g = colorMap[index].g || 255;
186-
color.b = colorMap[index].b || 255;
150+
color = colorMap[index];
187151
break;
188152

189153
case 24:
190154
await socket.waitBytes(3);
191155
dataSize += 3;
192-
color.r = socket.readUInt8();
193-
color.g = socket.readUInt8();
194-
color.b = socket.readUInt8();
156+
color = socket.readRgbPlusAlpha(redShift, greenShift, blueShift);
195157
break;
196158

197159
case 32:
198160
await socket.waitBytes(4);
199161
dataSize += 4;
200-
color.r = socket.readUInt8();
201-
color.g = socket.readUInt8();
202-
color.b = socket.readUInt8();
203-
color.a = socket.readUInt8();
162+
color = socket.readRgba(redShift, greenShift, blueShift);
204163
break;
205164
}
206165

207166
} else {
208-
color.r = foregroundColor.r;
209-
color.g = foregroundColor.g;
210-
color.b = foregroundColor.b;
211-
color.a = foregroundColor.a;
167+
color = foregroundColor;
212168
}
213169

214170
await socket.waitBytes(2);
@@ -251,10 +207,7 @@ class Hextile {
251207
for (let h = 0; h < th; h++) {
252208
for (let w = 0; w < tw; w++) {
253209
const fbBytePosOffset = this.getPixelBytePos(tx + w, ty + h, screenW, screenH);
254-
fb.writeUInt8(color.r || 255, fbBytePosOffset + 2);
255-
fb.writeUInt8(color.g || 255, fbBytePosOffset + 1);
256-
fb.writeUInt8(color.b || 255, fbBytePosOffset);
257-
fb.writeUInt8(255, fbBytePosOffset + 3);
210+
fb.writeIntBE(color, fbBytePosOffset, 4);
258211
}
259212
}
260213
}

‎decoders/raw.js

+11-27
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
class Raw {
22

3-
constructor() {
4-
3+
constructor(debug = false, debugLevel = 1) {
4+
this.debug = debug;
5+
this.debugLevel = debugLevel;
56
}
67

78
getPixelBytePos(x, y, width, height) {
89
return ((y * width) + x) * 4;
910
}
1011

11-
decode(rect, fb, bitsPerPixel, colorMap, screenW, screenH, socket, depth) {
12+
decode(rect, fb, bitsPerPixel, colorMap, screenW, screenH, socket, depth, red, green, blue) {
1213
return new Promise(async (resolve, reject) => {
1314

1415
await socket.waitBytes(rect.width * rect.height * (bitsPerPixel / 8), 'Raw pixel data');
@@ -21,35 +22,18 @@ class Raw {
2122
const bytePosOffset = (h * rect.width) + w;
2223
const index = rect.data.readUInt8(bytePosOffset);
2324
const color = colorMap[index];
24-
// RGB
25-
// fb.writeUInt8(color?.r || 255, fbBytePosOffset);
26-
// fb.writeUInt8(color?.g || 255, fbBytePosOffset + 1);
27-
// fb.writeUInt8(color?.b || 255, fbBytePosOffset + 2);
28-
29-
// BGR
30-
fb.writeUInt8(color?.r || 255, fbBytePosOffset + 2);
31-
fb.writeUInt8(color?.g || 255, fbBytePosOffset + 1);
32-
fb.writeUInt8(color?.b || 255, fbBytePosOffset);
33-
34-
fb.writeUInt8(255, fbBytePosOffset + 3);
25+
fb.writeIntBE(color, fbBytePosOffset, 4);
3526
} else if (bitsPerPixel === 24) {
3627
const bytePosOffset = ((h * rect.width) + w) * 3;
37-
fb.writeUInt8(rect.data.readUInt8(bytePosOffset), fbBytePosOffset);
38-
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 1), fbBytePosOffset + 1);
39-
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 2), fbBytePosOffset + 2);
28+
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + red), fbBytePosOffset);
29+
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + green), fbBytePosOffset + 1);
30+
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + blue), fbBytePosOffset + 2);
4031
fb.writeUInt8(255, fbBytePosOffset + 3);
4132
} else if (bitsPerPixel === 32) {
4233
const bytePosOffset = ((h * rect.width) + w) * 4;
43-
// RGB
44-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset), fbBytePosOffset);
45-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 1), fbBytePosOffset + 1);
46-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 2), fbBytePosOffset + 2);
47-
48-
// BGR
49-
fb.writeUInt8(rect.data.readUInt8(bytePosOffset), fbBytePosOffset + 2);
50-
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 1), fbBytePosOffset + 1);
51-
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 2), fbBytePosOffset);
52-
// fb.writeUInt8(rect.data.readUInt8(bytePosOffset + 3), fbBytePosOffset + 3);
34+
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + red), fbBytePosOffset + 2);
35+
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + green), fbBytePosOffset + 1);
36+
fb.writeUInt8(rect.data.readUInt8(bytePosOffset + blue), fbBytePosOffset);
5337
fb.writeUInt8(255, fbBytePosOffset + 3);
5438
}
5539
}

0 commit comments

Comments
 (0)