cleaned AnimationAction

This commit is contained in:
Dank074 2021-05-29 19:54:44 -05:00
parent 986c55fee2
commit c4b8d64d75
12 changed files with 31 additions and 31 deletions

View File

@ -252,7 +252,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher
if(!figurePartSet) continue;
for(const part of figurePartSet._Str_806)
for(const part of figurePartSet.parts)
{
if(!part) continue;

View File

@ -342,7 +342,7 @@ export class AvatarStructure extends EventDispatcher
if(_local_5) return _local_5.getFrameBodyPartOffset(_arg_2, _arg_3, _arg_4);
return AnimationAction._Str_1934;
return AnimationAction.DEFAULT_OFFSET;
}
public getParts(k: string, _arg_2:IAvatarFigureContainer, _arg_3:IActiveActionData, _arg_4: string, _arg_5: number, removes: string[], _arg_7: IAvatarImage, _arg_8: Map<string, string> = null): AvatarImagePartContainer[]
@ -367,7 +367,7 @@ export class AvatarStructure extends EventDispatcher
if(_local_10)
{
_local_14 = this.getPopulatedArray(_local_10._Str_2185(_arg_3.overridingAction));
_local_14 = this.getPopulatedArray(_local_10.frameCount(_arg_3.overridingAction));
for(const _local_25 of _local_10._Str_1065(0, _arg_3.overridingAction))
{
@ -415,13 +415,13 @@ export class AvatarStructure extends EventDispatcher
{
removes = removes.concat(_local_32._Str_790);
for(const _local_33 of _local_32._Str_806)
for(const _local_33 of _local_32.parts)
{
if(_local_16.indexOf(_local_33.type) > -1)
{
if(_local_15)
{
const _local_19 = _local_15._Str_989(_local_33.type);
const _local_19 = _local_15.getPart(_local_33.type);
if(_local_19)
{
@ -506,7 +506,7 @@ export class AvatarStructure extends EventDispatcher
if(_local_15)
{
const _local_19 = _local_15._Str_989(_local_12);
const _local_19 = _local_15.getPart(_local_12);
if(_local_19)
{
@ -570,7 +570,7 @@ export class AvatarStructure extends EventDispatcher
if(_local_15)
{
const _local_19 = _local_15._Str_989(_local_12);
const _local_19 = _local_15.getPart(_local_12);
if(_local_19)
{

View File

@ -130,7 +130,7 @@ export class Animation implements IAnimation
}
}
public _Str_2185(k: string = null): number
public frameCount(k: string = null): number
{
if(!k) return this._frames.length;

View File

@ -53,6 +53,6 @@ export class AvatarAnimationData implements IFigureSetData
if(!animationAction) return 0;
return animationAction._Str_2185;
return animationAction.frameCount;
}
}

View File

@ -71,7 +71,7 @@ export class PartSetsData implements IFigureSetData
if(!activePartSet) return [];
return activePartSet._Str_806;
return activePartSet.parts;
}
public _Str_1102(part: string): PartDefinition
@ -108,7 +108,7 @@ export class PartSetsData implements IFigureSetData
return existing;
}
public get _Str_806(): Map<string, PartDefinition>
public get parts(): Map<string, PartDefinition>
{
return this._parts;
}
@ -117,4 +117,4 @@ export class PartSetsData implements IFigureSetData
{
return this._activePartSets;
}
}
}

View File

@ -3,7 +3,7 @@ import { AnimationActionPart } from './AnimationActionPart';
export class AnimationAction
{
public static _Str_1934: Point = new Point(0, 0);
public static DEFAULT_OFFSET: Point = new Point(0, 0);
private _id: string;
private _actionParts: Map<string, AnimationActionPart>;
@ -91,7 +91,7 @@ export class AnimationAction
}
}
public _Str_989(type: string): AnimationActionPart
public getPart(type: string): AnimationActionPart
{
if(!type) return null;
@ -108,15 +108,15 @@ export class AnimationAction
const frameNumber = this._frameIndexes[frameIndex];
const offsets = this._bodyPartOffsets.get(frameNumber);
if(!offsets) return AnimationAction._Str_1934;
if(!offsets) return AnimationAction.DEFAULT_OFFSET;
const frameOffset = offsets.get(frameId);
if(!frameOffset) return AnimationAction._Str_1934;
if(!frameOffset) return AnimationAction.DEFAULT_OFFSET;
const offset = frameOffset.get(partId);
if(!offset) return AnimationAction._Str_1934;
if(!offset) return AnimationAction.DEFAULT_OFFSET;
return offset;
}
@ -126,12 +126,12 @@ export class AnimationAction
return this._id;
}
public get _Str_806(): Map<string, AnimationActionPart>
public get parts(): Map<string, AnimationActionPart>
{
return this._actionParts;
}
public get _Str_2185(): number
public get frameCount(): number
{
return this._frameCount;
}

View File

@ -80,7 +80,7 @@ export class FigurePartSet implements IFigurePartSet
return -1;
}
public _Str_989(k: string, _arg_2: number): IFigurePart
public getPart(k: string, _arg_2: number): IFigurePart
{
for(const part of this._parts)
{
@ -122,7 +122,7 @@ export class FigurePartSet implements IFigurePartSet
return this._isSelectable;
}
public get _Str_806(): IFigurePart[]
public get parts(): IFigurePart[]
{
return this._parts;
}
@ -141,4 +141,4 @@ export class FigurePartSet implements IFigurePartSet
{
return this._isSellable;
}
}
}

View File

@ -2,15 +2,15 @@ import { IFigurePart } from './IFigurePart';
export interface IFigurePartSet
{
_Str_989(_arg_1: string, _arg_2: number): IFigurePart;
getPart(_arg_1: string, _arg_2: number): IFigurePart;
id: number;
type: string;
gender: string;
clubLevel: number;
isColorable: boolean;
_Str_608: boolean;
_Str_806: IFigurePart[];
parts: IFigurePart[];
_Str_790: string[];
_Str_653: boolean;
_Str_651: boolean;
}
}

View File

@ -19,8 +19,8 @@ export class ActivePartSet
}
}
public get _Str_806(): string[]
public get parts(): string[]
{
return this._parts;
}
}
}

View File

@ -90,7 +90,7 @@ export class LandscapeRasterizer extends PlaneRasterizer
let material: PlaneMaterial = null;
let align: number = PlaneVisualizationLayer._Str_6914;
let color: number = LandscapePlane._Str_2531;
let offset: number = PlaneVisualizationLayer._Str_1934;
let offset: number = PlaneVisualizationLayer.DEFAULT_OFFSET;
if(layer.materialId) material = this._Str_8547(layer.materialId);

View File

@ -563,7 +563,7 @@ export class PlaneRasterizer implements IPlaneRasterizer
let material: PlaneMaterial = null;
let align: number = PlaneVisualizationLayer._Str_6914;
let color: number = FloorPlane._Str_2531;
let offset: number = PlaneVisualizationLayer._Str_1934;
let offset: number = PlaneVisualizationLayer.DEFAULT_OFFSET;
if(layer.materialId) material = this._Str_8547(layer.materialId);

View File

@ -6,7 +6,7 @@ import { PlaneMaterial } from './PlaneMaterial';
export class PlaneVisualizationLayer
{
public static _Str_1934: number = 0;
public static DEFAULT_OFFSET: number = 0;
public static ALIGN_TOP: number = 1;
public static _Str_3606: number = 2;
public static _Str_6914: number = PlaneVisualizationLayer.ALIGN_TOP;
@ -144,4 +144,4 @@ export class PlaneVisualizationLayer
{
return this._color;
}
}
}