Miko/node-metaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take care not to overwrite gltf overrides when receiving an object update

Browse Source
This commit is contained in:
Casper Warden
2023-11-17 11:55:05 +00:00
parent a31d0deb4e
commit 6758226ea2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/ObjectStoreFull.ts
View File

@@ -102,6 +102,10 @@ export class ObjectStoreFull extends ObjectStoreLite implements IObjectStore
obj.ProfileBegin = Utils.unpackBeginCut(objData.ProfileBegin); obj.ProfileBegin = Utils.unpackBeginCut(objData.ProfileBegin);
obj.ProfileEnd = Utils.unpackEndCut(objData.ProfileEnd); obj.ProfileEnd = Utils.unpackEndCut(objData.ProfileEnd);
obj.ProfileHollow = Utils.unpackProfileHollow(objData.ProfileHollow); obj.ProfileHollow = Utils.unpackProfileHollow(objData.ProfileHollow);
if (obj.TextureEntry?.gltfMaterialOverrides && !this.cachedMaterialOverrides.has(obj.ID))
{
this.cachedMaterialOverrides.set(obj.ID, obj.TextureEntry.gltfMaterialOverrides);
}
obj.TextureEntry = TextureEntry.from(objData.TextureEntry); obj.TextureEntry = TextureEntry.from(objData.TextureEntry);
const override = this.cachedMaterialOverrides.get(obj.ID); const override = this.cachedMaterialOverrides.get(obj.ID);
if (override) if (override)
@@ -439,6 +443,10 @@ export class ObjectStoreFull extends ObjectStoreLite implements IObjectStore
pos = pos + 2; pos = pos + 2;
const textureEntryLength = buf.readUInt32LE(pos); const textureEntryLength = buf.readUInt32LE(pos);
pos = pos + 4; pos = pos + 4;
if (o.TextureEntry?.gltfMaterialOverrides && !this.cachedMaterialOverrides.has(o.ID))
{
this.cachedMaterialOverrides.set(o.ID, o.TextureEntry.gltfMaterialOverrides);
}
o.TextureEntry = TextureEntry.from(buf.slice(pos, pos + textureEntryLength)); o.TextureEntry = TextureEntry.from(buf.slice(pos, pos + textureEntryLength));
const override = this.cachedMaterialOverrides.get(o.ID); const override = this.cachedMaterialOverrides.get(o.ID);
if (override) if (override)
@@ -523,6 +531,10 @@ export class ObjectStoreFull extends ObjectStoreLite implements IObjectStore
if (objectData.TextureEntry.length > 0) if (objectData.TextureEntry.length > 0)
{ {
// No idea why the first four bytes are skipped here. // No idea why the first four bytes are skipped here.
if (o.TextureEntry?.gltfMaterialOverrides && !this.cachedMaterialOverrides.has(o.ID))
{
this.cachedMaterialOverrides.set(o.ID, o.TextureEntry.gltfMaterialOverrides);
}
o.TextureEntry = TextureEntry.from(objectData.TextureEntry.slice(4)); o.TextureEntry = TextureEntry.from(objectData.TextureEntry.slice(4));
const override = this.cachedMaterialOverrides.get(o.ID); const override = this.cachedMaterialOverrides.get(o.ID);
if (override) if (override)

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@caspertech/node-metaverse", "name": "@caspertech/node-metaverse",
"version": "0.6.16", "version": "0.6.17",
"description": "A node.js interface for Second Life.", "description": "A node.js interface for Second Life.",
"main": "dist/lib/index.js", "main": "dist/lib/index.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",