diff --git a/.gitignore b/.gitignore index 44cbc56..e8498ad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /npm-debug.log /dist /exampleMine +/localDeploy.js diff --git a/.npmignore b/.npmignore index c016217..2a57fb3 100644 --- a/.npmignore +++ b/.npmignore @@ -11,5 +11,6 @@ dist/tests/ testing/ .npmignore .gitignore +localDeploy.js caspertech-node-metaverse-*.tgz dist/classes/cache diff --git a/lib/classes/commands/RegionCommands.ts b/lib/classes/commands/RegionCommands.ts index 629dc1b..353daa1 100644 --- a/lib/classes/commands/RegionCommands.ts +++ b/lib/classes/commands/RegionCommands.ts @@ -586,7 +586,24 @@ export class RegionCommands extends CommandsBase 'FullMaterialsPerFace': [] }; - let gotSomeActualMaterials = false; + const materialFaces: {[key: string]: boolean} = {}; + if (obj.TextureEntry.defaultTexture !== undefined && obj.TextureEntry.defaultTexture !== null) + { + const materialID = obj.TextureEntry.defaultTexture.materialID; + if (!materialID.isZero()) + { + const storedMat = buildMap.assetMap.materials[materialID.toString()]; + if (storedMat !== null && storedMat !== undefined) + { + materialUpload.FullMaterialsPerFace.push({ + ID: object.ID, + Material: storedMat.toLLSDObject() + }); + materialFaces[-1] = true; + } + } + } + for (let face = 0; face < obj.TextureEntry.faces.length; face++) { const materialID = obj.TextureEntry.faces[face].materialID; @@ -600,12 +617,12 @@ export class RegionCommands extends CommandsBase ID: object.ID, Material: storedMat.toLLSDObject() }); - gotSomeActualMaterials = true; + materialFaces[face] = true; } } } - if (gotSomeActualMaterials) + if (Object.keys(materialFaces).length > 0) { const zipped = await Utils.deflate(Buffer.from(LLSD.LLSD.formatBinary(materialUpload).octets)); const newMat = { @@ -617,11 +634,56 @@ export class RegionCommands extends CommandsBase }); try { - await object.waitForTextureUpdate(1000); + let complete = false; + do + { + complete = true; + await object.waitForTextureUpdate(10000); + for (const materialFace of Object.keys(materialFaces)) + { + const entry = object.TextureEntry; + if (entry === undefined) + { + complete = false; + } + else if (parseInt(materialFace, 10) === -1) + { + const def = entry.defaultTexture + if (def === undefined || def === null) + { + complete = false; + } + else + { + if (def.materialID.equals(UUID.zero())) + { + complete = false; + } + } + } + else + { + const fc = parseInt(materialFace, 10); + const thisFace = entry.faces[fc]; + if (thisFace === undefined) + { + complete = false; + } + else + { + if (thisFace.materialID.equals(UUID.zero())) + { + complete = false; + } + } + } + } + } + while (!complete); } catch (error) { - console.error('Timed out while waiting for RenderMaterials update'); + console.error(obj.name + ':Timed out while waiting for RenderMaterials update'); } if (object.TextureEntry !== undefined) { @@ -640,10 +702,13 @@ export class RegionCommands extends CommandsBase } } } + if (obj.TextureEntry.defaultTexture !== null && object.TextureEntry.defaultTexture !== null) + { + obj.TextureEntry.defaultTexture.materialID = object.TextureEntry.defaultTexture.materialID; + } } } - // We're zero-ing out the materialID here because we'll apply materials immediately after if (obj.TextureEntry.defaultTexture !== null) { const oldTextureID = obj.TextureEntry.defaultTexture.textureID.toString(); @@ -667,10 +732,7 @@ export class RegionCommands extends CommandsBase try { - await object.setTextureEntry(obj.TextureEntry).then(() => {}).catch((err) => - { - console.error(err); - }); + await object.setTextureEntry(obj.TextureEntry); } catch (error) { diff --git a/package-lock.json b/package-lock.json index 8a1a473..0bc6884 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@caspertech/node-metaverse", - "version": "0.5.21", + "version": "0.5.24", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -268,6 +268,11 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -281,8 +286,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base64-js": { "version": "1.5.1", @@ -324,7 +328,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -545,8 +548,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "core-util-is": { "version": "1.0.2", @@ -729,6 +731,17 @@ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, + "fs-extra": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, "fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -740,8 +753,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "2.1.3", @@ -771,10 +783,9 @@ } }, "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", - "dev": true, + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -793,6 +804,11 @@ "is-glob": "^4.0.1" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, "growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", @@ -853,7 +869,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -987,6 +1002,22 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + }, + "dependencies": { + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + } + } + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -1113,7 +1144,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1306,8 +1336,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-parse": { "version": "1.0.6", @@ -1830,6 +1859,11 @@ "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==", "dev": true }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" + }, "uri-js": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", diff --git a/package.json b/package.json index c028079..b91c075 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@caspertech/node-metaverse", - "version": "0.5.23", + "version": "0.5.25", "description": "A node.js interface for Second Life.", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", @@ -45,6 +45,8 @@ "@types/xmlrpc": "^1.3.6", "chalk": "^3.0.0", "flatted": "^2.0.1", + "fs-extra": "^9.0.1", + "glob": "^7.1.6", "ipaddr.js": "^1.9.1", "logform": "^2.1.2", "long": "^4.0.0",