@illgrenoble/webx-client 1.3.0 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/display/WebXCursor.js +5 -1
- package/dist/display/WebXCursor.js.map +1 -1
- package/dist/display/WebXTextureFactory.d.ts +1 -1
- package/dist/display/WebXTextureFactory.js +2 -2
- package/dist/display/WebXTextureFactory.js.map +1 -1
- package/dist/transport/WebXMessageDecoder.js +6 -5
- package/dist/transport/WebXMessageDecoder.js.map +1 -1
- package/package.json +1 -1
|
@@ -92,6 +92,9 @@ class WebXCursor {
|
|
|
92
92
|
* @param cursorId The ID of the cursor to display.
|
|
93
93
|
*/
|
|
94
94
|
setCursorId(cursorId) {
|
|
95
|
+
if (this._cursorId === cursorId) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
95
98
|
this._cursorId = cursorId;
|
|
96
99
|
this._cursorFactory.getCursor(cursorId).then(cursorData => {
|
|
97
100
|
const cursor = cursorData.cursor;
|
|
@@ -117,9 +120,10 @@ class WebXCursor {
|
|
|
117
120
|
if (texture != null && texture.image != null) {
|
|
118
121
|
this._width = texture.image.width;
|
|
119
122
|
this._height = texture.image.height;
|
|
123
|
+
// console.log(`WebXCursor ${cursorId}: ${xHot}, ${yHot}, ${this._width}, ${this._height}`);
|
|
120
124
|
this._texture = texture;
|
|
121
125
|
this._texture.minFilter = three_1.LinearFilter;
|
|
122
|
-
this._texture.repeat.set(this._width / this._texture.image.width, this._height / this._texture.image.height);
|
|
126
|
+
// this._texture.repeat.set(this._width / this._texture.image.width, this._height / this._texture.image.height);
|
|
123
127
|
this._material.map = texture;
|
|
124
128
|
this._material.visible = true;
|
|
125
129
|
this._material.needsUpdate = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebXCursor.js","sourceRoot":"","sources":["../../src/display/WebXCursor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WebXCursor.js","sourceRoot":"","sources":["../../src/display/WebXCursor.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ export declare class WebXTextureFactory {
|
|
|
33
33
|
* @param mimetype The MIME type of the image data (e.g., "image/png").
|
|
34
34
|
* @returns A promise that resolves to the created texture.
|
|
35
35
|
*/
|
|
36
|
-
createTextureFromArray(imageData: Uint8Array, mimetype: string): Promise<Texture>;
|
|
36
|
+
createTextureFromArray(imageData: Uint8Array, mimetype: string, colorSpace: string): Promise<Texture>;
|
|
37
37
|
/**
|
|
38
38
|
* Creates a texture from a Blob object.
|
|
39
39
|
*
|
|
@@ -77,7 +77,7 @@ class WebXTextureFactory {
|
|
|
77
77
|
* @param mimetype The MIME type of the image data (e.g., "image/png").
|
|
78
78
|
* @returns A promise that resolves to the created texture.
|
|
79
79
|
*/
|
|
80
|
-
createTextureFromArray(imageData, mimetype) {
|
|
80
|
+
createTextureFromArray(imageData, mimetype, colorSpace) {
|
|
81
81
|
return __awaiter(this, void 0, void 0, function* () {
|
|
82
82
|
if (imageData != null && imageData.byteLength > 0) {
|
|
83
83
|
const blob = new Blob([imageData], { type: mimetype });
|
|
@@ -85,7 +85,7 @@ class WebXTextureFactory {
|
|
|
85
85
|
texture.needsUpdate = true;
|
|
86
86
|
texture.flipY = false;
|
|
87
87
|
texture.minFilter = three_1.LinearFilter;
|
|
88
|
-
texture.colorSpace =
|
|
88
|
+
texture.colorSpace = colorSpace;
|
|
89
89
|
return texture;
|
|
90
90
|
}
|
|
91
91
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebXTextureFactory.js","sourceRoot":"","sources":["../../src/display/WebXTextureFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAAoD;AACpD,iCAA4D;AAG5D;;;;GAIG;AACH,MAAa,kBAAkB;IAE7B,YAAoB,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IAE3C;;;;;OAKG;IACU,gBAAgB,CAAC,QAAgB;;YAC5C,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,kCAAoB,CAAC,QAAQ,CAAC,CAAqB,CAAC;gBACxG,OAAO;oBACL,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;iBAC5B,CAAC;YAEJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;KAAA;IAED;;;;;OAKG;IACI,4BAA4B,CAAC,SAAiB;QACnD,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAqB,IAAI,KAAK,EAAE,CAAC;gBAC5C,MAAM,OAAO,GAAY,IAAI,eAAO,CAAC,KAAK,CAAC,CAAC;gBAC5C,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE;oBAClB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;oBAC3B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBACtB,OAAO,CAAC,SAAS,GAAG,oBAAY,CAAC;oBAEjC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACnB,CAAC,CAAC;gBAEF,KAAK,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;oBACxB,OAAO,CAAC,IAAI,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;oBAC/D,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAA;gBAED,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;YAExB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACU,sBAAsB,CAAC,SAAqB,EAAE,QAAgB;;
|
|
1
|
+
{"version":3,"file":"WebXTextureFactory.js","sourceRoot":"","sources":["../../src/display/WebXTextureFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.WebXMessageDecoder = void 0;
|
|
13
13
|
const message_1 = require("../message");
|
|
14
14
|
const display_1 = require("../display");
|
|
15
|
+
const three_1 = require("three");
|
|
15
16
|
/**
|
|
16
17
|
* Decodes binary messages received from the WebX Engine into WebXMessage objects.
|
|
17
18
|
* This class handles various message types and converts them into their respective
|
|
@@ -95,8 +96,8 @@ class WebXMessageDecoder {
|
|
|
95
96
|
const alphaDataSize = buffer.getUint32();
|
|
96
97
|
const colorData = buffer.getUint8Array(colorDataSize);
|
|
97
98
|
const alphaData = buffer.getUint8Array(alphaDataSize);
|
|
98
|
-
const colorMapPromise = this._textureFactory.createTextureFromArray(colorData, mimetype);
|
|
99
|
-
const alphaMapPromise = this._textureFactory.createTextureFromArray(alphaData, mimetype);
|
|
99
|
+
const colorMapPromise = this._textureFactory.createTextureFromArray(colorData, mimetype, three_1.SRGBColorSpace);
|
|
100
|
+
const alphaMapPromise = this._textureFactory.createTextureFromArray(alphaData, mimetype, three_1.LinearSRGBColorSpace);
|
|
100
101
|
Promise.all([colorMapPromise, alphaMapPromise])
|
|
101
102
|
.then(([colorMap, alphaMap]) => {
|
|
102
103
|
resolve(new message_1.WebXImageMessage(windowId, depth, colorMap, alphaMap, commandId, buffer.bufferLength));
|
|
@@ -128,8 +129,8 @@ class WebXMessageDecoder {
|
|
|
128
129
|
const colorData = buffer.getUint8Array(colorDataSize);
|
|
129
130
|
const alphaData = buffer.getUint8Array(alphaDataSize);
|
|
130
131
|
const imagePromise = new Promise((innerResolve, innerReject) => {
|
|
131
|
-
const colorMapPromise = this._textureFactory.createTextureFromArray(colorData, mimetype);
|
|
132
|
-
const alphaMapPromise = this._textureFactory.createTextureFromArray(alphaData, mimetype);
|
|
132
|
+
const colorMapPromise = this._textureFactory.createTextureFromArray(colorData, mimetype, three_1.SRGBColorSpace);
|
|
133
|
+
const alphaMapPromise = this._textureFactory.createTextureFromArray(alphaData, mimetype, three_1.LinearSRGBColorSpace);
|
|
133
134
|
Promise.all([colorMapPromise, alphaMapPromise])
|
|
134
135
|
.then(([colorMap, alphaMap]) => {
|
|
135
136
|
innerResolve(new display_1.WebXSubImage({ x, y, width, height, depth, colorMap, alphaMap }));
|
|
@@ -197,7 +198,7 @@ class WebXMessageDecoder {
|
|
|
197
198
|
const imageDataSize = buffer.getUint32();
|
|
198
199
|
const imageData = buffer.getUint8Array(imageDataSize);
|
|
199
200
|
try {
|
|
200
|
-
const texture = yield this._textureFactory.createTextureFromArray(imageData, 'image/png');
|
|
201
|
+
const texture = yield this._textureFactory.createTextureFromArray(imageData, 'image/png', three_1.SRGBColorSpace);
|
|
201
202
|
return new message_1.WebXCursorImageMessage(x, y, xHot, yHot, cursorId, texture, commandId);
|
|
202
203
|
}
|
|
203
204
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebXMessageDecoder.js","sourceRoot":"","sources":["../../src/transport/WebXMessageDecoder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAYoB;AACpB,wCAAoF;
|
|
1
|
+
{"version":3,"file":"WebXMessageDecoder.js","sourceRoot":"","sources":["../../src/transport/WebXMessageDecoder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED