diff --git a/package.json b/package.json index 9d13fd0fe..7629c485c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blitzkrieg", - "version": "1.17.0", + "version": "1.17.1", "description": "🎉 Tools for everything World of Tanks Blitz", "main": "src/server.ts", "type": "module", diff --git a/src/core/blitz/extractModel/index.ts b/src/core/blitz/extractModel/index.ts index 68060ccc2..4d15b10cd 100644 --- a/src/core/blitz/extractModel/index.ts +++ b/src/core/blitz/extractModel/index.ts @@ -57,7 +57,7 @@ export async function extractModel(data: string, path: string) { material.setBaseColorTexture( document .createTexture(node.materialName) - .setMimeType('image/png') + .setMimeType('image/jpeg') .setImage( await readTexture( `${data}/3d/${dirname(path)}/${textures.albedo}`, @@ -70,7 +70,7 @@ export async function extractModel(data: string, path: string) { material.setMetallicRoughnessTexture( document .createTexture(node.materialName) - .setMimeType('image/png') + .setMimeType('image/jpeg') .setImage( await readTexture( `${data}/3d/${dirname(path)}/${textures.baseRMMap}`, @@ -86,7 +86,7 @@ export async function extractModel(data: string, path: string) { material.setNormalTexture( document .createTexture(node.materialName) - .setMimeType('image/png') + .setMimeType('image/jpeg') .setImage( await readTexture( `${data}/3d/${dirname(path)}/${ @@ -102,7 +102,7 @@ export async function extractModel(data: string, path: string) { material.setOcclusionTexture( document .createTexture(node.materialName) - .setMimeType('image/png') + .setMimeType('image/jpeg') .setImage( await readTexture( `${data}/3d/${dirname(path)}/${textures.miscMap}`, diff --git a/src/core/blitzkrieg/readTexture/index.ts b/src/core/blitzkrieg/readTexture/index.ts index 9f55a3fea..3c42af572 100644 --- a/src/core/blitzkrieg/readTexture/index.ts +++ b/src/core/blitzkrieg/readTexture/index.ts @@ -36,7 +36,7 @@ export async function readTexture(path: string, mutation?: TextureMutation) { raw.data[index + 3] = 255; } - return await sharp(raw.data, { raw }).png().toBuffer(); + return await sharp(raw.data, { raw }).jpeg().toBuffer(); } case TextureMutation.RoughnessMetallicness: { @@ -45,16 +45,16 @@ export async function readTexture(path: string, mutation?: TextureMutation) { }); const metallicness = sharp(raw.data, { raw }) .extractChannel('green') - .png() + .jpeg() .toBuffer(); const roughness = sharp(raw.data, { raw }) .extractChannel('alpha') - .png() + .jpeg() .toBuffer(); return await newImage .joinChannel(await Promise.all([roughness, metallicness])) - .png() + .jpeg() .toBuffer(); } @@ -65,15 +65,15 @@ export async function readTexture(path: string, mutation?: TextureMutation) { */ return await sharp(raw.data, { raw }) .extractChannel('alpha') - .png() + .jpeg() .toBuffer(); } case TextureMutation.Albedo: { - return await sharp(raw.data, { raw }).removeAlpha().png().toBuffer(); + return await sharp(raw.data, { raw }).removeAlpha().jpeg().toBuffer(); } default: - return await sharp(raw.data, { raw }).png().toBuffer(); + return await sharp(raw.data, { raw }).jpeg().toBuffer(); } }