From 96737416efed25dd817a083c516cd430ccc3cadb Mon Sep 17 00:00:00 2001 From: Dank074 Date: Sat, 29 May 2021 19:07:07 -0500 Subject: [PATCH] cleaned AvatarAnimationFrame --- src/nitro/avatar/AvatarImage.ts | 4 ++-- src/nitro/avatar/AvatarImagePartContainer.ts | 2 +- src/nitro/avatar/actions/ActionDefinition.ts | 4 ++-- src/nitro/avatar/actions/IActionDefinition.ts | 4 ++-- src/nitro/avatar/cache/AvatarImageCache.ts | 4 ++-- src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/nitro/avatar/AvatarImage.ts b/src/nitro/avatar/AvatarImage.ts index 545862cb..49a9932f 100644 --- a/src/nitro/avatar/AvatarImage.ts +++ b/src/nitro/avatar/AvatarImage.ts @@ -941,7 +941,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { return; } - if(k.definition._Str_778 == '') + if(k.definition.assetPartDefinition == '') { return; } @@ -958,7 +958,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { if(!k) return; - if(k.definition._Str_778 === '') return; + if(k.definition.assetPartDefinition === '') return; if(k.definition._Str_779) { diff --git a/src/nitro/avatar/AvatarImagePartContainer.ts b/src/nitro/avatar/AvatarImagePartContainer.ts index 7dec4bc8..c8604851 100644 --- a/src/nitro/avatar/AvatarImagePartContainer.ts +++ b/src/nitro/avatar/AvatarImagePartContainer.ts @@ -73,7 +73,7 @@ export class AvatarImagePartContainer { const frame = this._frames[frameNumber]; - return (this.partId + ':' + frame._Str_778 + ':' + frame.number); + return (this.partId + ':' + frame.assetPartDefinition + ':' + frame.number); } } diff --git a/src/nitro/avatar/actions/ActionDefinition.ts b/src/nitro/avatar/actions/ActionDefinition.ts index df5b4b52..8f74ce43 100644 --- a/src/nitro/avatar/actions/ActionDefinition.ts +++ b/src/nitro/avatar/actions/ActionDefinition.ts @@ -172,7 +172,7 @@ export class ActionDefinition implements IActionDefinition return this._activePartSet; } - public get _Str_778(): string + public get assetPartDefinition(): string { return this._assetPartDefinition; } @@ -221,4 +221,4 @@ export class ActionDefinition implements IActionDefinition { return this._params; } -} \ No newline at end of file +} diff --git a/src/nitro/avatar/actions/IActionDefinition.ts b/src/nitro/avatar/actions/IActionDefinition.ts index a2edafb0..a11a6d49 100644 --- a/src/nitro/avatar/actions/IActionDefinition.ts +++ b/src/nitro/avatar/actions/IActionDefinition.ts @@ -7,7 +7,7 @@ export interface IActionDefinition activePartSet: string; _Str_779: boolean; _Str_804: boolean; - _Str_778: string; + assetPartDefinition: string; lay: string; _Str_868: string; _Str_861: boolean; @@ -17,4 +17,4 @@ export interface IActionDefinition _Str_715(_arg_1: string): boolean; _Str_772(_arg_1: string, _arg_2: number, _arg_3: []): void; _Str_805(_arg_1: string, _arg_2: number): number[]; -} \ No newline at end of file +} diff --git a/src/nitro/avatar/cache/AvatarImageCache.ts b/src/nitro/avatar/cache/AvatarImageCache.ts index 4762766f..0b667847 100644 --- a/src/nitro/avatar/cache/AvatarImageCache.ts +++ b/src/nitro/avatar/cache/AvatarImageCache.ts @@ -331,7 +331,7 @@ export class AvatarImageCache } const isFlipped = AvatarDirectionAngle.DIRECTION_IS_FLIPPED[direction] || false; - let assetPartDefinition = _arg_4.definition._Str_778; + let assetPartDefinition = _arg_4.definition.assetPartDefinition; let isCacheable = true; let containerIndex = (containers.length - 1); @@ -355,7 +355,7 @@ export class AvatarImageCache { frameNumber = animationFrame.number; - if((animationFrame._Str_778) && (animationFrame._Str_778 !== '')) assetPartDefinition = animationFrame._Str_778; + if((animationFrame.assetPartDefinition) && (animationFrame.assetPartDefinition !== '')) assetPartDefinition = animationFrame.assetPartDefinition; } else frameNumber = container.getFrameIndex(frameCount); diff --git a/src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts b/src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts index f86273fe..ba1a18ff 100644 --- a/src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts +++ b/src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts @@ -14,7 +14,7 @@ export class AvatarAnimationFrame return this._number; } - public get _Str_778(): string + public get assetPartDefinition(): string { return this._assetPartDefinition; }