nitro/nitro-renderer
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-renderer.git synced 2024-11-22 23:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambiguities

Browse Source
This commit is contained in:
Bill 2021-04-14 16:57:52 -04:00
parent f7629f84f4
commit de670e858e
11 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nitro/avatar/AvatarImagePartContainer.ts
View File

@ -1,6 +1,6 @@
import { AdjustmentFilter } from '@pixi/filter-adjustment';
import { IActionDefinition } from './actions/IActionDefinition';
import { AnimationFrame } from './structure/animation/AnimationFrame';
import { AvatarAnimationFrame } from './structure/animation/AvatarAnimationFrame';
import { IPartColor } from './structure/figure/IPartColor';
export class AvatarImagePartContainer
@ -10,14 +10,14 @@ export class AvatarImagePartContainer
private _flippedPartType: string;
private _partId: string;
private _color: IPartColor;
private _frames: AnimationFrame[];
private _frames: AvatarAnimationFrame[];
private _action: IActionDefinition;
private _isColorable: boolean;
private _isBlendable: boolean;
private _blendTransform: AdjustmentFilter;
private _paletteMapId: number;
constructor(k: string, _arg_2: string, _arg_3: string, _arg_4: IPartColor, _arg_5: AnimationFrame[], _arg_6: IActionDefinition, _arg_7: boolean, _arg_8: number, _arg_9: string = '', _arg_10: boolean = false, _arg_11: number = 1)
constructor(k: string, _arg_2: string, _arg_3: string, _arg_4: IPartColor, _arg_5: AvatarAnimationFrame[], _arg_6: IActionDefinition, _arg_7: boolean, _arg_8: number, _arg_9: string = '', _arg_10: boolean = false, _arg_11: number = 1)
{
this._bodyPartId = k;
this._partType = _arg_2;
@ -40,7 +40,7 @@ export class AvatarImagePartContainer
const frameNumber = (k % this._frames.length);
if(this._frames[frameNumber] instanceof AnimationFrame)
if(this._frames[frameNumber] instanceof AvatarAnimationFrame)
{
return this._frames[frameNumber].number;
}
@ -48,13 +48,13 @@ export class AvatarImagePartContainer
return frameNumber;
}
public _Str_2258(k: number): AnimationFrame
public _Str_2258(k: number): AvatarAnimationFrame
{
const frameNumber = (k % this._frames.length);
if(this._frames && (this._frames.length > frameNumber))
{
if(this._frames[frameNumber] instanceof AnimationFrame)
if(this._frames[frameNumber] instanceof AvatarAnimationFrame)
{
return this._frames[frameNumber];
}
@ -69,7 +69,7 @@ export class AvatarImagePartContainer
if(this._frames && (this._frames.length > frameNumber))
{
if(this._frames[frameNumber] instanceof AnimationFrame)
if(this._frames[frameNumber] instanceof AvatarAnimationFrame)
{
const frame = this._frames[frameNumber];
@ -134,4 +134,4 @@ export class AvatarImagePartContainer
{
return [ this._bodyPartId, this._partType, this._partId ].join(':');
}
}
}

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

@ -7,8 +7,8 @@ import { AvatarActionManager } from './actions/AvatarActionManager';
import { IActionDefinition } from './actions/IActionDefinition';
import { IActiveActionData } from './actions/IActiveActionData';
import { Animation } from './animation/Animation';
import { AnimationLayerData } from './animation/AnimationLayerData';
import { AnimationManager } from './animation/AnimationManager';
import { AvatarAnimationLayerData } from './animation/AvatarAnimationLayerData';
import { AvatarImagePartContainer } from './AvatarImagePartContainer';
import { AvatarRenderManager } from './AvatarRenderManager';
import { AvatarDirectionAngle } from './enum/AvatarDirectionAngle';
@ -17,8 +17,8 @@ import { IAvatarFigureContainer } from './IAvatarFigureContainer';
import { IAvatarImage } from './IAvatarImage';
import { IAvatarRenderManager } from './IAvatarRenderManager';
import { AnimationAction } from './structure/animation/AnimationAction';
import { AnimationFrame } from './structure/animation/AnimationFrame';
import { AnimationData } from './structure/AnimationData';
import { AvatarAnimationFrame } from './structure/animation/AvatarAnimationFrame';
import { AvatarAnimationData } from './structure/AvatarAnimationData';
import { AvatarCanvas } from './structure/AvatarCanvas';
import { IFigurePartSet } from './structure/figure/IFigurePartSet';
import { IPartColor } from './structure/figure/IPartColor';
@ -32,7 +32,7 @@ export class AvatarStructure extends EventDispatcher
private _geometry: AvatarModelGeometry;
private _figureData: FigureSetData;
private _partSetsData: PartSetsData;
private _animationData: AnimationData;
private _animationData: AvatarAnimationData;
private _animationManager: AnimationManager;
private _mandatorySetTypeIds: { [index: string]: { [index: number]: string[] } };
private _actionManager: AvatarActionManager;
@ -46,7 +46,7 @@ export class AvatarStructure extends EventDispatcher
this._geometry = null;
this._figureData = new FigureSetData();
this._partSetsData = new PartSetsData();
this._animationData = new AnimationData();
this._animationData = new AvatarAnimationData();
this._animationManager = new AnimationManager();
this._mandatorySetTypeIds = {};
this._actionManager = null;
@ -168,9 +168,9 @@ export class AvatarStructure extends EventDispatcher
return _local_6._Str_751(_local_4[_arg_3]);
}
public _Str_1881(animation: string, frameCount: number, spriteId: string): AnimationLayerData
public _Str_1881(animation: string, frameCount: number, spriteId: string): AvatarAnimationLayerData
{
return this._animationManager._Str_607(animation, frameCount, spriteId) as AnimationLayerData;
return this._animationManager._Str_607(animation, frameCount, spriteId) as AvatarAnimationLayerData;
}
public _Str_720(k: string): Animation
@ -350,7 +350,7 @@ export class AvatarStructure extends EventDispatcher
const _local_10: Animation = null;
let _local_34: IActionDefinition = null;
let _local_20: AnimationFrame[] = [];
let _local_20: AvatarAnimationFrame[] = [];
let _local_36:IPartColor = null;
if(!_arg_3 == null) return [];

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

@ -1,7 +1,7 @@
import { IAssetAnimation, IAssetAnimationFrame } from '../../../core/asset/interfaces';
import { AvatarStructure } from '../AvatarStructure';
import { AddDataContainer } from './AddDataContainer';
import { AnimationLayerData } from './AnimationLayerData';
import { AvatarAnimationLayerData } from './AvatarAnimationLayerData';
import { AvatarDataContainer } from './AvatarDataContainer';
import { DirectionDataContainer } from './DirectionDataContainer';
import { IAnimation } from './IAnimation';
@ -13,14 +13,14 @@ export class Animation implements IAnimation
private _id: string;
private _description: string;
private _frames: AnimationLayerData[][];
private _frames: AvatarAnimationLayerData[][];
private _spriteData: SpriteDataContainer[];
private _avatarData: AvatarDataContainer;
private _directionData: DirectionDataContainer;
private _removeData: string[];
private _addData: AddDataContainer[];
private _overriddenActions: Map<string, string>;
private _overrideFrames: Map<string, AnimationLayerData[][]>;
private _overrideFrames: Map<string, AvatarAnimationLayerData[][]>;
private _resetOnToggle: boolean;
constructor(k: AvatarStructure, _arg_2: IAssetAnimation)
@ -74,7 +74,7 @@ export class Animation implements IAnimation
this._overriddenActions.set(value, name);
const frames: AnimationLayerData[][] = [];
const frames: AvatarAnimationLayerData[][] = [];
this._Str_1031(frames, override.frames, k);
@ -85,7 +85,7 @@ export class Animation implements IAnimation
this._Str_1031(this._frames, _arg_2.frames, k);
}
private _Str_1031(frames: AnimationLayerData[][], _arg_2: IAssetAnimationFrame[], _arg_3: AvatarStructure): void
private _Str_1031(frames: AvatarAnimationLayerData[][], _arg_2: IAssetAnimationFrame[], _arg_3: AvatarStructure): void
{
if(!_arg_2 || !_arg_2.length) return;
@ -99,14 +99,14 @@ export class Animation implements IAnimation
while(index < repeats)
{
const layers: AnimationLayerData[] = [];
const layers: AvatarAnimationLayerData[] = [];
if(frame.bodyparts && frame.bodyparts.length)
{
for(const bodyPart of frame.bodyparts)
{
const definition = _arg_3._Str_1675(bodyPart.action);
const layer = new AnimationLayerData(bodyPart, AnimationLayerData.BODYPART, definition);
const layer = new AvatarAnimationLayerData(bodyPart, AvatarAnimationLayerData.BODYPART, definition);
layers.push(layer);
}
@ -117,7 +117,7 @@ export class Animation implements IAnimation
for(const fx of frame.fxs)
{
const definition = _arg_3._Str_1675(fx.action);
const layer = new AnimationLayerData(fx, AnimationLayerData.FX, definition);
const layer = new AvatarAnimationLayerData(fx, AvatarAnimationLayerData.FX, definition);
layers.push(layer);
}
@ -169,11 +169,11 @@ export class Animation implements IAnimation
return this._overriddenActions.get(k);
}
private _Str_2259(frameCount: number, _arg_2: string = null): AnimationLayerData[]
private _Str_2259(frameCount: number, _arg_2: string = null): AvatarAnimationLayerData[]
{
if(frameCount < 0) frameCount = 0;
let layers: AnimationLayerData[] = [];
let layers: AvatarAnimationLayerData[] = [];
if(!_arg_2)
{
@ -201,12 +201,12 @@ export class Animation implements IAnimation
for(const layer of this._Str_2259(k, _arg_2))
{
if(layer.type === AnimationLayerData.BODYPART)
if(layer.type === AvatarAnimationLayerData.BODYPART)
{
_local_3.push(layer.id);
}
else if(layer.type === AnimationLayerData.FX)
else if(layer.type === AvatarAnimationLayerData.FX)
{
if(this._addData && this._addData.length)
{
@ -221,13 +221,13 @@ export class Animation implements IAnimation
return _local_3;
}
public _Str_607(frameCount: number, spriteId: string, _arg_3: string = null): AnimationLayerData
public _Str_607(frameCount: number, spriteId: string, _arg_3: string = null): AvatarAnimationLayerData
{
for(const layer of this._Str_2259(frameCount, _arg_3))
{
if(layer.id === spriteId) return layer;
if(layer.type === AnimationLayerData.FX)
if(layer.type === AvatarAnimationLayerData.FX)
{
if(this._addData && this._addData.length)
{

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

@ -1,7 +1,7 @@
export * from './AddDataContainer';
export * from './Animation';
export * from './AnimationLayerData';
export * from './AnimationManager';
export * from './AvatarAnimationLayerData';
export * from './AvatarDataContainer';
export * from './DirectionDataContainer';
export * from './IAnimation';

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

@ -3,7 +3,7 @@ import { RoomObjectSpriteData } from '../../../room/data/RoomObjectSpriteData';
import { Nitro } from '../../Nitro';
import { IActiveActionData } from '../actions/IActiveActionData';
import { AssetAliasCollection } from '../alias/AssetAliasCollection';
import { AnimationLayerData } from '../animation/AnimationLayerData';
import { AvatarAnimationLayerData } from '../animation/AvatarAnimationLayerData';
import { AvatarImageBodyPartContainer } from '../AvatarImageBodyPartContainer';
import { AvatarImagePartContainer } from '../AvatarImagePartContainer';
import { AvatarStructure } from '../AvatarStructure';
@ -232,7 +232,7 @@ export class AvatarImageCache
_local_7 = _local_18.action;
}
if(_local_18.type === AnimationLayerData.BODYPART)
if(_local_18.type === AvatarAnimationLayerData.BODYPART)
{
if(_local_18.action != null)
{
@ -241,7 +241,7 @@ export class AvatarImageCache
_local_5 = _local_15;
}
else if(_local_18.type === AnimationLayerData.FX) _local_5 = _local_15;
else if(_local_18.type === AvatarAnimationLayerData.FX) _local_5 = _local_15;
_local_10 = _local_18.items;
}

10
src/nitro/avatar/structure/animation/AnimationActionPart.ts
View File

@ -1,8 +1,8 @@
import { AnimationFrame } from './AnimationFrame';
import { AvatarAnimationFrame } from './AvatarAnimationFrame';
export class AnimationActionPart
{
private _frames: AnimationFrame[];
private _frames: AvatarAnimationFrame[];
constructor(data: any)
{
@ -14,7 +14,7 @@ export class AnimationActionPart
{
if(!frame) continue;
this._frames.push(new AnimationFrame(frame));
this._frames.push(new AvatarAnimationFrame(frame));
let repeats = frame.repeats || 0;
@ -23,8 +23,8 @@ export class AnimationActionPart
}
}
public get frames(): AnimationFrame[]
public get frames(): AvatarAnimationFrame[]
{
return this._frames;
}
}
}

2
src/nitro/avatar/structure/animation/index.ts
View File

@ -1,3 +1,3 @@
export * from './AnimationAction';
export * from './AnimationActionPart';
export * from './AnimationFrame';
export * from './AvatarAnimationFrame';

2
src/nitro/avatar/structure/index.ts
View File

@ -1,5 +1,5 @@
export * from './animation';
export * from './AnimationData';
export * from './AvatarAnimationData';
export * from './AvatarCanvas';
export * from './AvatarStructureDownload';
export * from './figure';

14
src/nitro/room/RoomEngine.ts
View File

@ -99,11 +99,11 @@ import { RoomMessageHandler } from './RoomMessageHandler';
import { RoomObjectEventHandler } from './RoomObjectEventHandler';
import { RoomObjectLogicFactory } from './RoomObjectLogicFactory';
import { RoomVariableEnum } from './RoomVariableEnum';
import { FurnitureData } from './utils/FurnitureData';
import { FurnitureStackingHeightMap } from './utils/FurnitureStackingHeightMap';
import { LegacyWallGeometry } from './utils/LegacyWallGeometry';
import { RoomCamera } from './utils/RoomCamera';
import { RoomData } from './utils/RoomData';
import { RoomFurnitureData } from './utils/RoomFurnitureData';
import { RoomInstanceData } from './utils/RoomInstanceData';
import { RoomObjectBadgeImageAssetListener } from './utils/RoomObjectBadgeImageAssetListener';
import { SelectedRoomObjectData } from './utils/SelectedRoomObjectData';
@ -941,7 +941,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
{
if(!instanceData) continue;
let pendingData: FurnitureData = null;
let pendingData: RoomFurnitureData = null;
let totalFurnitureAdded = 0;
let furnitureAdded = false;
@ -1012,7 +1012,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
}
}
private processPendingFurnitureFloor(roomId: number, id: number, data: FurnitureData): boolean
private processPendingFurnitureFloor(roomId: number, id: number, data: RoomFurnitureData): boolean
{
if(!data)
{
@ -1072,7 +1072,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
return true;
}
private processPendingFurnitureWall(roomId: number, id: number, data: FurnitureData): boolean
private processPendingFurnitureWall(roomId: number, id: number, data: RoomFurnitureData): boolean
{
if(!data)
{
@ -1912,7 +1912,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!instanceData) return false;
const furnitureData = new FurnitureData(id, typeId, null, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ);
const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ);
instanceData.addPendingFurnitureFloor(furnitureData);
@ -1925,7 +1925,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!instanceData) return false;
const furnitureData = new FurnitureData(id, 0, typeName, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ);
const furnitureData = new RoomFurnitureData(id, 0, typeName, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ);
instanceData.addPendingFurnitureFloor(furnitureData);
@ -1942,7 +1942,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
objectData.setString(extra);
const furnitureData = new FurnitureData(id, typeId, null, location, direction, state, objectData, NaN, expires, usagePolicy, ownerId, ownerName, true, realRoomObject);
const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, NaN, expires, usagePolicy, ownerId, ownerName, true, realRoomObject);
instanceData.addPendingFurnitureWall(furnitureData);

24
src/nitro/room/utils/RoomInstanceData.ts
View File

@ -1,7 +1,7 @@
import { FurnitureData } from './FurnitureData';
import { FurnitureStackingHeightMap } from './FurnitureStackingHeightMap';
import { LegacyWallGeometry } from './LegacyWallGeometry';
import { RoomCamera } from './RoomCamera';
import { RoomFurnitureData } from './RoomFurnitureData';
import { SelectedRoomObjectData } from './SelectedRoomObjectData';
import { TileObjectMap } from './TileObjectMap';
@ -17,8 +17,8 @@ export class RoomInstanceData
private _placedObject: SelectedRoomObjectData;
private _furnitureStackingHeightMap: FurnitureStackingHeightMap;
private _floorStack: Map<number, FurnitureData>;
private _wallStack: Map<number, FurnitureData>;
private _floorStack: Map<number, RoomFurnitureData>;
private _wallStack: Map<number, RoomFurnitureData>;
private _mouseButtonCursorOwners: string[];
constructor(roomId: number)
@ -82,7 +82,7 @@ export class RoomInstanceData
}
}
public addPendingFurnitureFloor(data: FurnitureData): void
public addPendingFurnitureFloor(data: RoomFurnitureData): void
{
if(!data) return;
@ -90,7 +90,7 @@ export class RoomInstanceData
this._floorStack.set(data.id, data);
}
public removePendingFunitureFloor(id: number): FurnitureData
public removePendingFunitureFloor(id: number): RoomFurnitureData
{
const existing = this._floorStack.get(id);
@ -101,7 +101,7 @@ export class RoomInstanceData
return existing;
}
public getPendingFurnitureFloor(id: number): FurnitureData
public getPendingFurnitureFloor(id: number): RoomFurnitureData
{
const existing = this._floorStack.get(id);
@ -112,7 +112,7 @@ export class RoomInstanceData
return existing;
}
public getNextPendingFurnitureFloor(): FurnitureData
public getNextPendingFurnitureFloor(): RoomFurnitureData
{
if(!this._floorStack.size) return null;
@ -121,7 +121,7 @@ export class RoomInstanceData
return this.getPendingFurnitureFloor(keys.next().value as number);
}
public addPendingFurnitureWall(data: FurnitureData): void
public addPendingFurnitureWall(data: RoomFurnitureData): void
{
if(!data) return;
@ -129,7 +129,7 @@ export class RoomInstanceData
this._wallStack.set(data.id, data);
}
public removePendingFurnitureWall(id: number): FurnitureData
public removePendingFurnitureWall(id: number): RoomFurnitureData
{
const existing = this._wallStack.get(id);
@ -140,7 +140,7 @@ export class RoomInstanceData
return existing;
}
public getPendingFurnitureWall(id: number): FurnitureData
public getPendingFurnitureWall(id: number): RoomFurnitureData
{
const existing = this._wallStack.get(id);
@ -151,7 +151,7 @@ export class RoomInstanceData
return existing;
}
public getNextPendingFurnitureWall(): FurnitureData
public getNextPendingFurnitureWall(): RoomFurnitureData
{
if(!this._wallStack.size) return null;
@ -232,4 +232,4 @@ export class RoomInstanceData
{
return this._furnitureStackingHeightMap;
}
}
}

2
src/nitro/room/utils/index.ts
View File

@ -1,9 +1,9 @@
export * from './FurnitureData';
export * from './FurnitureStackingHeightMap';
export * from './LegacyWallGeometry';
export * from './ObjectRolling';
export * from './RoomCamera';
export * from './RoomData';
export * from './RoomFurnitureData';
export * from './RoomInstanceData';
export * from './RoomObjectBadgeImageAssetListener';
export * from './SelectedRoomObjectData';