From 88d4c2752faa5fe2c2081a5dd957ac544437fee9 Mon Sep 17 00:00:00 2001 From: dank074 Date: Tue, 31 Aug 2021 00:26:29 -0500 Subject: [PATCH] changes --- src/nitro/avatar/AvatarImage.ts | 12 +++++++----- src/nitro/avatar/animation/AvatarDataContainer.ts | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/nitro/avatar/AvatarImage.ts b/src/nitro/avatar/AvatarImage.ts index af776118..3bc44f3e 100644 --- a/src/nitro/avatar/AvatarImage.ts +++ b/src/nitro/avatar/AvatarImage.ts @@ -415,9 +415,12 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener if(!this._reusableTexture) return null; - if(this._avatarSpriteData && this._avatarSpriteData.paletteIsGrayscale) + if(this._avatarSpriteData) { - this._reusableTexture = this.applyPalette(this._reusableTexture, this._avatarSpriteData.reds); + if(this._avatarSpriteData.paletteIsGrayscale) + { + this._reusableTexture = this.applyPalette(this._reusableTexture, this._avatarSpriteData.reds); + } } this._image = this._reusableTexture; @@ -436,11 +439,10 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener for(let i = 0; i < data.length; i += 4) { - let paletteColor = reds[data[ i ]]; - + let paletteColor = (reds[ data[i] ]); if(paletteColor === undefined) paletteColor = 0; - data[ i ] = paletteColor[0]; + data[ i ] = ((paletteColor >> 16)); } textureCtx.putImageData(textureImageData, 0, 0); diff --git a/src/nitro/avatar/animation/AvatarDataContainer.ts b/src/nitro/avatar/animation/AvatarDataContainer.ts index 98b7fc50..d587ca7b 100644 --- a/src/nitro/avatar/animation/AvatarDataContainer.ts +++ b/src/nitro/avatar/animation/AvatarDataContainer.ts @@ -121,7 +121,7 @@ export class AvatarDataContainer implements IAvatarDataContainer _local_22 = (_local_22 + _local_13); _local_23 = (_local_23 + _local_14); _local_19.push((_local_20 << 24)); - _local_16.push(~~(((((_local_20 << 24) | (_local_21 << 16)) | (_local_22 << 8)) | _local_23) / 255)); + _local_16.push((((((_local_20 << 24) | (_local_21 << 16)) | (_local_22 << 8)) | _local_23))); _local_17.push(((((_local_20 << 24) | (_local_21 << 16)) | (_local_22 << 8)) | _local_23)); _local_18.push(((((_local_20 << 24) | (_local_21 << 16)) | (_local_22 << 8)) | _local_23)); _local_24++;