nitro/nitro-renderer
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-renderer.git synced 2024-10-23 03:33:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleaned ActiveActionData

Browse Source
This commit is contained in:
Dank074 2021-05-29 16:56:42 -05:00
parent 3584040d78
commit adb974ea87
9 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/nitro/avatar/AvatarImage.ts
View File

@ -99,7 +99,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
this.setDirection(AvatarImage.DEFAULT_AVATAR_SET, AvatarImage.DEFAULT_DIRECTION);
this._actions = [];
this._defaultAction = new ActiveActionData(AvatarAction.POSTURE_STAND);
this._defaultAction._Str_742 = this._structure._Str_1675(AvatarImage.DEFAULT_ACTION);
this._defaultAction.definition = this._structure._Str_1675(AvatarImage.DEFAULT_ACTION);
this.resetActions();
this._fullImageCache = new AdvancedMap();
this._animationFrameCount = 0;
@ -246,25 +246,25 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
{
for(const k of this._sortedActions)
{
if(((k._Str_695 == 'fx') && ((((k._Str_727 == '33') || (k._Str_727 == '34')) || (k._Str_727 == '35')) || (k._Str_727 == '36'))))
if(((k.actionType == 'fx') && ((((k.actionParameter == '33') || (k.actionParameter == '34')) || (k.actionParameter == '35')) || (k.actionParameter == '36'))))
{
return (this._mainDirection + this._currentActionsString) + 0;
}
if(((k._Str_695 == 'fx') && ((k._Str_727 == '38') || (k._Str_727 == '39'))))
if(((k.actionType == 'fx') && ((k.actionParameter == '38') || (k.actionParameter == '39'))))
{
return (((this._mainDirection + '_') + this._headDirection) + this._currentActionsString) + (this._frameCounter % 11);
}
if((k._Str_695 === 'dance') && ((k._Str_727 === '1') || (k._Str_727 === '2') || (k._Str_727 === '3') || (k._Str_727 === '4')))
if((k.actionType === 'dance') && ((k.actionParameter === '1') || (k.actionParameter === '2') || (k.actionParameter === '3') || (k.actionParameter === '4')))
{
let frame = (this._frameCounter % 8);
if((k._Str_727 === '3')) frame = (this._frameCounter % 10);
if((k.actionParameter === '3')) frame = (this._frameCounter % 10);
if((k._Str_727 === '4')) frame = (this._frameCounter % 16);
if((k.actionParameter === '4')) frame = (this._frameCounter % 16);
return (((this._mainDirection + k._Str_695) + k._Str_727) + frame);
return (((this._mainDirection + k.actionType) + k.actionParameter) + frame);
}
}
}
@ -291,12 +291,12 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
{
return;
}
const _local_2 = this._structure._Str_1664(this._scale, this._mainAction._Str_742._Str_868);
const _local_2 = this._structure._Str_1664(this._scale, this._mainAction.definition._Str_868);
if(_local_2 == null)
{
return;
}
const _local_3 = this.getBodyParts(k, this._mainAction._Str_742._Str_868, this._mainDirection);
const _local_3 = this.getBodyParts(k, this._mainAction.definition._Str_868, this._mainDirection);
let _local_6 = (_local_3.length - 1);
while(_local_6 >= 0)
{
@ -314,7 +314,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
if(!this._actionsSorted) this.endActionAppends();
const avatarCanvas = this._structure._Str_1664(this._scale, this._mainAction._Str_742._Str_868);
const avatarCanvas = this._structure._Str_1664(this._scale, this._mainAction.definition._Str_868);
if(!avatarCanvas) return null;
@ -331,7 +331,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
this._isCachedImage = false;
}
const _local_6 = this.getBodyParts(setType, this._mainAction._Str_742._Str_868, this._mainDirection);
const _local_6 = this.getBodyParts(setType, this._mainAction.definition._Str_868, this._mainDirection);
this._image = null;
@ -444,11 +444,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
if(!this._actionsSorted) this.endActionAppends();
const avatarCanvas = this._structure._Str_1664(this._scale, this._mainAction._Str_742._Str_868);
const avatarCanvas = this._structure._Str_1664(this._scale, this._mainAction.definition._Str_868);
if(!avatarCanvas) return null;
const setTypes = this.getBodyParts(setType, this._mainAction._Str_742._Str_868, this._mainDirection);
const setTypes = this.getBodyParts(setType, this._mainAction.definition._Str_868, this._mainDirection);
const container = new Sprite();
const sprite = new Sprite(Texture.EMPTY);
@ -509,11 +509,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
if(!this._actionsSorted) this.endActionAppends();
const avatarCanvas = this._structure._Str_1664(this._scale, this._mainAction._Str_742._Str_868);
const avatarCanvas = this._structure._Str_1664(this._scale, this._mainAction.definition._Str_868);
if(!avatarCanvas) return null;
const setTypes = this.getBodyParts(setType, this._mainAction._Str_742._Str_868, this._mainDirection);
const setTypes = this.getBodyParts(setType, this._mainAction.definition._Str_868, this._mainDirection);
const container = new Container();
const sprite = new Sprite(Texture.EMPTY);
@ -646,9 +646,9 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
for(const k of this._sortedActions)
{
if(k._Str_695 === AvatarAction.EFFECT)
if(k.actionType === AvatarAction.EFFECT)
{
if(!this._effectManager.isAvatarEffectReady(parseInt(k._Str_727))) this._effectManager.downloadAvatarEffect(parseInt(k._Str_727), this);
if(!this._effectManager.isAvatarEffectReady(parseInt(k.actionParameter))) this._effectManager.downloadAvatarEffect(parseInt(k.actionParameter), this);
}
}
@ -760,7 +760,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
while(_local_4 < this._actions.length)
{
_local_3 = this._actions[_local_4];
if(((_local_3._Str_695 == k) && (_local_3._Str_727 == _arg_2)))
if(((_local_3.actionType == k) && (_local_3.actionParameter == _arg_2)))
{
return;
}
@ -783,7 +783,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
this._directionOffset = 0;
this._structure._Str_2101(this);
this._mainAction = this._defaultAction;
this._mainAction._Str_742 = this._defaultAction._Str_742;
this._mainAction.definition = this._defaultAction.definition;
this.resetBodyPartCache(this._defaultAction);
return true;
}
@ -799,8 +799,8 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
}
for(const _local_3 of this._sortedActions)
{
_local_2 = this._structure._Str_2018(_local_3._Str_695);
if(((!(_local_2 == null)) && (_local_2._Str_715(_local_3._Str_727))))
_local_2 = this._structure._Str_2018(_local_3.actionType);
if(((!(_local_2 == null)) && (_local_2._Str_715(_local_3.actionParameter))))
{
k = true;
}
@ -837,11 +837,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
for(const _local_4 of this._sortedActions)
{
this._currentActionsString = (this._currentActionsString + (_local_4._Str_695 + _local_4._Str_727));
this._currentActionsString = (this._currentActionsString + (_local_4.actionType + _local_4.actionParameter));
if(_local_4._Str_695 === AvatarAction.EFFECT)
if(_local_4.actionType === AvatarAction.EFFECT)
{
const _local_5 = parseInt(_local_4._Str_727);
const _local_5 = parseInt(_local_4.actionParameter);
if(this._effectIdInUse !== _local_5) _local_2 = true;
@ -880,13 +880,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
const _local_3: number = Nitro.instance.time;
const _local_4: string[] = [];
for(const k of this._sortedActions) _local_4.push(k._Str_695);
for(const k of this._sortedActions) _local_4.push(k.actionType);
for(const k of this._sortedActions)
{
if((k && k._Str_742) && k._Str_742._Str_861)
if((k && k.definition) && k.definition._Str_861)
{
const _local_2 = this._structure._Str_720(((k._Str_742.state + '.') + k._Str_727));
const _local_2 = this._structure._Str_720(((k.definition.state + '.') + k.actionParameter));
if(_local_2 && _local_2._Str_1892())
{
@ -896,7 +896,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
{
for(const _local_6 of _local_5)
{
if(_local_4.indexOf(_local_6) >= 0) k._Str_707 = _local_2._Str_707(_local_6);
if(_local_4.indexOf(_local_6) >= 0) k.overridingAction = _local_2.overridingAction(_local_6);
}
}
}
@ -910,17 +910,17 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
for(const k of this._sortedActions)
{
if(!((!(k)) || (!(k._Str_742))))
if(!((!(k)) || (!(k.definition))))
{
if(k._Str_742._Str_861 && (k._Str_727 === '')) k._Str_727 = '1';
if(k.definition._Str_861 && (k.actionParameter === '')) k.actionParameter = '1';
this.setActionToParts(k, _local_3);
if(k._Str_742._Str_861)
if(k.definition._Str_861)
{
this._isAnimating = k._Str_742._Str_801(k._Str_727);
this._isAnimating = k.definition._Str_801(k.actionParameter);
const _local_2 = this._structure._Str_720(((k._Str_742.state + '.') + k._Str_727));
const _local_2 = this._structure._Str_720(((k.definition.state + '.') + k.actionParameter));
if(_local_2)
{
@ -937,18 +937,18 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
private setActionToParts(k: IActiveActionData, _arg_2: number): void
{
if(((k == null) || (k._Str_742 == null)))
if(((k == null) || (k.definition == null)))
{
return;
}
if(k._Str_742._Str_778 == '')
if(k.definition._Str_778 == '')
{
return;
}
if(k._Str_742._Str_779)
if(k.definition._Str_779)
{
this._mainAction = k;
this._cache._Str_2014(k._Str_742._Str_868);
this._cache._Str_2014(k.definition._Str_868);
}
this._cache._Str_1565(k, _arg_2);
this._changes = true;
@ -958,12 +958,12 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
{
if(!k) return;
if(k._Str_742._Str_778 === '') return;
if(k.definition._Str_778 === '') return;
if(k._Str_742._Str_779)
if(k.definition._Str_779)
{
this._mainAction = k;
this._cache._Str_2014(k._Str_742._Str_868);
this._cache._Str_2014(k.definition._Str_868);
}
this._cache._Str_741(k);
@ -1045,7 +1045,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
public get mainAction(): string
{
return this._mainAction._Str_695;
return this._mainAction.actionType;
}
public resetEffect(effect: number): void

36
src/nitro/avatar/AvatarStructure.ts
View File

@ -204,7 +204,7 @@ export class AvatarStructure extends EventDispatcher
for(const _local_3 of k)
{
_local_2 = Math.max(_local_2, this._animationData._Str_1408(_local_3._Str_742));
_local_2 = Math.max(_local_2, this._animationData._Str_1408(_local_3.definition));
}
return _local_2;
}
@ -251,16 +251,16 @@ export class AvatarStructure extends EventDispatcher
let _local_3: string[] = [];
const _local_4: string[] = [];
const _local_5 = k._Str_742._Str_868;
const _local_5 = k.definition._Str_868;
if(k._Str_742._Str_861)
if(k.definition._Str_861)
{
const _local_7 = ((k._Str_742.state + '.') + k._Str_727);
const _local_7 = ((k.definition.state + '.') + k.actionParameter);
const _local_8 = this._animationManager._Str_720(_local_7);
if(_local_8)
{
_local_3 = _local_8._Str_1065(0, k._Str_707);
_local_3 = _local_8._Str_1065(0, k.overridingAction);
if(_local_8._Str_706())
{
@ -311,7 +311,7 @@ export class AvatarStructure extends EventDispatcher
}
else
{
_local_3 = this._partSetsData._Str_1795(k._Str_742);
_local_3 = this._partSetsData._Str_1795(k.definition);
for(const _local_14 of _local_3)
{
@ -338,7 +338,7 @@ export class AvatarStructure extends EventDispatcher
public _Str_1888(k:IActiveActionData, _arg_2: number, _arg_3: number, _arg_4: string): Point
{
const _local_5 = this._animationData._Str_2244(k._Str_742);
const _local_5 = this._animationData._Str_2244(k.definition);
if(_local_5) return _local_5._Str_1888(_arg_2, _arg_3, _arg_4);
@ -355,21 +355,21 @@ export class AvatarStructure extends EventDispatcher
if(!_arg_3 == null) return [];
const _local_9 = this._partSetsData._Str_1795(_arg_3._Str_742);
const _local_9 = this._partSetsData._Str_1795(_arg_3.definition);
const _local_11: AvatarImagePartContainer[] = [];
let _local_14: any[] = [ 0 ];
const _local_15 = this._animationData._Str_2244(_arg_3._Str_742);
const _local_15 = this._animationData._Str_2244(_arg_3.definition);
if(_arg_3._Str_742._Str_861)
if(_arg_3.definition._Str_861)
{
const _local_24 = ((_arg_3._Str_742.state + '.') + _arg_3._Str_727);
const _local_24 = ((_arg_3.definition.state + '.') + _arg_3.actionParameter);
const _local_10 = this._animationManager._Str_720(_local_24);
if(_local_10)
{
_local_14 = this._Str_1768(_local_10._Str_2185(_arg_3._Str_707));
_local_14 = this._Str_1768(_local_10._Str_2185(_arg_3.overridingAction));
for(const _local_25 of _local_10._Str_1065(0, _arg_3._Str_707))
for(const _local_25 of _local_10._Str_1065(0, _arg_3.overridingAction))
{
if(_local_25 === k)
{
@ -437,7 +437,7 @@ export class AvatarStructure extends EventDispatcher
_local_20 = _local_14;
}
_local_34 = _arg_3._Str_742;
_local_34 = _arg_3.definition;
if(_local_9.indexOf(_local_33.type) === -1) _local_34 = this._defaultAction;
@ -522,7 +522,7 @@ export class AvatarStructure extends EventDispatcher
_local_20 = _local_14;
}
const _local_18 = new AvatarImagePartContainer(k, _local_12, _local_41, _local_39, _local_20, _arg_3._Str_742, (!(_local_39 == null)), -1, _local_12, false, 1);
const _local_18 = new AvatarImagePartContainer(k, _local_12, _local_41, _local_39, _local_20, _arg_3.definition, (!(_local_39 == null)), -1, _local_12, false, 1);
_local_22.push(_local_18);
}
@ -547,9 +547,9 @@ export class AvatarStructure extends EventDispatcher
{
let _local_47 = '1';
if(_arg_3._Str_727 !== '')
if(_arg_3.actionParameter !== '')
{
_local_47 = _arg_3._Str_727;
_local_47 = _arg_3.actionParameter;
}
if(_local_13.hasStaticId())
@ -586,7 +586,7 @@ export class AvatarStructure extends EventDispatcher
_local_20 = _local_14;
}
const _local_18 = new AvatarImagePartContainer(k, _local_12, _local_47, null, _local_20, _arg_3._Str_742, false, -1, _local_12, _local_45, _local_46);
const _local_18 = new AvatarImagePartContainer(k, _local_12, _local_47, null, _local_20, _arg_3.definition, false, -1, _local_12, _local_45, _local_46);
_local_22.push(_local_18);
}

18
src/nitro/avatar/actions/ActiveActionData.ts
View File

@ -32,43 +32,43 @@ export class ActiveActionData implements IActiveActionData
return this._definition.id + '_' + this._actionParameter;
}
public get _Str_695(): string
public get actionType(): string
{
return this._actionType;
}
public get _Str_727(): string
public get actionParameter(): string
{
return this._actionParameter;
}
public set _Str_727(parameter: string)
public set actionParameter(parameter: string)
{
this._actionParameter = parameter;
}
public get _Str_742(): IActionDefinition
public get definition(): IActionDefinition
{
return this._definition;
}
public set _Str_742(definition: IActionDefinition)
public set definition(definition: IActionDefinition)
{
this._definition = definition;
}
public get _Str_664(): number
public get startFrame(): number
{
return this._startFrame;
}
public get _Str_707(): string
public get overridingAction(): string
{
return this._overridingAction;
}
public set _Str_707(action: string)
public set overridingAction(action: string)
{
this._overridingAction = action;
}
}
}

20
src/nitro/avatar/actions/AvatarActionManager.ts
View File

@ -106,7 +106,7 @@ export class AvatarActionManager
{
if(!activeAction) continue;
const action = this._actions.get(activeAction._Str_695);
const action = this._actions.get(activeAction.actionType);
const offsets = action && action._Str_805(_arg_2, _arg_3);
if(offsets) canvasOffsets = offsets;
@ -127,11 +127,11 @@ export class AvatarActionManager
{
if(!action) continue;
const definition = this._actions.get(action._Str_695);
const definition = this._actions.get(action.actionType);
if(!definition) continue;
action._Str_742 = definition;
action.definition = definition;
validatedActions.push(action);
}
@ -150,18 +150,18 @@ export class AvatarActionManager
{
if(!action) continue;
const localAction = this._actions.get(action._Str_695);
const localAction = this._actions.get(action.actionType);
if(localAction) preventions = preventions.concat(localAction._Str_733(action._Str_727));
if(localAction) preventions = preventions.concat(localAction._Str_733(action.actionParameter));
}
for(const action of actions)
{
if(!action) continue;
let actionType = action._Str_695;
let actionType = action.actionType;
if(action._Str_695 === 'fx') actionType = (actionType + ('.' + action._Str_727));
if(action.actionType === 'fx') actionType = (actionType + ('.' + action.actionParameter));
if(preventions.indexOf(actionType) >= 0) continue;
@ -175,8 +175,8 @@ export class AvatarActionManager
{
if(!actionOne || !actionTwo) return 0;
const precedenceOne = actionOne._Str_742.precedence;
const precedenceTwo = actionTwo._Str_742.precedence;
const precedenceOne = actionOne.definition.precedence;
const precedenceTwo = actionTwo.definition.precedence;
if(precedenceOne < precedenceTwo) return 1;
@ -184,4 +184,4 @@ export class AvatarActionManager
return 0;
}
}
}

12
src/nitro/avatar/actions/IActiveActionData.ts
View File

@ -3,9 +3,9 @@ import { IActionDefinition } from './IActionDefinition';
export interface IActiveActionData
{
id: string;
_Str_695: string;
_Str_727: string;
_Str_664: number;
_Str_742: IActionDefinition;
_Str_707: string;
}
actionType: string;
actionParameter: string;
startFrame: number;
definition: IActionDefinition;
overridingAction: string;
}

2
src/nitro/avatar/animation/Animation.ts
View File

@ -162,7 +162,7 @@ export class Animation implements IAnimation
return keys;
}
public _Str_707(k: string): string
public overridingAction(k: string): string
{
if(!this._overriddenActions) return null;

2
src/nitro/avatar/animation/AvatarAnimationLayerData.ts
View File

@ -41,7 +41,7 @@ export class AvatarAnimationLayerData implements IAnimationLayerData
if(_arg_3)
{
this._action = new ActiveActionData(_arg_3.state, this.base);
this._action._Str_742 = _arg_3;
this._action.definition = _arg_3;
}
}

6
src/nitro/avatar/cache/AvatarImageActionCache.ts vendored
View File

@ -79,18 +79,18 @@ export class AvatarImageActionCache
if(!k) k = this._Str_1233;
if(k._Str_707) return this._Str_586.get(k._Str_707);
if(k.overridingAction) return this._Str_586.get(k.overridingAction);
return this._Str_586.get(k.id);
}
public _Str_1765(k: IActiveActionData, _arg_2: AvatarImageBodyPartCache): void
{
if(k._Str_707) this._Str_586.set(k._Str_707, _arg_2);
if(k.overridingAction) this._Str_586.set(k.overridingAction, _arg_2);
else this._Str_586.set(k.id, _arg_2);
}
private _Str_587(k: string): void
{
}
}
}

14
src/nitro/avatar/cache/AvatarImageCache.ts vendored
View File

@ -173,25 +173,25 @@ export class AvatarImageCache
let _local_7 = _local_4._Str_2244();
let frameCount = frameNumber;
if(_local_7._Str_742._Str_812) frameCount -= _local_7._Str_664;
if(_local_7.definition._Str_812) frameCount -= _local_7.startFrame;
let _local_8 = _local_7;
let _local_9: string[] = [];
let _local_10: Map<string, string> = new Map();
const _local_11 = new Point();
if(!((!(_local_7)) || (!(_local_7._Str_742))))
if(!((!(_local_7)) || (!(_local_7.definition))))
{
if(_local_7._Str_742._Str_861)
if(_local_7.definition._Str_861)
{
let _local_15 = _local_5;
const _local_16 = this._structure._Str_720(((_local_7._Str_742.state + '.') + _local_7._Str_727));
const _local_17 = (frameNumber - _local_7._Str_664);
const _local_16 = this._structure._Str_720(((_local_7.definition.state + '.') + _local_7.actionParameter));
const _local_17 = (frameNumber - _local_7.startFrame);
if(_local_16)
{
const _local_18 = _local_16._Str_607(_local_17, k, _local_7._Str_707);
const _local_18 = _local_16._Str_607(_local_17, k, _local_7.overridingAction);
if(_local_18)
{
@ -331,7 +331,7 @@ export class AvatarImageCache
}
const isFlipped = AvatarDirectionAngle.DIRECTION_IS_FLIPPED[direction] || false;
let assetPartDefinition = _arg_4._Str_742._Str_778;
let assetPartDefinition = _arg_4.definition._Str_778;
let isCacheable = true;
let containerIndex = (containers.length - 1);