diff --git a/src/nitro/avatar/IAvatarEffectListener.ts b/src/api/nitro/avatar/IAvatarEffectListener.ts similarity index 70% rename from src/nitro/avatar/IAvatarEffectListener.ts rename to src/api/nitro/avatar/IAvatarEffectListener.ts index 0af6db28..adb37f05 100644 --- a/src/nitro/avatar/IAvatarEffectListener.ts +++ b/src/api/nitro/avatar/IAvatarEffectListener.ts @@ -1,4 +1,4 @@ -import { IDisposable } from '../../api'; +import { IDisposable } from '../../common'; export interface IAvatarEffectListener extends IDisposable { diff --git a/src/nitro/avatar/IAvatarFigureContainer.ts b/src/api/nitro/avatar/IAvatarFigureContainer.ts similarity index 100% rename from src/nitro/avatar/IAvatarFigureContainer.ts rename to src/api/nitro/avatar/IAvatarFigureContainer.ts diff --git a/src/nitro/avatar/IAvatarImage.ts b/src/api/nitro/avatar/IAvatarImage.ts similarity index 79% rename from src/nitro/avatar/IAvatarImage.ts rename to src/api/nitro/avatar/IAvatarImage.ts index 88dd9e02..559a7d3a 100644 --- a/src/nitro/avatar/IAvatarImage.ts +++ b/src/api/nitro/avatar/IAvatarImage.ts @@ -1,11 +1,10 @@ import { RenderTexture } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; -import { IDisposable, IGraphicAsset } from '../../api'; -import { IAnimationLayerData } from './animation/IAnimationLayerData'; -import { IAvatarDataContainer } from './animation/IAvatarDataContainer'; -import { ISpriteDataContainer } from './animation/ISpriteDataContainer'; +import { IGraphicAsset } from '../../asset'; +import { IDisposable } from '../../common'; +import { IAnimationLayerData, IAvatarDataContainer, ISpriteDataContainer } from './animation'; import { IAvatarFigureContainer } from './IAvatarFigureContainer'; -import { IPartColor } from './structure/figure/IPartColor'; +import { IPartColor } from './structure'; export interface IAvatarImage extends IDisposable { diff --git a/src/nitro/avatar/IAvatarImageListener.ts b/src/api/nitro/avatar/IAvatarImageListener.ts similarity index 69% rename from src/nitro/avatar/IAvatarImageListener.ts rename to src/api/nitro/avatar/IAvatarImageListener.ts index 36a0007d..cc68c923 100644 --- a/src/nitro/avatar/IAvatarImageListener.ts +++ b/src/api/nitro/avatar/IAvatarImageListener.ts @@ -1,4 +1,4 @@ -import { IDisposable } from '../../api'; +import { IDisposable } from '../../common'; export interface IAvatarImageListener extends IDisposable { diff --git a/src/nitro/avatar/IAvatarRenderManager.ts b/src/api/nitro/avatar/IAvatarRenderManager.ts similarity index 82% rename from src/nitro/avatar/IAvatarRenderManager.ts rename to src/api/nitro/avatar/IAvatarRenderManager.ts index 427bd3b1..0c983e37 100644 --- a/src/nitro/avatar/IAvatarRenderManager.ts +++ b/src/api/nitro/avatar/IAvatarRenderManager.ts @@ -1,11 +1,11 @@ -import { IAssetManager, IGraphicAsset, INitroManager } from '../../api'; -import { AvatarAssetDownloadManager } from './AvatarAssetDownloadManager'; -import { AvatarStructure } from './AvatarStructure'; +import { AvatarAssetDownloadManager, AvatarStructure } from '../../../nitro'; +import { IAssetManager, IGraphicAsset } from '../../asset'; +import { INitroManager } from '../../common'; import { IAvatarEffectListener } from './IAvatarEffectListener'; import { IAvatarFigureContainer } from './IAvatarFigureContainer'; import { IAvatarImage } from './IAvatarImage'; import { IAvatarImageListener } from './IAvatarImageListener'; -import { IStructureData } from './structure/IStructureData'; +import { IStructureData } from './structure'; export interface IAvatarRenderManager extends INitroManager { diff --git a/src/nitro/avatar/IOutfit.ts b/src/api/nitro/avatar/IOutfit.ts similarity index 100% rename from src/nitro/avatar/IOutfit.ts rename to src/api/nitro/avatar/IOutfit.ts diff --git a/src/nitro/avatar/actions/IActionDefinition.ts b/src/api/nitro/avatar/actions/IActionDefinition.ts similarity index 99% rename from src/nitro/avatar/actions/IActionDefinition.ts rename to src/api/nitro/avatar/actions/IActionDefinition.ts index 8227c376..9c0e5f16 100644 --- a/src/nitro/avatar/actions/IActionDefinition.ts +++ b/src/api/nitro/avatar/actions/IActionDefinition.ts @@ -1,4 +1,3 @@ - export interface IActionDefinition { id: string; diff --git a/src/nitro/avatar/actions/IActiveActionData.ts b/src/api/nitro/avatar/actions/IActiveActionData.ts similarity index 100% rename from src/nitro/avatar/actions/IActiveActionData.ts rename to src/api/nitro/avatar/actions/IActiveActionData.ts diff --git a/src/api/nitro/avatar/actions/index.ts b/src/api/nitro/avatar/actions/index.ts new file mode 100644 index 00000000..9e191b08 --- /dev/null +++ b/src/api/nitro/avatar/actions/index.ts @@ -0,0 +1,2 @@ +export * from './IActionDefinition'; +export * from './IActiveActionData'; diff --git a/src/nitro/avatar/animation/IAnimation.ts b/src/api/nitro/avatar/animation/IAnimation.ts similarity index 100% rename from src/nitro/avatar/animation/IAnimation.ts rename to src/api/nitro/avatar/animation/IAnimation.ts diff --git a/src/nitro/avatar/animation/IAnimationLayerData.ts b/src/api/nitro/avatar/animation/IAnimationLayerData.ts similarity index 72% rename from src/nitro/avatar/animation/IAnimationLayerData.ts rename to src/api/nitro/avatar/animation/IAnimationLayerData.ts index 673e7ad7..8bf9e86b 100644 --- a/src/nitro/avatar/animation/IAnimationLayerData.ts +++ b/src/api/nitro/avatar/animation/IAnimationLayerData.ts @@ -1,4 +1,4 @@ -import { IActiveActionData } from '../actions/IActiveActionData'; +import { IActiveActionData } from '../actions'; export interface IAnimationLayerData { diff --git a/src/nitro/avatar/animation/IAnimationManager.ts b/src/api/nitro/avatar/animation/IAnimationManager.ts similarity index 100% rename from src/nitro/avatar/animation/IAnimationManager.ts rename to src/api/nitro/avatar/animation/IAnimationManager.ts diff --git a/src/nitro/avatar/animation/IAvatarDataContainer.ts b/src/api/nitro/avatar/animation/IAvatarDataContainer.ts similarity index 100% rename from src/nitro/avatar/animation/IAvatarDataContainer.ts rename to src/api/nitro/avatar/animation/IAvatarDataContainer.ts diff --git a/src/nitro/avatar/animation/ISpriteDataContainer.ts b/src/api/nitro/avatar/animation/ISpriteDataContainer.ts similarity index 100% rename from src/nitro/avatar/animation/ISpriteDataContainer.ts rename to src/api/nitro/avatar/animation/ISpriteDataContainer.ts diff --git a/src/api/nitro/avatar/animation/index.ts b/src/api/nitro/avatar/animation/index.ts new file mode 100644 index 00000000..c6ce58c4 --- /dev/null +++ b/src/api/nitro/avatar/animation/index.ts @@ -0,0 +1,5 @@ +export * from './IAnimation'; +export * from './IAnimationLayerData'; +export * from './IAnimationManager'; +export * from './IAvatarDataContainer'; +export * from './ISpriteDataContainer'; diff --git a/src/nitro/avatar/enum/AvatarAction.ts b/src/api/nitro/avatar/enum/AvatarAction.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarAction.ts rename to src/api/nitro/avatar/enum/AvatarAction.ts diff --git a/src/nitro/avatar/enum/AvatarDirectionAngle.ts b/src/api/nitro/avatar/enum/AvatarDirectionAngle.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarDirectionAngle.ts rename to src/api/nitro/avatar/enum/AvatarDirectionAngle.ts diff --git a/src/nitro/avatar/enum/AvatarEditorFigureCategory.ts b/src/api/nitro/avatar/enum/AvatarEditorFigureCategory.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarEditorFigureCategory.ts rename to src/api/nitro/avatar/enum/AvatarEditorFigureCategory.ts diff --git a/src/nitro/avatar/enum/AvatarEditorInstanceId.ts b/src/api/nitro/avatar/enum/AvatarEditorInstanceId.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarEditorInstanceId.ts rename to src/api/nitro/avatar/enum/AvatarEditorInstanceId.ts diff --git a/src/nitro/avatar/enum/AvatarEditorSideCategory.ts b/src/api/nitro/avatar/enum/AvatarEditorSideCategory.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarEditorSideCategory.ts rename to src/api/nitro/avatar/enum/AvatarEditorSideCategory.ts diff --git a/src/nitro/avatar/enum/AvatarFigurePartType.ts b/src/api/nitro/avatar/enum/AvatarFigurePartType.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarFigurePartType.ts rename to src/api/nitro/avatar/enum/AvatarFigurePartType.ts diff --git a/src/nitro/avatar/enum/AvatarGuideStatus.ts b/src/api/nitro/avatar/enum/AvatarGuideStatus.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarGuideStatus.ts rename to src/api/nitro/avatar/enum/AvatarGuideStatus.ts diff --git a/src/nitro/avatar/enum/AvatarScaleType.ts b/src/api/nitro/avatar/enum/AvatarScaleType.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarScaleType.ts rename to src/api/nitro/avatar/enum/AvatarScaleType.ts diff --git a/src/nitro/avatar/enum/AvatarSetType.ts b/src/api/nitro/avatar/enum/AvatarSetType.ts similarity index 100% rename from src/nitro/avatar/enum/AvatarSetType.ts rename to src/api/nitro/avatar/enum/AvatarSetType.ts diff --git a/src/nitro/avatar/enum/GeometryType.ts b/src/api/nitro/avatar/enum/GeometryType.ts similarity index 100% rename from src/nitro/avatar/enum/GeometryType.ts rename to src/api/nitro/avatar/enum/GeometryType.ts diff --git a/src/nitro/avatar/enum/RenderMode.ts b/src/api/nitro/avatar/enum/RenderMode.ts similarity index 100% rename from src/nitro/avatar/enum/RenderMode.ts rename to src/api/nitro/avatar/enum/RenderMode.ts diff --git a/src/nitro/avatar/enum/index.ts b/src/api/nitro/avatar/enum/index.ts similarity index 100% rename from src/nitro/avatar/enum/index.ts rename to src/api/nitro/avatar/enum/index.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureData.ts b/src/api/nitro/avatar/figuredata/IFigureData.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureData.ts rename to src/api/nitro/avatar/figuredata/IFigureData.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureDataColor.ts b/src/api/nitro/avatar/figuredata/IFigureDataColor.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureDataColor.ts rename to src/api/nitro/avatar/figuredata/IFigureDataColor.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureDataHiddenLayer.ts b/src/api/nitro/avatar/figuredata/IFigureDataHiddenLayer.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureDataHiddenLayer.ts rename to src/api/nitro/avatar/figuredata/IFigureDataHiddenLayer.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureDataPalette.ts b/src/api/nitro/avatar/figuredata/IFigureDataPalette.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureDataPalette.ts rename to src/api/nitro/avatar/figuredata/IFigureDataPalette.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureDataPart.ts b/src/api/nitro/avatar/figuredata/IFigureDataPart.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureDataPart.ts rename to src/api/nitro/avatar/figuredata/IFigureDataPart.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureDataSet.ts b/src/api/nitro/avatar/figuredata/IFigureDataSet.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureDataSet.ts rename to src/api/nitro/avatar/figuredata/IFigureDataSet.ts diff --git a/src/nitro/avatar/interfaces/figuredata/IFigureDataSetType.ts b/src/api/nitro/avatar/figuredata/IFigureDataSetType.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/IFigureDataSetType.ts rename to src/api/nitro/avatar/figuredata/IFigureDataSetType.ts diff --git a/src/nitro/avatar/interfaces/figuredata/index.ts b/src/api/nitro/avatar/figuredata/index.ts similarity index 100% rename from src/nitro/avatar/interfaces/figuredata/index.ts rename to src/api/nitro/avatar/figuredata/index.ts diff --git a/src/api/nitro/avatar/index.ts b/src/api/nitro/avatar/index.ts index eccf4ec5..84a5e432 100644 --- a/src/api/nitro/avatar/index.ts +++ b/src/api/nitro/avatar/index.ts @@ -1 +1,12 @@ +export * from './actions'; +export * from './animation'; +export * from './enum'; +export * from './figuredata'; +export * from './IAvatarEffectListener'; +export * from './IAvatarFigureContainer'; +export * from './IAvatarImage'; +export * from './IAvatarImageListener'; +export * from './IAvatarRenderManager'; +export * from './IOutfit'; export * from './pet'; +export * from './structure'; diff --git a/src/nitro/avatar/structure/figure/IFigurePart.ts b/src/api/nitro/avatar/structure/IFigurePart.ts similarity index 100% rename from src/nitro/avatar/structure/figure/IFigurePart.ts rename to src/api/nitro/avatar/structure/IFigurePart.ts diff --git a/src/nitro/avatar/structure/figure/IFigurePartSet.ts b/src/api/nitro/avatar/structure/IFigurePartSet.ts similarity index 100% rename from src/nitro/avatar/structure/figure/IFigurePartSet.ts rename to src/api/nitro/avatar/structure/IFigurePartSet.ts diff --git a/src/nitro/avatar/structure/IFigureSetData.ts b/src/api/nitro/avatar/structure/IFigureSetData.ts similarity index 70% rename from src/nitro/avatar/structure/IFigureSetData.ts rename to src/api/nitro/avatar/structure/IFigureSetData.ts index fb747e10..5ea24a6e 100644 --- a/src/nitro/avatar/structure/IFigureSetData.ts +++ b/src/api/nitro/avatar/structure/IFigureSetData.ts @@ -1,4 +1,4 @@ -import { IFigureData } from '../interfaces'; +import { IFigureData } from '../figuredata'; export interface IFigureSetData { diff --git a/src/nitro/avatar/structure/figure/IPalette.ts b/src/api/nitro/avatar/structure/IPalette.ts similarity index 56% rename from src/nitro/avatar/structure/figure/IPalette.ts rename to src/api/nitro/avatar/structure/IPalette.ts index 3c230abd..cbd5e9ca 100644 --- a/src/nitro/avatar/structure/figure/IPalette.ts +++ b/src/api/nitro/avatar/structure/IPalette.ts @@ -1,9 +1,9 @@ -import { AdvancedMap } from '../../../../core'; +import { IAdvancedMap } from '../../../IAdvancedMap'; import { IPartColor } from './IPartColor'; export interface IPalette { getColor(id: number): IPartColor; id: number; - colors: AdvancedMap; + colors: IAdvancedMap; } diff --git a/src/nitro/avatar/structure/figure/IPartColor.ts b/src/api/nitro/avatar/structure/IPartColor.ts similarity index 100% rename from src/nitro/avatar/structure/figure/IPartColor.ts rename to src/api/nitro/avatar/structure/IPartColor.ts diff --git a/src/nitro/avatar/structure/figure/ISetType.ts b/src/api/nitro/avatar/structure/ISetType.ts similarity index 100% rename from src/nitro/avatar/structure/figure/ISetType.ts rename to src/api/nitro/avatar/structure/ISetType.ts diff --git a/src/nitro/avatar/structure/IStructureData.ts b/src/api/nitro/avatar/structure/IStructureData.ts similarity index 60% rename from src/nitro/avatar/structure/IStructureData.ts rename to src/api/nitro/avatar/structure/IStructureData.ts index e8506c3c..392e885d 100644 --- a/src/nitro/avatar/structure/IStructureData.ts +++ b/src/api/nitro/avatar/structure/IStructureData.ts @@ -1,6 +1,6 @@ -import { IFigurePartSet } from './figure/IFigurePartSet'; -import { IPalette } from './figure/IPalette'; -import { ISetType } from './figure/ISetType'; +import { IFigurePartSet } from './IFigurePartSet'; +import { IPalette } from './IPalette'; +import { ISetType } from './ISetType'; export interface IStructureData { diff --git a/src/api/nitro/avatar/structure/index.ts b/src/api/nitro/avatar/structure/index.ts new file mode 100644 index 00000000..4c63b053 --- /dev/null +++ b/src/api/nitro/avatar/structure/index.ts @@ -0,0 +1,7 @@ +export * from './IFigurePart'; +export * from './IFigurePartSet'; +export * from './IFigureSetData'; +export * from './IPalette'; +export * from './IPartColor'; +export * from './ISetType'; +export * from './IStructureData'; diff --git a/src/api/nitro/index.ts b/src/api/nitro/index.ts index 6e966b1c..fea0a3bc 100644 --- a/src/api/nitro/index.ts +++ b/src/api/nitro/index.ts @@ -1,5 +1,10 @@ export * from './avatar'; +export * from './avatar/actions'; +export * from './avatar/animation'; +export * from './avatar/enum'; +export * from './avatar/figuredata'; export * from './avatar/pet'; +export * from './avatar/structure'; export * from './camera'; export * from './communication'; export * from './enums'; @@ -12,3 +17,4 @@ export * from './room/object/data/type'; export * from './room/utils'; export * from './session'; export * from './session/enum'; +export * from './sound'; diff --git a/src/nitro/sound/music/IMusicManager.ts b/src/api/nitro/sound/IMusicManager.ts similarity index 64% rename from src/nitro/sound/music/IMusicManager.ts rename to src/api/nitro/sound/IMusicManager.ts index f23ad0b2..59e5cb24 100644 --- a/src/nitro/sound/music/IMusicManager.ts +++ b/src/api/nitro/sound/IMusicManager.ts @@ -1,5 +1,4 @@ -import { INitroManager } from '../../../api'; - +import { INitroManager } from '../../common'; export interface IMusicManager extends INitroManager { diff --git a/src/api/nitro/sound/ISoundManager.ts b/src/api/nitro/sound/ISoundManager.ts new file mode 100644 index 00000000..ed89ee0f --- /dev/null +++ b/src/api/nitro/sound/ISoundManager.ts @@ -0,0 +1,7 @@ +import { INitroManager } from '../../common'; +import { IMusicManager } from './IMusicManager'; + +export interface ISoundManager extends INitroManager +{ + musicManager: IMusicManager; +} diff --git a/src/api/nitro/sound/index.ts b/src/api/nitro/sound/index.ts new file mode 100644 index 00000000..2939b351 --- /dev/null +++ b/src/api/nitro/sound/index.ts @@ -0,0 +1,2 @@ +export * from './IMusicManager'; +export * from './ISoundManager'; diff --git a/src/core/asset/GraphicAssetCollection.ts b/src/core/asset/GraphicAssetCollection.ts index 050faec0..a772482d 100644 --- a/src/core/asset/GraphicAssetCollection.ts +++ b/src/core/asset/GraphicAssetCollection.ts @@ -2,6 +2,7 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Spritesheet } from '@pixi/spritesheet'; import { Dict } from '@pixi/utils'; import { IAsset, IAssetData, IAssetPalette, IGraphicAsset, IGraphicAssetCollection } from '../../api'; +import { GetTickerTime } from '../../pixi-proxy'; import { GraphicAsset } from './GraphicAsset'; import { GraphicAssetPalette } from './GraphicAssetPalette'; @@ -22,7 +23,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection constructor(data: IAssetData, spritesheet: Spritesheet) { - if(!data) throw new Error('invalid_collection'); + if (!data) throw new Error('invalid_collection'); this._name = data.name; this._baseTexture = ((spritesheet && spritesheet.baseTexture) || null); @@ -32,7 +33,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection this._palettes = new Map(); this._paletteAssetNames = []; - if(spritesheet) this.addLibraryAsset(spritesheet.textures); + if (spritesheet) this.addLibraryAsset(spritesheet.textures); this.define(data); } @@ -44,23 +45,23 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public dispose(): void { - if(this._palettes) + if (this._palettes) { - for(const palette of this._palettes.values()) palette.dispose(); + for (const palette of this._palettes.values()) palette.dispose(); this._palettes.clear(); } - if(this._paletteAssetNames) + if (this._paletteAssetNames) { this.disposePaletteAssets(); this._paletteAssetNames = null; } - if(this._assets) + if (this._assets) { - for(const asset of this._assets.values()) asset.recycle(); + for (const asset of this._assets.values()) asset.recycle(); this._assets.clear(); } @@ -69,17 +70,17 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public addReference(): void { this._referenceCount++; - //this._referenceTimestamp = Nitro.instance.time; + this._referenceTimestamp = GetTickerTime(); } public removeReference(): void { this._referenceCount--; - if(this._referenceCount <= 0) + if (this._referenceCount <= 0) { this._referenceCount = 0; - //this._referenceTimestamp = Nitro.instance.time; + this._referenceTimestamp = GetTickerTime(); this.disposePaletteAssets(false); } @@ -90,20 +91,20 @@ export class GraphicAssetCollection implements IGraphicAssetCollection const assets = data.assets; const palettes = data.palettes; - if(assets) this.defineAssets(assets); + if (assets) this.defineAssets(assets); - if(palettes) this.definePalettes(palettes); + if (palettes) this.definePalettes(palettes); } private defineAssets(assets: { [index: string]: IAsset }): void { - if(!assets) return; + if (!assets) return; - for(const name in assets) + for (const name in assets) { const asset = assets[name]; - if(!asset) continue; + if (!asset) continue; const x = (-(asset.x) || 0); const y = (-(asset.y) || 0); @@ -112,23 +113,23 @@ export class GraphicAssetCollection implements IGraphicAssetCollection const usesPalette = (asset.usesPalette || false); let source = (asset.source || ''); - if(asset.flipH && source.length) flipH = true; + if (asset.flipH && source.length) flipH = true; // if(asset.flipV && source.length) flipV = true; - if(!source.length) source = name; + if (!source.length) source = name; const texture = this.getLibraryAsset(source); - if(!texture) continue; + if (!texture) continue; let didAddAsset = this.createAsset(name, source, texture, flipH, flipV, x, y, usesPalette); - if(!didAddAsset) + if (!didAddAsset) { const existingAsset = this.getAsset(name); - if(existingAsset && (existingAsset.name !== existingAsset.source)) + if (existingAsset && (existingAsset.name !== existingAsset.source)) { didAddAsset = this.replaceAsset(name, source, texture, flipH, flipV, x, y, usesPalette); } @@ -138,28 +139,28 @@ export class GraphicAssetCollection implements IGraphicAssetCollection private definePalettes(palettes: { [index: string]: IAssetPalette }): void { - if(!palettes) return; + if (!palettes) return; - for(const name in palettes) + for (const name in palettes) { const palette = palettes[name]; - if(!palette) continue; + if (!palette) continue; const id = palette.id.toString(); - if(this._palettes.get(id)) continue; + if (this._palettes.get(id)) continue; let colorOne = 0xFFFFFF; let colorTwo = 0xFFFFFF; let color = palette.color1; - if(color && color.length > 0) colorOne = parseInt(color, 16); + if (color && color.length > 0) colorOne = parseInt(color, 16); color = palette.color2; - if(color && color.length > 0) colorTwo = parseInt(color, 16); + if (color && color.length > 0) colorTwo = parseInt(color, 16); this._palettes.set(id, new GraphicAssetPalette(palette.rgb, colorOne, colorTwo)); } @@ -167,7 +168,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection private createAsset(name: string, source: string, texture: Texture, flipH: boolean, flipV: boolean, x: number, y: number, usesPalette: boolean): boolean { - if(this._assets.get(name)) return false; + if (this._assets.get(name)) return false; const graphicAsset = GraphicAsset.createAsset(name, source, texture, x, y, flipH, flipV, usesPalette); @@ -180,7 +181,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const existing = this._assets.get(name); - if(existing) + if (existing) { this._assets.delete(name); @@ -192,11 +193,11 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public getAsset(name: string): IGraphicAsset { - if(!name) return null; + if (!name) return null; const existing = this._assets.get(name); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -207,19 +208,19 @@ export class GraphicAssetCollection implements IGraphicAssetCollection let asset = this.getAsset(saveName); - if(!asset) + if (!asset) { asset = this.getAsset(name); - if(!asset || !asset.usesPalette) return asset; + if (!asset || !asset.usesPalette) return asset; const palette = this.getPalette(paletteName); - if(palette) + if (palette) { const texture = palette.applyPalette(asset.texture); - if(texture) + if (texture) { this._paletteAssetNames.push(saveName); @@ -247,36 +248,36 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const palette = this.getPalette(paletteName); - if(palette) return [palette.primaryColor, palette.secondaryColor]; + if (palette) return [palette.primaryColor, palette.secondaryColor]; return null; } public getPalette(name: string): GraphicAssetPalette { - if(!name) return null; + if (!name) return null; const existing = this._palettes.get(name); - if(!existing) return null; + if (!existing) return null; return existing; } public addAsset(name: string, texture: Texture, override: boolean, x: number = 0, y: number = 0, flipH: boolean = false, flipV: boolean = false): boolean { - if(!name || !texture) return false; + if (!name || !texture) return false; const existingTexture = this.getLibraryAsset(name); - if(!existingTexture) + if (!existingTexture) { this._textures.set(name, texture); return this.createAsset(name, name, texture, flipH, flipV, x, y, false); } - if(override) + if (override) { existingTexture.baseTexture = texture.baseTexture; existingTexture.frame = texture.frame; @@ -294,13 +295,13 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const existing = this._assets.get(name); - if(!existing) return; + if (!existing) return; this._assets.delete(name); const texture = this.getLibraryAsset(existing.source); - if(texture) + if (texture) { this._textures.delete(existing.source); @@ -312,26 +313,26 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public getLibraryAsset(name: string): Texture { - if(!name) return null; + if (!name) return null; name = this._name + '_' + name; const texture = this._textures.get(name); - if(!texture) return null; + if (!texture) return null; return texture; } private addLibraryAsset(textures: Dict>): void { - if(!textures) return; + if (!textures) return; - for(const name in textures) + for (const name in textures) { const texture = textures[name]; - if(!texture) continue; + if (!texture) continue; this._textures.set(GraphicAssetCollection.removeFileExtension(name), texture); } @@ -339,11 +340,11 @@ export class GraphicAssetCollection implements IGraphicAssetCollection private disposePaletteAssets(disposeAll: boolean = true): void { - if(this._paletteAssetNames) + if (this._paletteAssetNames) { - if(disposeAll || (this._paletteAssetNames.length > GraphicAssetCollection.PALETTE_ASSET_DISPOSE_THRESHOLD)) + if (disposeAll || (this._paletteAssetNames.length > GraphicAssetCollection.PALETTE_ASSET_DISPOSE_THRESHOLD)) { - for(const name of this._paletteAssetNames) this.disposeAsset(name); + for (const name of this._paletteAssetNames) this.disposeAsset(name); this._paletteAssetNames = []; } diff --git a/src/nitro/INitro.ts b/src/nitro/INitro.ts index 04fbc705..8113de6b 100644 --- a/src/nitro/INitro.ts +++ b/src/nitro/INitro.ts @@ -1,8 +1,6 @@ import { Application } from '@pixi/app'; import { Ticker } from '@pixi/ticker'; -import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api'; -import { IAvatarRenderManager } from './avatar/IAvatarRenderManager'; -import { ISoundManager } from './sound/ISoundManager'; +import { IAvatarRenderManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager, IWorkerEventTracker } from '../api'; export interface INitro { diff --git a/src/nitro/Nitro.ts b/src/nitro/Nitro.ts index d59f4837..74efbb1f 100644 --- a/src/nitro/Nitro.ts +++ b/src/nitro/Nitro.ts @@ -2,25 +2,21 @@ import { Application, IApplicationOptions } from '@pixi/app'; import { SCALE_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Ticker } from '@pixi/ticker'; -import { IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, IWorkerEventTracker } from '../api'; +import { IAvatarRenderManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager, IWorkerEventTracker } from '../api'; import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core'; import { PixiApplicationProxy } from '../pixi-proxy'; -import { RoomManager } from '../room/RoomManager'; -import { AvatarRenderManager } from './avatar/AvatarRenderManager'; -import { IAvatarRenderManager } from './avatar/IAvatarRenderManager'; -import { RoomCameraWidgetManager } from './camera/RoomCameraWidgetManager'; -import { NitroCommunicationManager } from './communication/NitroCommunicationManager'; -import { LegacyExternalInterface } from './externalInterface/LegacyExternalInterface'; -import { GameMessageHandler } from './game/GameMessageHandler'; +import { RoomManager } from '../room'; +import { AvatarRenderManager } from './avatar'; +import { RoomCameraWidgetManager } from './camera'; +import { NitroCommunicationManager } from './communication'; +import { LegacyExternalInterface } from './externalInterface'; +import { GameMessageHandler } from './game'; import { INitro } from './INitro'; -import { NitroLocalizationManager } from './localization/NitroLocalizationManager'; +import { NitroLocalizationManager } from './localization'; import './Plugins'; -import { RoomEngineEvent } from './room'; -import { RoomEngine } from './room/RoomEngine'; -import { RoomSessionManager } from './session/RoomSessionManager'; -import { SessionDataManager } from './session/SessionDataManager'; -import { ISoundManager } from './sound/ISoundManager'; -import { SoundManager } from './sound/SoundManager'; +import { RoomEngine, RoomEngineEvent } from './room'; +import { RoomSessionManager, SessionDataManager } from './session'; +import { SoundManager } from './sound'; import { HabboWebTools } from './utils/HabboWebTools'; LegacyExternalInterface.available; @@ -57,7 +53,7 @@ export class Nitro implements INitro constructor(core: INitroCore, options?: IApplicationOptions) { - if(!Nitro.INSTANCE) Nitro.INSTANCE = this; + if (!Nitro.INSTANCE) Nitro.INSTANCE = this; this._worker = null; this._application = new PixiApplicationProxy(options); @@ -81,12 +77,12 @@ export class Nitro implements INitro this._core.configuration.events.addEventListener(ConfigurationEvent.LOADED, this.onConfigurationLoadedEvent.bind(this)); this._roomEngine.events.addEventListener(RoomEngineEvent.ENGINE_INITIALIZED, this.onRoomEngineReady.bind(this)); - if(this._worker) this._worker.onmessage = this.createWorkerEvent.bind(this); + if (this._worker) this._worker.onmessage = this.createWorkerEvent.bind(this); } public static bootstrap(): void { - if(Nitro.INSTANCE) + if (Nitro.INSTANCE) { Nitro.INSTANCE.dispose(); @@ -108,25 +104,25 @@ export class Nitro implements INitro public init(): void { - if(this._isReady || this._isDisposed) return; + if (this._isReady || this._isDisposed) return; - if(this._avatar) this._avatar.init(); + if (this._avatar) this._avatar.init(); - if(this._soundManager) this._soundManager.init(); + if (this._soundManager) this._soundManager.init(); - if(this._roomEngine) + if (this._roomEngine) { this._roomEngine.sessionDataManager = this._sessionDataManager; this._roomEngine.roomSessionManager = this._roomSessionManager; this._roomEngine.roomManager = this._roomManager; - if(this._sessionDataManager) this._sessionDataManager.init(); - if(this._roomSessionManager) this._roomSessionManager.init(); + if (this._sessionDataManager) this._sessionDataManager.init(); + if (this._roomSessionManager) this._roomSessionManager.init(); this._roomEngine.init(); } - if(!this._communication.connection) + if (!this._communication.connection) { throw new Error('No connection found'); } @@ -138,58 +134,58 @@ export class Nitro implements INitro public dispose(): void { - if(this._isDisposed) return; + if (this._isDisposed) return; - if(this._roomManager) + if (this._roomManager) { this._roomManager.dispose(); this._roomManager = null; } - if(this._roomSessionManager) + if (this._roomSessionManager) { this._roomSessionManager.dispose(); this._roomSessionManager = null; } - if(this._sessionDataManager) + if (this._sessionDataManager) { this._sessionDataManager.dispose(); this._sessionDataManager = null; } - if(this._roomEngine) + if (this._roomEngine) { this._roomEngine.dispose(); this._roomEngine = null; } - if(this._avatar) + if (this._avatar) { this._avatar.dispose(); this._avatar = null; } - if(this._soundManager) + if (this._soundManager) { this._soundManager.dispose(); this._soundManager = null; } - if(this._communication) + if (this._communication) { this._communication.dispose(); this._communication = null; } - if(this._application) + if (this._application) { this._application.destroy(); @@ -205,7 +201,7 @@ export class Nitro implements INitro const animationFPS = this.getConfiguration('system.animation.fps', 24); const limitsFPS = this.getConfiguration('system.limits.fps', true); - if(limitsFPS) Nitro.instance.ticker.maxFPS = animationFPS; + if (limitsFPS) Nitro.instance.ticker.maxFPS = animationFPS; } private onRoomEngineReady(event: RoomEngineEvent): void @@ -235,7 +231,7 @@ export class Nitro implements INitro public addWorkerEventTracker(tracker: IWorkerEventTracker): void { - if(this._workerTrackers.indexOf(tracker) >= 0) return; + if (this._workerTrackers.indexOf(tracker) >= 0) return; this._workerTrackers.push(tracker); } @@ -244,20 +240,20 @@ export class Nitro implements INitro { const index = this._workerTrackers.indexOf(tracker); - if(index === -1) return; + if (index === -1) return; this._workerTrackers.splice(index, 1); } public createWorkerEvent(message: MessageEvent): void { - if(!message) return; + if (!message) return; const data: { [index: string]: any } = message.data; - for(const tracker of this._workerTrackers) + for (const tracker of this._workerTrackers) { - if(!tracker) continue; + if (!tracker) continue; tracker.workerMessageReceived(data); } @@ -265,14 +261,14 @@ export class Nitro implements INitro public sendWorkerEvent(message: { [index: string]: any }): void { - if(!message || !this._worker) return; + if (!message || !this._worker) return; this._worker.postMessage(message); } public addLinkEventTracker(tracker: ILinkEventTracker): void { - if(this._linkTrackers.indexOf(tracker) >= 0) return; + if (this._linkTrackers.indexOf(tracker) >= 0) return; this._linkTrackers.push(tracker); } @@ -281,24 +277,24 @@ export class Nitro implements INitro { const index = this._linkTrackers.indexOf(tracker); - if(index === -1) return; + if (index === -1) return; this._linkTrackers.splice(index, 1); } public createLinkEvent(link: string): void { - if(!link || (link === '')) return; + if (!link || (link === '')) return; - for(const tracker of this._linkTrackers) + for (const tracker of this._linkTrackers) { - if(!tracker) continue; + if (!tracker) continue; const prefix = tracker.eventUrlPrefix; - if(prefix.length > 0) + if (prefix.length > 0) { - if(link.substr(0, prefix.length) === prefix) tracker.linkReceived(link); + if (link.substr(0, prefix.length) === prefix) tracker.linkReceived(link); } else { diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index a65e7032..3815af30 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -1,11 +1,9 @@ -import { IAssetManager } from '../../api'; +import { IAssetManager, IAvatarFigureContainer, IAvatarImageListener } from '../../api'; import { EventDispatcher, NitroEvent } from '../../core'; import { Nitro } from '../Nitro'; import { AvatarAssetDownloadLibrary } from './AvatarAssetDownloadLibrary'; import { AvatarStructure } from './AvatarStructure'; import { AvatarRenderEvent, AvatarRenderLibraryEvent } from './events'; -import { IAvatarFigureContainer } from './IAvatarFigureContainer'; -import { IAvatarImageListener } from './IAvatarImageListener'; export class AvatarAssetDownloadManager extends EventDispatcher { @@ -64,7 +62,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if(request.responseText) + if (request.responseText) { const data = JSON.parse(request.responseText); @@ -92,16 +90,16 @@ export class AvatarAssetDownloadManager extends EventDispatcher private processFigureMap(data: any): void { - if(!data) return; + if (!data) return; - for(const library of data) + for (const library of data) { - if(!library) continue; + if (!library) continue; const id = (library.id as string); const revision = (library.revision || ''); - if(this._libraryNames.indexOf(id) >= 0) continue; + if (this._libraryNames.indexOf(id) >= 0) continue; this._libraryNames.push(id); @@ -109,7 +107,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher downloadLibrary.addEventListener(AvatarRenderLibraryEvent.DOWNLOAD_COMPLETE, this.onLibraryLoaded); - for(const part of library.parts) + for (const part of library.parts) { const id = (part.id as string); const type = (part.type as string); @@ -117,7 +115,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher let existing = this._figureMap.get(partString); - if(!existing) existing = []; + if (!existing) existing = []; existing.push(downloadLibrary); @@ -128,9 +126,9 @@ export class AvatarAssetDownloadManager extends EventDispatcher private onAvatarRenderReady(event: NitroEvent): void { - if(!event) return; + if (!event) return; - for(const [container, listener] of this._pendingContainers) + for (const [container, listener] of this._pendingContainers) { this.downloadAvatarFigure(container, listener); } @@ -140,34 +138,34 @@ export class AvatarAssetDownloadManager extends EventDispatcher private onLibraryLoaded(event: AvatarRenderLibraryEvent): void { - if(!event || !event.library) return; + if (!event || !event.library) return; const loadedFigures: string[] = []; - for(const [figure, libraries] of this._incompleteFigures.entries()) + for (const [figure, libraries] of this._incompleteFigures.entries()) { let isReady = true; - for(const library of libraries) + for (const library of libraries) { - if(!library || library.isLoaded) continue; + if (!library || library.isLoaded) continue; isReady = false; break; } - if(isReady) + if (isReady) { loadedFigures.push(figure); const listeners = this._figureListeners.get(figure); - if(listeners) + if (listeners) { - for(const listener of listeners) + for (const listener of listeners) { - if(!listener || listener.disposed) continue; + if (!listener || listener.disposed) continue; listener.resetFigure(figure); } @@ -179,22 +177,22 @@ export class AvatarAssetDownloadManager extends EventDispatcher } } - for(const figure of loadedFigures) + for (const figure of loadedFigures) { - if(!figure) continue; + if (!figure) continue; this._incompleteFigures.delete(figure); } let index = 0; - while(index < this._currentDownloads.length) + while (index < this._currentDownloads.length) { const download = this._currentDownloads[index]; - if(download) + if (download) { - if(download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); + if (download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); } index++; @@ -205,19 +203,19 @@ export class AvatarAssetDownloadManager extends EventDispatcher { const libraries = this._missingMandatoryLibs.slice(); - for(const library of libraries) + for (const library of libraries) { - if(!library) continue; + if (!library) continue; const map = this._figureMap.get(library); - if(map) for(const avatar of map) avatar && this.downloadLibrary(avatar); + if (map) for (const avatar of map) avatar && this.downloadLibrary(avatar); } } public isAvatarFigureContainerReady(container: IAvatarFigureContainer): boolean { - if(!this._isReady || !this._structure.renderManager.isReady) + if (!this._isReady || !this._structure.renderManager.isReady) { return false; } @@ -231,38 +229,38 @@ export class AvatarAssetDownloadManager extends EventDispatcher { const pendingLibraries: AvatarAssetDownloadLibrary[] = []; - if(!container || !this._structure) return pendingLibraries; + if (!container || !this._structure) return pendingLibraries; const figureData = this._structure.figureData; - if(!figureData) return pendingLibraries; + if (!figureData) return pendingLibraries; const setKeys = container.getPartTypeIds(); - for(const key of setKeys) + for (const key of setKeys) { const set = figureData.getSetType(key); - if(!set) continue; + if (!set) continue; const figurePartSet = set.getPartSet(container.getPartSetId(key)); - if(!figurePartSet) continue; + if (!figurePartSet) continue; - for(const part of figurePartSet.parts) + for (const part of figurePartSet.parts) { - if(!part) continue; + if (!part) continue; const name = (part.type + ':' + part.id); const existing = this._figureMap.get(name); - if(existing === undefined) continue; + if (existing === undefined) continue; - for(const library of existing) + for (const library of existing) { - if(!library || library.isLoaded) continue; + if (!library || library.isLoaded) continue; - if(pendingLibraries.indexOf(library) >= 0) continue; + if (pendingLibraries.indexOf(library) >= 0) continue; pendingLibraries.push(library); } @@ -274,7 +272,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher public downloadAvatarFigure(container: IAvatarFigureContainer, listener: IAvatarImageListener): void { - if(!this._isReady || !this._structure.renderManager.isReady) + if (!this._isReady || !this._structure.renderManager.isReady) { this._pendingContainers.push([container, listener]); @@ -284,13 +282,13 @@ export class AvatarAssetDownloadManager extends EventDispatcher const figure = container.getFigureString(); const pendingLibraries = this.getAvatarFigurePendingLibraries(container); - if(pendingLibraries && pendingLibraries.length) + if (pendingLibraries && pendingLibraries.length) { - if(listener && !listener.disposed) + if (listener && !listener.disposed) { let listeners = this._figureListeners.get(figure); - if(!listeners) + if (!listeners) { listeners = []; @@ -302,24 +300,24 @@ export class AvatarAssetDownloadManager extends EventDispatcher this._incompleteFigures.set(figure, pendingLibraries); - for(const library of pendingLibraries) + for (const library of pendingLibraries) { - if(!library) continue; + if (!library) continue; this.downloadLibrary(library); } } else { - if(listener && !listener.disposed) listener.resetFigure(figure); + if (listener && !listener.disposed) listener.resetFigure(figure); } } private downloadLibrary(library: AvatarAssetDownloadLibrary): void { - if(!library || library.isLoaded) return; + if (!library || library.isLoaded) return; - if((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; + if ((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; this._pendingDownloadQueue.push(library); @@ -328,7 +326,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher private processDownloadQueue(): void { - while(this._pendingDownloadQueue.length) + while (this._pendingDownloadQueue.length) { const library = this._pendingDownloadQueue[0]; diff --git a/src/nitro/avatar/AvatarFigureContainer.ts b/src/nitro/avatar/AvatarFigureContainer.ts index 33428e5e..58ec0aeb 100644 --- a/src/nitro/avatar/AvatarFigureContainer.ts +++ b/src/nitro/avatar/AvatarFigureContainer.ts @@ -1,4 +1,4 @@ -import { IAvatarFigureContainer } from './IAvatarFigureContainer'; +import { IAvatarFigureContainer } from '../../api'; export class AvatarFigureContainer implements IAvatarFigureContainer { @@ -25,7 +25,7 @@ export class AvatarFigureContainer implements IAvatarFigureContainer { const existing = this.partSets().get(k); - if(!existing) return 0; + if (!existing) return 0; return existing.get('setid'); } @@ -34,7 +34,7 @@ export class AvatarFigureContainer implements IAvatarFigureContainer { const existing = this.partSets().get(k); - if(!existing) return null; + if (!existing) return null; return existing.get('colorids'); } @@ -62,9 +62,9 @@ export class AvatarFigureContainer implements IAvatarFigureContainer { const parts: string[] = []; - for(const key of this.partSets().keys()) + for (const key of this.partSets().keys()) { - if(!key) continue; + if (!key) continue; let setParts = []; @@ -81,20 +81,20 @@ export class AvatarFigureContainer implements IAvatarFigureContainer private partSets(): Map> { - if(!this._parts) this._parts = new Map(); + if (!this._parts) this._parts = new Map(); return this._parts; } private parseFigure(figure: string): void { - if(!figure) figure = ''; + if (!figure) figure = ''; - for(const part of figure.split('.')) + for (const part of figure.split('.')) { const pieces = part.split('-'); - if(pieces.length >= 2) + if (pieces.length >= 2) { const type = pieces[0]; const setId = parseInt(pieces[1]); @@ -102,7 +102,7 @@ export class AvatarFigureContainer implements IAvatarFigureContainer let index = 2; - while(index < pieces.length) + while (index < pieces.length) { colors.push(parseInt(pieces[index])); diff --git a/src/nitro/avatar/AvatarImage.ts b/src/nitro/avatar/AvatarImage.ts index 11fe28ee..a022e81e 100644 --- a/src/nitro/avatar/AvatarImage.ts +++ b/src/nitro/avatar/AvatarImage.ts @@ -3,29 +3,15 @@ import { Container } from '@pixi/display'; import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; import { Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; -import { IGraphicAsset } from '../../api'; +import { AvatarAction, AvatarDirectionAngle, AvatarScaleType, AvatarSetType, IActionDefinition, IActiveActionData, IAnimationLayerData, IAvatarDataContainer, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IGraphicAsset, IPartColor, ISpriteDataContainer } from '../../api'; import { AdvancedMap } from '../../core'; -import { NitroContainer, NitroSprite, PaletteMapFilter, PixiApplicationProxy, TextureUtils } from '../../pixi-proxy'; -import { Nitro } from '../Nitro'; -import { ActiveActionData } from './actions/ActiveActionData'; -import { IActionDefinition } from './actions/IActionDefinition'; -import { IActiveActionData } from './actions/IActiveActionData'; -import { AssetAliasCollection } from './alias/AssetAliasCollection'; -import { IAnimationLayerData } from './animation/IAnimationLayerData'; -import { IAvatarDataContainer } from './animation/IAvatarDataContainer'; -import { ISpriteDataContainer } from './animation/ISpriteDataContainer'; +import { GetTickerTime, NitroContainer, NitroSprite, PaletteMapFilter, PixiApplicationProxy, TextureUtils } from '../../pixi-proxy'; +import { ActiveActionData } from './actions'; +import { AssetAliasCollection } from './alias'; import { AvatarFigureContainer } from './AvatarFigureContainer'; import { AvatarStructure } from './AvatarStructure'; -import { AvatarImageCache } from './cache/AvatarImageCache'; +import { AvatarImageCache } from './cache'; import { EffectAssetDownloadManager } from './EffectAssetDownloadManager'; -import { AvatarAction } from './enum/AvatarAction'; -import { AvatarDirectionAngle } from './enum/AvatarDirectionAngle'; -import { AvatarScaleType } from './enum/AvatarScaleType'; -import { AvatarSetType } from './enum/AvatarSetType'; -import { IAvatarEffectListener } from './IAvatarEffectListener'; -import { IAvatarFigureContainer } from './IAvatarFigureContainer'; -import { IAvatarImage } from './IAvatarImage'; -import { IPartColor } from './structure/figure/IPartColor'; export class AvatarImage implements IAvatarImage, IAvatarEffectListener { @@ -90,11 +76,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._assets = _arg_2; this._scale = _arg_4; this._effectListener = _arg_6; - if(this._scale == null) + if (this._scale == null) { this._scale = AvatarScaleType.LARGE; } - if(_arg_3 == null) + if (_arg_3 == null) { _arg_3 = new AvatarFigureContainer('hr-893-45.hd-180-2.ch-210-66.lg-270-82.sh-300-91.wa-2007-.ri-1-'); } @@ -118,7 +104,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public dispose(): void { - if(this._disposed) return; + if (this._disposed) return; this._structure = null; this._assets = null; @@ -127,22 +113,22 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._avatarSpriteData = null; this._actions = null; - if(this._image) + if (this._image) { this._image.destroy(); this._image = null; } - if(this._cache) + if (this._cache) { this._cache.dispose(); this._cache = null; } - if(this._fullImageCache) + if (this._fullImageCache) { - for(const k of this._fullImageCache.getValues()) (k && k.destroy()); + for (const k of this._fullImageCache.getValues()) (k && k.destroy()); this._fullImageCache = null; } @@ -176,24 +162,24 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { _arg_2 = (_arg_2 + this._directionOffset); - if(_arg_2 < AvatarDirectionAngle.MIN_DIRECTION) + if (_arg_2 < AvatarDirectionAngle.MIN_DIRECTION) { _arg_2 = (AvatarDirectionAngle.MAX_DIRECTION + (_arg_2 + 1)); } - if(_arg_2 > AvatarDirectionAngle.MAX_DIRECTION) + if (_arg_2 > AvatarDirectionAngle.MAX_DIRECTION) { _arg_2 = (_arg_2 - (AvatarDirectionAngle.MAX_DIRECTION + 1)); } - if(this._structure.isMainAvatarSet(k)) + if (this._structure.isMainAvatarSet(k)) { this._mainDirection = _arg_2; } - if((k === AvatarSetType.HEAD) || (k === AvatarSetType.FULL)) + if ((k === AvatarSetType.HEAD) || (k === AvatarSetType.FULL)) { - if((k === AvatarSetType.HEAD) && (this.isHeadTurnPreventedByAction())) + if ((k === AvatarSetType.HEAD) && (this.isHeadTurnPreventedByAction())) { _arg_2 = this._mainDirection; } @@ -239,34 +225,34 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private getFullImageCacheKey(): string { - if(!this._useFullImageCache) return null; + if (!this._useFullImageCache) return null; - if(((this._sortedActions.length == 1) && (this._mainDirection == this._headDirection))) + if (((this._sortedActions.length == 1) && (this._mainDirection == this._headDirection))) { return (this._mainDirection + this._currentActionsString) + (this._frameCounter % 4); } - if(this._sortedActions.length == 2) + if (this._sortedActions.length == 2) { - for(const k of this._sortedActions) + for (const k of this._sortedActions) { - if(((k.actionType == 'fx') && ((((k.actionParameter == '33') || (k.actionParameter == '34')) || (k.actionParameter == '35')) || (k.actionParameter == '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.actionType == 'fx') && ((k.actionParameter == '38') || (k.actionParameter == '39')))) + if (((k.actionType == 'fx') && ((k.actionParameter == '38') || (k.actionParameter == '39')))) { return (((this._mainDirection + '_') + this._headDirection) + this._currentActionsString) + (this._frameCounter % 11); } - if((k.actionType === 'dance') && ((k.actionParameter === '1') || (k.actionParameter === '2') || (k.actionParameter === '3') || (k.actionParameter === '4'))) + if ((k.actionType === 'dance') && ((k.actionParameter === '1') || (k.actionParameter === '2') || (k.actionParameter === '3') || (k.actionParameter === '4'))) { let frame = (this._frameCounter % 8); - if((k.actionParameter === '3')) frame = (this._frameCounter % 10); + if ((k.actionParameter === '3')) frame = (this._frameCounter % 10); - if((k.actionParameter === '4')) frame = (this._frameCounter % 16); + if ((k.actionParameter === '4')) frame = (this._frameCounter % 16); return (((this._mainDirection + k.actionType) + k.actionParameter) + frame); } @@ -278,7 +264,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private getBodyParts(k: string, _arg_2: string, _arg_3: number): string[] { - if((((!(_arg_3 == this._cachedBodyPartsDirection)) || (!(_arg_2 == this._cachedBodyPartsGeometryType))) || (!(k == this._cachedBodyPartsAvatarSet)))) + if ((((!(_arg_3 == this._cachedBodyPartsDirection)) || (!(_arg_2 == this._cachedBodyPartsGeometryType))) || (!(k == this._cachedBodyPartsAvatarSet)))) { this._cachedBodyPartsDirection = _arg_3; this._cachedBodyPartsGeometryType = _arg_2; @@ -291,18 +277,18 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getAvatarPartsForCamera(k: string): void { let _local_4: string; - if(this._mainAction == null) + if (this._mainAction == null) { return; } const _local_2 = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if(_local_2 == null) + if (_local_2 == null) { return; } const _local_3 = this.getBodyParts(k, this._mainAction.definition.geometryType, this._mainDirection); let _local_6 = (_local_3.length - 1); - while(_local_6 >= 0) + while (_local_6 >= 0) { _local_4 = _local_3[_local_6]; const _local_5 = this._cache.getImageContainer(_local_4, this._frameCounter, true); @@ -312,19 +298,19 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getImage(setType: string, hightlight: boolean, scale: number = 1, cache: boolean = true): RenderTexture { - if(!this._changes) return this._image; + if (!this._changes) return this._image; - if(!this._mainAction) return null; + if (!this._mainAction) return null; - if(!this._actionsSorted) this.endActionAppends(); + if (!this._actionsSorted) this.endActionAppends(); const avatarCanvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if(!avatarCanvas) return null; + if (!avatarCanvas) return null; - if(this._image && ((this._image.width !== avatarCanvas.width) || (this._image.height !== avatarCanvas.height))) + if (this._image && ((this._image.width !== avatarCanvas.width) || (this._image.height !== avatarCanvas.height))) { - if(this._reusableTexture) + if (this._reusableTexture) { this._reusableTexture.destroy(true); @@ -344,16 +330,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let isCachable = true; let partCount = (_local_6.length - 1); - while(partCount >= 0) + while (partCount >= 0) { const set = _local_6[partCount]; const part = this._cache.getImageContainer(set, this._frameCounter); - if(part) + if (part) { const partCacheContainer = part.image; - if(!partCacheContainer) + if (!partCacheContainer) { container.destroy({ children: true @@ -366,7 +352,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const point = part.regPoint.clone(); - if(point) + if (point) { point.x += avatarCanvas.offset.x; point.y += avatarCanvas.offset.y; @@ -378,7 +364,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partContainer.addChild(partCacheContainer); - if(partContainer) + if (partContainer) { partContainer.position.set(point.x, point.y); @@ -390,13 +376,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partCount--; } - if(this._avatarSpriteData) + if (this._avatarSpriteData) { - if(!container.filters) container.filters = []; + if (!container.filters) container.filters = []; - if(this._avatarSpriteData.colorTransform) container.filters.push(this._avatarSpriteData.colorTransform); + if (this._avatarSpriteData.colorTransform) container.filters.push(this._avatarSpriteData.colorTransform); - if(this._avatarSpriteData.paletteIsGrayscale) + if (this._avatarSpriteData.paletteIsGrayscale) { this.convertToGrayscale(container); @@ -404,12 +390,12 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener } } - if(!cache) + if (!cache) { return TextureUtils.generateTexture(container, new Rectangle(0, 0, avatarCanvas.width, avatarCanvas.height)); } - if(this._reusableTexture) + if (this._reusableTexture) { PixiApplicationProxy.instance.renderer.render(container, { renderTexture: this._reusableTexture, @@ -421,7 +407,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._reusableTexture = TextureUtils.generateTexture(container, new Rectangle(0, 0, avatarCanvas.width, avatarCanvas.height)); } - if(!this._reusableTexture) return null; + if (!this._reusableTexture) return null; /* if(this._avatarSpriteData) @@ -446,31 +432,31 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const textureImageData = textureCtx.getImageData(0, 0, textureCanvas.width, textureCanvas.height); const data = textureImageData.data; - for(let i = 0; i < data.length; i += 4) + for (let i = 0; i < data.length; i += 4) { - if(reds.length == 256) + if (reds.length == 256) { let paletteColor = reds[data[i]]; - if(paletteColor === undefined) paletteColor = 0; + if (paletteColor === undefined) paletteColor = 0; data[i] = ((paletteColor >> 16) & 0xFF); data[i + 1] = ((paletteColor >> 8) & 0xFF); data[i + 2] = (paletteColor & 0xFF); } - if(greens.length == 256) + if (greens.length == 256) { let paletteColor = greens[data[i + 1]]; - if(paletteColor === undefined) paletteColor = 0; + if (paletteColor === undefined) paletteColor = 0; data[i] = ((paletteColor >> 16) & 0xFF); data[i + 1] = ((paletteColor >> 8) & 0xFF); data[i + 2] = (paletteColor & 0xFF); } - if(blues.length == 256) + if (blues.length == 256) { let paletteColor = greens[data[i + 2]]; - if(paletteColor === undefined) paletteColor = 0; + if (paletteColor === undefined) paletteColor = 0; data[i] = ((paletteColor >> 16) & 0xFF); data[i + 1] = ((paletteColor >> 8) & 0xFF); @@ -492,13 +478,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getImageAsSprite(setType: string, scale: number = 1): Sprite { - if(!this._mainAction) return null; + if (!this._mainAction) return null; - if(!this._actionsSorted) this.endActionAppends(); + if (!this._actionsSorted) this.endActionAppends(); const avatarCanvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if(!avatarCanvas) return null; + if (!avatarCanvas) return null; const setTypes = this.getBodyParts(setType, this._mainAction.definition.geometryType, this._mainDirection); const container = new NitroSprite(); @@ -511,16 +497,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let partCount = (setTypes.length - 1); - while(partCount >= 0) + while (partCount >= 0) { const set = setTypes[partCount]; const part = this._cache.getImageContainer(set, this._frameCounter); - if(part) + if (part) { const partCacheContainer = part.image; - if(!partCacheContainer) + if (!partCacheContainer) { container.destroy({ children: true @@ -531,7 +517,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const point = part.regPoint.clone(); - if(point) + if (point) { point.x += avatarCanvas.offset.x; point.y += avatarCanvas.offset.y; @@ -557,29 +543,29 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getCroppedImage(setType: string, scale: number = 1): HTMLImageElement { - if(!this._mainAction) return null; + if (!this._mainAction) return null; - if(!this._actionsSorted) this.endActionAppends(); + if (!this._actionsSorted) this.endActionAppends(); const avatarCanvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if(!avatarCanvas) return null; + if (!avatarCanvas) return null; const setTypes = this.getBodyParts(setType, this._mainAction.definition.geometryType, this._mainDirection); const container = new NitroContainer(); let partCount = (setTypes.length - 1); - while(partCount >= 0) + while (partCount >= 0) { const set = setTypes[partCount]; const part = this._cache.getImageContainer(set, this._frameCounter); - if(part) + if (part) { const partCacheContainer = part.image; - if(!partCacheContainer) + if (!partCacheContainer) { container.destroy({ children: true @@ -590,7 +576,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const point = part.regPoint.clone(); - if(point) + if (point) { point.x += avatarCanvas.offset.x; point.y += avatarCanvas.offset.y; @@ -602,7 +588,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partContainer.addChild(partCacheContainer); - if(partContainer) + if (partContainer) { partContainer.position.set(point.x, point.y); @@ -618,7 +604,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const image = TextureUtils.generateImage(texture); - if(!image) return null; + if (!image) return null; return image; } @@ -627,9 +613,9 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { const existing = this._fullImageCache.getValue(k); - if(existing) + if (existing) { - if(!existing.valid) + if (!existing.valid) { this._fullImageCache.remove(k); @@ -646,18 +632,18 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { const existing = this._fullImageCache.getValue(k); - if(existing) + if (existing) { this._fullImageCache.remove(k); existing.destroy(true); } - if(this._fullImageCache.length === this._fullImageCacheSize) + if (this._fullImageCache.length === this._fullImageCacheSize) { const oldestKey = this._fullImageCache.getKey(0); - if(oldestKey) + if (oldestKey) { const removed = this._fullImageCache.remove(oldestKey); @@ -690,13 +676,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { let k: ActiveActionData; - if(!this.sortActions()) return; + if (!this.sortActions()) return; - for(const k of this._sortedActions) + for (const k of this._sortedActions) { - if(k.actionType === AvatarAction.EFFECT) + if (k.actionType === AvatarAction.EFFECT) { - if(!this._effectManager.isAvatarEffectReady(parseInt(k.actionParameter))) this._effectManager.downloadAvatarEffect(parseInt(k.actionParameter), this); + if (!this._effectManager.isAvatarEffectReady(parseInt(k.actionParameter))) this._effectManager.downloadAvatarEffect(parseInt(k.actionParameter), this); } } @@ -710,14 +696,14 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._actionsSorted = false; - if(_args && (_args.length > 0)) _local_3 = _args[0]; + if (_args && (_args.length > 0)) _local_3 = _args[0]; - if((_local_3 !== undefined) && (_local_3 !== null)) _local_3 = _local_3.toString(); + if ((_local_3 !== undefined) && (_local_3 !== null)) _local_3 = _local_3.toString(); - switch(k) + switch (k) { case AvatarAction.POSTURE: - switch(_local_3) + switch (_local_3) { case AvatarAction.POSTURE_LAY: case AvatarAction.POSTURE_WALK: @@ -730,11 +716,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener case AvatarAction.SNOWWAR_DIE_BACK: case AvatarAction.SNOWWAR_PICK: case AvatarAction.SNOWWAR_THROW: - if((_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY)) + if ((_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY)) { - if(_local_3 === AvatarAction.POSTURE_LAY) + if (_local_3 === AvatarAction.POSTURE_LAY) { - if(this._mainDirection == 0) + if (this._mainDirection == 0) { this.setDirection(AvatarSetType.FULL, 4); } @@ -753,7 +739,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener } break; case AvatarAction.GESTURE: - switch(_local_3) + switch (_local_3) { case AvatarAction.GESTURE_AGGRAVATED: case AvatarAction.GESTURE_SAD: @@ -777,9 +763,9 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener case AvatarAction.EXPRESSION_SNOWBOARD_OLLIE: case AvatarAction.EXPRESSION_SNOWBORD_360: case AvatarAction.EXPRESSION_RIDE_JUMP: - if(_local_3 === AvatarAction.EFFECT) + if (_local_3 === AvatarAction.EFFECT) { - if((((((_local_3 === '33') || (_local_3 === '34')) || (_local_3 === '35')) || (_local_3 === '36')) || (_local_3 === '38')) || (_local_3 === '39')) + if ((((((_local_3 === '33') || (_local_3 === '34')) || (_local_3 === '35')) || (_local_3 === '36')) || (_local_3 === '38')) || (_local_3 === '39')) { this._useFullImageCache = true; } @@ -790,7 +776,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener case AvatarAction.CARRY_OBJECT: case AvatarAction.USE_OBJECT: { const _local_4 = this._structure.getActionDefinitionWithState(k); - if(_local_4) _local_3 = _local_4.getParameterValue(_local_3); + if (_local_4) _local_3 = _local_4.getParameterValue(_local_3); this.addActionData(k, _local_3); break; } @@ -802,13 +788,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener protected addActionData(k: string, _arg_2: string = ''): void { let _local_3: ActiveActionData; - if(!this._actions) this._actions = []; + if (!this._actions) this._actions = []; let _local_4 = 0; - while(_local_4 < this._actions.length) + while (_local_4 < this._actions.length) { _local_3 = this._actions[_local_4]; - if(((_local_3.actionType == k) && (_local_3.actionParameter == _arg_2))) + if (((_local_3.actionType == k) && (_local_3.actionParameter == _arg_2))) { return; } @@ -841,14 +827,14 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let _local_2: IActionDefinition; let _local_3: ActiveActionData; let k: boolean; - if(this._sortedActions == null) + if (this._sortedActions == null) { return false; } - for(const _local_3 of this._sortedActions) + for (const _local_3 of this._sortedActions) { _local_2 = this._structure.getActionDefinitionWithState(_local_3.actionType); - if(((!(_local_2 == null)) && (_local_2.getPreventHeadTurn(_local_3.actionParameter)))) + if (((!(_local_2 == null)) && (_local_2.getPreventHeadTurn(_local_3.actionParameter)))) { k = true; } @@ -868,11 +854,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._sortedActions = this._structure.sortActions(this._actions); this._animationFrameCount = this._structure.maxFrames(this._sortedActions); - if(!this._sortedActions) + if (!this._sortedActions) { this._canvasOffsets = [0, 0, 0]; - if(this._lastActionsString !== '') + if (this._lastActionsString !== '') { k = true; @@ -883,15 +869,15 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { this._canvasOffsets = this._structure.getCanvasOffsets(this._sortedActions, this._scale, this._mainDirection); - for(const _local_4 of this._sortedActions) + for (const _local_4 of this._sortedActions) { this._currentActionsString = (this._currentActionsString + (_local_4.actionType + _local_4.actionParameter)); - if(_local_4.actionType === AvatarAction.EFFECT) + if (_local_4.actionType === AvatarAction.EFFECT) { const _local_5 = parseInt(_local_4.actionParameter); - if(this._effectIdInUse !== _local_5) _local_2 = true; + if (this._effectIdInUse !== _local_5) _local_2 = true; this._effectIdInUse = _local_5; @@ -899,16 +885,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener } } - if(!_local_3) + if (!_local_3) { - if(this._effectIdInUse > -1) _local_2 = true; + if (this._effectIdInUse > -1) _local_2 = true; this._effectIdInUse = -1; } - if(_local_2) this._cache.disposeInactiveActions(0); + if (_local_2) this._cache.disposeInactiveActions(0); - if(this._lastActionsString != this._currentActionsString) + if (this._lastActionsString != this._currentActionsString) { k = true; @@ -923,60 +909,60 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private setActionsToParts(): void { - if(!this._sortedActions == null) return; + if (!this._sortedActions == null) return; - const _local_3: number = Nitro.instance.time; + const _local_3: number = GetTickerTime(); const _local_4: string[] = []; - for(const k of this._sortedActions) _local_4.push(k.actionType); + for (const k of this._sortedActions) _local_4.push(k.actionType); - for(const k of this._sortedActions) + for (const k of this._sortedActions) { - if((k && k.definition) && k.definition.isAnimation) + if ((k && k.definition) && k.definition.isAnimation) { const _local_2 = this._structure.getAnimation(((k.definition.state + '.') + k.actionParameter)); - if(_local_2 && _local_2.hasOverriddenActions()) + if (_local_2 && _local_2.hasOverriddenActions()) { const _local_5 = _local_2.overriddenActionNames(); - if(_local_5) + if (_local_5) { - for(const _local_6 of _local_5) + for (const _local_6 of _local_5) { - if(_local_4.indexOf(_local_6) >= 0) k.overridingAction = _local_2.overridingAction(_local_6); + if (_local_4.indexOf(_local_6) >= 0) k.overridingAction = _local_2.overridingAction(_local_6); } } } - if(_local_2 && _local_2.resetOnToggle) + if (_local_2 && _local_2.resetOnToggle) { this._animationHasResetOnToggle = true; } } } - for(const k of this._sortedActions) + for (const k of this._sortedActions) { - if(!((!(k)) || (!(k.definition)))) + if (!((!(k)) || (!(k.definition)))) { - if(k.definition.isAnimation && (k.actionParameter === '')) k.actionParameter = '1'; + if (k.definition.isAnimation && (k.actionParameter === '')) k.actionParameter = '1'; this.setActionToParts(k, _local_3); - if(k.definition.isAnimation) + if (k.definition.isAnimation) { this._isAnimating = k.definition.isAnimated(k.actionParameter); const _local_2 = this._structure.getAnimation(((k.definition.state + '.') + k.actionParameter)); - if(_local_2) + if (_local_2) { this._sprites = this._sprites.concat(_local_2.spriteData); - if(_local_2.hasDirectionData()) this._directionOffset = _local_2.directionData.offset; + if (_local_2.hasDirectionData()) this._directionOffset = _local_2.directionData.offset; - if(_local_2.hasAvatarData()) this._avatarSpriteData = _local_2.avatarData; + if (_local_2.hasAvatarData()) this._avatarSpriteData = _local_2.avatarData; } } } @@ -985,15 +971,15 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private setActionToParts(k: IActiveActionData, _arg_2: number): void { - if(((k == null) || (k.definition == null))) + if (((k == null) || (k.definition == null))) { return; } - if(k.definition.assetPartDefinition == '') + if (k.definition.assetPartDefinition == '') { return; } - if(k.definition.isMain) + if (k.definition.isMain) { this._mainAction = k; this._cache.setGeometryType(k.definition.geometryType); @@ -1004,11 +990,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private resetBodyPartCache(k: IActiveActionData): void { - if(!k) return; + if (!k) return; - if(k.definition.assetPartDefinition === '') return; + if (k.definition.assetPartDefinition === '') return; - if(k.definition.isMain) + if (k.definition.isMain) { this._mainAction = k; this._cache.setGeometryType(k.definition.geometryType); @@ -1030,7 +1016,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let _local_5 = 0.33; const _local_6 = 1; - switch(channel) + switch (channel) { case AvatarImage.CHANNELS_UNIQUE: _local_3 = 0.3; @@ -1098,7 +1084,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public resetEffect(effect: number): void { - if(effect === this._effectIdInUse) + if (effect === this._effectIdInUse) { this.resetActions(); this.setActionsToParts(); @@ -1106,7 +1092,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._animationHasResetOnToggle = true; this._changes = true; - if(this._effectListener) this._effectListener.resetEffect(effect); + if (this._effectListener) this._effectListener.resetEffect(effect); } } } diff --git a/src/nitro/avatar/AvatarImagePartContainer.ts b/src/nitro/avatar/AvatarImagePartContainer.ts index cc32c403..a2a5dec5 100644 --- a/src/nitro/avatar/AvatarImagePartContainer.ts +++ b/src/nitro/avatar/AvatarImagePartContainer.ts @@ -1,7 +1,6 @@ import { AdjustmentFilter } from '@pixi/filter-adjustment'; -import { IActionDefinition } from './actions/IActionDefinition'; -import { AvatarAnimationFrame } from './structure/animation/AvatarAnimationFrame'; -import { IPartColor } from './structure/figure/IPartColor'; +import { IActionDefinition, IPartColor } from '../../api'; +import { AvatarAnimationFrame } from './structure'; export class AvatarImagePartContainer { @@ -17,30 +16,30 @@ export class AvatarImagePartContainer private _blendTransform: AdjustmentFilter; private _paletteMapId: number; - 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) + constructor(bodyPartId: string, partType: string, partId: string, partColor: IPartColor, frames: AvatarAnimationFrame[], action: IActionDefinition, isColorable: boolean, paletteMapId: number, flippedPartType: string = '', isBlendable: boolean = false, _arg_11: number = 1) { - this._bodyPartId = k; - this._partType = _arg_2; - this._partId = _arg_3; - this._color = _arg_4; - this._frames = _arg_5; - this._action = _arg_6; - this._isColorable = _arg_7; - this._paletteMapId = _arg_8; - this._flippedPartType = _arg_9; - this._isBlendable = _arg_10; + this._bodyPartId = bodyPartId; + this._partType = partType; + this._partId = partId; + this._color = partColor; + this._frames = frames; + this._action = action; + this._isColorable = isColorable; + this._paletteMapId = paletteMapId; + this._flippedPartType = flippedPartType; + this._isBlendable = isBlendable; this._blendTransform = null; - if(this._partType === 'ey') this._isColorable = false; + if (this._partType === 'ey') this._isColorable = false; } public getFrameIndex(k: number): number { - if(!this._frames || !this._frames.length) return 0; + if (!this._frames || !this._frames.length) return 0; const frameNumber = (k % this._frames.length); - if(this._frames[frameNumber] instanceof AvatarAnimationFrame) + if (this._frames[frameNumber] instanceof AvatarAnimationFrame) { return this._frames[frameNumber].number; } @@ -52,9 +51,9 @@ export class AvatarImagePartContainer { const frameNumber = (k % this._frames.length); - if(this._frames && (this._frames.length > frameNumber)) + if (this._frames && (this._frames.length > frameNumber)) { - if(this._frames[frameNumber] instanceof AvatarAnimationFrame) + if (this._frames[frameNumber] instanceof AvatarAnimationFrame) { return this._frames[frameNumber]; } @@ -67,9 +66,9 @@ export class AvatarImagePartContainer { const frameNumber = (k % this._frames.length); - if(this._frames && (this._frames.length > frameNumber)) + if (this._frames && (this._frames.length > frameNumber)) { - if(this._frames[frameNumber] instanceof AvatarAnimationFrame) + if (this._frames[frameNumber] instanceof AvatarAnimationFrame) { const frame = this._frames[frameNumber]; @@ -132,6 +131,6 @@ export class AvatarImagePartContainer public toString(): string { - return [ this._bodyPartId, this._partType, this._partId ].join(':'); + return [this._bodyPartId, this._partType, this._partId].join(':'); } } diff --git a/src/nitro/avatar/AvatarRenderManager.ts b/src/nitro/avatar/AvatarRenderManager.ts index 3ba09eb4..bf06604a 100644 --- a/src/nitro/avatar/AvatarRenderManager.ts +++ b/src/nitro/avatar/AvatarRenderManager.ts @@ -1,29 +1,19 @@ -import { IAssetManager, IGraphicAsset } from '../../api'; +import { AvatarSetType, IAssetManager, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IFigureData, IFigurePartSet, IFigureSetData, IGraphicAsset, IStructureData } from '../../api'; import { NitroEvent, NitroManager } from '../../core'; import { Nitro } from '../Nitro'; -import { FigureDataContainer } from '../utils/FigureDataContainer'; -import { AssetAliasCollection } from './alias/AssetAliasCollection'; +import { FigureDataContainer } from '../utils'; +import { AssetAliasCollection } from './alias'; import { AvatarAssetDownloadManager } from './AvatarAssetDownloadManager'; import { AvatarFigureContainer } from './AvatarFigureContainer'; import { AvatarImage } from './AvatarImage'; import { AvatarStructure } from './AvatarStructure'; -import { HabboAvatarAnimations } from './data/HabboAvatarAnimations'; +import { HabboAvatarAnimations } from "./data/HabboAvatarAnimations"; import { HabboAvatarGeometry } from './data/HabboAvatarGeometry'; import { HabboAvatarPartSets } from './data/HabboAvatarPartSets'; import { EffectAssetDownloadManager } from './EffectAssetDownloadManager'; -import { AvatarSetType } from './enum/AvatarSetType'; -import { AvatarRenderEvent } from './events/AvatarRenderEvent'; -import { IAvatarEffectListener } from './IAvatarEffectListener'; -import { IAvatarFigureContainer } from './IAvatarFigureContainer'; -import { IAvatarImage } from './IAvatarImage'; -import { IAvatarImageListener } from './IAvatarImageListener'; -import { IAvatarRenderManager } from './IAvatarRenderManager'; -import { IFigureData } from './interfaces'; +import { AvatarRenderEvent } from './events'; import { PlaceHolderAvatarImage } from './PlaceHolderAvatarImage'; -import { AvatarStructureDownload } from './structure/AvatarStructureDownload'; -import { IFigurePartSet } from './structure/figure/IFigurePartSet'; -import { IFigureSetData } from './structure/IFigureSetData'; -import { IStructureData } from './structure/IStructureData'; +import { AvatarStructureDownload } from './structure'; export class AvatarRenderManager extends NitroManager implements IAvatarRenderManager { @@ -84,7 +74,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this._aliasCollection.init(); - if(!this._avatarAssetDownloadManager) + if (!this._avatarAssetDownloadManager) { this._avatarAssetDownloadManager = new AvatarAssetDownloadManager(Nitro.instance.core.asset, this._structure); @@ -92,7 +82,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this._avatarAssetDownloadManager.addEventListener(AvatarAssetDownloadManager.LIBRARY_LOADED, this.onAvatarAssetDownloaded); } - if(!this._effectAssetDownloadManager) + if (!this._effectAssetDownloadManager) { this._effectAssetDownloadManager = new EffectAssetDownloadManager(Nitro.instance.core.asset, this._structure); @@ -105,14 +95,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public onDispose(): void { - if(this._avatarAssetDownloadManager) + if (this._avatarAssetDownloadManager) { this._avatarAssetDownloadManager.removeEventListener(AvatarAssetDownloadManager.DOWNLOADER_READY, this.onAvatarAssetDownloaderReady); this._avatarAssetDownloadManager.removeEventListener(AvatarAssetDownloadManager.LIBRARY_LOADED, this.onAvatarAssetDownloaded); } - if(this._effectAssetDownloadManager) + if (this._effectAssetDownloadManager) { this._effectAssetDownloadManager.removeEventListener(EffectAssetDownloadManager.DOWNLOADER_READY, this.onEffectAssetDownloaderReady); @@ -122,7 +112,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadGeometry(): void { - if(!this._structure) return; + if (!this._structure) return; this._structure.initGeometry(HabboAvatarGeometry.geometry); @@ -133,7 +123,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadPartSets(): void { - if(!this._structure) return; + if (!this._structure) return; this._structure.initPartSets(HabboAvatarPartSets.partSets); @@ -146,7 +136,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const defaultActions = Nitro.instance.getConfiguration('avatar.default.actions'); - if(defaultActions) this._structure.initActions(Nitro.instance.core.asset, defaultActions); + if (defaultActions) this._structure.initActions(Nitro.instance.core.asset, defaultActions); const request = new XMLHttpRequest(); @@ -158,7 +148,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa request.onloadend = e => { - if(!this._structure) return; + if (!this._structure) return; this._structure.updateActions(JSON.parse(request.responseText)); @@ -181,7 +171,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadAnimations(): void { - if(!this._structure) return; + if (!this._structure) return; this._structure.initAnimation(HabboAvatarAnimations.animations); @@ -194,14 +184,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const defaultFigureData = Nitro.instance.getConfiguration('avatar.default.figuredata'); - if(!defaultFigureData || (typeof defaultFigureData === 'string')) + if (!defaultFigureData || (typeof defaultFigureData === 'string')) { this.logger.error('XML figuredata is no longer supported'); return; } - if(this._structure) this._structure.initFigureData(defaultFigureData); + if (this._structure) this._structure.initFigureData(defaultFigureData); const structureDownloader = new AvatarStructureDownload(Nitro.instance.getConfiguration('avatar.figuredata.url'), (this._structure.figureData as IFigureSetData)); @@ -219,7 +209,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaderReady(event: NitroEvent): void { - if(!event) return; + if (!event) return; this._figureMapReady = true; @@ -228,14 +218,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaded(event: NitroEvent): void { - if(!event) return; + if (!event) return; this._aliasCollection.reset(); } private onEffectAssetDownloaderReady(event: NitroEvent): void { - if(!event) return; + if (!event) return; this._effectMapReady = true; @@ -244,20 +234,20 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onEffectAssetDownloaded(event: NitroEvent): void { - if(!event) return; + if (!event) return; this._aliasCollection.reset(); } private checkReady(): void { - if(this._isReady) return; + if (this._isReady) return; - if(!this._geometryReady || !this._partSetsReady || !this._actionsReady || !this._animationsReady || !this._figureMapReady || !this._effectMapReady || !this._structureReady) return; + if (!this._geometryReady || !this._partSetsReady || !this._actionsReady || !this._animationsReady || !this._figureMapReady || !this._effectMapReady || !this._structureReady) return; this._isReady = true; - if(this.events) this.events.dispatchEvent(new NitroEvent(AvatarRenderEvent.AVATAR_RENDER_READY)); + if (this.events) this.events.dispatchEvent(new NitroEvent(AvatarRenderEvent.AVATAR_RENDER_READY)); } public createFigureContainer(figure: string): IAvatarFigureContainer @@ -267,25 +257,25 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public isFigureContainerReady(container: IAvatarFigureContainer): boolean { - if(!this._avatarAssetDownloadManager) return false; + if (!this._avatarAssetDownloadManager) return false; return this._avatarAssetDownloadManager.isAvatarFigureContainerReady(container); } public createAvatarImage(figure: string, size: string, gender: string, listener: IAvatarImageListener = null, effectListener: IAvatarEffectListener = null): IAvatarImage { - if(!this._structure || !this._avatarAssetDownloadManager) return null; + if (!this._structure || !this._avatarAssetDownloadManager) return null; const figureContainer = new AvatarFigureContainer(figure); - if(gender) this.validateAvatarFigure(figureContainer, gender); + if (gender) this.validateAvatarFigure(figureContainer, gender); - if(this._avatarAssetDownloadManager.isAvatarFigureContainerReady(figureContainer)) + if (this._avatarAssetDownloadManager.isAvatarFigureContainerReady(figureContainer)) { return new AvatarImage(this._structure, this._aliasCollection, figureContainer, size, this._effectAssetDownloadManager, effectListener); } - if(!this._placeHolderFigure) this._placeHolderFigure = new AvatarFigureContainer(AvatarRenderManager.DEFAULT_FIGURE); + if (!this._placeHolderFigure) this._placeHolderFigure = new AvatarFigureContainer(AvatarRenderManager.DEFAULT_FIGURE); this._avatarAssetDownloadManager.downloadAvatarFigure(figureContainer, listener); @@ -294,7 +284,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public downloadAvatarFigure(container: IAvatarFigureContainer, listener: IAvatarImageListener): void { - if(!this._avatarAssetDownloadManager) return; + if (!this._avatarAssetDownloadManager) return; this._avatarAssetDownloadManager.downloadAvatarFigure(container, listener); } @@ -305,17 +295,17 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa const typeIds = this._structure.getMandatorySetTypeIds(gender, 2); - if(typeIds) + if (typeIds) { const figureData = this._structure.figureData; - for(const id of typeIds) + for (const id of typeIds) { - if(!container.hasPartType(id)) + if (!container.hasPartType(id)) { const figurePartSet = this._structure.getDefaultPartSet(id, gender); - if(figurePartSet) + if (figurePartSet) { container.updatePart(id, figurePartSet.id, [0]); @@ -326,15 +316,15 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const setType = figureData.getSetType(id); - if(setType) + if (setType) { const figurePartSet = setType.getPartSet(container.getPartSetId(id)); - if(!figurePartSet) + if (!figurePartSet) { const partSet = this._structure.getDefaultPartSet(id, gender); - if(partSet) + if (partSet) { container.updatePart(id, partSet.id, [0]); @@ -351,49 +341,49 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public getFigureClubLevel(container: IAvatarFigureContainer, gender: string, searchParts: string[] = null): number { - if(!this._structure) return 0; + if (!this._structure) return 0; const figureData = this._structure.figureData; const parts = Array.from(container.getPartTypeIds()); let clubLevel = 0; - for(const part of parts) + for (const part of parts) { const set = figureData.getSetType(part); - if(!set) continue; + if (!set) continue; const setId = container.getPartSetId(part); const partSet = set.getPartSet(setId); - if(partSet) + if (partSet) { clubLevel = Math.max(partSet.clubLevel, clubLevel); const palette = figureData.getPalette(set.paletteID); const colors = container.getPartColorIds(part); - for(const colorId of colors) + for (const colorId of colors) { const color = palette.getColor(colorId); - if(!color) continue; + if (!color) continue; clubLevel = Math.max(color.clubLevel, clubLevel); } } } - if(!searchParts) searchParts = this._structure.getBodyPartsUnordered(AvatarSetType.FULL); + if (!searchParts) searchParts = this._structure.getBodyPartsUnordered(AvatarSetType.FULL); - for(const part of searchParts) + for (const part of searchParts) { const set = figureData.getSetType(part); - if(!set) continue; + if (!set) continue; - if(parts.indexOf(part) === -1) clubLevel = Math.max(set.optionalFromClubLevel(gender), clubLevel); + if (parts.indexOf(part) === -1) clubLevel = Math.max(set.optionalFromClubLevel(gender), clubLevel); } return clubLevel; @@ -407,15 +397,15 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa return !!(partSet && ((partSet.gender.toUpperCase() === 'U') || (partSet.gender.toUpperCase() === gender.toUpperCase()))); } - public getFigureStringWithFigureIds(k: string, _arg_2: string, _arg_3: number[]): string + public getFigureStringWithFigureIds(figure: string, gender: string, _arg_3: number[]): string { const container = new FigureDataContainer(); - container.loadAvatarData(k, _arg_2); + container.loadAvatarData(figure, gender); const partSets: IFigurePartSet[] = this.resolveFigureSets(_arg_3); - for(const partSet of partSets) + for (const partSet of partSets) { container.savePartData(partSet.type, partSet.id, container.getColourIds(partSet.type)); } @@ -423,16 +413,16 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa return container.getFigureString(); } - private resolveFigureSets(k: number[]): IFigurePartSet[] + private resolveFigureSets(setIds: number[]): IFigurePartSet[] { const structure = this.structureData; const partSets: IFigurePartSet[] = []; - for(const _local_4 of k) + for (const setId of setIds) { - const partSet = structure.getFigurePartSet(_local_4); + const partSet = structure.getFigurePartSet(setId); - if(partSet) partSets.push(partSet); + if (partSet) partSets.push(partSet); } return partSets; @@ -440,7 +430,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public getMandatoryAvatarPartSetIds(k: string, _arg_2: number): string[] { - if(!this._structure) return null; + if (!this._structure) return null; return this._structure.getMandatorySetTypeIds(k, _arg_2); } @@ -467,7 +457,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public get structureData(): IStructureData { - if(this._structure) return this._structure.figureData; + if (this._structure) return this._structure.figureData; return null; } diff --git a/src/nitro/avatar/AvatarStructure.ts b/src/nitro/avatar/AvatarStructure.ts index 6fde8683..24377c1c 100644 --- a/src/nitro/avatar/AvatarStructure.ts +++ b/src/nitro/avatar/AvatarStructure.ts @@ -1,30 +1,12 @@ import { Point } from '@pixi/math'; -import { IAssetAnimation, IAssetManager } from '../../api'; +import { AvatarDirectionAngle, IActionDefinition, IActiveActionData, IAssetAnimation, IAssetManager, IAvatarFigureContainer, IAvatarImage, IAvatarRenderManager, IFigureData, IFigurePartSet, IPartColor, IStructureData } from '../../api'; import { EventDispatcher } from '../../core'; -import { ActionDefinition } from './actions/ActionDefinition'; -import { AvatarActionManager } from './actions/AvatarActionManager'; -import { IActionDefinition } from './actions/IActionDefinition'; -import { IActiveActionData } from './actions/IActiveActionData'; -import { Animation } from './animation/Animation'; -import { AnimationManager } from './animation/AnimationManager'; -import { AvatarAnimationLayerData } from './animation/AvatarAnimationLayerData'; +import { ActionDefinition, AvatarActionManager } from './actions'; +import { Animation, AnimationManager, AvatarAnimationLayerData } from './animation'; import { AvatarImagePartContainer } from './AvatarImagePartContainer'; import { AvatarRenderManager } from './AvatarRenderManager'; -import { AvatarDirectionAngle } from './enum/AvatarDirectionAngle'; -import { AvatarModelGeometry } from './geometry/AvatarModelGeometry'; -import { IAvatarFigureContainer } from './IAvatarFigureContainer'; -import { IAvatarImage } from './IAvatarImage'; -import { IAvatarRenderManager } from './IAvatarRenderManager'; -import { IFigureData } from './interfaces'; -import { AnimationAction } from './structure/animation/AnimationAction'; -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'; -import { FigureSetData } from './structure/FigureSetData'; -import { IStructureData } from './structure/IStructureData'; -import { PartSetsData } from './structure/PartSetsData'; +import { AvatarModelGeometry } from './geometry'; +import { AnimationAction, AvatarAnimationData, AvatarAnimationFrame, AvatarCanvas, FigureSetData, PartSetsData } from './structure'; export class AvatarStructure extends EventDispatcher { @@ -60,7 +42,7 @@ export class AvatarStructure extends EventDispatcher public dispose(): void { - if(this.disposed) return; + if (this.disposed) return; super.dispose(); @@ -73,14 +55,14 @@ export class AvatarStructure extends EventDispatcher public initGeometry(k: any): void { - if(!k) return; + if (!k) return; this._geometry = new AvatarModelGeometry(k); } public initActions(k: IAssetManager, _arg_2: any): void { - if(!_arg_2) return; + if (!_arg_2) return; this._actionManager = new AvatarActionManager(k, _arg_2); this._defaultAction = this._actionManager.getDefaultAction(); @@ -95,9 +77,9 @@ export class AvatarStructure extends EventDispatcher public initPartSets(k: any): boolean { - if(!k) return false; + if (!k) return false; - if(this._partSetsData.parse(k)) + if (this._partSetsData.parse(k)) { this._partSetsData.getPartDefinition('ri').appendToFigure = true; this._partSetsData.getPartDefinition('li').appendToFigure = true; @@ -110,14 +92,14 @@ export class AvatarStructure extends EventDispatcher public initAnimation(k: any): boolean { - if(!k) return false; + if (!k) return false; return this._animationData.parse(k); } public initFigureData(k: IFigureData): boolean { - if(!k) return false; + if (!k) return false; return this._figureData.parse(k); } @@ -131,11 +113,11 @@ export class AvatarStructure extends EventDispatcher { let index = 0; - while(index < _arg_3) + while (index < _arg_3) { const collection = k.getCollection((_arg_2 + index)); - if(collection) + if (collection) { const animationData = collection.data; @@ -155,15 +137,15 @@ export class AvatarStructure extends EventDispatcher { const _local_4 = k.getPartColorIds(_arg_2); - if((!(_local_4)) || (_local_4.length < _arg_3)) return null; + if ((!(_local_4)) || (_local_4.length < _arg_3)) return null; const _local_5 = this._figureData.getSetType(_arg_2); - if(_local_5 == null) return null; + if (_local_5 == null) return null; const _local_6 = this._figureData.getPalette(_local_5.paletteID); - if(!_local_6) return null; + if (!_local_6) return null; return _local_6.getColor(_local_4[_arg_3]); } @@ -202,7 +184,7 @@ export class AvatarStructure extends EventDispatcher { let _local_2 = 0; - for(const _local_3 of k) + for (const _local_3 of k) { _local_2 = Math.max(_local_2, this._animationData.getFrameCount(_local_3.definition)); } @@ -211,12 +193,12 @@ export class AvatarStructure extends EventDispatcher public getMandatorySetTypeIds(k: string, _arg_2: number): string[] { - if(!this._mandatorySetTypeIds[k]) + if (!this._mandatorySetTypeIds[k]) { this._mandatorySetTypeIds[k] = []; } - if(this._mandatorySetTypeIds[k][_arg_2]) + if (this._mandatorySetTypeIds[k][_arg_2]) { return this._mandatorySetTypeIds[k][_arg_2]; } @@ -253,16 +235,16 @@ export class AvatarStructure extends EventDispatcher const _local_4: string[] = []; const _local_5 = k.definition.geometryType; - if(k.definition.isAnimation) + if (k.definition.isAnimation) { const _local_7 = ((k.definition.state + '.') + k.actionParameter); const _local_8 = this._animationManager.getAnimation(_local_7); - if(_local_8) + if (_local_8) { _local_3 = _local_8.getAnimatedBodyPartIds(0, k.overridingAction); - if(_local_8.hasAddData()) + if (_local_8.hasAddData()) { const _local_11 = { id: '', @@ -280,11 +262,11 @@ export class AvatarStructure extends EventDispatcher setType: '' }; - for(const _local_13 of _local_8.addData) + for (const _local_13 of _local_8.addData) { const _local_6 = this._geometry.getBodyPart(_local_5, _local_13.align); - if(_local_6) + if (_local_6) { _local_11.id = _local_13.id; _local_6.addPart(_local_11, _arg_2); @@ -294,30 +276,30 @@ export class AvatarStructure extends EventDispatcher const _local_10 = this._partSetsData.addPartDefinition(_local_12); _local_10.appendToFigure = true; - if(_local_13.base === '') _local_10.staticId = 1; + if (_local_13.base === '') _local_10.staticId = 1; - if(_local_4.indexOf(_local_6.id) === -1) _local_4.push(_local_6.id); + if (_local_4.indexOf(_local_6.id) === -1) _local_4.push(_local_6.id); } } } } - for(const _local_9 of _local_3) + for (const _local_9 of _local_3) { const _local_6 = this._geometry.getBodyPart(_local_5, _local_9); - if(_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); + if (_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); } } else { _local_3 = this._partSetsData.getActiveParts(k.definition); - for(const _local_14 of _local_3) + for (const _local_14 of _local_3) { const _local_6 = this._geometry.getBodyPartOfItem(_local_5, _local_14, _arg_2); - if(_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); + if (_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); } } @@ -340,7 +322,7 @@ export class AvatarStructure extends EventDispatcher { const _local_5 = this._animationData.getAction(k.definition); - if(_local_5) return _local_5.getFrameBodyPartOffset(_arg_2, _arg_3, _arg_4); + if (_local_5) return _local_5.getFrameBodyPartOffset(_arg_2, _arg_3, _arg_4); return AnimationAction.DEFAULT_OFFSET; } @@ -353,31 +335,31 @@ export class AvatarStructure extends EventDispatcher let _local_20: AvatarAnimationFrame[] = []; let _local_36: IPartColor = null; - if(!_arg_3 == null) return []; + if (!_arg_3 == null) return []; const _local_9 = this._partSetsData.getActiveParts(_arg_3.definition); const _local_11: AvatarImagePartContainer[] = []; let _local_14: any[] = [0]; const _local_15 = this._animationData.getAction(_arg_3.definition); - if(_arg_3.definition.isAnimation) + if (_arg_3.definition.isAnimation) { const _local_24 = ((_arg_3.definition.state + '.') + _arg_3.actionParameter); const _local_10 = this._animationManager.getAnimation(_local_24); - if(_local_10) + if (_local_10) { _local_14 = this.getPopulatedArray(_local_10.frameCount(_arg_3.overridingAction)); - for(const _local_25 of _local_10.getAnimatedBodyPartIds(0, _arg_3.overridingAction)) + for (const _local_25 of _local_10.getAnimatedBodyPartIds(0, _arg_3.overridingAction)) { - if(_local_25 === k) + if (_local_25 === k) { const _local_26 = this._geometry.getBodyPart(_arg_4, _local_25); - if(_local_26) + if (_local_26) { - for(const _local_27 of _local_26.getDynamicParts(_arg_7)) + for (const _local_27 of _local_26.getDynamicParts(_arg_7)) { _local_9.push(_local_27.id); } @@ -390,11 +372,11 @@ export class AvatarStructure extends EventDispatcher const _local_16 = this._geometry.getParts(_arg_4, k, _arg_5, _local_9, _arg_7); const _local_21 = _arg_2.getPartTypeIds(); - for(const _local_17 of _local_21) + for (const _local_17 of _local_21) { - if(_arg_8) + if (_arg_8) { - if(_arg_8.get(_local_17)) continue; + if (_arg_8.get(_local_17)) continue; } const _local_28 = _arg_2.getPartSetId(_local_17); @@ -403,27 +385,27 @@ export class AvatarStructure extends EventDispatcher - if(_local_30) + if (_local_30) { const _local_31 = this._figureData.getPalette(_local_30.paletteID); - if(_local_31) + if (_local_31) { const _local_32 = _local_30.getPartSet(_local_28); - if(_local_32) + if (_local_32) { removes = removes.concat(_local_32.hiddenLayers); - for(const _local_33 of _local_32.parts) + for (const _local_33 of _local_32.parts) { - if(_local_16.indexOf(_local_33.type) > -1) + if (_local_16.indexOf(_local_33.type) > -1) { - if(_local_15) + if (_local_15) { const _local_19 = _local_15.getPart(_local_33.type); - if(_local_19) + if (_local_19) { _local_20 = _local_19.frames; } @@ -439,15 +421,15 @@ export class AvatarStructure extends EventDispatcher _local_34 = _arg_3.definition; - if(_local_9.indexOf(_local_33.type) === -1) _local_34 = this._defaultAction; + if (_local_9.indexOf(_local_33.type) === -1) _local_34 = this._defaultAction; const _local_13 = this._partSetsData.getPartDefinition(_local_33.type); let _local_35 = (!_local_13) ? _local_33.type : _local_13.flippedSetType; - if(!_local_35 || (_local_35 === '')) _local_35 = _local_33.type; + if (!_local_35 || (_local_35 === '')) _local_35 = _local_33.type; - if(_local_29 && (_local_29.length > (_local_33.colorLayerIndex - 1))) + if (_local_29 && (_local_29.length > (_local_33.colorLayerIndex - 1))) { _local_36 = _local_31.getColor(_local_29[(_local_33.colorLayerIndex - 1)]); } @@ -465,18 +447,18 @@ export class AvatarStructure extends EventDispatcher const _local_22: AvatarImagePartContainer[] = []; - for(const _local_12 of _local_16) + for (const _local_12 of _local_16) { let _local_39: IPartColor = null; let _local_38 = false; const _local_40 = ((_arg_8) && (_arg_8.get(_local_12))); - for(const _local_23 of _local_11) + for (const _local_23 of _local_11) { - if(_local_23.partType === _local_12) + if (_local_23.partType === _local_12) { - if(_local_40) + if (_local_40) { _local_39 = _local_23.color; } @@ -484,31 +466,31 @@ export class AvatarStructure extends EventDispatcher { _local_38 = true; - if(removes.indexOf(_local_12) === -1) _local_22.push(_local_23); + if (removes.indexOf(_local_12) === -1) _local_22.push(_local_23); } } } - if(!_local_38) + if (!_local_38) { - if(_local_40) + if (_local_40) { const _local_41 = _arg_8.get(_local_12); let _local_42 = 0; let _local_43 = 0; - while(_local_43 < _local_41.length) + while (_local_43 < _local_41.length) { _local_42 = (_local_42 + _local_41.charCodeAt(_local_43)); _local_43++; } - if(_local_15) + if (_local_15) { const _local_19 = _local_15.getPart(_local_12); - if(_local_19) + if (_local_19) { _local_20 = _local_19.frames; } @@ -528,11 +510,11 @@ export class AvatarStructure extends EventDispatcher } else { - if(_local_9.indexOf(_local_12) > -1) + if (_local_9.indexOf(_local_12) > -1) { const _local_44 = this._geometry.getBodyPartOfItem(_arg_4, _local_12, _arg_7); - if(k !== _local_44.id) + if (k !== _local_44.id) { // } @@ -543,36 +525,36 @@ export class AvatarStructure extends EventDispatcher let _local_45 = false; let _local_46 = 1; - if(_local_13.appendToFigure) + if (_local_13.appendToFigure) { let _local_47 = '1'; - if(_arg_3.actionParameter !== '') + if (_arg_3.actionParameter !== '') { _local_47 = _arg_3.actionParameter; } - if(_local_13.hasStaticId()) + if (_local_13.hasStaticId()) { _local_47 = _local_13.staticId.toString(); } - if(_local_10 != null) + if (_local_10 != null) { const _local_48 = _local_10.getAddData(_local_12); - if(_local_48) + if (_local_48) { _local_45 = _local_48.isBlended; _local_46 = _local_48.blend; } } - if(_local_15) + if (_local_15) { const _local_19 = _local_15.getPart(_local_12); - if(_local_19) + if (_local_19) { _local_20 = _local_19.frames; } @@ -605,7 +587,7 @@ export class AvatarStructure extends EventDispatcher let index = 0; - while(index < k) + while (index < k) { _local_2.push(index); @@ -617,13 +599,13 @@ export class AvatarStructure extends EventDispatcher public getItemIds(): string[] { - if(this._actionManager) + if (this._actionManager) { const k = this._actionManager.getActionDefinition('CarryItem').params; const _local_2 = []; - for(const _local_3 of k.values()) _local_2.push(_local_3); + for (const _local_3 of k.values()) _local_2.push(_local_3); return _local_2; } diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index c9758987..06aa219f 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -1,10 +1,9 @@ -import { IAssetManager } from '../../api'; +import { IAssetManager, IAvatarEffectListener } from '../../api'; import { EventDispatcher, NitroEvent } from '../../core'; import { Nitro } from '../Nitro'; import { AvatarStructure } from './AvatarStructure'; import { EffectAssetDownloadLibrary } from './EffectAssetDownloadLibrary'; import { AvatarRenderEffectLibraryEvent, AvatarRenderEvent } from './events'; -import { IAvatarEffectListener } from './IAvatarEffectListener'; export class EffectAssetDownloadManager extends EventDispatcher { @@ -63,7 +62,7 @@ export class EffectAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if(request.responseText) + if (request.responseText) { const data = JSON.parse(request.responseText); @@ -91,17 +90,17 @@ export class EffectAssetDownloadManager extends EventDispatcher private processEffectMap(data: any): void { - if(!data) return; + if (!data) return; - for(const effect of data) + for (const effect of data) { - if(!effect) continue; + if (!effect) continue; const id = (effect.id as string); const lib = (effect.lib as string); const revision = (effect.revision || ''); - if(this._libraryNames.indexOf(lib) >= 0) continue; + if (this._libraryNames.indexOf(lib) >= 0) continue; this._libraryNames.push(lib); @@ -111,7 +110,7 @@ export class EffectAssetDownloadManager extends EventDispatcher let existing = this._effectMap.get(id); - if(!existing) existing = []; + if (!existing) existing = []; existing.push(downloadLibrary); @@ -121,7 +120,7 @@ export class EffectAssetDownloadManager extends EventDispatcher public downloadAvatarEffect(id: number, listener: IAvatarEffectListener): void { - if(!this._isReady || !this._structure.renderManager.isReady) + if (!this._isReady || !this._structure.renderManager.isReady) { this._initDownloadBuffer.push([id, listener]); @@ -130,13 +129,13 @@ export class EffectAssetDownloadManager extends EventDispatcher const pendingLibraries = this.getAvatarEffectPendingLibraries(id); - if(pendingLibraries && pendingLibraries.length) + if (pendingLibraries && pendingLibraries.length) { - if(listener && !listener.disposed) + if (listener && !listener.disposed) { let listeners = this._effectListeners.get(id.toString()); - if(!listeners) listeners = []; + if (!listeners) listeners = []; listeners.push(listener); @@ -145,24 +144,24 @@ export class EffectAssetDownloadManager extends EventDispatcher this._incompleteEffects.set(id.toString(), pendingLibraries); - for(const library of pendingLibraries) + for (const library of pendingLibraries) { - if(!library) continue; + if (!library) continue; this.downloadLibrary(library); } } else { - if(listener && !listener.disposed) listener.resetEffect(id); + if (listener && !listener.disposed) listener.resetEffect(id); } } private onAvatarRenderReady(event: NitroEvent): void { - if(!event) return; + if (!event) return; - for(const [id, listener] of this._initDownloadBuffer) + for (const [id, listener] of this._initDownloadBuffer) { this.downloadAvatarEffect(id, listener); } @@ -172,34 +171,34 @@ export class EffectAssetDownloadManager extends EventDispatcher private onLibraryLoaded(event: AvatarRenderEffectLibraryEvent): void { - if(!event || !event.library) return; + if (!event || !event.library) return; const loadedEffects: string[] = []; this._structure.registerAnimation(event.library.animation); - for(const [id, libraries] of this._incompleteEffects.entries()) + for (const [id, libraries] of this._incompleteEffects.entries()) { let isReady = true; - for(const library of libraries) + for (const library of libraries) { - if(!library || library.isLoaded) continue; + if (!library || library.isLoaded) continue; isReady = false; break; } - if(isReady) + if (isReady) { loadedEffects.push(id); const listeners = this._effectListeners.get(id); - for(const listener of listeners) + for (const listener of listeners) { - if(!listener || listener.disposed) continue; + if (!listener || listener.disposed) continue; listener.resetEffect(parseInt(id)); } @@ -210,17 +209,17 @@ export class EffectAssetDownloadManager extends EventDispatcher } } - for(const id of loadedEffects) this._incompleteEffects.delete(id); + for (const id of loadedEffects) this._incompleteEffects.delete(id); let index = 0; - while(index < this._currentDownloads.length) + while (index < this._currentDownloads.length) { const download = this._currentDownloads[index]; - if(download) + if (download) { - if(download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); + if (download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); } index++; @@ -231,19 +230,19 @@ export class EffectAssetDownloadManager extends EventDispatcher { const libraries = this._missingMandatoryLibs.slice(); - for(const library of libraries) + for (const library of libraries) { - if(!library) continue; + if (!library) continue; const map = this._effectMap.get(library); - if(map) for(const effect of map) effect && this.downloadLibrary(effect); + if (map) for (const effect of map) effect && this.downloadLibrary(effect); } } public isAvatarEffectReady(effect: number): boolean { - if(!this._isReady || !this._structure.renderManager.isReady) + if (!this._isReady || !this._structure.renderManager.isReady) { return false; } @@ -257,17 +256,17 @@ export class EffectAssetDownloadManager extends EventDispatcher { const pendingLibraries: EffectAssetDownloadLibrary[] = []; - if(!this._structure) return pendingLibraries; + if (!this._structure) return pendingLibraries; const libraries = this._effectMap.get(id.toString()); - if(libraries) + if (libraries) { - for(const library of libraries) + for (const library of libraries) { - if(!library || library.isLoaded) continue; + if (!library || library.isLoaded) continue; - if(pendingLibraries.indexOf(library) === -1) pendingLibraries.push(library); + if (pendingLibraries.indexOf(library) === -1) pendingLibraries.push(library); } } @@ -276,9 +275,9 @@ export class EffectAssetDownloadManager extends EventDispatcher private downloadLibrary(library: EffectAssetDownloadLibrary): void { - if(!library || library.isLoaded) return; + if (!library || library.isLoaded) return; - if((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; + if ((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; this._pendingDownloadQueue.push(library); @@ -287,7 +286,7 @@ export class EffectAssetDownloadManager extends EventDispatcher private processDownloadQueue(): void { - while(this._pendingDownloadQueue.length) + while (this._pendingDownloadQueue.length) { const library = this._pendingDownloadQueue[0]; diff --git a/src/nitro/avatar/PlaceHolderAvatarImage.ts b/src/nitro/avatar/PlaceHolderAvatarImage.ts index 15847812..1a56373f 100644 --- a/src/nitro/avatar/PlaceHolderAvatarImage.ts +++ b/src/nitro/avatar/PlaceHolderAvatarImage.ts @@ -1,4 +1,4 @@ -import { AssetAliasCollection } from './alias/AssetAliasCollection'; +import { AssetAliasCollection } from './alias'; import { AvatarFigureContainer } from './AvatarFigureContainer'; import { AvatarImage } from './AvatarImage'; import { AvatarStructure } from './AvatarStructure'; @@ -15,4 +15,4 @@ export class PlaceHolderAvatarImage extends AvatarImage { return true; } -} \ No newline at end of file +} diff --git a/src/nitro/avatar/actions/ActionDefinition.ts b/src/nitro/avatar/actions/ActionDefinition.ts index 0aad3e46..5729dc41 100644 --- a/src/nitro/avatar/actions/ActionDefinition.ts +++ b/src/nitro/avatar/actions/ActionDefinition.ts @@ -1,5 +1,5 @@ +import { IActionDefinition } from '../../../api'; import { ActionType } from './ActionType'; -import { IActionDefinition } from './IActionDefinition'; export class ActionDefinition implements IActionDefinition { @@ -41,22 +41,22 @@ export class ActionDefinition implements IActionDefinition this._defaultParameterValue = ''; this._canvasOffsets = null; - if(data.params && (data.params.length > 0)) + if (data.params && (data.params.length > 0)) { - for(const param of data.params) + for (const param of data.params) { - if(!param) continue; + if (!param) continue; - if(param.id === 'default') this._defaultParameterValue = param.value; + if (param.id === 'default') this._defaultParameterValue = param.value; else this._params.set(param.id, param.value); } } - if(data.types && (data.types.length > 0)) + if (data.types && (data.types.length > 0)) { - for(const type of data.types) + for (const type of data.types) { - if(!type) continue; + if (!type) continue; const action = new ActionType(type); @@ -67,11 +67,11 @@ export class ActionDefinition implements IActionDefinition public setOffsets(k: string, _arg_2: number, _arg_3: number[]): void { - if(!this._canvasOffsets) this._canvasOffsets = new Map(); + if (!this._canvasOffsets) this._canvasOffsets = new Map(); let existing = this._canvasOffsets.get(k); - if(!existing) + if (!existing) { existing = new Map(); @@ -83,33 +83,33 @@ export class ActionDefinition implements IActionDefinition public getOffsets(k: string, _arg_2: number): number[] { - if(!this._canvasOffsets) return null; + if (!this._canvasOffsets) return null; const existing = this._canvasOffsets.get(k); - if(!existing) return null; + if (!existing) return null; return existing.get(_arg_2); } public getType(id: string): ActionType { - if(!id) return null; + if (!id) return null; const existing = this._types.get(parseInt(id)); - if(!existing) return null; + if (!existing) return null; return existing; } public getParameterValue(id: string): string { - if(!id) return ''; + if (!id) return ''; const existing = this._params.get(id); - if(!existing) return this._defaultParameterValue; + if (!existing) return this._defaultParameterValue; return existing; } @@ -121,33 +121,33 @@ export class ActionDefinition implements IActionDefinition private getTypePrevents(type: string): string[] { - if(!type) return []; + if (!type) return []; const existing = this._types.get(parseInt(type)); - if(!existing) return []; + if (!existing) return []; return existing.prevents; } public getPreventHeadTurn(k: string): boolean { - if(!k) return this._preventHeadTurn; + if (!k) return this._preventHeadTurn; const type = this.getType(k); - if(!type) return this._preventHeadTurn; + if (!type) return this._preventHeadTurn; return type.preventHeadTurn; } public isAnimated(k: string): boolean { - if(!k) return true; + if (!k) return true; const type = this.getType(k); - if(!type) return true; + if (!type) return true; return type.isAnimated; } diff --git a/src/nitro/avatar/actions/ActiveActionData.ts b/src/nitro/avatar/actions/ActiveActionData.ts index 138c4085..0664c591 100644 --- a/src/nitro/avatar/actions/ActiveActionData.ts +++ b/src/nitro/avatar/actions/ActiveActionData.ts @@ -1,5 +1,4 @@ -import { IActionDefinition } from './IActionDefinition'; -import { IActiveActionData } from './IActiveActionData'; +import { IActionDefinition, IActiveActionData } from '../../../api'; export class ActiveActionData implements IActiveActionData { @@ -27,7 +26,7 @@ export class ActiveActionData implements IActiveActionData public get id(): string { - if(!this._definition) return ''; + if (!this._definition) return ''; return this._definition.id + '_' + this._actionParameter; } diff --git a/src/nitro/avatar/actions/AvatarActionManager.ts b/src/nitro/avatar/actions/AvatarActionManager.ts index de0563f7..d267d8ac 100644 --- a/src/nitro/avatar/actions/AvatarActionManager.ts +++ b/src/nitro/avatar/actions/AvatarActionManager.ts @@ -1,6 +1,5 @@ -import { IAssetManager } from '../../../api'; +import { IActiveActionData, IAssetManager } from '../../../api'; import { ActionDefinition } from './ActionDefinition'; -import { IActiveActionData } from './IActiveActionData'; export class AvatarActionManager { @@ -19,36 +18,36 @@ export class AvatarActionManager public updateActions(data: any): void { - if(!data) return; + if (!data) return; - for(const action of data.actions) + for (const action of data.actions) { - if(!action || !action.state) continue; + if (!action || !action.state) continue; const definition = new ActionDefinition(action); this._actions.set(definition.state, definition); } - if(data.actionOffsets) this.parseActionOffsets(data.actionOffsets); + if (data.actionOffsets) this.parseActionOffsets(data.actionOffsets); } private parseActionOffsets(offsets: any): void { - if(!offsets || !offsets.length) return; + if (!offsets || !offsets.length) return; - for(const offset of offsets) + for (const offset of offsets) { const action = this._actions.get(offset.action); - if(!action) continue; + if (!action) continue; - for(const canvasOffset of offset.offsets) + for (const canvasOffset of offset.offsets) { const size = (canvasOffset.size || ''); const direction = canvasOffset.direction; - if((size === '') || (direction === undefined)) continue; + if ((size === '') || (direction === undefined)) continue; const x = (canvasOffset.x || 0); const y = (canvasOffset.y || 0); @@ -61,11 +60,11 @@ export class AvatarActionManager public getActionDefinition(id: string): ActionDefinition { - if(!id) return null; + if (!id) return null; - for(const action of this._actions.values()) + for (const action of this._actions.values()) { - if(!action || (action.id !== id)) continue; + if (!action || (action.id !== id)) continue; return action; } @@ -77,18 +76,18 @@ export class AvatarActionManager { const existing = this._actions.get(state); - if(!existing) return null; + if (!existing) return null; return existing; } public getDefaultAction(): ActionDefinition { - if(this._defaultAction) return this._defaultAction; + if (this._defaultAction) return this._defaultAction; - for(const action of this._actions.values()) + for (const action of this._actions.values()) { - if(!action || !action.isDefault) continue; + if (!action || !action.isDefault) continue; this._defaultAction = action; @@ -102,14 +101,14 @@ export class AvatarActionManager { let canvasOffsets: number[] = []; - for(const activeAction of k) + for (const activeAction of k) { - if(!activeAction) continue; + if (!activeAction) continue; const action = this._actions.get(activeAction.actionType); const offsets = action && action.getOffsets(_arg_2, _arg_3); - if(offsets) canvasOffsets = offsets; + if (offsets) canvasOffsets = offsets; } return canvasOffsets; @@ -117,19 +116,19 @@ export class AvatarActionManager public sortActions(actions: IActiveActionData[]): IActiveActionData[] { - if(!actions) return null; + if (!actions) return null; actions = this.filterActions(actions); const validatedActions: IActiveActionData[] = []; - for(const action of actions) + for (const action of actions) { - if(!action) continue; + if (!action) continue; const definition = this._actions.get(action.actionType); - if(!definition) continue; + if (!definition) continue; action.definition = definition; @@ -146,24 +145,24 @@ export class AvatarActionManager let preventions: string[] = []; const activeActions: IActiveActionData[] = []; - for(const action of actions) + for (const action of actions) { - if(!action) continue; + if (!action) continue; const localAction = this._actions.get(action.actionType); - if(localAction) preventions = preventions.concat(localAction.getPrevents(action.actionParameter)); + if (localAction) preventions = preventions.concat(localAction.getPrevents(action.actionParameter)); } - for(const action of actions) + for (const action of actions) { - if(!action) continue; + if (!action) continue; let actionType = action.actionType; - if(action.actionType === 'fx') actionType = (actionType + ('.' + action.actionParameter)); + if (action.actionType === 'fx') actionType = (actionType + ('.' + action.actionParameter)); - if(preventions.indexOf(actionType) >= 0) continue; + if (preventions.indexOf(actionType) >= 0) continue; activeActions.push(action); } @@ -173,14 +172,14 @@ export class AvatarActionManager private sortByPrecedence(actionOne: IActiveActionData, actionTwo: IActiveActionData): number { - if(!actionOne || !actionTwo) return 0; + if (!actionOne || !actionTwo) return 0; const precedenceOne = actionOne.definition.precedence; const precedenceTwo = actionTwo.definition.precedence; - if(precedenceOne < precedenceTwo) return 1; + if (precedenceOne < precedenceTwo) return 1; - if(precedenceOne > precedenceTwo) return -1; + if (precedenceOne > precedenceTwo) return -1; return 0; } diff --git a/src/nitro/avatar/actions/index.ts b/src/nitro/avatar/actions/index.ts index 342a3f8a..a8495362 100644 --- a/src/nitro/avatar/actions/index.ts +++ b/src/nitro/avatar/actions/index.ts @@ -2,5 +2,3 @@ export * from './ActionDefinition'; export * from './ActionType'; export * from './ActiveActionData'; export * from './AvatarActionManager'; -export * from './IActionDefinition'; -export * from './IActiveActionData'; diff --git a/src/nitro/avatar/animation/Animation.ts b/src/nitro/avatar/animation/Animation.ts index a99b758c..54c204ea 100644 --- a/src/nitro/avatar/animation/Animation.ts +++ b/src/nitro/avatar/animation/Animation.ts @@ -1,10 +1,9 @@ -import { IAssetAnimation, IAssetAnimationFrame } from '../../../api'; +import { IAnimation, IAssetAnimation, IAssetAnimationFrame } from '../../../api'; import { AvatarStructure } from '../AvatarStructure'; import { AddDataContainer } from './AddDataContainer'; import { AvatarAnimationLayerData } from './AvatarAnimationLayerData'; import { AvatarDataContainer } from './AvatarDataContainer'; import { DirectionDataContainer } from './DirectionDataContainer'; -import { IAnimation } from './IAnimation'; import { SpriteDataContainer } from './SpriteDataContainer'; export class Animation implements IAnimation @@ -37,37 +36,37 @@ export class Animation implements IAnimation this._overrideFrames = null; this._resetOnToggle = (_arg_2.resetOnToggle || false); - if(_arg_2.sprites && _arg_2.sprites.length) + if (_arg_2.sprites && _arg_2.sprites.length) { this._spriteData = []; - for(const sprite of _arg_2.sprites) this._spriteData.push(new SpriteDataContainer(this, sprite)); + for (const sprite of _arg_2.sprites) this._spriteData.push(new SpriteDataContainer(this, sprite)); } - if(_arg_2.avatars && _arg_2.avatars.length) this._avatarData = new AvatarDataContainer(_arg_2.avatars[0]); + if (_arg_2.avatars && _arg_2.avatars.length) this._avatarData = new AvatarDataContainer(_arg_2.avatars[0]); - if(_arg_2.directions && _arg_2.directions.length) this._directionData = new DirectionDataContainer(_arg_2.directions[0]); + if (_arg_2.directions && _arg_2.directions.length) this._directionData = new DirectionDataContainer(_arg_2.directions[0]); - if(_arg_2.removes && _arg_2.removes.length) + if (_arg_2.removes && _arg_2.removes.length) { this._removeData = []; - for(const remove of _arg_2.removes) this._removeData.push(remove.id); + for (const remove of _arg_2.removes) this._removeData.push(remove.id); } - if(_arg_2.adds && _arg_2.adds.length) + if (_arg_2.adds && _arg_2.adds.length) { this._addData = []; - for(const add of _arg_2.adds) this._addData.push(new AddDataContainer(add)); + for (const add of _arg_2.adds) this._addData.push(new AddDataContainer(add)); } - if(_arg_2.overrides && _arg_2.overrides.length) + if (_arg_2.overrides && _arg_2.overrides.length) { this._overrideFrames = new Map(); this._overriddenActions = new Map(); - for(const override of _arg_2.overrides) + for (const override of _arg_2.overrides) { const name = override.name; const value = override.override; @@ -87,23 +86,23 @@ export class Animation implements IAnimation private parseFrames(frames: AvatarAnimationLayerData[][], _arg_2: IAssetAnimationFrame[], _arg_3: AvatarStructure): void { - if(!_arg_2 || !_arg_2.length) return; + if (!_arg_2 || !_arg_2.length) return; - for(const frame of _arg_2) + for (const frame of _arg_2) { let repeats = 1; - if(frame.repeats && (frame.repeats > 1)) repeats = frame.repeats; + if (frame.repeats && (frame.repeats > 1)) repeats = frame.repeats; let index = 0; - while(index < repeats) + while (index < repeats) { const layers: AvatarAnimationLayerData[] = []; - if(frame.bodyparts && frame.bodyparts.length) + if (frame.bodyparts && frame.bodyparts.length) { - for(const bodyPart of frame.bodyparts) + for (const bodyPart of frame.bodyparts) { const definition = _arg_3.getActionDefinition(bodyPart.action); const layer = new AvatarAnimationLayerData(bodyPart, AvatarAnimationLayerData.BODYPART, definition); @@ -112,9 +111,9 @@ export class Animation implements IAnimation } } - if(frame.fxs && frame.fxs.length) + if (frame.fxs && frame.fxs.length) { - for(const fx of frame.fxs) + for (const fx of frame.fxs) { const definition = _arg_3.getActionDefinition(fx.action); const layer = new AvatarAnimationLayerData(fx, AvatarAnimationLayerData.FX, definition); @@ -132,13 +131,13 @@ export class Animation implements IAnimation public frameCount(k: string = null): number { - if(!k) return this._frames.length; + if (!k) return this._frames.length; - if(this._overrideFrames) + if (this._overrideFrames) { const _local_2 = this._overrideFrames.get(k); - if(_local_2) return _local_2.length; + if (_local_2) return _local_2.length; } return 0; @@ -146,38 +145,38 @@ export class Animation implements IAnimation public hasOverriddenActions(): boolean { - if(!this._overriddenActions) return false; + if (!this._overriddenActions) return false; return (this._overriddenActions.size > 0); } public overriddenActionNames(): string[] { - if(!this._overriddenActions) return null; + if (!this._overriddenActions) return null; const keys: string[] = []; - for(const key of this._overriddenActions.keys()) keys.push(key); + for (const key of this._overriddenActions.keys()) keys.push(key); return keys; } public overridingAction(k: string): string { - if(!this._overriddenActions) return null; + if (!this._overriddenActions) return null; return this._overriddenActions.get(k); } private getFrame(frameCount: number, _arg_2: string = null): AvatarAnimationLayerData[] { - if(frameCount < 0) frameCount = 0; + if (frameCount < 0) frameCount = 0; let layers: AvatarAnimationLayerData[] = []; - if(!_arg_2) + if (!_arg_2) { - if(this._frames.length > 0) + if (this._frames.length > 0) { layers = this._frames[(frameCount % this._frames.length)]; } @@ -186,7 +185,7 @@ export class Animation implements IAnimation { const overrideLayers = this._overrideFrames.get(_arg_2); - if(overrideLayers && (overrideLayers.length > 0)) + if (overrideLayers && (overrideLayers.length > 0)) { layers = overrideLayers[(frameCount % overrideLayers.length)]; } @@ -199,20 +198,20 @@ export class Animation implements IAnimation { const _local_3: string[] = []; - for(const layer of this.getFrame(k, _arg_2)) + for (const layer of this.getFrame(k, _arg_2)) { - if(layer.type === AvatarAnimationLayerData.BODYPART) + if (layer.type === AvatarAnimationLayerData.BODYPART) { _local_3.push(layer.id); } - else if(layer.type === AvatarAnimationLayerData.FX) + else if (layer.type === AvatarAnimationLayerData.FX) { - if(this._addData && this._addData.length) + if (this._addData && this._addData.length) { - for(const _local_5 of this._addData) + for (const _local_5 of this._addData) { - if(_local_5.id === layer.id) _local_3.push(_local_5.align); + if (_local_5.id === layer.id) _local_3.push(_local_5.align); } } } @@ -223,17 +222,17 @@ export class Animation implements IAnimation public getLayerData(frameCount: number, spriteId: string, _arg_3: string = null): AvatarAnimationLayerData { - for(const layer of this.getFrame(frameCount, _arg_3)) + for (const layer of this.getFrame(frameCount, _arg_3)) { - if(layer.id === spriteId) return layer; + if (layer.id === spriteId) return layer; - if(layer.type === AvatarAnimationLayerData.FX) + if (layer.type === AvatarAnimationLayerData.FX) { - if(this._addData && this._addData.length) + if (this._addData && this._addData.length) { - for(const addData of this._addData) + for (const addData of this._addData) { - if(((addData.align === spriteId) && (addData.id === layer.id))) return layer; + if (((addData.align === spriteId) && (addData.id === layer.id))) return layer; } } } @@ -259,11 +258,11 @@ export class Animation implements IAnimation public getAddData(k: string): AddDataContainer { - if(this._addData) + if (this._addData) { - for(const _local_2 of this._addData) + for (const _local_2 of this._addData) { - if(_local_2.id === k) return _local_2; + if (_local_2.id === k) return _local_2; } } diff --git a/src/nitro/avatar/animation/AnimationManager.ts b/src/nitro/avatar/animation/AnimationManager.ts index c612d8e2..86ae66d1 100644 --- a/src/nitro/avatar/animation/AnimationManager.ts +++ b/src/nitro/avatar/animation/AnimationManager.ts @@ -1,9 +1,6 @@ -import { IAssetAnimation } from '../../../api'; +import { IAnimation, IAnimationLayerData, IAnimationManager, IAssetAnimation } from '../../../api'; import { AvatarStructure } from '../AvatarStructure'; import { Animation } from './Animation'; -import { IAnimation } from './IAnimation'; -import { IAnimationLayerData } from './IAnimationLayerData'; -import { IAnimationManager } from './IAnimationManager'; export class AnimationManager implements IAnimationManager { @@ -29,7 +26,7 @@ export class AnimationManager implements IAnimationManager { const existing = this._animations.get(animation); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -38,7 +35,7 @@ export class AnimationManager implements IAnimationManager { const existing = this.getAnimation(animation); - if(!existing) return null; + if (!existing) return null; return existing.getLayerData(frameCount, spriteId); } diff --git a/src/nitro/avatar/animation/AvatarAnimationLayerData.ts b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts index 02d2d728..18d055b2 100644 --- a/src/nitro/avatar/animation/AvatarAnimationLayerData.ts +++ b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts @@ -1,8 +1,5 @@ -import { IAssetAnimationFramePart } from '../../../api'; -import { ActiveActionData } from '../actions/ActiveActionData'; -import { IActionDefinition } from '../actions/IActionDefinition'; -import { IActiveActionData } from '../actions/IActiveActionData'; -import { IAnimationLayerData } from './IAnimationLayerData'; +import { IActionDefinition, IActiveActionData, IAnimationLayerData, IAssetAnimationFramePart } from '../../../api'; +import { ActiveActionData } from '../actions'; export class AvatarAnimationLayerData implements IAnimationLayerData { @@ -32,13 +29,13 @@ export class AvatarAnimationLayerData implements IAnimationLayerData this._base = (k.base || ''); this._items = new Map(); - if(k.items) for(const _local_4 of k.items) this._items.set(_local_4.id, _local_4.base); + if (k.items) for (const _local_4 of k.items) this._items.set(_local_4.id, _local_4.base); let _local_5 = ''; - if(this._base !== '') _local_5 = this.baseAsInt().toString(); + if (this._base !== '') _local_5 = this.baseAsInt().toString(); - if(_arg_3) + if (_arg_3) { this._action = new ActiveActionData(_arg_3.state, this.base); this._action.definition = _arg_3; @@ -55,7 +52,7 @@ export class AvatarAnimationLayerData implements IAnimationLayerData let k = 0; let index = 0; - while(index < this._base.length) + while (index < this._base.length) { k = (k + this._base.charCodeAt(index)); diff --git a/src/nitro/avatar/animation/AvatarDataContainer.ts b/src/nitro/avatar/animation/AvatarDataContainer.ts index 814c0d85..dd52d993 100644 --- a/src/nitro/avatar/animation/AvatarDataContainer.ts +++ b/src/nitro/avatar/animation/AvatarDataContainer.ts @@ -1,6 +1,5 @@ import { AdjustmentFilter } from '@pixi/filter-adjustment'; -import { IAssetAnimationAvatar } from '../../../api'; -import { IAvatarDataContainer } from './IAvatarDataContainer'; +import { IAssetAnimationAvatar, IAvatarDataContainer } from '../../../api'; export class AvatarDataContainer implements IAvatarDataContainer { @@ -42,7 +41,7 @@ export class AvatarDataContainer implements IAvatarDataContainer this._alphaMultiplier = 1; this._paletteIsGrayscale = true; - if(this._ink === 37) + if (this._ink === 37) { this._alphaMultiplier = 0.5; this._paletteIsGrayscale = false; @@ -111,9 +110,9 @@ export class AvatarDataContainer implements IAvatarDataContainer let _local_22 = greenBackground; let _local_23 = blueBackground; - for(let i = 0; i < 256; i++) + for (let i = 0; i < 256; i++) { - if((((_local_21 == redBackground) && (_local_22 == greenBackground)) && (_local_23 == blueBackground))) + if ((((_local_21 == redBackground) && (_local_22 == greenBackground)) && (_local_23 == blueBackground))) { _local_20 = 0; } diff --git a/src/nitro/avatar/animation/SpriteDataContainer.ts b/src/nitro/avatar/animation/SpriteDataContainer.ts index 94461d06..4c49b5f2 100644 --- a/src/nitro/avatar/animation/SpriteDataContainer.ts +++ b/src/nitro/avatar/animation/SpriteDataContainer.ts @@ -1,6 +1,4 @@ -import { IAssetAnimationSprite } from '../../../api'; -import { IAnimation } from './IAnimation'; -import { ISpriteDataContainer } from './ISpriteDataContainer'; +import { IAnimation, IAssetAnimationSprite, ISpriteDataContainer } from '../../../api'; export class SpriteDataContainer implements ISpriteDataContainer { @@ -28,13 +26,13 @@ export class SpriteDataContainer implements ISpriteDataContainer const directions = _arg_2.directionList; - if(directions && directions.length) + if (directions && directions.length) { - for(const direction of directions) + for (const direction of directions) { const id = direction.id; - if(id === undefined) continue; + if (id === undefined) continue; this._dx[id] = (direction.dx || 0); this._dy[id] = (direction.dy || 0); @@ -45,21 +43,21 @@ export class SpriteDataContainer implements ISpriteDataContainer public getDirectionOffsetX(k: number): number { - if(k < this._dx.length) return this._dx[k]; + if (k < this._dx.length) return this._dx[k]; return 0; } public getDirectionOffsetY(k: number): number { - if(k < this._dy.length) return this._dy[k]; + if (k < this._dy.length) return this._dy[k]; return 0; } public getDirectionOffsetZ(k: number): number { - if(k < this._dz.length) return this._dz[k]; + if (k < this._dz.length) return this._dz[k]; return 0; } diff --git a/src/nitro/avatar/animation/index.ts b/src/nitro/avatar/animation/index.ts index fbaf45ca..f2e83c4a 100644 --- a/src/nitro/avatar/animation/index.ts +++ b/src/nitro/avatar/animation/index.ts @@ -4,9 +4,4 @@ export * from './AnimationManager'; export * from './AvatarAnimationLayerData'; export * from './AvatarDataContainer'; export * from './DirectionDataContainer'; -export * from './IAnimation'; -export * from './IAnimationLayerData'; -export * from './IAnimationManager'; -export * from './IAvatarDataContainer'; -export * from './ISpriteDataContainer'; export * from './SpriteDataContainer'; diff --git a/src/nitro/avatar/cache/AvatarImageActionCache.ts b/src/nitro/avatar/cache/AvatarImageActionCache.ts index 0bd7ee51..e38bec8f 100644 --- a/src/nitro/avatar/cache/AvatarImageActionCache.ts +++ b/src/nitro/avatar/cache/AvatarImageActionCache.ts @@ -1,4 +1,4 @@ -import { Nitro } from '../../Nitro'; +import { GetTickerTime } from '../../../pixi-proxy'; import { AvatarImageDirectionCache } from './AvatarImageDirectionCache'; export class AvatarImageActionCache @@ -10,18 +10,18 @@ export class AvatarImageActionCache { this._cache = new Map(); - this.setLastAccessTime(Nitro.instance.time); + this.setLastAccessTime(GetTickerTime()); } public dispose(): void { this.debugInfo('[dispose]'); - if(!this._cache) return; + if (!this._cache) return; - for(const direction of this._cache.values()) + for (const direction of this._cache.values()) { - if(direction) direction.dispose(); + if (direction) direction.dispose(); } this._cache.clear(); @@ -31,7 +31,7 @@ export class AvatarImageActionCache { const existing = this._cache.get(k.toString()); - if(!existing) return null; + if (!existing) return null; return existing; } diff --git a/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts b/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts index caab3746..fed0968c 100644 --- a/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts +++ b/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts @@ -1,4 +1,4 @@ -import { IActiveActionData } from '../actions/IActiveActionData'; +import { IActiveActionData } from '../../../api'; import { AvatarImageActionCache } from './AvatarImageActionCache'; export class AvatarImageBodyPartCache @@ -15,20 +15,20 @@ export class AvatarImageBodyPartCache public setAction(k: IActiveActionData, _arg_2: number): void { - if(!this._currentAction) this._currentAction = k; + if (!this._currentAction) this._currentAction = k; const _local_3 = this.getActionCache(this._currentAction); - if(_local_3) _local_3.setLastAccessTime(_arg_2); + if (_local_3) _local_3.setLastAccessTime(_arg_2); this._currentAction = k; } public dispose(): void { - if(!this._disposed) + if (!this._disposed) { - if(!this._cache) return; + if (!this._cache) return; this.disposeActions(0, 2147483647); @@ -41,15 +41,15 @@ export class AvatarImageBodyPartCache public disposeActions(k: number, _arg_2: number): void { - if(!this._cache || this._disposed) return; + if (!this._cache || this._disposed) return; - for(const [ key, cache ] of this._cache.entries()) + for (const [key, cache] of this._cache.entries()) { - if(!cache) continue; + if (!cache) continue; const _local_3 = cache.getLastAccessTime(); - if((_arg_2 - _local_3) >= k) + if ((_arg_2 - _local_3) >= k) { cache.dispose(); @@ -58,7 +58,7 @@ export class AvatarImageBodyPartCache } } - public getAction():IActiveActionData + public getAction(): IActiveActionData { return this._currentAction; } @@ -73,20 +73,20 @@ export class AvatarImageBodyPartCache return this._currentDirection; } - public getActionCache(k: IActiveActionData=null): AvatarImageActionCache + public getActionCache(k: IActiveActionData = null): AvatarImageActionCache { - if(!this._currentAction) return null; + if (!this._currentAction) return null; - if(!k) k = this._currentAction; + if (!k) k = this._currentAction; - if(k.overridingAction) return this._cache.get(k.overridingAction); + if (k.overridingAction) return this._cache.get(k.overridingAction); return this._cache.get(k.id); } public updateActionCache(k: IActiveActionData, _arg_2: AvatarImageActionCache): void { - if(k.overridingAction) this._cache.set(k.overridingAction, _arg_2); + if (k.overridingAction) this._cache.set(k.overridingAction, _arg_2); else this._cache.set(k.id, _arg_2); } diff --git a/src/nitro/avatar/cache/AvatarImageCache.ts b/src/nitro/avatar/cache/AvatarImageCache.ts index 7b64a84e..60718e51 100644 --- a/src/nitro/avatar/cache/AvatarImageCache.ts +++ b/src/nitro/avatar/cache/AvatarImageCache.ts @@ -1,19 +1,13 @@ import { Texture } from '@pixi/core'; import { Matrix, Point, Rectangle } from '@pixi/math'; -import { RoomObjectSpriteData } from '../../../api'; -import { NitroContainer, NitroSprite, PixiApplicationProxy } from '../../../pixi-proxy'; -import { IActiveActionData } from '../actions/IActiveActionData'; -import { AssetAliasCollection } from '../alias/AssetAliasCollection'; -import { AvatarAnimationLayerData } from '../animation/AvatarAnimationLayerData'; +import { AvatarDirectionAngle, AvatarFigurePartType, AvatarScaleType, GeometryType, IActiveActionData, IAvatarImage, RoomObjectSpriteData } from '../../../api'; +import { GetTickerTime, NitroContainer, NitroSprite } from '../../../pixi-proxy'; +import { AssetAliasCollection } from '../alias'; +import { AvatarAnimationLayerData } from '../animation'; import { AvatarImageBodyPartContainer } from '../AvatarImageBodyPartContainer'; import { AvatarImagePartContainer } from '../AvatarImagePartContainer'; import { AvatarStructure } from '../AvatarStructure'; -import { AvatarDirectionAngle } from '../enum/AvatarDirectionAngle'; -import { AvatarFigurePartType } from '../enum/AvatarFigurePartType'; -import { AvatarScaleType } from '../enum/AvatarScaleType'; -import { GeometryType } from '../enum/GeometryType'; -import { IAvatarImage } from '../IAvatarImage'; -import { AvatarCanvas } from '../structure/AvatarCanvas'; +import { AvatarCanvas } from '../structure'; import { AvatarImageActionCache } from './AvatarImageActionCache'; import { AvatarImageBodyPartCache } from './AvatarImageBodyPartCache'; import { AvatarImageDirectionCache } from './AvatarImageDirectionCache'; @@ -51,7 +45,7 @@ export class AvatarImageCache public dispose(): void { - if(this._disposed) return; + if (this._disposed) return; this._structure = null; this._avatar = null; @@ -59,11 +53,11 @@ export class AvatarImageCache this._canvas = null; this._disposed = true; - if(this._cache) + if (this._cache) { - for(const cache of this._cache.values()) + for (const cache of this._cache.values()) { - if(!cache) continue; + if (!cache) continue; cache.dispose(); } @@ -71,11 +65,11 @@ export class AvatarImageCache this._cache = null; } - if(this._unionImages) + if (this._unionImages) { - for(const image of this._unionImages) + for (const image of this._unionImages) { - if(!image) continue; + if (!image) continue; image.dispose(); } @@ -86,13 +80,13 @@ export class AvatarImageCache public disposeInactiveActions(k: number = 60000): void { - const time = PixiApplicationProxy.instance.ticker.lastTime; + const time = GetTickerTime(); - if(this._cache) + if (this._cache) { - for(const cache of this._cache.values()) + for (const cache of this._cache.values()) { - if(!cache) continue; + if (!cache) continue; cache.disposeActions(k, time); } @@ -101,11 +95,11 @@ export class AvatarImageCache public resetBodyPartCache(k: IActiveActionData): void { - if(this._cache) + if (this._cache) { - for(const cache of this._cache.values()) + for (const cache of this._cache.values()) { - if(!cache) continue; + if (!cache) continue; cache.setAction(k, 0); } @@ -116,13 +110,13 @@ export class AvatarImageCache { const parts = this._structure.getBodyPartsUnordered(k); - if(parts) + if (parts) { - for(const part of parts) + for (const part of parts) { const actionCache = this.getBodyPartCache(part); - if(!actionCache) continue; + if (!actionCache) continue; actionCache.setDirection(_arg_2); } @@ -133,19 +127,19 @@ export class AvatarImageCache { const _local_3 = this._structure.getActiveBodyPartIds(k, this._avatar); - for(const _local_4 of _local_3) + for (const _local_4 of _local_3) { const _local_5 = this.getBodyPartCache(_local_4); - if(_local_5) _local_5.setAction(k, _arg_2); + if (_local_5) _local_5.setAction(k, _arg_2); } } public setGeometryType(k: string): void { - if(this._geometryType === k) return; + if (this._geometryType === k) return; - if((((this._geometryType === GeometryType.SITTING) && (k === GeometryType.VERTICAL)) || ((this._geometryType === GeometryType.VERTICAL) && (k === GeometryType.SITTING)) || ((this._geometryType === GeometryType.SNOWWARS_HORIZONTAL) && (k = GeometryType.SNOWWARS_HORIZONTAL)))) + if ((((this._geometryType === GeometryType.SITTING) && (k === GeometryType.VERTICAL)) || ((this._geometryType === GeometryType.VERTICAL) && (k === GeometryType.SITTING)) || ((this._geometryType === GeometryType.SNOWWARS_HORIZONTAL) && (k = GeometryType.SNOWWARS_HORIZONTAL)))) { this._geometryType = k; this._canvas = null; @@ -163,7 +157,7 @@ export class AvatarImageCache { let _local_4 = this.getBodyPartCache(k); - if(!_local_4) + if (!_local_4) { _local_4 = new AvatarImageBodyPartCache(); @@ -174,48 +168,48 @@ export class AvatarImageCache let _local_7 = _local_4.getAction(); let frameCount = frameNumber; - if(_local_7.definition.startFromFrameZero) frameCount -= _local_7.startFrame; + if (_local_7.definition.startFromFrameZero) frameCount -= _local_7.startFrame; let _local_8 = _local_7; let _local_9: string[] = []; let _local_10: Map = new Map(); const _local_11 = new Point(); - if(!((!(_local_7)) || (!(_local_7.definition)))) + if (!((!(_local_7)) || (!(_local_7.definition)))) { - if(_local_7.definition.isAnimation) + if (_local_7.definition.isAnimation) { let _local_15 = _local_5; const _local_16 = this._structure.getAnimation(((_local_7.definition.state + '.') + _local_7.actionParameter)); const _local_17 = (frameNumber - _local_7.startFrame); - if(_local_16) + if (_local_16) { const _local_18 = _local_16.getLayerData(_local_17, k, _local_7.overridingAction); - if(_local_18) + if (_local_18) { _local_15 = (_local_5 + _local_18.dd); - if(_local_18.dd < 0) + if (_local_18.dd < 0) { - if(_local_15 < 0) + if (_local_15 < 0) { _local_15 = (8 + _local_15); } - else if(_local_15 > 7) _local_15 = (8 - _local_15); + else if (_local_15 > 7) _local_15 = (8 - _local_15); } else { - if(_local_15 < 0) + if (_local_15 < 0) { _local_15 = (_local_15 + 8); } - else if(_local_15 > 7) _local_15 = (_local_15 - 8); + else if (_local_15 > 7) _local_15 = (_local_15 - 8); } - if(this._scale === AvatarScaleType.LARGE) + if (this._scale === AvatarScaleType.LARGE) { _local_11.x = _local_18.dx; _local_11.y = _local_18.dy; @@ -228,21 +222,21 @@ export class AvatarImageCache frameCount = _local_18.animationFrame; - if(_local_18.action) + if (_local_18.action) { _local_7 = _local_18.action; } - if(_local_18.type === AvatarAnimationLayerData.BODYPART) + if (_local_18.type === AvatarAnimationLayerData.BODYPART) { - if(_local_18.action != null) + if (_local_18.action != null) { _local_8 = _local_18.action; } _local_5 = _local_15; } - else if(_local_18.type === AvatarAnimationLayerData.FX) _local_5 = _local_15; + else if (_local_18.type === AvatarAnimationLayerData.FX) _local_5 = _local_15; _local_10 = _local_18.items; } @@ -254,7 +248,7 @@ export class AvatarImageCache let _local_12 = _local_4.getActionCache(_local_8); - if(!_local_12 || _arg_3) + if (!_local_12 || _arg_3) { _local_12 = new AvatarImageActionCache(); _local_4.updateActionCache(_local_8, _local_12); @@ -262,7 +256,7 @@ export class AvatarImageCache let _local_13 = _local_12.getDirectionCache(_local_5); - if(!_local_13 || _arg_3) + if (!_local_13 || _arg_3) { const _local_19 = this._structure.getParts(k, this._avatar.getFigure(), _local_8, this._geometryType, _local_5, _local_9, this._avatar, _local_10); @@ -273,15 +267,15 @@ export class AvatarImageCache let _local_14 = _local_13.getImageContainer(frameCount); - if(!_local_14 || _arg_3) + if (!_local_14 || _arg_3) { const _local_20 = _local_13.getPartList(); _local_14 = this.renderBodyPart(_local_5, _local_20, frameCount, _local_7, _arg_3); - if(_local_14 && !_arg_3) + if (_local_14 && !_arg_3) { - if(_local_14.isCacheable) _local_13.updateImageContainer(_local_14, frameCount); + if (_local_14.isCacheable) _local_13.updateImageContainer(_local_14, frameCount); } else { @@ -310,7 +304,7 @@ export class AvatarImageCache { let existing = this._cache.get(k); - if(!existing) + if (!existing) { existing = new AvatarImageBodyPartCache(); @@ -322,13 +316,13 @@ export class AvatarImageCache private renderBodyPart(direction: number, containers: AvatarImagePartContainer[], frameCount: number, _arg_4: IActiveActionData, renderServerData: boolean = false): AvatarImageBodyPartContainer { - if(!containers || !containers.length) return null; + if (!containers || !containers.length) return null; - if(!this._canvas) + if (!this._canvas) { this._canvas = this._structure.getCanvas(this._scale, this._geometryType); - if(!this._canvas) return null; + if (!this._canvas) return null; } const isFlipped = AvatarDirectionAngle.DIRECTION_IS_FLIPPED[direction] || false; @@ -336,15 +330,15 @@ export class AvatarImageCache let isCacheable = true; let containerIndex = (containers.length - 1); - while(containerIndex >= 0) + while (containerIndex >= 0) { const container = containers[containerIndex]; let color = 16777215; - if(!((direction == 7) && ((container.partType === 'fc') || (container.partType === 'ey')))) + if (!((direction == 7) && ((container.partType === 'fc') || (container.partType === 'ey')))) { - if(!((container.partType === 'ri') && !container.partId)) + if (!((container.partType === 'ri') && !container.partId)) { const partId = container.partId; const animationFrame = container.getFrameDefinition(frameCount); @@ -352,59 +346,59 @@ export class AvatarImageCache let partType = container.partType; let frameNumber = 0; - if(animationFrame) + if (animationFrame) { frameNumber = animationFrame.number; - if((animationFrame.assetPartDefinition) && (animationFrame.assetPartDefinition !== '')) assetPartDefinition = animationFrame.assetPartDefinition; + if ((animationFrame.assetPartDefinition) && (animationFrame.assetPartDefinition !== '')) assetPartDefinition = animationFrame.assetPartDefinition; } else frameNumber = container.getFrameIndex(frameCount); let assetDirection = direction; let flipH = false; - if(isFlipped) + if (isFlipped) { - if(((assetPartDefinition === 'wav') && (((partType === AvatarFigurePartType.LEFT_HAND) || (partType === AvatarFigurePartType.LEFT_SLEEVE)) || (partType === AvatarFigurePartType.LEFT_COAT_SLEEVE))) || ((assetPartDefinition === 'drk') && (((partType === AvatarFigurePartType.RIGHT_HAND) || (partType === AvatarFigurePartType.RIGHT_SLEEVE)) || (partType === AvatarFigurePartType.RIGHT_COAT_SLEEVE))) || ((assetPartDefinition === 'blw') && (partType === AvatarFigurePartType.RIGHT_HAND)) || ((assetPartDefinition === 'sig') && (partType === AvatarFigurePartType.LEFT_HAND)) || ((assetPartDefinition === 'respect') && (partType === AvatarFigurePartType.LEFT_HAND)) || (partType === AvatarFigurePartType.RIGHT_HAND_ITEM) || (partType === AvatarFigurePartType.LEFT_HAND_ITEM) || (partType === AvatarFigurePartType.CHEST_PRINT)) + if (((assetPartDefinition === 'wav') && (((partType === AvatarFigurePartType.LEFT_HAND) || (partType === AvatarFigurePartType.LEFT_SLEEVE)) || (partType === AvatarFigurePartType.LEFT_COAT_SLEEVE))) || ((assetPartDefinition === 'drk') && (((partType === AvatarFigurePartType.RIGHT_HAND) || (partType === AvatarFigurePartType.RIGHT_SLEEVE)) || (partType === AvatarFigurePartType.RIGHT_COAT_SLEEVE))) || ((assetPartDefinition === 'blw') && (partType === AvatarFigurePartType.RIGHT_HAND)) || ((assetPartDefinition === 'sig') && (partType === AvatarFigurePartType.LEFT_HAND)) || ((assetPartDefinition === 'respect') && (partType === AvatarFigurePartType.LEFT_HAND)) || (partType === AvatarFigurePartType.RIGHT_HAND_ITEM) || (partType === AvatarFigurePartType.LEFT_HAND_ITEM) || (partType === AvatarFigurePartType.CHEST_PRINT)) { flipH = true; } else { - if(direction === 4) assetDirection = 2; - else if(direction === 5) assetDirection = 1; - else if(direction === 6) assetDirection = 0; + if (direction === 4) assetDirection = 2; + else if (direction === 5) assetDirection = 1; + else if (direction === 6) assetDirection = 0; - if(container.flippedPartType !== partType) partType = container.flippedPartType; + if (container.flippedPartType !== partType) partType = container.flippedPartType; } } let assetName = (this._scale + '_' + assetPartDefinition + '_' + partType + '_' + partId + '_' + assetDirection + '_' + frameNumber); let asset = this._assets.getAsset(assetName); - if(!asset) + if (!asset) { assetName = (this._scale + '_std_' + partType + '_' + partId + '_' + assetDirection + '_0'); asset = this._assets.getAsset(assetName); } - if(asset) + if (asset) { const texture = asset.texture; - if(!texture || !texture.valid || !texture.baseTexture) + if (!texture || !texture.valid || !texture.baseTexture) { isCacheable = false; } else { - if(container.isColorable && container.color) color = container.color.rgb; + if (container.isColorable && container.color) color = container.color.rgb; const offset = new Point(-(asset.x), -(asset.y)); - if(flipH) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 65 : 31)); + if (flipH) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 65 : 31)); - if(renderServerData) + if (renderServerData) { const spriteData = new RoomObjectSpriteData(); @@ -416,17 +410,17 @@ export class AvatarImageCache spriteData.height = asset.rectangle.height; spriteData.flipH = flipH; - if(assetPartDefinition === 'lay') spriteData.x = (spriteData.x + 53); + if (assetPartDefinition === 'lay') spriteData.x = (spriteData.x + 53); - if(isFlipped) + if (isFlipped) { spriteData.flipH = (!(spriteData.flipH)); - if(spriteData.flipH) spriteData.x = (-(spriteData.x) - texture.width); + if (spriteData.flipH) spriteData.x = (-(spriteData.x) - texture.width); else spriteData.x = (spriteData.x + 65); } - if(container.isColorable) spriteData.color = `${color}`; + if (container.isColorable) spriteData.color = `${color}`; this._serverRenderData.push(spriteData); } @@ -440,21 +434,21 @@ export class AvatarImageCache containerIndex--; } - if(!this._unionImages.length) return null; + if (!this._unionImages.length) return null; const imageData = this.createUnionImage(this._unionImages, isFlipped); const canvasOffset = ((this._scale === AvatarScaleType.LARGE) ? (this._canvas.height - 16) : (this._canvas.height - 8)); const offset = new Point(-(imageData.regPoint.x), (canvasOffset - imageData.regPoint.y)); - if(isFlipped && (assetPartDefinition !== 'lay')) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 67 : 31)); + if (isFlipped && (assetPartDefinition !== 'lay')) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 67 : 31)); let imageIndex = (this._unionImages.length - 1); - while(imageIndex >= 0) + while (imageIndex >= 0) { const _local_17 = this._unionImages.pop(); - if(_local_17) _local_17.dispose(); + if (_local_17) _local_17.dispose(); imageIndex--; } @@ -465,7 +459,7 @@ export class AvatarImageCache private convertColorToHex(k: number): string { let _local_2: string = (k * 0xFF).toString(16); - if(_local_2.length < 2) + if (_local_2.length < 2) { _local_2 = ('0' + _local_2); } @@ -476,7 +470,7 @@ export class AvatarImageCache { const bounds = new Rectangle(); - for(const data of k) data && bounds.enlarge(data.offsetRect); + for (const data of k) data && bounds.enlarge(data.offsetRect); const point = new Point(-(bounds.x), -(bounds.y)); const container = new NitroContainer(); @@ -488,9 +482,9 @@ export class AvatarImageCache container.addChild(sprite); - for(const data of k) + for (const data of k) { - if(!data) continue; + if (!data) continue; const texture = data.texture; const color = data.colorTransform; @@ -500,9 +494,9 @@ export class AvatarImageCache regPoint.x -= data.regPoint.x; regPoint.y -= data.regPoint.y; - if(isFlipped) regPoint.x = (container.width - (regPoint.x + data.rect.width)); + if (isFlipped) regPoint.x = (container.width - (regPoint.x + data.rect.width)); - if(flipH) + if (flipH) { this._matrix.a = -1; this._matrix.tx = ((data.rect.x + data.rect.width) + regPoint.x); diff --git a/src/nitro/avatar/geometry/AvatarModelGeometry.ts b/src/nitro/avatar/geometry/AvatarModelGeometry.ts index 9cd57a08..b447f31f 100644 --- a/src/nitro/avatar/geometry/AvatarModelGeometry.ts +++ b/src/nitro/avatar/geometry/AvatarModelGeometry.ts @@ -1,5 +1,5 @@ -import { IAvatarImage } from '../IAvatarImage'; -import { AvatarCanvas } from '../structure/AvatarCanvas'; +import { IAvatarImage } from '../../../api'; +import { AvatarCanvas } from '../structure'; import { AvatarSet } from './AvatarSet'; import { GeometryBodyPart } from './GeometryBodyPart'; import { Matrix4x4 } from './Matrix4x4'; @@ -25,27 +25,27 @@ export class AvatarModelGeometry const camera = k.camera; - if(camera) + if (camera) { this._camera.x = parseFloat(camera.x); this._camera.y = parseFloat(camera.y); this._camera.z = parseFloat(camera.z); } - if(k.canvases && (k.canvases.length > 0)) + if (k.canvases && (k.canvases.length > 0)) { - for(const canvas of k.canvases) + for (const canvas of k.canvases) { - if(!canvas) continue; + if (!canvas) continue; const scale = canvas.scale; const geometries = new Map(); - if(canvas.geometries && (canvas.geometries.length > 0)) + if (canvas.geometries && (canvas.geometries.length > 0)) { - for(const geometry of canvas.geometries) + for (const geometry of canvas.geometries) { - if(!geometry) continue; + if (!geometry) continue; const avatarCanvas = new AvatarCanvas(geometry, scale); @@ -57,26 +57,26 @@ export class AvatarModelGeometry } } - if(k.types && (k.types.length > 0)) + if (k.types && (k.types.length > 0)) { - for(const type of k.types) + for (const type of k.types) { - if(!type) continue; + if (!type) continue; const bodyParts: Map = new Map(); const itemIds: Map = new Map(); - if(type.bodyParts && (type.bodyParts.length > 0)) + if (type.bodyParts && (type.bodyParts.length > 0)) { - for(const bodyPart of type.bodyParts) + for (const bodyPart of type.bodyParts) { - if(!bodyPart) continue; + if (!bodyPart) continue; const geometryBodyPart = new GeometryBodyPart(bodyPart); bodyParts.set(geometryBodyPart.id, geometryBodyPart); - for(const part of geometryBodyPart.getPartIds(null)) + for (const part of geometryBodyPart.getPartIds(null)) { itemIds.set(part, geometryBodyPart); } @@ -91,13 +91,13 @@ export class AvatarModelGeometry public removeDynamicItems(k: IAvatarImage): void { - for(const geometry of this._geometryTypes.values()) + for (const geometry of this._geometryTypes.values()) { - if(!geometry) continue; + if (!geometry) continue; - for(const part of geometry.values()) + for (const part of geometry.values()) { - if(!part) continue; + if (!part) continue; part.removeDynamicParts(k); } @@ -108,7 +108,7 @@ export class AvatarModelGeometry { const avatarSet = this._avatarSet.findAvatarSet(k); - if(!avatarSet) return []; + if (!avatarSet) return []; return avatarSet.getBodyParts(); } @@ -117,7 +117,7 @@ export class AvatarModelGeometry { const avatarSet = this._avatarSet.findAvatarSet(k); - if(!avatarSet) return false; + if (!avatarSet) return false; return avatarSet.isMain; } @@ -126,7 +126,7 @@ export class AvatarModelGeometry { const canvas = this._canvases.get(k); - if(!canvas) return null; + if (!canvas) return null; return (canvas.get(_arg_2) || null); } @@ -135,18 +135,18 @@ export class AvatarModelGeometry { const existing = this._geometryTypes.get(k); - if(existing) return true; + if (existing) return true; return false; } private hasBodyPart(k: string, _arg_2: string): boolean { - if(this.typeExists(k)) + if (this.typeExists(k)) { const existing = this._geometryTypes.get(k); - if(existing && existing.get(_arg_2)) return true; + if (existing && existing.get(_arg_2)) return true; } return false; @@ -158,11 +158,11 @@ export class AvatarModelGeometry const types = []; - if(parts) + if (parts) { - for(const part of parts.values()) + for (const part of parts.values()) { - if(!part) continue; + if (!part) continue; types.push(part.id); } @@ -173,7 +173,7 @@ export class AvatarModelGeometry private getBodyPartsOfType(k: string): Map { - if(this.typeExists(k)) return this._geometryTypes.get(k); + if (this.typeExists(k)) return this._geometryTypes.get(k); return new Map(); } @@ -183,25 +183,25 @@ export class AvatarModelGeometry return (this.getBodyPartsOfType(k).get(_arg_2) || null); } - public getBodyPartOfItem(k: string, _arg_2: string, _arg_3:IAvatarImage): GeometryBodyPart + public getBodyPartOfItem(k: string, _arg_2: string, _arg_3: IAvatarImage): GeometryBodyPart { const itemIds = this._itemIdToBodyPartMap.get(k); - if(itemIds) + if (itemIds) { const part = itemIds.get(_arg_2); - if(part) return part; + if (part) return part; const parts = this.getBodyPartsOfType(k); - if(parts) + if (parts) { - for(const part of parts.values()) + for (const part of parts.values()) { - if(!part) continue; + if (!part) continue; - if(part.hasPart(_arg_2, _arg_3)) return part; + if (part.hasPart(_arg_2, _arg_3)) return part; } } } @@ -214,13 +214,13 @@ export class AvatarModelGeometry const parts = this.getBodyPartIdsInAvatarSet(_arg_2); const geometryParts = []; - for(const part of parts) + for (const part of parts) { - if(!part) continue; + if (!part) continue; const bodyPart = k.get(part); - if(bodyPart) + if (bodyPart) { geometryParts.push(bodyPart); } @@ -231,22 +231,22 @@ export class AvatarModelGeometry public getBodyPartsAtAngle(k: string, _arg_2: number, _arg_3: string): string[] { - if(!_arg_3) return []; + if (!_arg_3) return []; const geometryParts = this.getBodyPartsOfType(_arg_3); const parts = this.getBodyPartsInAvatarSet(geometryParts, k); - const sets: [ number, GeometryBodyPart ][] = []; + const sets: [number, GeometryBodyPart][] = []; const ids: string[] = []; this._transformation = Matrix4x4.getYRotationMatrix(_arg_2); - for(const part of parts.values()) + for (const part of parts.values()) { - if(!part) continue; + if (!part) continue; part.applyTransform(this._transformation); - sets.push([ part.getDistance(this._camera), part ]); + sets.push([part.getDistance(this._camera), part]); } sets.sort((a, b) => @@ -254,16 +254,16 @@ export class AvatarModelGeometry const partA = a[0]; const partB = b[0]; - if(partA < partB) return -1; + if (partA < partB) return -1; - if(partA > partB) return 1; + if (partA > partB) return 1; return 0; }); - for(const set of sets) + for (const set of sets) { - if(!set) continue; + if (!set) continue; ids.push(set[1].id); } @@ -271,9 +271,9 @@ export class AvatarModelGeometry return ids; } - public getParts(k: string, _arg_2: string, _arg_3: number, _arg_4: any[], _arg_5:IAvatarImage): string[] + public getParts(k: string, _arg_2: string, _arg_3: number, _arg_4: any[], _arg_5: IAvatarImage): string[] { - if(this.hasBodyPart(k, _arg_2)) + if (this.hasBodyPart(k, _arg_2)) { const part = this.getBodyPartsOfType(k).get(_arg_2); diff --git a/src/nitro/avatar/geometry/GeometryBodyPart.ts b/src/nitro/avatar/geometry/GeometryBodyPart.ts index e151ad3d..1ad78eeb 100644 --- a/src/nitro/avatar/geometry/GeometryBodyPart.ts +++ b/src/nitro/avatar/geometry/GeometryBodyPart.ts @@ -1,4 +1,4 @@ -import { IAvatarImage } from '../IAvatarImage'; +import { IAvatarImage } from '../../../api'; import { GeometryItem } from './GeometryItem'; import { Matrix4x4 } from './Matrix4x4'; import { Node3D } from './Node3D'; @@ -20,11 +20,11 @@ export class GeometryBodyPart extends Node3D this._parts = new Map(); this._dynamicParts = new Map(); - if(k.items && (k.items.length > 0)) + if (k.items && (k.items.length > 0)) { - for(const item of k.items) + for (const item of k.items) { - if(!item) continue; + if (!item) continue; const geometryItem = new GeometryItem(item); @@ -38,13 +38,13 @@ export class GeometryBodyPart extends Node3D const existing = this._dynamicParts.get(k); const parts: GeometryItem[] = []; - if(existing) + if (existing) { - for(const index in existing) + for (const index in existing) { const item = existing[index]; - if(!item) continue; + if (!item) continue; parts.push(item); } @@ -57,24 +57,24 @@ export class GeometryBodyPart extends Node3D { const ids: string[] = []; - for(const part of this._parts.values()) + for (const part of this._parts.values()) { - if(!part) continue; + if (!part) continue; ids.push(part.id); } - if(k) + if (k) { const existing = this._dynamicParts.get(k); - if(existing) + if (existing) { - for(const index in existing) + for (const index in existing) { const part = existing[index]; - if(!part) continue; + if (!part) continue; ids.push(part.id); } @@ -93,11 +93,11 @@ export class GeometryBodyPart extends Node3D public addPart(k: any, _arg_2: IAvatarImage): boolean { - if(this.hasPart(k.id, _arg_2)) return false; + if (this.hasPart(k.id, _arg_2)) return false; let existing = this._dynamicParts.get(_arg_2); - if(!existing) + if (!existing) { existing = {}; @@ -113,7 +113,7 @@ export class GeometryBodyPart extends Node3D { let existingPart = (this._parts.get(k) || null); - if(!existingPart && (this._dynamicParts.get(_arg_2) !== undefined)) + if (!existingPart && (this._dynamicParts.get(_arg_2) !== undefined)) { existingPart = (this._dynamicParts.get(_arg_2)[k] || null); } @@ -123,30 +123,30 @@ export class GeometryBodyPart extends Node3D public getParts(k: Matrix4x4, _arg_2: Vector3D, _arg_3: any[], _arg_4: IAvatarImage): string[] { - const parts: [ number, GeometryItem ][] = []; + const parts: [number, GeometryItem][] = []; - for(const part of this._parts.values()) + for (const part of this._parts.values()) { - if(!part) continue; + if (!part) continue; part.applyTransform(k); - parts.push([ part.getDistance(_arg_2), part ]); + parts.push([part.getDistance(_arg_2), part]); } const existingDynamic = this._dynamicParts.get(_arg_4); - if(existingDynamic) + if (existingDynamic) { - for(const index in existingDynamic) + for (const index in existingDynamic) { const part = existingDynamic[index]; - if(!part) continue; + if (!part) continue; part.applyTransform(k); - parts.push([ part.getDistance(_arg_2), part ]); + parts.push([part.getDistance(_arg_2), part]); } } @@ -155,18 +155,18 @@ export class GeometryBodyPart extends Node3D const partA = a[0]; const partB = b[0]; - if(partA < partB) return -1; + if (partA < partB) return -1; - if(partA > partB) return 1; + if (partA > partB) return 1; return 0; }); const partIds: string[] = []; - for(const part of parts) + for (const part of parts) { - if(!part) continue; + if (!part) continue; partIds.push(part[1].id); } diff --git a/src/nitro/avatar/index.ts b/src/nitro/avatar/index.ts index 3265bf6d..a00fb967 100644 --- a/src/nitro/avatar/index.ts +++ b/src/nitro/avatar/index.ts @@ -10,17 +10,16 @@ export * from './AvatarImagePartContainer'; export * from './AvatarRenderManager'; export * from './AvatarStructure'; export * from './cache'; +export * from './data/HabboAvatarAnimations'; +export * from './data/HabboAvatarGeometry'; +export * from './data/HabboAvatarPartSets'; export * from './EffectAssetDownloadLibrary'; export * from './EffectAssetDownloadManager'; -export * from './enum'; export * from './events'; export * from './geometry'; -export * from './IAvatarEffectListener'; -export * from './IAvatarFigureContainer'; -export * from './IAvatarImage'; -export * from './IAvatarImageListener'; -export * from './IAvatarRenderManager'; -export * from './IOutfit'; export * from './pets'; export * from './PlaceHolderAvatarImage'; export * from './structure'; +export * from './structure/animation'; +export * from './structure/figure'; +export * from './structure/parts'; diff --git a/src/nitro/avatar/interfaces/index.ts b/src/nitro/avatar/interfaces/index.ts deleted file mode 100644 index c44ce3e6..00000000 --- a/src/nitro/avatar/interfaces/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './figuredata'; diff --git a/src/nitro/avatar/structure/AvatarAnimationData.ts b/src/nitro/avatar/structure/AvatarAnimationData.ts index 1ac42316..186e9fef 100644 --- a/src/nitro/avatar/structure/AvatarAnimationData.ts +++ b/src/nitro/avatar/structure/AvatarAnimationData.ts @@ -1,6 +1,5 @@ -import { IActionDefinition } from '../actions/IActionDefinition'; -import { AnimationAction } from './animation/AnimationAction'; -import { IFigureSetData } from './IFigureSetData'; +import { IActionDefinition, IFigureSetData } from '../../../api'; +import { AnimationAction } from './animation'; export class AvatarAnimationData implements IFigureSetData { @@ -13,11 +12,11 @@ export class AvatarAnimationData implements IFigureSetData public parse(data: any): boolean { - if(data && (data.length > 0)) + if (data && (data.length > 0)) { - for(const animation of data) + for (const animation of data) { - if(!animation) continue; + if (!animation) continue; const newAnimation = new AnimationAction(animation); @@ -30,7 +29,7 @@ export class AvatarAnimationData implements IFigureSetData public appendJSON(k: any): boolean { - for(const _local_2 of k.action) + for (const _local_2 of k.action) { this._actions.set(_local_2.id, new AnimationAction(_local_2)); } @@ -42,7 +41,7 @@ export class AvatarAnimationData implements IFigureSetData { const existing = this._actions.get(action.id); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -51,7 +50,7 @@ export class AvatarAnimationData implements IFigureSetData { const animationAction = this.getAction(k); - if(!animationAction) return 0; + if (!animationAction) return 0; return animationAction.frameCount; } diff --git a/src/nitro/avatar/structure/AvatarCanvas.ts b/src/nitro/avatar/structure/AvatarCanvas.ts index db76239a..aef33a0b 100644 --- a/src/nitro/avatar/structure/AvatarCanvas.ts +++ b/src/nitro/avatar/structure/AvatarCanvas.ts @@ -1,5 +1,5 @@ import { Point } from '@pixi/math'; -import { AvatarScaleType } from '../enum/AvatarScaleType'; +import { AvatarScaleType } from '../../../api'; export class AvatarCanvas { @@ -16,7 +16,7 @@ export class AvatarCanvas this._height = k.height; this._offset = new Point(k.dx, k.dy); - if(_arg_2 == AvatarScaleType.LARGE) this._regPoint = new Point(((this._width - 64) / 2), 0); + if (_arg_2 == AvatarScaleType.LARGE) this._regPoint = new Point(((this._width - 64) / 2), 0); else this._regPoint = new Point(((this._width - 32) / 2), 0); } diff --git a/src/nitro/avatar/structure/AvatarStructureDownload.ts b/src/nitro/avatar/structure/AvatarStructureDownload.ts index 322e634a..44b311d7 100644 --- a/src/nitro/avatar/structure/AvatarStructureDownload.ts +++ b/src/nitro/avatar/structure/AvatarStructureDownload.ts @@ -1,5 +1,5 @@ +import { IFigureSetData } from '../../../api'; import { EventDispatcher, NitroEvent } from '../../../core'; -import { IFigureSetData } from './IFigureSetData'; export class AvatarStructureDownload extends EventDispatcher { @@ -30,9 +30,9 @@ export class AvatarStructureDownload extends EventDispatcher { const response = request.responseText; - if(!response || !response.length) throw new Error('invalid_figure_data'); + if (!response || !response.length) throw new Error('invalid_figure_data'); - if(this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response)); + if (this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response)); this.dispatchEvent(new NitroEvent(AvatarStructureDownload.AVATAR_STRUCTURE_DONE)); }; diff --git a/src/nitro/avatar/structure/FigureSetData.ts b/src/nitro/avatar/structure/FigureSetData.ts index 0de29d06..9957a6e3 100644 --- a/src/nitro/avatar/structure/FigureSetData.ts +++ b/src/nitro/avatar/structure/FigureSetData.ts @@ -1,11 +1,5 @@ -import { IFigureData } from '../interfaces'; -import { IFigurePartSet } from './figure/IFigurePartSet'; -import { IPalette } from './figure/IPalette'; -import { ISetType } from './figure/ISetType'; -import { Palette } from './figure/Palette'; -import { SetType } from './figure/SetType'; -import { IFigureSetData } from './IFigureSetData'; -import { IStructureData } from './IStructureData'; +import { IFigureData, IFigurePartSet, IFigureSetData, IPalette, ISetType, IStructureData } from '../../../api'; +import { Palette, SetType } from './figure'; export class FigureSetData implements IFigureSetData, IStructureData { @@ -25,22 +19,22 @@ export class FigureSetData implements IFigureSetData, IStructureData public parse(data: IFigureData): boolean { - if(!data) return false; + if (!data) return false; - for(const palette of data.palettes) + for (const palette of data.palettes) { const newPalette = new Palette(palette); - if(!newPalette) continue; + if (!newPalette) continue; this._palettes.set(newPalette.id.toString(), newPalette); } - for(const set of data.setTypes) + for (const set of data.setTypes) { const newSet = new SetType(set); - if(!newSet) continue; + if (!newSet) continue; this._setTypes.set(newSet.type, newSet); } @@ -50,11 +44,11 @@ export class FigureSetData implements IFigureSetData, IStructureData public injectJSON(data: IFigureData): void { - for(const setType of data.setTypes) + for (const setType of data.setTypes) { const existingSetType = this._setTypes.get(setType.type); - if(existingSetType) existingSetType.cleanUp(setType); + if (existingSetType) existingSetType.cleanUp(setType); else this._setTypes.set(setType.type, new SetType(setType)); } @@ -63,23 +57,23 @@ export class FigureSetData implements IFigureSetData, IStructureData public appendJSON(data: IFigureData): boolean { - if(!data) return false; + if (!data) return false; - for(const palette of data.palettes) + for (const palette of data.palettes) { const id = palette.id.toString(); const existingPalette = this._palettes.get(id); - if(!existingPalette) this._palettes.set(id, new Palette(palette)); + if (!existingPalette) this._palettes.set(id, new Palette(palette)); else existingPalette.append(palette); } - for(const setType of data.setTypes) + for (const setType of data.setTypes) { const type = setType.type; const existingSetType = this._setTypes.get(type); - if(!existingSetType) this._setTypes.set(type, new SetType(setType)); + if (!existingSetType) this._setTypes.set(type, new SetType(setType)); else existingSetType.append(setType); } @@ -90,9 +84,9 @@ export class FigureSetData implements IFigureSetData, IStructureData { const types: string[] = []; - for(const set of this._setTypes.values()) + for (const set of this._setTypes.values()) { - if(!set || !set.isMandatory(k, _arg_2)) continue; + if (!set || !set.isMandatory(k, _arg_2)) continue; types.push(set.type); } @@ -100,13 +94,13 @@ export class FigureSetData implements IFigureSetData, IStructureData return types; } - public getDefaultPartSet(k: string, _arg_2: string): IFigurePartSet + public getDefaultPartSet(type: string, gender: string): IFigurePartSet { - const setType = this._setTypes.get(k); + const setType = this._setTypes.get(type); - if(!setType) return null; + if (!setType) return null; - return setType.getDefaultPartSet(_arg_2); + return setType.getDefaultPartSet(gender); } public getSetType(k: string): ISetType @@ -121,11 +115,11 @@ export class FigureSetData implements IFigureSetData, IStructureData public getFigurePartSet(k: number): IFigurePartSet { - for(const set of this._setTypes.values()) + for (const set of this._setTypes.values()) { const partSet = set.getPartSet(k); - if(!partSet) continue; + if (!partSet) continue; return partSet; } diff --git a/src/nitro/avatar/structure/PartSetsData.ts b/src/nitro/avatar/structure/PartSetsData.ts index 4845f7e3..184b2c52 100644 --- a/src/nitro/avatar/structure/PartSetsData.ts +++ b/src/nitro/avatar/structure/PartSetsData.ts @@ -1,8 +1,6 @@ -import { ActionDefinition } from '../actions/ActionDefinition'; -import { IActionDefinition } from '../actions/IActionDefinition'; -import { IFigureSetData } from './IFigureSetData'; -import { ActivePartSet } from './parts/ActivePartSet'; -import { PartDefinition } from './parts/PartDefinition'; +import { IActionDefinition, IFigureSetData } from '../../../api'; +import { ActionDefinition } from '../actions'; +import { ActivePartSet, PartDefinition } from './parts'; export class PartSetsData implements IFigureSetData { @@ -17,21 +15,21 @@ export class PartSetsData implements IFigureSetData public parse(data: any): boolean { - if(data.partSet && (data.partSet.length > 0)) + if (data.partSet && (data.partSet.length > 0)) { - for(const part of data.partSet) + for (const part of data.partSet) { - if(!part) continue; + if (!part) continue; this._parts.set(part.setType, new PartDefinition(part)); } } - if(data.activePartSets && (data.activePartSets.length > 0)) + if (data.activePartSets && (data.activePartSets.length > 0)) { - for(const activePart of data.activePartSets) + for (const activePart of data.activePartSets) { - if(!activePart) continue; + if (!activePart) continue; this._activePartSets.set(activePart.id, new ActivePartSet(activePart)); } @@ -42,21 +40,21 @@ export class PartSetsData implements IFigureSetData public appendJSON(data: any): boolean { - if(data.partSet && (data.partSet.length > 0)) + if (data.partSet && (data.partSet.length > 0)) { - for(const part of data.partSet) + for (const part of data.partSet) { - if(!part) continue; + if (!part) continue; this._parts.set(part.setType, new PartDefinition(part)); } } - if(data.activePartSets && (data.activePartSets.length > 0)) + if (data.activePartSets && (data.activePartSets.length > 0)) { - for(const activePart of data.activePartSets) + for (const activePart of data.activePartSets) { - if(!activePart) continue; + if (!activePart) continue; this._activePartSets.set(activePart.id, new ActivePartSet(activePart)); } @@ -65,11 +63,11 @@ export class PartSetsData implements IFigureSetData return false; } - public getActiveParts(k:IActionDefinition): string[] + public getActiveParts(k: IActionDefinition): string[] { const activePartSet = this._activePartSets.get(k.activePartSet); - if(!activePartSet) return []; + if (!activePartSet) return []; return activePartSet.parts; } @@ -78,7 +76,7 @@ export class PartSetsData implements IFigureSetData { const existing = this._parts.get(part); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -89,7 +87,7 @@ export class PartSetsData implements IFigureSetData let existing = this._parts.get(_local_2); - if(!existing) + if (!existing) { existing = new PartDefinition(k); @@ -103,7 +101,7 @@ export class PartSetsData implements IFigureSetData { const existing = this._activePartSets.get(k.activePartSet); - if(!existing) return null; + if (!existing) return null; return existing; } diff --git a/src/nitro/avatar/structure/figure/FigurePart.ts b/src/nitro/avatar/structure/figure/FigurePart.ts index afc22585..87147481 100644 --- a/src/nitro/avatar/structure/figure/FigurePart.ts +++ b/src/nitro/avatar/structure/figure/FigurePart.ts @@ -1,5 +1,4 @@ -import { IFigureDataPart } from '../../interfaces'; -import { IFigurePart } from './IFigurePart'; +import { IFigureDataPart, IFigurePart } from '../../../../api'; export class FigurePart implements IFigurePart { @@ -12,7 +11,7 @@ export class FigurePart implements IFigurePart constructor(data: IFigureDataPart) { - if(!data) throw new Error('invalid_data'); + if (!data) throw new Error('invalid_data'); this._id = data.id; this._type = data.type; diff --git a/src/nitro/avatar/structure/figure/FigurePartSet.ts b/src/nitro/avatar/structure/figure/FigurePartSet.ts index ad6910e9..834e72dd 100644 --- a/src/nitro/avatar/structure/figure/FigurePartSet.ts +++ b/src/nitro/avatar/structure/figure/FigurePartSet.ts @@ -1,7 +1,5 @@ -import { IFigureDataSet } from '../../interfaces'; +import { IFigureDataSet, IFigurePart, IFigurePartSet } from '../../../../api'; import { FigurePart } from './FigurePart'; -import { IFigurePart } from './IFigurePart'; -import { IFigurePartSet } from './IFigurePartSet'; export class FigurePartSet implements IFigurePartSet { @@ -18,7 +16,7 @@ export class FigurePartSet implements IFigurePartSet constructor(type: string, data: IFigureDataSet) { - if(!type || !data) throw new Error('invalid_data'); + if (!type || !data) throw new Error('invalid_data'); this._id = data.id; this._type = type; @@ -31,24 +29,24 @@ export class FigurePartSet implements IFigurePartSet this._isPreSelectable = data.preselectable; this._isSellable = data.sellable; - for(const part of data.parts) + for (const part of data.parts) { const newPart = new FigurePart(part); const partIndex = this.getPartIndex(newPart); - if(partIndex !== -1) this._parts.splice(partIndex, 0, newPart); + if (partIndex !== -1) this._parts.splice(partIndex, 0, newPart); else this._parts.push(newPart); } - if(data.hiddenLayers) + if (data.hiddenLayers) { - for(const hiddenLayer of data.hiddenLayers) this._hiddenLayers.push(hiddenLayer.partType); + for (const hiddenLayer of data.hiddenLayers) this._hiddenLayers.push(hiddenLayer.partType); } } public dispose(): void { - for(const part of this._parts) + for (const part of this._parts) { const figurePart = part as FigurePart; @@ -63,15 +61,15 @@ export class FigurePartSet implements IFigurePartSet { const totalParts = this._parts.length; - if(!totalParts) return -1; + if (!totalParts) return -1; - for(let i = 0; i < totalParts; i++) + for (let i = 0; i < totalParts; i++) { const existingPart = this._parts[i]; - if(!existingPart) continue; + if (!existingPart) continue; - if(existingPart.type !== part.type || existingPart.index > part.index) continue; + if (existingPart.type !== part.type || existingPart.index > part.index) continue; return i; } @@ -81,9 +79,9 @@ export class FigurePartSet implements IFigurePartSet public getPart(k: string, _arg_2: number): IFigurePart { - for(const part of this._parts) + for (const part of this._parts) { - if((part.type !== k) || (part.id !== _arg_2)) continue; + if ((part.type !== k) || (part.id !== _arg_2)) continue; return part; } diff --git a/src/nitro/avatar/structure/figure/Palette.ts b/src/nitro/avatar/structure/figure/Palette.ts index 42da5a83..43a13b71 100644 --- a/src/nitro/avatar/structure/figure/Palette.ts +++ b/src/nitro/avatar/structure/figure/Palette.ts @@ -1,7 +1,5 @@ +import { IFigureDataPalette, IPalette, IPartColor } from '../../../../api'; import { AdvancedMap } from '../../../../core'; -import { IFigureDataPalette } from '../../interfaces'; -import { IPalette } from './IPalette'; -import { IPartColor } from './IPartColor'; import { PartColor } from './PartColor'; export class Palette implements IPalette @@ -11,7 +9,7 @@ export class Palette implements IPalette constructor(data: IFigureDataPalette) { - if(!data) throw new Error('invalid_data'); + if (!data) throw new Error('invalid_data'); this._id = data.id; this._colors = new AdvancedMap(); @@ -21,7 +19,7 @@ export class Palette implements IPalette public append(data: IFigureDataPalette): void { - for(const color of data.colors) + for (const color of data.colors) { const newColor = new PartColor(color); @@ -31,7 +29,7 @@ export class Palette implements IPalette public getColor(id: number): IPartColor { - if((id === undefined) || id < 0) return null; + if ((id === undefined) || id < 0) return null; return (this._colors.getValue(id.toString()) || null); } diff --git a/src/nitro/avatar/structure/figure/PartColor.ts b/src/nitro/avatar/structure/figure/PartColor.ts index 0bd79036..cfa311c9 100644 --- a/src/nitro/avatar/structure/figure/PartColor.ts +++ b/src/nitro/avatar/structure/figure/PartColor.ts @@ -1,5 +1,4 @@ -import { IFigureDataColor } from '../../interfaces'; -import { IPartColor } from './IPartColor'; +import { IFigureDataColor, IPartColor } from '../../../../api'; export class PartColor implements IPartColor { @@ -11,7 +10,7 @@ export class PartColor implements IPartColor constructor(data: IFigureDataColor) { - if(!data) throw new Error('invalid_data'); + if (!data) throw new Error('invalid_data'); this._id = data.id; this._index = data.index; diff --git a/src/nitro/avatar/structure/figure/SetType.ts b/src/nitro/avatar/structure/figure/SetType.ts index 471dc66b..85ca5a3b 100644 --- a/src/nitro/avatar/structure/figure/SetType.ts +++ b/src/nitro/avatar/structure/figure/SetType.ts @@ -1,8 +1,6 @@ +import { IFigureDataSetType, IFigurePartSet, ISetType } from '../../../../api'; import { AdvancedMap } from '../../../../core'; -import { IFigureDataSetType } from '../../interfaces'; import { FigurePartSet } from './FigurePartSet'; -import { IFigurePartSet } from './IFigurePartSet'; -import { ISetType } from './ISetType'; export class SetType implements ISetType { @@ -13,7 +11,7 @@ export class SetType implements ISetType constructor(data: IFigureDataSetType) { - if(!data) throw new Error('invalid_data'); + if (!data) throw new Error('invalid_data'); this._type = data.type; this._paletteId = data.paletteId; @@ -27,7 +25,7 @@ export class SetType implements ISetType public dispose(): void { - for(const set of this._partSets.getValues()) + for (const set of this._partSets.getValues()) { const partSet = set as FigurePartSet; @@ -39,12 +37,12 @@ export class SetType implements ISetType public cleanUp(data: IFigureDataSetType): void { - for(const set of data.sets) + for (const set of data.sets) { const setId = set.id.toString(); const partSet = (this._partSets.getValue(setId) as FigurePartSet); - if(partSet) + if (partSet) { partSet.dispose(); @@ -55,18 +53,18 @@ export class SetType implements ISetType public append(setType: IFigureDataSetType): void { - if(!setType || !setType.sets) return; + if (!setType || !setType.sets) return; - for(const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set)); + for (const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set)); } public getDefaultPartSet(gender: string): IFigurePartSet { - for(const set of this._partSets.getValues()) + for (const set of this._partSets.getValues()) { - if(!set) continue; + if (!set) continue; - if((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set; + if ((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set; } return null; diff --git a/src/nitro/avatar/structure/figure/index.ts b/src/nitro/avatar/structure/figure/index.ts index d2b5f52d..1b9ebc3d 100644 --- a/src/nitro/avatar/structure/figure/index.ts +++ b/src/nitro/avatar/structure/figure/index.ts @@ -1,10 +1,5 @@ export * from './FigurePart'; export * from './FigurePartSet'; -export * from './IFigurePart'; -export * from './IFigurePartSet'; -export * from './IPalette'; -export * from './IPartColor'; -export * from './ISetType'; export * from './Palette'; export * from './PartColor'; export * from './SetType'; diff --git a/src/nitro/avatar/structure/index.ts b/src/nitro/avatar/structure/index.ts index 2c6d7334..11269ae9 100644 --- a/src/nitro/avatar/structure/index.ts +++ b/src/nitro/avatar/structure/index.ts @@ -4,7 +4,5 @@ export * from './AvatarCanvas'; export * from './AvatarStructureDownload'; export * from './figure'; export * from './FigureSetData'; -export * from './IFigureSetData'; -export * from './IStructureData'; export * from './parts'; export * from './PartSetsData'; diff --git a/src/nitro/communication/demo/NitroCommunicationDemo.ts b/src/nitro/communication/demo/NitroCommunicationDemo.ts index b4fb66b2..0350c13c 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemo.ts +++ b/src/nitro/communication/demo/NitroCommunicationDemo.ts @@ -1,5 +1,6 @@ import { IConnection, INitroCommunicationDemo, INitroCommunicationManager } from '../../../api'; import { NitroManager, SocketConnectionEvent } from '../../../core'; +import { GetTickerTime } from '../../../pixi-proxy'; import { Nitro } from '../../Nitro'; import { AuthenticatedEvent, ClientHelloMessageComposer, ClientPingEvent, InfoRetrieveMessageComposer, PongMessageComposer, SSOTicketMessageComposer } from '../messages'; import { NitroCommunicationDemoEvent } from './NitroCommunicationDemoEvent'; @@ -34,7 +35,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if(connection) + if (connection) { connection.addEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); connection.addEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -49,7 +50,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if(connection) + if (connection) { connection.removeEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); connection.removeEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -67,13 +68,13 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if(!connection) return; + if (!connection) return; this._didConnect = true; this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_ESTABLISHED, connection); - if(Nitro.instance.getConfiguration('system.pong.manually', false)) this.startPonging(); + if (Nitro.instance.getConfiguration('system.pong.manually', false)) this.startPonging(); this.startHandshake(connection); @@ -86,18 +87,18 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if(!connection) return; + if (!connection) return; this.stopPonging(); - if(this._didConnect) this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_CLOSED, connection); + if (this._didConnect) this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_CLOSED, connection); } private onConnectionErrorEvent(event: CloseEvent): void { const connection = this._communication.connection; - if(!connection) return; + if (!connection) return; this.stopPonging(); @@ -106,9 +107,9 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun private tryAuthentication(connection: IConnection): void { - if(!connection || !this.getSSO()) + if (!connection || !this.getSSO()) { - if(!this.getSSO()) + if (!this.getSSO()) { this.logger.error('Login without an SSO ticket is not supported'); } @@ -118,19 +119,19 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun return; } - connection.send(new SSOTicketMessageComposer(this.getSSO(), Nitro.instance.time)); + connection.send(new SSOTicketMessageComposer(this.getSSO(), GetTickerTime())); } private onClientPingEvent(event: ClientPingEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; this.sendPong(event.connection); } private onAuthenticatedEvent(event: AuthenticatedEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; this.completeHandshake(event.connection); @@ -162,7 +163,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun private stopPonging(): void { - if(!this._pongInterval) return; + if (!this._pongInterval) return; clearInterval(this._pongInterval); @@ -173,7 +174,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { connection = ((connection || this._communication.connection) || null); - if(!connection) return; + if (!connection) return; connection.send(new PongMessageComposer()); } diff --git a/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts b/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts index 24254803..243d9279 100644 --- a/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts +++ b/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../api'; -import { PixiApplicationProxy } from '../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../pixi-proxy'; export class FrontPageItem { @@ -18,7 +18,7 @@ export class FrontPageItem constructor(wrapper: IMessageDataWrapper) { - if(!wrapper) throw new Error('invalid_wrapper'); + if (!wrapper) throw new Error('invalid_wrapper'); this.flush(); this.parse(wrapper); @@ -40,14 +40,14 @@ export class FrontPageItem public parse(wrapper: IMessageDataWrapper): boolean { - if(!wrapper) return false; + if (!wrapper) return false; this._position = wrapper.readInt(); this._itemName = wrapper.readString(); this._itemPromoImage = wrapper.readString(); this._type = wrapper.readInt(); - switch(this._type) + switch (this._type) { case FrontPageItem.ITEM_CATALOGUE_PAGE: this._catalogPageLocation = wrapper.readString(); @@ -62,7 +62,7 @@ export class FrontPageItem const time = wrapper.readInt(); - this._expirationTime = ((time > 0) ? ((time * 1000) + PixiApplicationProxy.instance.ticker.lastTime) : 0); + this._expirationTime = ((time > 0) ? ((time * 1000) + GetTickerTime()) : 0); return true; } diff --git a/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts b/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts index eb91e46a..636bd5a7 100644 --- a/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts +++ b/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper } from '../../../../../api'; -import { PixiApplicationProxy } from '../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../pixi-proxy'; export class TargetedOfferData { @@ -31,7 +31,7 @@ export class TargetedOfferData this._Str_9772 = wrapper.readInt(); const time = wrapper.readInt(); - this._expirationTime = ((time > 0) ? ((time * 1000) + PixiApplicationProxy.instance.ticker.lastTime) : 0); + this._expirationTime = ((time > 0) ? ((time * 1000) + GetTickerTime()) : 0); this._title = wrapper.readString(); this._Str_1858 = wrapper.readString(); @@ -42,7 +42,7 @@ export class TargetedOfferData let count = wrapper.readInt(); - while(count > 0) + while (count > 0) { this._Str_11962.push(wrapper.readString()); @@ -53,7 +53,7 @@ export class TargetedOfferData public populate(offerData: TargetedOfferData) { - if(!offerData) return; + if (!offerData) return; this._id = offerData.id; this._identifier = offerData.identifier; diff --git a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts index 5546c669..97d685ab 100644 --- a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts +++ b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IObjectData } from '../../../../../../api'; -import { PixiApplicationProxy } from '../../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../../pixi-proxy'; import { FurnitureDataParser } from '../../room'; import { IFurnitureItemData } from './IFurnitureItemData'; @@ -30,7 +30,7 @@ export class FurnitureListItemParser implements IFurnitureItemData constructor(wrapper: IMessageDataWrapper) { - if(!wrapper) throw new Error('invalid_wrapper'); + if (!wrapper) throw new Error('invalid_wrapper'); this.flush(); this.parse(wrapper); @@ -63,7 +63,7 @@ export class FurnitureListItemParser implements IFurnitureItemData public parse(wrapper: IMessageDataWrapper): boolean { - if(!wrapper) return false; + if (!wrapper) return false; this._itemId = wrapper.readInt(); this._furniType = wrapper.readString(); @@ -76,9 +76,9 @@ export class FurnitureListItemParser implements IFurnitureItemData this._isGroupable = wrapper.readBoolean(); this._sellable = wrapper.readBoolean(); this._secondsToExpiration = wrapper.readInt(); - this._expirationTimeStamp = PixiApplicationProxy.instance.ticker.lastTime; + this._expirationTimeStamp = GetTickerTime(); - if(this.secondsToExpiration > -1) + if (this.secondsToExpiration > -1) { this._rentable = true; } @@ -92,7 +92,7 @@ export class FurnitureListItemParser implements IFurnitureItemData this._flatId = wrapper.readInt(); this._isWallItem = (this._furniType === FurnitureListItemParser.WALL_ITEM); - if(this._furniType === FurnitureListItemParser.FLOOR_ITEM) + if (this._furniType === FurnitureListItemParser.FLOOR_ITEM) { this._slotId = wrapper.readString(); this._extra = wrapper.readInt(); diff --git a/src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts b/src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts index 1ac29479..b653c3ea 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/ItemDataStructure.ts @@ -1,5 +1,5 @@ import { IMessageDataWrapper, IObjectData } from '../../../../../../api'; -import { PixiApplicationProxy } from '../../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../../pixi-proxy'; import { FurnitureDataParser } from '../../room'; import { IFurnitureItemData } from '../furniture'; @@ -34,7 +34,7 @@ export class ItemDataStructure implements IFurnitureItemData this._isGroupable = wrapper.readBoolean(); this._stuffData = FurnitureDataParser.parseObjectData(wrapper); this._secondsToExpiration = -1; - this._expirationTimeStamp = PixiApplicationProxy.instance.ticker.lastTime; + this._expirationTimeStamp = GetTickerTime(); this._hasRentPeriodStarted = false; this._creationDay = wrapper.readInt(); this._creationMonth = wrapper.readInt(); diff --git a/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts b/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts index 29a21e7f..330b21c9 100644 --- a/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts +++ b/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts @@ -1,4 +1,4 @@ -import { PixiApplicationProxy } from '../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../pixi-proxy'; import { PatternMatchData } from './PatternMatchData'; export class IssueMessageData @@ -47,7 +47,7 @@ export class IssueMessageData this._message = message; this._chatRecordId = chatRecordId; this._patterns = patterns; - this._creationTimeInMilliseconds = PixiApplicationProxy.instance.ticker.lastTime; //getTimer() + this._creationTimeInMilliseconds = GetTickerTime(); //getTimer() } public get issueId(): number @@ -133,11 +133,11 @@ export class IssueMessageData public dispose(): void { - if(this.disposed) + if (this.disposed) { return; } - for(const k of this._patterns) + for (const k of this._patterns) { k.dispose(); } diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index 0da1ebdc..58697a59 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -3,7 +3,7 @@ import { Container, DisplayObject } from '@pixi/display'; import { Matrix, Point, Rectangle } from '@pixi/math'; import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListener, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, LegacyDataType, ObjectDataFactory, RoomControllerLevel, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, ToolbarIconEnum, Vector3d } from '../../api'; import { NitroEvent, NitroManager } from '../../core'; -import { NitroSprite, TextureUtils } from '../../pixi-proxy'; +import { GetTickerTime, NitroSprite, TextureUtils } from '../../pixi-proxy'; import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room'; import { PetFigureData } from '../avatar'; import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication'; @@ -123,14 +123,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public onInit(): void { - if(this._ready) return; + if (this._ready) return; this._imageObjectIdBank = new NumberBank(1000); this._thumbnailObjectIdBank = new NumberBank(1000); this._logicFactory.registerEventFunction(this.processRoomObjectEvent); - if(this._roomManager) + if (this._roomManager) { this._roomManager.setContentLoader(this._roomContentLoader); this._roomManager.addUpdateCategory(RoomObjectCategory.FLOOR); @@ -146,7 +146,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this._roomContentLoader.setSessionDataManager(this._sessionDataManager); this._roomContentLoader.setIconListener(this); - if(this._roomSessionManager) + if (this._roomSessionManager) { this._roomSessionManager.events.addEventListener(RoomSessionEvent.STARTED, this.onRoomSessionEvent); this._roomSessionManager.events.addEventListener(RoomSessionEvent.ENDED, this.onRoomSessionEvent); @@ -161,9 +161,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public onDispose(): void { - if(!this._ready) return; + if (!this._ready) return; - for(const [key, value] of this._roomInstanceDatas) + for (const [key, value] of this._roomInstanceDatas) { this.removeRoomInstance(key); } @@ -172,15 +172,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato Nitro.instance.ticker.remove(this.update, this); - if(this._roomObjectEventHandler) this._roomObjectEventHandler.dispose(); + if (this._roomObjectEventHandler) this._roomObjectEventHandler.dispose(); - if(this._roomMessageHandler) this._roomMessageHandler.dispose(); + if (this._roomMessageHandler) this._roomMessageHandler.dispose(); - if(this._roomContentLoader) this._roomContentLoader.dispose(); + if (this._roomContentLoader) this._roomContentLoader.dispose(); this.events.removeEventListener(RoomContentLoader.LOADER_READY, this.onRoomContentLoaderReadyEvent); - if(this._roomSessionManager) + if (this._roomSessionManager) { this._roomSessionManager.events.removeEventListener(RoomSessionEvent.STARTED, this.onRoomSessionEvent); this._roomSessionManager.events.removeEventListener(RoomSessionEvent.ENDED, this.onRoomSessionEvent); @@ -191,15 +191,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private onRoomSessionEvent(event: RoomSessionEvent): void { - if(!(event instanceof RoomSessionEvent)) return; + if (!(event instanceof RoomSessionEvent)) return; - switch(event.type) + switch (event.type) { case RoomSessionEvent.STARTED: - if(this._roomMessageHandler) this._roomMessageHandler.setRoomId(event.session.roomId); + if (this._roomMessageHandler) this._roomMessageHandler.setRoomId(event.session.roomId); return; case RoomSessionEvent.ENDED: - if(this._roomMessageHandler) + if (this._roomMessageHandler) { this._roomMessageHandler.clearRoomId(); this.removeRoomInstance(event.session.roomId); @@ -234,14 +234,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(instance) + if (instance) { this._roomManager && this._roomManager.removeRoomInstance(this.getRoomId(roomId)); } const existing = this._roomInstanceDatas.get(roomId); - if(existing) + if (existing) { this._roomInstanceDatas.delete(existing.roomId); @@ -257,11 +257,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let wallType = '201'; let landscapeType = '1'; - if(!this._ready) + if (!this._ready) { let data = this._roomDatas.get(roomId); - if(data) + if (data) { this._roomDatas.delete(roomId); @@ -283,7 +283,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato return; } - if(!roomMap) + if (!roomMap) { this.logger.warn('Room property messages'); @@ -292,22 +292,22 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const data = this._roomDatas.get(roomId); - if(data) + if (data) { this._roomDatas.delete(roomId); - if(data.floorType) floorType = data.floorType; + if (data.floorType) floorType = data.floorType; - if(data.wallType) wallType = data.wallType; + if (data.wallType) wallType = data.wallType; - if(data.landscapeType) landscapeType = data.landscapeType; + if (data.landscapeType) landscapeType = data.landscapeType; } const instance = this.setupRoomInstance(roomId, roomMap, floorType, wallType, landscapeType, this.getRoomInstanceModelName(roomId)); - if(!instance) return; + if (!instance) return; - if(roomMap.restrictsDragging) + if (roomMap.restrictsDragging) { this._roomAllowsDragging = false; } @@ -321,11 +321,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private setupRoomInstance(roomId: number, roomMap: RoomMapData, floorType: string, wallType: string, landscapeType: string, worldType: string): IRoomInstance { - if(!this._ready || !this._roomManager) return; + if (!this._ready || !this._roomManager) return; const instance = this._roomManager.createRoomInstance(this.getRoomId(roomId)); - if(!instance) return null; + if (!instance) return null; const category = RoomObjectCategory.ROOM; @@ -334,7 +334,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato instance.model.setValue(RoomVariableEnum.ROOM_IS_PUBLIC, 0); instance.model.setValue(RoomVariableEnum.ROOM_Z_SCALE, 1); - if(roomMap) + if (roomMap) { instance.model.setValue(RoomVariableEnum.RESTRICTS_DRAGGING, roomMap.restrictsDragging); instance.model.setValue(RoomVariableEnum.RESTRICTS_SCALING, roomMap.restrictsScaling); @@ -342,7 +342,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const dimensions = roomMap.dimensions; - if(dimensions) + if (dimensions) { const minX = roomMap.dimensions.minX; const maxX = roomMap.dimensions.maxX; @@ -356,44 +356,44 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const seed = ((((minX * 423) + (maxX * 671)) + (minY * 913)) + (maxY * 7509)); - if(roomObject && roomObject.model) roomObject.model.setValue(RoomObjectVariable.ROOM_RANDOM_SEED, seed); + if (roomObject && roomObject.model) roomObject.model.setValue(RoomObjectVariable.ROOM_RANDOM_SEED, seed); } } const logic = (roomObject && roomObject.logic as RoomLogic) || null; - if(logic) + if (logic) { logic.initialize(roomMap); - if(floorType) + if (floorType) { logic.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_FLOOR_UPDATE, floorType)); instance.model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, floorType); } - if(wallType) + if (wallType) { logic.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_WALL_UPDATE, wallType)); instance.model.setValue(RoomObjectVariable.ROOM_WALL_TYPE, wallType); } - if(landscapeType) + if (landscapeType) { logic.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_LANDSCAPE_UPDATE, landscapeType)); instance.model.setValue(RoomObjectVariable.ROOM_LANDSCAPE_TYPE, landscapeType); } } - if(roomMap && roomMap.doors.length) + if (roomMap && roomMap.doors.length) { let doorIndex = 0; - while(doorIndex < roomMap.doors.length) + while (doorIndex < roomMap.doors.length) { const door = roomMap.doors[doorIndex]; - if(door) + if (door) { const doorX = door.x; const doorY = door.y; @@ -405,15 +405,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato logic.processUpdateMessage(new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.ADD_MASK, maskId, maskType, maskLocation, ObjectRoomMaskUpdateMessage.HOLE)); - if((doorDir === 90) || (doorDir === 180)) + if ((doorDir === 90) || (doorDir === 180)) { - if(doorDir === 90) + if (doorDir === 90) { instance.model.setValue(RoomObjectVariable.ROOM_DOOR_X, (doorX - 0.5)); instance.model.setValue(RoomObjectVariable.ROOM_DOOR_Y, doorY); } - if(doorDir === 180) + if (doorDir === 180) { instance.model.setValue(RoomObjectVariable.ROOM_DOOR_X, doorX); instance.model.setValue(RoomObjectVariable.ROOM_DOOR_Y, (doorY - 0.5)); @@ -429,7 +429,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } instance.createRoomObjectAndInitalize(RoomEngine.CURSOR_OBJECT_ID, RoomEngine.CURSOR_OBJECT_TYPE, RoomObjectCategory.CURSOR); - if(Nitro.instance.getConfiguration('enable.avatar.arrow', false)) instance.createRoomObjectAndInitalize(RoomEngine.ARROW_OBJECT_ID, RoomEngine.ARROW_OBJECT_TYPE, RoomObjectCategory.CURSOR); + if (Nitro.instance.getConfiguration('enable.avatar.arrow', false)) instance.createRoomObjectAndInitalize(RoomEngine.ARROW_OBJECT_ID, RoomEngine.ARROW_OBJECT_TYPE, RoomObjectCategory.CURSOR); return instance; } @@ -438,15 +438,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; let renderer = instance.renderer as IRoomRenderer; - if(!renderer) + if (!renderer) { renderer = this._roomRendererFactory.createRenderer(); - if(!renderer) return null; + if (!renderer) return null; } renderer.roomObjectVariableAccurateZ = RoomObjectVariable.OBJECT_ACCURATE_Z_VALUE; @@ -455,15 +455,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const canvas = renderer.createCanvas(id, width, height, scale); - if(!canvas) return null; + if (!canvas) return null; const restrictedScaling = instance.model.getValue(RoomVariableEnum.RESTRICTS_SCALING); - if(restrictedScaling) + if (restrictedScaling) { let restrictedScale = instance.model.getValue(RoomVariableEnum.RESTRICTED_SCALE); - if(!restrictedScale) restrictedScale = 1; + if (!restrictedScale) restrictedScale = 1; canvas.setScale(restrictedScale); @@ -476,7 +476,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato canvas.setMouseListener(this._roomObjectEventHandler); - if(canvas.geometry) + if (canvas.geometry) { canvas.geometry.z_scale = instance.model.getValue(RoomVariableEnum.ROOM_Z_SCALE); @@ -488,15 +488,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let direction: IVector3D = null; - if(doorDirection === 90) direction = new Vector3d(-2000, 0, 0); + if (doorDirection === 90) direction = new Vector3d(-2000, 0, 0); - if(doorDirection === 180) direction = new Vector3d(0, -2000, 0); + if (doorDirection === 180) direction = new Vector3d(0, -2000, 0); canvas.geometry.setDisplacement(vector, direction); const displayObject = (canvas.master as Container); - if(displayObject) + if (displayObject) { const overlay = new NitroSprite(Texture.EMPTY); @@ -514,16 +514,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(roomCanvas) roomCanvas.setMask(flag); + if (roomCanvas) roomCanvas.setMask(flag); } public setRoomInstanceRenderingCanvasScale(roomId: number, canvasId: number, scale: number, point: Point = null, offsetPoint: Point = null, override: boolean = false, asDelta: boolean = false): void { const roomCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(roomCanvas) + if (roomCanvas) { - if(roomCanvas.restrictsScaling && !override) return; + if (roomCanvas.restrictsScaling && !override) return; roomCanvas.setScale(scale, point, offsetPoint, override, asDelta); @@ -535,17 +535,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; const renderer = instance.renderer as IRoomRenderer; - if(!renderer) return null; + if (!renderer) return null; - if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; const canvas = renderer.getCanvas(canvasId); - if(!canvas) return null; + if (!canvas) return null; return canvas; } @@ -557,11 +557,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomInstanceRenderingCanvasOffset(roomId: number, canvasId: number = -1): Point { - if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(!renderingCanvas) return null; + if (!renderingCanvas) return null; return new Point(renderingCanvas.screenOffsetX, renderingCanvas.screenOffsetY); } @@ -570,12 +570,12 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(!renderingCanvas || !point) return false; + if (!renderingCanvas || !point) return false; const x = ~~(point.x); const y = ~~(point.y); - if((renderingCanvas.screenOffsetX === x) && (renderingCanvas.screenOffsetY === y)) return; + if ((renderingCanvas.screenOffsetX === x) && (renderingCanvas.screenOffsetY === y)) return; this.events.dispatchEvent(new RoomDragEvent(roomId, -(renderingCanvas.screenOffsetX - x), -(renderingCanvas.screenOffsetY - y))); @@ -587,13 +587,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomInstanceRenderingCanvasScale(roomId: number = -1000, canvasId: number = -1): number { - if(roomId === -1000) roomId = this._activeRoomId; + if (roomId === -1000) roomId = this._activeRoomId; - if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(!canvas) return 1; + if (!canvas) return 1; return canvas.scale; } @@ -602,7 +602,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(!canvas) return; + if (!canvas) return; canvas.initialize(width, height); } @@ -611,17 +611,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; const renderer = instance.renderer as IRoomRenderer; - if(!renderer) return null; + if (!renderer) return null; - if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; const canvas = renderer.getCanvas(canvasId); - if(!canvas) return null; + if (!canvas) return null; return canvas.geometry; } @@ -630,7 +630,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; return ((instance.model && instance.model.getValue(key)) || null); } @@ -639,7 +639,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomOwnObject(roomId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectRoomPlaneVisibilityUpdateMessage(ObjectRoomPlaneVisibilityUpdateMessage.WALL_VISIBILITY, wallVisible)); object.processUpdateMessage(new ObjectRoomPlaneVisibilityUpdateMessage(ObjectRoomPlaneVisibilityUpdateMessage.FLOOR_VISIBILITY, floorVisible)); @@ -651,7 +651,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomOwnObject(roomId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectRoomPlanePropertyUpdateMessage(ObjectRoomPlanePropertyUpdateMessage.WALL_THICKNESS, wallThickness)); object.processUpdateMessage(new ObjectRoomPlanePropertyUpdateMessage(ObjectRoomPlanePropertyUpdateMessage.FLOOR_THICKNESS, floorThickness)); @@ -664,43 +664,43 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const roomObject = this.getRoomOwnObject(roomId); const roomInstance = this.getRoomInstance(roomId); - if(!roomObject) + if (!roomObject) { let roomData = this._roomDatas.get(roomId); - if(!roomData) + if (!roomData) { roomData = new RoomData(roomId, null); this._roomDatas.set(roomId, roomData); } - if(floorType) roomData.floorType = floorType; + if (floorType) roomData.floorType = floorType; - if(wallType) roomData.wallType = wallType; + if (wallType) roomData.wallType = wallType; - if(landscapeType) roomData.landscapeType = landscapeType; + if (landscapeType) roomData.landscapeType = landscapeType; return true; } - if(floorType) + if (floorType) { - if(roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, floorType); + if (roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, floorType); roomObject.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_FLOOR_UPDATE, floorType)); } - if(wallType) + if (wallType) { - if(roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_WALL_TYPE, wallType); + if (roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_WALL_TYPE, wallType); roomObject.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_WALL_UPDATE, wallType)); } - if(landscapeType) + if (landscapeType) { - if(roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_LANDSCAPE_TYPE, landscapeType); + if (roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_LANDSCAPE_TYPE, landscapeType); roomObject.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_LANDSCAPE_UPDATE, landscapeType)); } @@ -712,7 +712,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getRoomOwnObject(roomId); - if(!roomObject || !roomObject.logic) return false; + if (!roomObject || !roomObject.logic) return false; const event = new ObjectRoomColorUpdateMessage(ObjectRoomColorUpdateMessage.BACKGROUND_COLOR, color, light, backgroundOnly); @@ -725,12 +725,12 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public addRoomInstanceFloorHole(roomId: number, objectId: number): void { - if(objectId < 0) return; + if (objectId < 0) return; const roomOwnObject = this.getRoomOwnObject(roomId); const roomObject = this.getRoomObjectFloor(roomId, objectId); - if(roomOwnObject && roomOwnObject.logic && roomObject && roomObject.model) + if (roomOwnObject && roomOwnObject.logic && roomObject && roomObject.model) { const location = roomObject.getLocation(); const sizeX = roomObject.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); @@ -742,11 +742,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public removeRoomInstanceFloorHole(roomId: number, objectId: number): void { - if(objectId < 0) return; + if (objectId < 0) return; const roomOwnObject = this.getRoomOwnObject(roomId); - if(roomOwnObject) + if (roomOwnObject) { roomOwnObject.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.REMOVE, objectId)); } @@ -756,13 +756,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstance(roomId); - if(!roomInstance) return; + if (!roomInstance) return; const mode = isPlaying ? 1 : 0; roomInstance.model.setValue(RoomVariableEnum.IS_PLAYING_GAME, mode); - if(mode === 0) + if (mode === 0) { this.events.dispatchEvent(new RoomEngineEvent(RoomEngineEvent.NORMAL_MODE, roomId)); } @@ -776,7 +776,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstance(roomId); - if(!roomInstance) return false; + if (!roomInstance) return false; return (roomInstance.model.getValue(RoomVariableEnum.IS_PLAYING_GAME) > 0); } @@ -788,7 +788,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public disableUpdate(flag: boolean): void { - if(flag) + if (flag) { Nitro.instance.ticker.remove(this.update, this); } @@ -806,14 +806,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public runVisibilityUpdate(): void { - if(!document.hidden) this.update(1, true); + if (!document.hidden) this.update(1, true); } public update(time: number, update: boolean = false): void { - if(!this._roomManager) return; + if (!this._roomManager) return; - time = Nitro.instance.time; + time = GetTickerTime(); RoomEnterEffect.turnVisualizationOn(); @@ -823,7 +823,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.updateRoomCameras(time); - if(this._mouseCursorUpdate) this.setPointer(); + if (this._mouseCursorUpdate) this.setPointer(); RoomEnterEffect.turnVisualizationOff(); } @@ -834,7 +834,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const instanceData = this.getRoomInstanceData(this._activeRoomId); - if(instanceData && instanceData.hasButtonMouseCursorOwners()) + if (instanceData && instanceData.hasButtonMouseCursorOwners()) { document.body.style.cursor = 'pointer'; } @@ -846,7 +846,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private processPendingFurniture(): void { - if(this._skipFurnitureCreationForNextFrame) + if (this._skipFurnitureCreationForNextFrame) { this._skipFurnitureCreationForNextFrame = false; @@ -857,25 +857,25 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const furniturePerTick = 5; const hasTickLimit = true; - for(const instanceData of this._roomInstanceDatas.values()) + for (const instanceData of this._roomInstanceDatas.values()) { - if(!instanceData) continue; + if (!instanceData) continue; let pendingData: RoomFurnitureData = null; let totalFurnitureAdded = 0; let furnitureAdded = false; - while((pendingData = instanceData.getNextPendingFurnitureFloor())) + while ((pendingData = instanceData.getNextPendingFurnitureFloor())) { furnitureAdded = this.processPendingFurnitureFloor(instanceData.roomId, pendingData.id, pendingData); - if(hasTickLimit) + if (hasTickLimit) { - if(!(++totalFurnitureAdded % furniturePerTick)) + if (!(++totalFurnitureAdded % furniturePerTick)) { const time = new Date().valueOf(); - if((time - startTime) >= 40) + if ((time - startTime) >= 40) { this._skipFurnitureCreationForNextFrame = true; @@ -885,17 +885,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - while(!this._skipFurnitureCreationForNextFrame && (pendingData = instanceData.getNextPendingFurnitureWall())) + while (!this._skipFurnitureCreationForNextFrame && (pendingData = instanceData.getNextPendingFurnitureWall())) { furnitureAdded = this.processPendingFurnitureWall(instanceData.roomId, pendingData.id, pendingData); - if(hasTickLimit) + if (hasTickLimit) { - if(!(++totalFurnitureAdded % furniturePerTick)) + if (!(++totalFurnitureAdded % furniturePerTick)) { const time = new Date().valueOf(); - if((time - startTime) >= 40) + if ((time - startTime) >= 40) { this._skipFurnitureCreationForNextFrame = true; @@ -905,28 +905,28 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if(furnitureAdded && this._roomManager) + if (furnitureAdded && this._roomManager) { const roomInstance = this._roomManager.getRoomInstance(this.getRoomId(instanceData.roomId)) as RoomInstance; - if(!roomInstance.hasUninitializedObjects()) this.objectsInitialized(instanceData.roomId.toString()); + if (!roomInstance.hasUninitializedObjects()) this.objectsInitialized(instanceData.roomId.toString()); } - if(this._skipFurnitureCreationForNextFrame) return; + if (this._skipFurnitureCreationForNextFrame) return; } } public onRoomEngineInitalized(flag: boolean): void { - if(!flag) return; + if (!flag) return; this._ready = true; this.events.dispatchEvent(new RoomEngineEvent(RoomEngineEvent.ENGINE_INITIALIZED, 0)); - for(const roomData of this._roomDatas.values()) + for (const roomData of this._roomDatas.values()) { - if(!roomData) continue; + if (!roomData) continue; this.createRoomInstance(roomData.roomId, roomData.data); } @@ -934,19 +934,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private processPendingFurnitureFloor(roomId: number, id: number, data: RoomFurnitureData): boolean { - if(!data) + if (!data) { const instanceData = this.getRoomInstanceData(roomId); - if(instanceData) data = instanceData.getPendingFurnitureFloor(id); + if (instanceData) data = instanceData.getPendingFurnitureFloor(id); - if(!data) return false; + if (!data) return false; } let type = data.type; let didLoad = false; - if(!type) + if (!type) { type = this.getFurnitureFloorName(data.typeId); didLoad = true; @@ -955,70 +955,70 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const object = this.createRoomObjectFloor(roomId, id, type); - if(!object) return false; + if (!object) return false; const model = object.model; - if(model) + if (model) { model.setValue(RoomObjectVariable.FURNITURE_COLOR, this.getFurnitureFloorColorIndex(data.typeId)); model.setValue(RoomObjectVariable.FURNITURE_TYPE_ID, data.typeId); model.setValue(RoomObjectVariable.FURNITURE_AD_URL, this.getRoomObjectAdUrl(data.type)); model.setValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT, (data.realRoomObject ? 1 : 0)); model.setValue(RoomObjectVariable.FURNITURE_EXPIRY_TIME, data.expiryTime); - model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, Nitro.instance.time); + model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, GetTickerTime()); model.setValue(RoomObjectVariable.FURNITURE_USAGE_POLICY, data.usagePolicy); model.setValue(RoomObjectVariable.FURNITURE_OWNER_ID, data.ownerId); model.setValue(RoomObjectVariable.FURNITURE_OWNER_NAME, data.ownerName); } - if(!this.updateRoomObjectFloor(roomId, id, data.location, data.direction, data.state, data.data, data.extra)) return false; + if (!this.updateRoomObjectFloor(roomId, id, data.location, data.direction, data.state, data.data, data.extra)) return false; - if(data.sizeZ >= 0) + if (data.sizeZ >= 0) { - if(!this.updateRoomObjectFloorHeight(roomId, id, data.sizeZ)) return false; + if (!this.updateRoomObjectFloorHeight(roomId, id, data.sizeZ)) return false; } - if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.FLOOR)); + if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.FLOOR)); const selectedRoomObjectData = this.getPlacedRoomObjectData(roomId); - if(selectedRoomObjectData && (selectedRoomObjectData.id === id) && (selectedRoomObjectData.category === RoomObjectCategory.FLOOR)) + if (selectedRoomObjectData && (selectedRoomObjectData.id === id) && (selectedRoomObjectData.category === RoomObjectCategory.FLOOR)) { this.selectRoomObject(roomId, id, RoomObjectCategory.FLOOR); } - if(object.isReady && data.synchronized) this.addObjectToTileMap(roomId, object); + if (object.isReady && data.synchronized) this.addObjectToTileMap(roomId, object); return true; } private processPendingFurnitureWall(roomId: number, id: number, data: RoomFurnitureData): boolean { - if(!data) + if (!data) { const instanceData = this.getRoomInstanceData(roomId); - if(instanceData) data = instanceData.getPendingFurnitureWall(id); + if (instanceData) data = instanceData.getPendingFurnitureWall(id); - if(!data) return false; + if (!data) return false; } let extra = ''; - if(data.data) extra = data.data.getLegacyString(); + if (data.data) extra = data.data.getLegacyString(); let type = this.getFurnitureWallName(data.typeId, extra); - if(!type) type = ''; + if (!type) type = ''; const object = this.createRoomObjectWall(roomId, id, type); - if(!object) return false; + if (!object) return false; const model = object.model; - if(model) + if (model) { model.setValue(RoomObjectVariable.FURNITURE_COLOR, this.getFurnitureWallColorIndex(data.typeId)); model.setValue(RoomObjectVariable.FURNITURE_TYPE_ID, data.typeId); @@ -1026,19 +1026,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT, (data.realRoomObject ? 1 : 0)); model.setValue(RoomObjectVariable.OBJECT_ACCURATE_Z_VALUE, 1); model.setValue(RoomObjectVariable.FURNITURE_EXPIRY_TIME, data.expiryTime); - model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, Nitro.instance.time); + model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, GetTickerTime()); model.setValue(RoomObjectVariable.FURNITURE_USAGE_POLICY, data.usagePolicy); model.setValue(RoomObjectVariable.FURNITURE_OWNER_ID, data.ownerId); model.setValue(RoomObjectVariable.FURNITURE_OWNER_NAME, data.ownerName); } - if(!this.updateRoomObjectWall(roomId, id, data.location, data.direction, data.state, extra)) return false; + if (!this.updateRoomObjectWall(roomId, id, data.location, data.direction, data.state, extra)) return false; - if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.WALL)); + if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.WALL)); const selectedRoomObjectData = this.getPlacedRoomObjectData(roomId); - if(selectedRoomObjectData && (Math.abs(selectedRoomObjectData.id) === id) && (selectedRoomObjectData.category === RoomObjectCategory.WALL)) + if (selectedRoomObjectData && (Math.abs(selectedRoomObjectData.id) === id) && (selectedRoomObjectData.category === RoomObjectCategory.WALL)) { this.selectRoomObject(roomId, id, RoomObjectCategory.WALL); } @@ -1048,18 +1048,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public setRoomSessionOwnUser(roomId: number, objectId: number): void { - if(!this._roomSessionManager) return; + if (!this._roomSessionManager) return; const session = this._roomSessionManager.getSession(roomId); - if(session) + if (session) { session.setOwnRoomIndex(objectId); } const camera = this.getRoomCamera(roomId); - if(camera) + if (camera) { camera.targetId = objectId; camera.targetCategory = RoomObjectCategory.UNIT; @@ -1076,33 +1076,33 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private updateRoomCameras(time: number): void { - for(const instanceData of this._roomInstanceDatas.values()) + for (const instanceData of this._roomInstanceDatas.values()) { - if(!instanceData) continue; + if (!instanceData) continue; const camera = instanceData.roomCamera; - if(!camera) continue; + if (!camera) continue; let location: IVector3D = null; const object = this.getRoomObject(instanceData.roomId, camera.targetId, camera.targetCategory); - if(object) location = object.getLocation(); + if (object) location = object.getLocation(); - if(!location) continue; + if (!location) continue; - if((instanceData.roomId !== this._activeRoomId) || !this._activeRoomIsDragged) + if ((instanceData.roomId !== this._activeRoomId) || !this._activeRoomIsDragged) { this.updateRoomCamera(instanceData.roomId, 1, location, time); } } - if(this._activeRoomWasDragged) + if (this._activeRoomWasDragged) { const renderingCanvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, 1); - if(renderingCanvas) this.setRoomInstanceRenderingCanvasOffset(this._activeRoomId, 1, new Point((renderingCanvas.screenOffsetX + this._activeRoomDragX), (renderingCanvas.screenOffsetY + this._activeRoomDragY))); + if (renderingCanvas) this.setRoomInstanceRenderingCanvasOffset(this._activeRoomId, 1, new Point((renderingCanvas.screenOffsetX + this._activeRoomDragX), (renderingCanvas.screenOffsetY + this._activeRoomDragY))); this._activeRoomDragX = 0; this._activeRoomDragY = 0; @@ -1114,29 +1114,29 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); const instanceData = this.getRoomInstanceData(roomId); - if(!renderingCanvas || !instanceData || (renderingCanvas.scale !== 1)) return; + if (!renderingCanvas || !instanceData || (renderingCanvas.scale !== 1)) return; const roomGeometry = (renderingCanvas.geometry as RoomGeometry); const roomCamera = instanceData.roomCamera; const roomInstance = this.getRoomInstance(roomId); - if(!roomGeometry || !roomCamera || !roomInstance) return; + if (!roomGeometry || !roomCamera || !roomInstance) return; const canvasRectangle = this.getRoomCanvasRectangle(roomId, canvasId); - if(!canvasRectangle) return; + if (!canvasRectangle) return; let _local_10 = (Math.floor(objectLocation.z) + 1); const width = Math.round(canvasRectangle.width); const height = Math.round(canvasRectangle.height); const bounds = this.getCanvasBoundingRectangle(canvasId); - if(bounds && ((bounds.right < 0) || (bounds.bottom < 0) || (bounds.left >= width) || (bounds.top >= height))) + if (bounds && ((bounds.right < 0) || (bounds.bottom < 0) || (bounds.left >= width) || (bounds.top >= height))) { roomCamera.reset(); } - if((roomCamera.screenWd !== width) || (roomCamera.screenHt !== height) || (roomCamera.scale !== roomGeometry.scale) || (roomCamera.geometryUpdateId !== roomGeometry.updateId) || !Vector3d.isEqual(objectLocation, roomCamera.targetObjectLoc) || roomCamera.isMoving) + if ((roomCamera.screenWd !== width) || (roomCamera.screenHt !== height) || (roomCamera.scale !== roomGeometry.scale) || (roomCamera.geometryUpdateId !== roomGeometry.updateId) || !Vector3d.isEqual(objectLocation, roomCamera.targetObjectLoc) || roomCamera.isMoving) { roomCamera.targetObjectLoc = objectLocation; @@ -1170,17 +1170,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let _local_32 = 0; let _local_33 = roomGeometry.getScreenPoint(new Vector3d(_local_20, _local_21, _local_22)); - if(!_local_33) return; + if (!_local_33) return; _local_33.x = (_local_33.x + Math.round((canvasRectangle.width / 2))); _local_33.y = (_local_33.y + Math.round((canvasRectangle.height / 2))); - if(bounds) + if (bounds) { bounds.x += -(renderingCanvas.screenOffsetX); bounds.y += -(renderingCanvas.screenOffsetY); - if(((bounds.width > 1) && (bounds.height > 1))) + if (((bounds.width > 1) && (bounds.height > 1))) { _local_29 = (((bounds.left - _local_33.x) - (roomGeometry.scale * 0.25)) / _local_24); _local_31 = (((bounds.right - _local_33.x) + (roomGeometry.scale * 0.25)) / _local_24); @@ -1207,7 +1207,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let _local_37 = false; const _local_38 = Math.round(((_local_31 - _local_29) * _local_24)); - if(_local_38 < canvasRectangle.width) + if (_local_38 < canvasRectangle.width) { _local_10 = 2; _local_23.x = ((_local_31 + _local_29) / 2); @@ -1215,19 +1215,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if(_local_23.x > (_local_31 - _local_27)) + if (_local_23.x > (_local_31 - _local_27)) { _local_23.x = (_local_31 - _local_27); _local_34 = true; } - if(_local_23.x < (_local_29 + _local_27)) + if (_local_23.x < (_local_29 + _local_27)) { _local_23.x = (_local_29 + _local_27); _local_34 = true; } } const _local_39 = Math.round(((_local_32 - _local_30) * _local_25)); - if(_local_39 < canvasRectangle.height) + if (_local_39 < canvasRectangle.height) { _local_10 = 2; _local_23.y = ((_local_32 + _local_30) / 2); @@ -1235,17 +1235,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if(_local_23.y > (_local_32 - _local_28)) + if (_local_23.y > (_local_32 - _local_28)) { _local_23.y = (_local_32 - _local_28); _local_35 = true; } - if(_local_23.y < (_local_30 + _local_28)) + if (_local_23.y < (_local_30 + _local_28)) { _local_23.y = (_local_30 + _local_28); _local_35 = true; } - if(_local_35) + if (_local_35) { _local_23.y = (_local_23.y / (_local_25 / _local_24)); } @@ -1259,23 +1259,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let _local_42 = 0.2; const _local_43 = 10; const _local_44 = 10; - if((_local_42 * width) > 100) + if ((_local_42 * width) > 100) { _local_42 = (100 / width); } - if((_local_40 * height) > 150) + if ((_local_40 * height) > 150) { _local_40 = (150 / height); } - if((_local_41 * height) > 150) + if ((_local_41 * height) > 150) { _local_41 = (150 / height); } - if((((roomCamera.limitedLocationX) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) + if ((((roomCamera.limitedLocationX) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) { _local_42 = 0; } - if((((roomCamera.limitedLocationY) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) + if ((((roomCamera.limitedLocationY) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) { _local_40 = 0; _local_41 = 0; @@ -1284,17 +1284,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato canvasRectangle.width = (canvasRectangle.width * (1 - (_local_42 * 2))); canvasRectangle.height = (canvasRectangle.height * (1 - (_local_40 + _local_41))); - if(canvasRectangle.width < _local_43) + if (canvasRectangle.width < _local_43) { canvasRectangle.width = _local_43; } - if(canvasRectangle.height < _local_44) + if (canvasRectangle.height < _local_44) { canvasRectangle.height = _local_44; } - if((_local_40 + _local_41) > 0) + if ((_local_40 + _local_41) > 0) { canvasRectangle.x += (-(canvasRectangle.width) / 2); canvasRectangle.y += (-(canvasRectangle.height) * (_local_41 / (_local_40 + _local_41))); @@ -1307,19 +1307,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato _local_33 = roomGeometry.getScreenPoint(_local_15); - if(!_local_33) return; + if (!_local_33) return; - if(_local_33) + if (_local_33) { _local_33.x = (_local_33.x + renderingCanvas.screenOffsetX); _local_33.y = (_local_33.y + renderingCanvas.screenOffsetY); _local_15.z = _local_10; _local_15.x = (Math.round((_local_23.x * 2)) / 2); _local_15.y = (Math.round((_local_23.y * 2)) / 2); - if(!roomCamera.location) + if (!roomCamera.location) { roomGeometry.location = _local_15; - if(this.useOffsetScrolling) + if (this.useOffsetScrolling) { roomCamera.initializeLocation(new Vector3d(0, 0, 0)); } @@ -1330,16 +1330,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } const _local_45 = roomGeometry.getScreenPoint(_local_15); const _local_46 = new Vector3d(0, 0, 0); - if(_local_45) + if (_local_45) { _local_46.x = _local_45.x; _local_46.y = _local_45.y; } - if(((((((((_local_33.x < canvasRectangle.left) || (_local_33.x > canvasRectangle.right)) && (!(roomCamera.centeredLocX))) || (((_local_33.y < canvasRectangle.top) || (_local_33.y > canvasRectangle.bottom)) && (!(roomCamera.centeredLocY)))) || (((_local_36) && (!(roomCamera.centeredLocX))) && (!(roomCamera.screenWd == width)))) || (((_local_37) && (!(roomCamera.centeredLocY))) && (!(roomCamera.screenHt == height)))) || ((!(roomCamera.roomWd == bounds.width)) || (!(roomCamera.roomHt == bounds.height)))) || ((!(roomCamera.screenWd == width)) || (!(roomCamera.screenHt == height))))) + if (((((((((_local_33.x < canvasRectangle.left) || (_local_33.x > canvasRectangle.right)) && (!(roomCamera.centeredLocX))) || (((_local_33.y < canvasRectangle.top) || (_local_33.y > canvasRectangle.bottom)) && (!(roomCamera.centeredLocY)))) || (((_local_36) && (!(roomCamera.centeredLocX))) && (!(roomCamera.screenWd == width)))) || (((_local_37) && (!(roomCamera.centeredLocY))) && (!(roomCamera.screenHt == height)))) || ((!(roomCamera.roomWd == bounds.width)) || (!(roomCamera.roomHt == bounds.height)))) || ((!(roomCamera.screenWd == width)) || (!(roomCamera.screenHt == height))))) { roomCamera.limitedLocationX = _local_34; roomCamera.limitedLocationY = _local_35; - if(this.useOffsetScrolling) + if (this.useOffsetScrolling) { roomCamera.target = _local_46; } @@ -1350,9 +1350,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if(!_local_34) roomCamera.limitedLocationX = false; + if (!_local_34) roomCamera.limitedLocationX = false; - if(!_local_35) roomCamera.limitedLocationY = false; + if (!_local_35) roomCamera.limitedLocationY = false; } } @@ -1365,9 +1365,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato roomCamera.roomWd = bounds.width; roomCamera.roomHt = bounds.height; - if(!this._sessionDataManager.isCameraFollowDisabled) + if (!this._sessionDataManager.isCameraFollowDisabled) { - if(this.useOffsetScrolling) + if (this.useOffsetScrolling) { roomCamera.update(time, 8); } @@ -1377,7 +1377,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if(this.useOffsetScrolling) + if (this.useOffsetScrolling) { this.setRoomInstanceRenderingCanvasOffset(this.activeRoomId, 1, new Point(-(roomCamera.location.x), -(roomCamera.location.y))); } @@ -1399,7 +1399,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(!canvas) return null; + if (!canvas) return null; return new Rectangle(0, 0, canvas.width, canvas.height); } @@ -1408,22 +1408,22 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const geometry = this.getRoomInstanceGeometry(roomId, canvasId); - if(!geometry) return null; + if (!geometry) return null; const roomObject = this.getRoomObject(roomId, objectId, category); - if(!roomObject) return null; + if (!roomObject) return null; const visualization = roomObject.visualization; - if(!visualization) return null; + if (!visualization) return null; const rectangle = visualization.getBoundingRectangle(); const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); const scale = ((canvas) ? canvas.scale : 1); const screenPoint = geometry.getScreenPoint(roomObject.getLocation()); - if(!screenPoint) return null; + if (!screenPoint) return null; screenPoint.x = Math.round(screenPoint.x); screenPoint.y = Math.round(screenPoint.y); @@ -1439,7 +1439,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato rectangle.x += screenPoint.x; rectangle.y += screenPoint.y; - if(!canvas) return null; + if (!canvas) return null; rectangle.x += (Math.round(canvas.width / 2) + canvas.screenOffsetX); rectangle.y += (Math.round(canvas.height / 2) + canvas.screenOffsetY); @@ -1454,28 +1454,28 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getFurnitureFloorName(typeId: number): string { - if(!this._roomContentLoader) return null; + if (!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureFloorNameForTypeId(typeId); } public getFurnitureWallName(typeId: number, extra: string = null): string { - if(!this._roomContentLoader) return null; + if (!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureWallNameForTypeId(typeId, extra); } public getFurnitureFloorColorIndex(typeId: number): number { - if(!this._roomContentLoader) return null; + if (!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureFloorColorIndex(typeId); } public getFurnitureWallColorIndex(typeId: number): number { - if(!this._roomContentLoader) return null; + if (!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureWallColorIndex(typeId); } @@ -1484,7 +1484,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const existing = this._roomInstanceDatas.get(roomId); - if(existing) return existing; + if (existing) return existing; const data = new RoomInstanceData(roomId); @@ -1497,7 +1497,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; return instanceData.modelName; } @@ -1506,7 +1506,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return; + if (!instanceData) return; instanceData.setModelName(name); } @@ -1515,7 +1515,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstanceData(k); - if(!roomInstance) return null; + if (!roomInstance) return null; return roomInstance.tileObjectMap; } @@ -1529,7 +1529,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; return instanceData.roomCamera; } @@ -1538,7 +1538,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; return instanceData.selectedObject; } @@ -1547,18 +1547,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; instanceData.setSelectedObject(data); - if(data) instanceData.setPlacedObject(null); + if (data) instanceData.setPlacedObject(null); } public getPlacedRoomObjectData(roomId: number): ISelectedRoomObjectData { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; return instanceData.placedObject; } @@ -1567,14 +1567,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; instanceData.setPlacedObject(data); } public cancelRoomObjectPlacement(): void { - if(!this._roomObjectEventHandler) return; + if (!this._roomObjectEventHandler) return; this._roomObjectEventHandler.cancelRoomObjectPlacement(this._activeRoomId); } @@ -1583,7 +1583,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; return instanceData.furnitureStackingHeightMap; } @@ -1592,7 +1592,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; instanceData.setFurnitureStackingHeightMap(heightMap); } @@ -1601,7 +1601,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return null; + if (!instanceData) return null; return instanceData.legacyGeometry; } @@ -1610,7 +1610,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; return instance.createRoomObjectAndInitalize(objectId, type, category) as IRoomObjectController; } @@ -1619,18 +1619,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return 0; + if (!instance) return 0; return instance.getTotalObjectsForManager(category); } public getRoomObject(roomId: number, objectId: number, category: number): IRoomObjectController { - if(!this._ready) return null; + if (!this._ready) return null; let roomIdString = this.getRoomId(roomId); - if(roomId === 0) roomIdString = RoomEngine.TEMPORARY_ROOM; + if (roomId === 0) roomIdString = RoomEngine.TEMPORARY_ROOM; return this.getObject(roomIdString, objectId, category); } @@ -1639,15 +1639,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let roomInstance: IRoomInstance = null; - if(this._roomManager) roomInstance = this._roomManager.getRoomInstance(roomId); + if (this._roomManager) roomInstance = this._roomManager.getRoomInstance(roomId); - if(!roomInstance) return null; + if (!roomInstance) return null; let roomObject = (roomInstance.getRoomObject(objectId, category) as IRoomObjectController); - if(!roomObject) + if (!roomObject) { - switch(category) + switch (category) { case RoomObjectCategory.FLOOR: this.processPendingFurnitureFloor(this.getRoomIdFromString(roomId), objectId, null); @@ -1669,14 +1669,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; return instance.getRoomObjectByIndex(index, category) as IRoomObjectController; } public getRoomObjectCategoryForType(type: string): number { - if(!type || !this._roomContentLoader) return RoomObjectCategory.MINIMUM; + if (!type || !this._roomContentLoader) return RoomObjectCategory.MINIMUM; return this._roomContentLoader.getCategoryForType(type); } @@ -1725,21 +1725,21 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstanceData = this.getRoomInstanceData(roomId); - if(roomInstanceData) roomInstanceData.removePendingFunitureFloor(objectId); + if (roomInstanceData) roomInstanceData.removePendingFunitureFloor(objectId); - if(this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) + if (this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) { const roomObject = this.getRoomObject(roomId, objectId, RoomObjectCategory.FLOOR); - if(roomObject) + if (roomObject) { const screenLocation = this.getRoomObjectScreenLocation(roomId, objectId, RoomObjectCategory.FLOOR, this._activeRoomActiveCanvas); - if(screenLocation) + if (screenLocation) { const disabledPickingAnimation = (roomObject.model.getValue(RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) === 1); - if(!disabledPickingAnimation) + if (!disabledPickingAnimation) { const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); const extras = roomObject.model.getValue(RoomObjectVariable.FURNITURE_EXTRAS); @@ -1747,11 +1747,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const objectData = ObjectDataFactory.getData(dataKey); const icon = this.getFurnitureFloorIcon(typeId, null, extras, objectData).data; - if(icon) + if (icon) { const image = TextureUtils.generateImage(icon); - if(this.events) + if (this.events) { const event = new NitroToolbarAnimateIconEvent(image, screenLocation.x, screenLocation.y); @@ -1768,7 +1768,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.removeRoomObject(roomId, objectId, RoomObjectCategory.FLOOR); this.setMouseDefault(roomId, RoomObjectCategory.FLOOR, objectId); - if(_arg_4) this.refreshTileObjectMap(roomId, 'RoomEngine.disposeObjectFurniture()'); + if (_arg_4) this.refreshTileObjectMap(roomId, 'RoomEngine.disposeObjectFurniture()'); } public getRoomObjectWall(roomId: number, objectId: number): IRoomObjectController @@ -1778,25 +1778,25 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public removeRoomObjectWall(roomId: number, objectId: number, userId: number = -1): void { - if(this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) + if (this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) { const roomObject = this.getRoomObject(roomId, objectId, RoomObjectCategory.WALL); - if(roomObject && (roomObject.type.indexOf('post_it') === -1) && (roomObject.type.indexOf('external_image_wallitem') === -1)) + if (roomObject && (roomObject.type.indexOf('post_it') === -1) && (roomObject.type.indexOf('external_image_wallitem') === -1)) { const screenLocation = this.getRoomObjectScreenLocation(roomId, objectId, RoomObjectCategory.WALL, this._activeRoomActiveCanvas); - if(screenLocation) + if (screenLocation) { const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); const objectData = roomObject.model.getValue(RoomObjectVariable.FURNITURE_DATA); const icon = this.getFurnitureWallIcon(typeId, null, objectData).data; - if(icon) + if (icon) { const image = TextureUtils.generateImage(icon); - if(this.events) + if (this.events) { const event = new NitroToolbarAnimateIconEvent(image, screenLocation.x, screenLocation.y); @@ -1823,18 +1823,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; instance.removeRoomObject(objectId, category); - if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REMOVED, roomId, objectId, category)); + if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REMOVED, roomId, objectId, category)); } public addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra: number = NaN, expires: number = -1, usagePolicy: number = 0, ownerId: number = 0, ownerName: string = '', synchronized: boolean = true, realRoomObject: boolean = true, sizeZ: number = -1): boolean { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return false; + if (!instanceData) return false; const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ); @@ -1847,7 +1847,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return false; + if (!instanceData) return false; const furnitureData = new RoomFurnitureData(id, 0, typeName, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ); @@ -1860,7 +1860,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if(!instanceData) return false; + if (!instanceData) return false; const objectData = new LegacyDataType(); @@ -1877,7 +1877,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectFloor(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new RoomObjectUpdateMessage(location, direction)); object.processUpdateMessage(new ObjectDataUpdateMessage(state, data, extra)); @@ -1889,7 +1889,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectWall(roomId, objectId); - if(!object || !object.logic) return false; + if (!object || !object.logic) return false; const updateMessage = new RoomObjectUpdateMessage(location, direction); const data = new LegacyDataType(); @@ -1909,7 +1909,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectWall(roomId, objectId); - if(!object || !object.logic) return false; + if (!object || !object.logic) return false; object.logic.processUpdateMessage(new ObjectItemDataUpdateMessage(data)); @@ -1920,7 +1920,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectFloor(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectHeightUpdateMessage(null, null, height)); @@ -1931,10 +1931,10 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectFloor(roomId, objectId); - if(!object) return false; + if (!object) return false; object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRY_TIME, expires); - object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, Nitro.instance.time); + object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, GetTickerTime()); return true; } @@ -1943,10 +1943,10 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectWall(roomId, objectId); - if(!object) return false; + if (!object) return false; object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRY_TIME, expires); - object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, Nitro.instance.time); + object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, GetTickerTime()); return true; } @@ -1958,14 +1958,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let maskUpdate: ObjectRoomMaskUpdateMessage = null; - if(roomObject && roomObject.model) + if (roomObject && roomObject.model) { - if(roomObject.model.getValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK) > 0) + if (roomObject.model.getValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK) > 0) { const maskType = roomObject.model.getValue(RoomObjectVariable.FURNITURE_PLANE_MASK_TYPE); const location = roomObject.getLocation(); - if(_arg_3) maskUpdate = new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.ADD_MASK, maskName, maskType, location); + if (_arg_3) maskUpdate = new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.ADD_MASK, maskName, maskType, location); else maskUpdate = new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.REMOVE_MASK, maskName); } } @@ -1976,14 +1976,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const roomOwnObject = this.getRoomOwnObject(roomId); - if(roomOwnObject && roomOwnObject.logic && maskUpdate) roomOwnObject.logic.processUpdateMessage(maskUpdate); + if (roomOwnObject && roomOwnObject.logic && maskUpdate) roomOwnObject.logic.processUpdateMessage(maskUpdate); } public rollRoomObjectFloor(roomId: number, objectId: number, location: IVector3D, targetLocation: IVector3D): void { const object = this.getRoomObjectFloor(roomId, objectId); - if(!object) return; + if (!object) return; object.processUpdateMessage(new ObjectMoveUpdateMessage(location, targetLocation, null, !!targetLocation)); } @@ -1992,9 +1992,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getRoomObjectWall(roomId, objectId); - if(!roomObject) return false; + if (!roomObject) return false; - if(roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectMoveUpdateMessage(location, null, null)); + if (roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectMoveUpdateMessage(location, null, null)); this.updateRoomObjectMask(roomId, objectId); @@ -2005,23 +2005,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const existing = this.getRoomObjectUser(roomId, objectId); - if(existing) return false; + if (existing) return false; let objectType = RoomObjectUserType.getTypeString(type); - if(objectType === RoomObjectUserType.PET) objectType = this.getPetType(figure); + if (objectType === RoomObjectUserType.PET) objectType = this.getPetType(figure); const object = this.createRoomObjectUser(roomId, objectId, objectType); - if(!object) return false; + if (!object) return false; //object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT_ENABLE, 1); object.processUpdateMessage(new ObjectAvatarUpdateMessage(this.fixedUserLocation(roomId, location), null, direction, headDirection, false, 0)); - if(figure) object.processUpdateMessage(new ObjectAvatarFigureUpdateMessage(figure)); + if (figure) object.processUpdateMessage(new ObjectAvatarFigureUpdateMessage(figure)); - if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, objectId, RoomObjectCategory.UNIT)); + if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, objectId, RoomObjectCategory.UNIT)); return true; } @@ -2030,19 +2030,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; - if(!location) location = object.getLocation(); + if (!location) location = object.getLocation(); - if(!direction) direction = object.getDirection(); + if (!direction) direction = object.getDirection(); - if(isNaN(headDirection)) headDirection = object.model.getValue(RoomObjectVariable.HEAD_DIRECTION); + if (isNaN(headDirection)) headDirection = object.model.getValue(RoomObjectVariable.HEAD_DIRECTION); object.processUpdateMessage(new ObjectAvatarUpdateMessage(this.fixedUserLocation(roomId, location), this.fixedUserLocation(roomId, targetLocation), direction, headDirection, canStandUp, baseY)); const roomSession = ((this._roomSessionManager && this._roomSessionManager.getSession(roomId)) || null); - if(roomSession && (roomSession.ownRoomIndex === objectId)) + if (roomSession && (roomSession.ownRoomIndex === objectId)) { this._logicFactory.events.dispatchEvent(new RoomToObjectOwnAvatarMoveEvent(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, targetLocation)); } @@ -2052,18 +2052,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private fixedUserLocation(roomId: number, location: IVector3D): IVector3D { - if(!location) return null; + if (!location) return null; const heightMap = this.getFurnitureStackingHeightMap(roomId); const wallGeometry = this.getLegacyWallGeometry(roomId); - if(!heightMap || !wallGeometry) return location; + if (!heightMap || !wallGeometry) return location; let _local_5 = location.z; const _local_6 = heightMap.getTileHeight(location.x, location.y); const _local_7 = wallGeometry.getHeight(location.x, location.y); - if((Math.abs((_local_5 - _local_6)) < 0.1) && (Math.abs((_local_6 - _local_7)) < 0.1)) + if ((Math.abs((_local_5 - _local_6)) < 0.1) && (Math.abs((_local_6 - _local_7)) < 0.1)) { _local_5 = wallGeometry.getFloorAltitude(location.x, location.y); } @@ -2075,11 +2075,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; let message: ObjectStateUpdateMessage = null; - switch(action) + switch (action) { case RoomObjectVariable.FIGURE_TALK: message = new ObjectAvatarChatUpdateMessage(value); @@ -2122,7 +2122,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato break; } - if(!message) return false; + if (!message) return false; object.processUpdateMessage(message); @@ -2133,7 +2133,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectAvatarFigureUpdateMessage(figure, gender, subType, isRiding)); @@ -2144,7 +2144,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectAvatarFlatControlUpdateMessage(parseInt(level))); @@ -2155,7 +2155,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectAvatarEffectUpdateMessage(effectId, delay)); @@ -2166,7 +2166,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectAvatarGestureUpdateMessage(gestureId)); @@ -2177,7 +2177,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectAvatarPetGestureUpdateMessage(gesture)); @@ -2188,7 +2188,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return false; + if (!object) return false; object.processUpdateMessage(new ObjectAvatarPostureUpdateMessage(type, parameter)); @@ -2199,7 +2199,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if(!object) return; + if (!object) return; object.processUpdateMessage(new ObjectAvatarOwnMessage()); } @@ -2208,11 +2208,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getRoomObject(this._activeRoomId, objectId, category); - if(roomObject) + if (roomObject) { const eventHandler = roomObject.logic; - if(eventHandler) + if (eventHandler) { eventHandler.useObject(); @@ -2227,18 +2227,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const id = this.getRoomIdFromString(roomId); - if(category === RoomObjectCategory.WALL) + if (category === RoomObjectCategory.WALL) { this.updateRoomObjectMask(id, objectId); } const object = this.getRoomObject(id, objectId, category); - if(object && object.model && object.logic) + if (object && object.model && object.logic) { const dataFormat = object.model.getValue(RoomObjectVariable.FURNITURE_DATA_FORMAT); - if(!isNaN(dataFormat)) + if (!isNaN(dataFormat)) { const data = ObjectDataFactory.getData(dataFormat); @@ -2250,14 +2250,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.CONTENT_UPDATED, id, objectId, category)); } - if(roomId !== RoomEngine.TEMPORARY_ROOM) this.addObjectToTileMap(id, object); + if (roomId !== RoomEngine.TEMPORARY_ROOM) this.addObjectToTileMap(id, object); } public changeObjectModelData(roomId: number, objectId: number, category: number, numberKey: string, numberValue: number): boolean { const roomObject = this.getObject(this.getRoomId(roomId), objectId, category); - if(!roomObject || !roomObject.logic) return false; + if (!roomObject || !roomObject.logic) return false; const message = new ObjectModelDataUpdateMessage(numberKey, numberValue); @@ -2270,11 +2270,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getObject(this.getRoomId(roomId), objectId, category); - if(!roomObject || !roomObject.model) return; + if (!roomObject || !roomObject.model) return; let stateIndex = roomObject.model.getValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX); - if(isNaN(stateIndex)) stateIndex = 1; + if (isNaN(stateIndex)) stateIndex = 1; else stateIndex = (stateIndex + 1); roomObject.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, stateIndex); @@ -2284,44 +2284,44 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato objectData.initializeFromRoomObjectModel(roomObject.model); - if(roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectDataUpdateMessage(stateIndex, objectData)); + if (roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectDataUpdateMessage(stateIndex, objectData)); } public loadRoomObjectBadgeImage(roomId: number, objectId: number, objectCategory: number, badgeId: string, groupBadge: boolean = true): void { - if(!this._sessionDataManager) return; + if (!this._sessionDataManager) return; let roomObject: IRoomObjectController = null; - if(roomId === 0) + if (roomId === 0) { const room = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if(room) roomObject = (room.getRoomObject(objectId, objectCategory) as IRoomObjectController); + if (room) roomObject = (room.getRoomObject(objectId, objectCategory) as IRoomObjectController); } else { roomObject = this.getRoomObjectFloor(roomId, objectId); } - if(!roomObject || !roomObject.logic) return; + if (!roomObject || !roomObject.logic) return; let badgeName = (groupBadge) ? this._sessionDataManager.loadGroupBadgeImage(badgeId) : this._sessionDataManager.loadBadgeImage(badgeId); - if(!badgeName) + if (!badgeName) { badgeName = 'loading_icon'; - if(!this._badgeListenerObjects) this._badgeListenerObjects = new Map(); + if (!this._badgeListenerObjects) this._badgeListenerObjects = new Map(); - if(!this._badgeListenerObjects.size) + if (!this._badgeListenerObjects.size) { this._sessionDataManager.events.addEventListener(BadgeImageReadyEvent.IMAGE_READY, this.onBadgeImageReadyEvent); } let listeners = this._badgeListenerObjects.get(badgeId); - if(!listeners) listeners = []; + if (!listeners) listeners = []; listeners.push(new RoomObjectBadgeImageAssetListener(roomObject, groupBadge)); @@ -2337,26 +2337,26 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private onBadgeImageReadyEvent(k: BadgeImageReadyEvent): void { - if(!this._sessionDataManager) return; + if (!this._sessionDataManager) return; const listeners = this._badgeListenerObjects && this._badgeListenerObjects.get(k.badgeId); - if(!listeners) return; + if (!listeners) return; - for(const listener of listeners) + for (const listener of listeners) { - if(!listener) continue; + if (!listener) continue; this.putBadgeInObjectAssets(listener.object, k.badgeId, listener.groupBadge); const badgeName = (listener.groupBadge) ? this._sessionDataManager.loadGroupBadgeImage(k.badgeId) : this._sessionDataManager.loadBadgeImage(k.badgeId); - if(listener.object && listener.object.logic) listener.object.logic.processUpdateMessage(new ObjectGroupBadgeUpdateMessage(k.badgeId, badgeName)); + if (listener.object && listener.object.logic) listener.object.logic.processUpdateMessage(new ObjectGroupBadgeUpdateMessage(k.badgeId, badgeName)); } this._badgeListenerObjects.delete(k.badgeId); - if(!this._badgeListenerObjects.size) + if (!this._badgeListenerObjects.size) { this._sessionDataManager.events.removeEventListener(BadgeImageReadyEvent.IMAGE_READY, this.onBadgeImageReadyEvent); } @@ -2364,24 +2364,24 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private putBadgeInObjectAssets(object: IRoomObjectController, badgeId: string, groupBadge: boolean = false): void { - if(!this._roomContentLoader || !this._sessionDataManager) return; + if (!this._roomContentLoader || !this._sessionDataManager) return; const badgeName = (groupBadge) ? this._sessionDataManager.loadGroupBadgeImage(badgeId) : this._sessionDataManager.loadBadgeImage(badgeId); const badgeImage = (groupBadge) ? this._sessionDataManager.getGroupBadgeImage(badgeId) : this._sessionDataManager.getBadgeImage(badgeId); - if(badgeImage) this._roomContentLoader.addAssetToCollection(object.type, badgeName, badgeImage, false); + if (badgeImage) this._roomContentLoader.addAssetToCollection(object.type, badgeName, badgeImage, false); } public dispatchMouseEvent(canvasId: number, x: number, y: number, type: string, altKey: boolean, ctrlKey: boolean, shiftKey: boolean, buttonDown: boolean): void { const canvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, canvasId); - if(!canvas) return; + if (!canvas) return; const overlay = this.getRenderingCanvasOverlay(canvas); const sprite = this.getOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE); - if(sprite) + if (sprite) { const rectangle = sprite.getLocalBounds(); @@ -2389,15 +2389,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato sprite.y = (y - (rectangle.height / 2)); } - if(!this.handleRoomDragging(canvas, x, y, type, altKey, ctrlKey, shiftKey)) + if (!this.handleRoomDragging(canvas, x, y, type, altKey, ctrlKey, shiftKey)) { - if(!canvas.handleMouseEvent(x, y, type, altKey, ctrlKey, shiftKey, buttonDown)) + if (!canvas.handleMouseEvent(x, y, type, altKey, ctrlKey, shiftKey, buttonDown)) { let eventType: string = null; - if(type === MouseEventType.MOUSE_CLICK) + if (type === MouseEventType.MOUSE_CLICK) { - if(this.events) + if (this.events) { this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, this._activeRoomId, -1, RoomObjectCategory.MINIMUM)); } @@ -2406,13 +2406,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if(type === MouseEventType.MOUSE_MOVE) eventType = RoomObjectMouseEvent.MOUSE_MOVE; + if (type === MouseEventType.MOUSE_MOVE) eventType = RoomObjectMouseEvent.MOUSE_MOVE; - else if(type === MouseEventType.MOUSE_DOWN) eventType = RoomObjectMouseEvent.MOUSE_DOWN; + else if (type === MouseEventType.MOUSE_DOWN) eventType = RoomObjectMouseEvent.MOUSE_DOWN; - else if(type === MouseEventType.MOUSE_DOWN_LONG) eventType = RoomObjectMouseEvent.MOUSE_DOWN_LONG; + else if (type === MouseEventType.MOUSE_DOWN_LONG) eventType = RoomObjectMouseEvent.MOUSE_DOWN_LONG; - else if(type === MouseEventType.MOUSE_UP) eventType = RoomObjectMouseEvent.MOUSE_UP; + else if (type === MouseEventType.MOUSE_UP) eventType = RoomObjectMouseEvent.MOUSE_UP; } this._roomObjectEventHandler.handleRoomObjectEvent(new RoomObjectMouseEvent(eventType, this.getRoomObject(this._activeRoomId, RoomEngine.ROOM_OBJECT_ID, RoomObjectCategory.ROOM), null, altKey), this._activeRoomId); @@ -2429,11 +2429,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let offsetX = (x - this._activeRoomActiveCanvasMouseX); let offsetY = (y - this._activeRoomActiveCanvasMouseY); - if(type === MouseEventType.MOUSE_DOWN) + if (type === MouseEventType.MOUSE_DOWN) { - if(!altKey && !ctrlKey && !shiftKey && !this.isDecorating) + if (!altKey && !ctrlKey && !shiftKey && !this.isDecorating) { - if(this._roomAllowsDragging) + if (this._roomAllowsDragging) { this._activeRoomIsDragged = true; this._activeRoomWasDragged = false; @@ -2443,25 +2443,25 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - else if(type === MouseEventType.MOUSE_UP) + else if (type === MouseEventType.MOUSE_UP) { - if(this._activeRoomIsDragged) + if (this._activeRoomIsDragged) { this._activeRoomIsDragged = false; - if(this._activeRoomWasDragged) + if (this._activeRoomWasDragged) { const instanceData = this.getRoomInstanceData(this._activeRoomId); - if(instanceData) + if (instanceData) { const camera = instanceData.roomCamera; - if(camera) + if (camera) { - if(this.useOffsetScrolling) + if (this.useOffsetScrolling) { - if(!camera.isMoving) + if (!camera.isMoving) { camera.centeredLocX = false; camera.centeredLocY = false; @@ -2470,23 +2470,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato camera.resetLocation(new Vector3d(-(canvas.screenOffsetX), -(canvas.screenOffsetY))); } - if(this._roomDraggingAlwaysCenters) camera.reset(); + if (this._roomDraggingAlwaysCenters) camera.reset(); } } } } } - else if(type === MouseEventType.MOUSE_MOVE) + else if (type === MouseEventType.MOUSE_MOVE) { - if(this._activeRoomIsDragged) + if (this._activeRoomIsDragged) { - if(!this._activeRoomWasDragged) + if (!this._activeRoomWasDragged) { offsetX = (x - this._activeRoomDragStartX); offsetY = (y - this._activeRoomDragStartY); - if(((((offsetX <= -(RoomEngine.DRAG_THRESHOLD)) || (offsetX >= RoomEngine.DRAG_THRESHOLD)) || (offsetY <= -(RoomEngine.DRAG_THRESHOLD))) || (offsetY >= RoomEngine.DRAG_THRESHOLD))) + if (((((offsetX <= -(RoomEngine.DRAG_THRESHOLD)) || (offsetX >= RoomEngine.DRAG_THRESHOLD)) || (offsetY <= -(RoomEngine.DRAG_THRESHOLD))) || (offsetY >= RoomEngine.DRAG_THRESHOLD))) { this._activeRoomWasDragged = true; } @@ -2495,7 +2495,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato offsetY = 0; } - if(((!(offsetX == 0)) || (!(offsetY == 0)))) + if (((!(offsetX == 0)) || (!(offsetY == 0)))) { this._activeRoomDragX += offsetX; this._activeRoomDragY += offsetY; @@ -2505,11 +2505,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - else if((type === MouseEventType.MOUSE_CLICK) || (type === MouseEventType.DOUBLE_CLICK)) + else if ((type === MouseEventType.MOUSE_CLICK) || (type === MouseEventType.DOUBLE_CLICK)) { this._activeRoomIsDragged = false; - if(this._activeRoomWasDragged) + if (this._activeRoomWasDragged) { this._activeRoomWasDragged = false; @@ -2524,7 +2524,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const category = this.getRoomObjectCategoryForType(objectType); - switch(type) + switch (type) { case RoomObjectFurnitureActionEvent.MOUSE_BUTTON: this.setMouseButton(this._activeRoomId, category, objectId); @@ -2537,67 +2537,67 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private setMouseButton(roomId: number, category: number, objectId: number): void { - if(!this._roomSessionManager) return; + if (!this._roomSessionManager) return; const session = this._roomSessionManager.getSession(roomId); - if(!session) return; + if (!session) return; - if(((category !== RoomObjectCategory.FLOOR) && (category !== RoomObjectCategory.WALL)) || ((session.controllerLevel >= RoomControllerLevel.GUEST))) + if (((category !== RoomObjectCategory.FLOOR) && (category !== RoomObjectCategory.WALL)) || ((session.controllerLevel >= RoomControllerLevel.GUEST))) { const instanceData = this.getRoomInstanceData(roomId); - if(instanceData) + if (instanceData) { - if(instanceData.addButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; + if (instanceData.addButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; } } } private setMouseDefault(roomId: number, category: number, objectId: number): void { - if(!this._roomSessionManager) return; + if (!this._roomSessionManager) return; const instanceData = this.getRoomInstanceData(roomId); - if(instanceData) + if (instanceData) { - if(instanceData.removeButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; + if (instanceData.removeButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; } } public processRoomObjectOperation(objectId: number, category: number, operation: string): boolean { - if(!this._roomObjectEventHandler) return false; + if (!this._roomObjectEventHandler) return false; this._roomObjectEventHandler.modifyRoomObject(this._activeRoomId, objectId, category, operation); } public modifyRoomObjectDataWithMap(objectId: number, category: number, operation: string, data: Map): boolean { - if(!this._roomObjectEventHandler) return false; + if (!this._roomObjectEventHandler) return false; - if(category !== RoomObjectCategory.FLOOR) return; + if (category !== RoomObjectCategory.FLOOR) return; this._roomObjectEventHandler.modifyRoomObjectDataWithMap(this._activeRoomId, objectId, category, operation, data); } public modifyRoomObjectData(objectId: number, category: number, colorHex: string, data: string): boolean { - if(!this._roomObjectEventHandler) return false; + if (!this._roomObjectEventHandler) return false; - if(category !== RoomObjectCategory.WALL) return; + if (category !== RoomObjectCategory.WALL) return; this._roomObjectEventHandler.modifyWallItemData(this._activeRoomId, objectId, colorHex, data); } private processRoomObjectEvent(event: RoomObjectEvent): void { - if(!this._roomObjectEventHandler) return; + if (!this._roomObjectEventHandler) return; const roomIdString = this.getRoomObjectRoomId(event.object); - if(!roomIdString) return; + if (!roomIdString) return; const roomId = this.getRoomIdFromString(roomIdString); @@ -2608,32 +2608,32 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstance(this._activeRoomId); - if(!roomInstance || (roomInstance.model.getValue(RoomVariableEnum.ROOM_IS_PUBLIC) !== 0)) return false; + if (!roomInstance || (roomInstance.model.getValue(RoomVariableEnum.ROOM_IS_PUBLIC) !== 0)) return false; - if(!this._roomObjectEventHandler) return false; + if (!this._roomObjectEventHandler) return false; return this._roomObjectEventHandler.processRoomObjectPlacement(placementSource, this._activeRoomId, id, category, typeId, extra, stuffData, state, frameNumber, posture); } public getRoomObjectScreenLocation(roomId: number, objectId: number, objectType: number, canvasId: number = -1): Point { - if(canvasId == -1) canvasId = this._activeRoomActiveCanvas; + if (canvasId == -1) canvasId = this._activeRoomActiveCanvas; const geometry = this.getRoomInstanceGeometry(roomId, canvasId); - if(!geometry) return null; + if (!geometry) return null; const roomObject = this.getRoomObject(roomId, objectId, objectType); - if(!roomObject) return null; + if (!roomObject) return null; const screenPoint = geometry.getScreenPoint(roomObject.getLocation()); - if(!screenPoint) return null; + if (!screenPoint) return null; const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if(!renderingCanvas) return null; + if (!renderingCanvas) return null; screenPoint.x = (screenPoint.x * renderingCanvas.scale); screenPoint.y = (screenPoint.y * renderingCanvas.scale); @@ -2649,32 +2649,32 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public selectRoomObject(roomId: number, objectId: number, objectCategory: number): void { - if(!this._roomObjectEventHandler) return; + if (!this._roomObjectEventHandler) return; this._roomObjectEventHandler.setSelectedObject(roomId, objectId, objectCategory); } public setSelectedAvatar(roomId: number, objectId: number): void { - if(this._roomObjectEventHandler) return; + if (this._roomObjectEventHandler) return; this._roomObjectEventHandler.setSelectedAvatar(roomId, objectId, true); } public cancelRoomObjectInsert(): void { - if(!this._roomObjectEventHandler) return; + if (!this._roomObjectEventHandler) return; this._roomObjectEventHandler.cancelRoomObjectInsert(this._activeRoomId); } private addOverlayIconSprite(k: NitroSprite, _arg_2: string, _arg_3: Texture, scale: number = 1): NitroSprite { - if(!k || !_arg_3) return; + if (!k || !_arg_3) return; let sprite = this.getOverlayIconSprite(k, _arg_2); - if(sprite) return null; + if (sprite) return null; sprite = new NitroSprite(_arg_3); @@ -2689,23 +2689,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public onRoomContentLoaded(id: number, assetName: string, success: boolean): void { - if(!this._roomContentLoader || (id === -1)) return; + if (!this._roomContentLoader || (id === -1)) return; this._thumbnailObjectIdBank.freeNumber((id - 1)); const listeners = this._thumbnailCallbacks.get(assetName); - if(listeners) + if (listeners) { this._thumbnailCallbacks.delete(assetName); const image = this._roomContentLoader.getImage(assetName); - if(image) + if (image) { - for(const listener of listeners) + for (const listener of listeners) { - if(!listener) continue; + if (!listener) continue; listener.imageReady(id, null, image); } @@ -2720,31 +2720,31 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let imageResult: IImageResult = null; const scale = 1; - if(_arg_3) + if (_arg_3) { imageResult = this.getRoomObjectImage(this._activeRoomId, objectId, category, new Vector3d(), 1, null); } else { - if(this._roomContentLoader) + if (this._roomContentLoader) { - if(category === RoomObjectCategory.FLOOR) + if (category === RoomObjectCategory.FLOOR) { type = this._roomContentLoader.getFurnitureFloorNameForTypeId(objectId); colorIndex = this._roomContentLoader.getFurnitureFloorColorIndex(objectId); } - else if(category === RoomObjectCategory.WALL) + else if (category === RoomObjectCategory.WALL) { type = this._roomContentLoader.getFurnitureWallNameForTypeId(objectId, instanceData); colorIndex = this._roomContentLoader.getFurnitureWallColorIndex(objectId); } - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { type = RoomObjectUserType.getTypeString(objectId); - if(type === 'pet') + if (type === 'pet') { type = this.getPetType(instanceData); @@ -2764,11 +2764,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if(!imageResult || !imageResult.data) return; + if (!imageResult || !imageResult.data) return; const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if(!canvas) return; + if (!canvas) return; const overlay = this.getRenderingCanvasOverlay(canvas); @@ -2776,7 +2776,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const _local_15 = this.addOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE, imageResult.data, scale); - if(_local_15) + if (_local_15) { _local_15.x = (this._activeRoomActiveCanvasMouseX - (imageResult.data.width / 2)); _local_15.y = (this._activeRoomActiveCanvasMouseY - (imageResult.data.height / 2)); @@ -2785,7 +2785,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomObjectImage(roomId: number, objectId: number, category: number, direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0): IImageResult { - if(!this._roomManager) return null; + if (!this._roomManager) return null; let id = -1; let type: string = null; @@ -2796,16 +2796,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const roomIdString = this.getRoomId(roomId); const roomInstance = this._roomManager.getRoomInstance(roomIdString); - if(roomInstance) + if (roomInstance) { const roomObject = roomInstance.getRoomObject(objectId, category); - if(roomObject && roomObject.model) + if (roomObject && roomObject.model) { id = roomObject.id; type = roomObject.type; - switch(category) + switch (category) { case RoomObjectCategory.FLOOR: case RoomObjectCategory.WALL: { @@ -2814,7 +2814,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const dataFormat = roomObject.model.getValue(RoomObjectVariable.FURNITURE_DATA_FORMAT); - if(dataFormat !== LegacyDataType.FORMAT_KEY) + if (dataFormat !== LegacyDataType.FORMAT_KEY) { data = ObjectDataFactory.getData(dataFormat); @@ -2838,7 +2838,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if(this._roomContentLoader) + if (this._roomContentLoader) { type = this._roomContentLoader.getFurnitureFloorNameForTypeId(typeId); color = (this._roomContentLoader.getFurnitureFloorColorIndex(typeId).toString()); @@ -2859,7 +2859,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if(this._roomContentLoader) + if (this._roomContentLoader) { type = this._roomContentLoader.getFurnitureWallNameForTypeId(typeId, extra); color = (this._roomContentLoader.getFurnitureWallColorIndex(typeId).toString()); @@ -2880,13 +2880,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if(this._roomContentLoader) + if (this._roomContentLoader) { type = this._roomContentLoader.getFurnitureFloorNameForTypeId(typeId); color = (this._roomContentLoader.getFurnitureFloorColorIndex(typeId).toString()); } - if((scale === 1) && listener) + if ((scale === 1) && listener) { return this.getGenericRoomObjectThumbnail(type, color, listener, extras, objectData); } @@ -2899,13 +2899,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if(this._roomContentLoader) + if (this._roomContentLoader) { type = this._roomContentLoader.getFurnitureWallNameForTypeId(typeId); color = this._roomContentLoader.getFurnitureWallColorIndex(typeId).toString(); } - if((scale === 1) && listener) + if ((scale === 1) && listener) { return this.getGenericRoomObjectThumbnail(type, color, listener, extras, null); } @@ -2918,56 +2918,56 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let value = ((((typeId + ' ') + paletteId) + ' ') + color.toString(16)); - if(headOnly) value = (value + (' ' + 'head')); + if (headOnly) value = (value + (' ' + 'head')); - if(customParts) + if (customParts) { value = (value + (' ' + customParts.length)); - for(const _local_13 of customParts) + for (const _local_13 of customParts) { value = (value + (((((' ' + _local_13.layerId) + ' ') + _local_13.partId) + ' ') + _local_13.paletteId)); } } - if(this._roomContentLoader) type = this._roomContentLoader.getPetNameForType(typeId); + if (this._roomContentLoader) type = this._roomContentLoader.getPetNameForType(typeId); return this.getGenericRoomObjectImage(type, value, direction, scale, listener, bgColor, null, null, -1, -1, posture); } public getGenericRoomObjectImage(type: string, value: string, direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0, extras: string = null, objectData: IObjectData = null, state: number = -1, frameCount: number = -1, posture: string = null, originalId: number = -1): IImageResult { - if(!this._roomManager) return null; + if (!this._roomManager) return null; const imageResult = new ImageResult(); imageResult.id = -1; - if(!this._ready || !type) return imageResult; + if (!this._ready || !type) return imageResult; let roomInstance = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if(!roomInstance) + if (!roomInstance) { roomInstance = this._roomManager.createRoomInstance(RoomEngine.TEMPORARY_ROOM); - if(!roomInstance) return imageResult; + if (!roomInstance) return imageResult; } let objectId = this._imageObjectIdBank.reserveNumber(); const objectCategory = this.getRoomObjectCategoryForType(type); - if(objectId < 0) return imageResult; + if (objectId < 0) return imageResult; objectId++; const roomObject = (roomInstance.createRoomObjectAndInitalize(objectId, type, objectCategory) as IRoomObjectController); - if(!roomObject || !roomObject.model || !roomObject.logic) return imageResult; + if (!roomObject || !roomObject.model || !roomObject.logic) return imageResult; const model = roomObject.model; - switch(objectCategory) + switch (objectCategory) { case RoomObjectCategory.FLOOR: case RoomObjectCategory.WALL: @@ -2975,7 +2975,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, extras); break; case RoomObjectCategory.UNIT: - if((type === RoomObjectUserType.USER) || (type === RoomObjectUserType.BOT) || (type === RoomObjectUserType.RENTABLE_BOT) || (type === RoomObjectUserType.PET)) + if ((type === RoomObjectUserType.USER) || (type === RoomObjectUserType.BOT) || (type === RoomObjectUserType.RENTABLE_BOT) || (type === RoomObjectUserType.PET)) { model.setValue(RoomObjectVariable.FIGURE, value); } @@ -2986,16 +2986,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.PET_PALETTE_INDEX, figureData.paletteId); model.setValue(RoomObjectVariable.PET_COLOR, figureData.color); - if(figureData.headOnly) model.setValue(RoomObjectVariable.PET_HEAD_ONLY, 1); + if (figureData.headOnly) model.setValue(RoomObjectVariable.PET_HEAD_ONLY, 1); - if(figureData.hasCustomParts) + if (figureData.hasCustomParts) { model.setValue(RoomObjectVariable.PET_CUSTOM_LAYER_IDS, figureData.customLayerIds); model.setValue(RoomObjectVariable.PET_CUSTOM_PARTS_IDS, figureData.customPartIds); model.setValue(RoomObjectVariable.PET_CUSTOM_PALETTE_IDS, figureData.customPaletteIds); } - if(posture) model.setValue(RoomObjectVariable.FIGURE_POSTURE, posture); + if (posture) model.setValue(RoomObjectVariable.FIGURE_POSTURE, posture); } break; case RoomObjectCategory.ROOM: @@ -3006,16 +3006,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const visualization = roomObject.visualization; - if(!visualization) + if (!visualization) { roomInstance.removeRoomObject(objectId, objectCategory); return imageResult; } - if((state > -1) || objectData) + if ((state > -1) || objectData) { - if(objectData && (objectData.getLegacyString() !== '')) + if (objectData && (objectData.getLegacyString() !== '')) { roomObject.logic.processUpdateMessage(new ObjectDataUpdateMessage(parseInt(objectData.getLegacyString()), objectData)); } @@ -3029,11 +3029,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato visualization.update(geometry, 0, true, false); - if(frameCount > 0) + if (frameCount > 0) { let i = 0; - while(i < frameCount) + while (i < frameCount) { visualization.update(geometry, 0, true, false); @@ -3046,11 +3046,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato imageResult.data = texture; imageResult.id = objectId; - if(!this.isRoomContentTypeLoaded(type) && listener) + if (!this.isRoomContentTypeLoaded(type) && listener) { let imageListeners = this._imageCallbacks.get(objectId.toString()); - if(!imageListeners) + if (!imageListeners) { imageListeners = []; @@ -3077,27 +3077,27 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getGenericRoomObjectThumbnail(type: string, param: string, listener: IGetImageListener, extraData: string = null, stuffData: IObjectData = null): IImageResult { - if(!this._roomManager) return null; + if (!this._roomManager) return null; const imageResult = new ImageResult(); imageResult.id = -1; - if(!this._ready || !type) return imageResult; + if (!this._ready || !type) return imageResult; let roomInstance = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if(!roomInstance) + if (!roomInstance) { roomInstance = this._roomManager.createRoomInstance(RoomEngine.TEMPORARY_ROOM); - if(!roomInstance) return imageResult; + if (!roomInstance) return imageResult; } let objectId = this._thumbnailObjectIdBank.reserveNumber(); const objectCategory = this.getRoomObjectCategoryForType(type); - if(objectId < 0) return imageResult; + if (objectId < 0) return imageResult; objectId++; @@ -3109,11 +3109,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const asset = this._roomContentLoader.getImage(assetName); - if(!asset && listener) + if (!asset && listener) { let contentListeners = this._thumbnailCallbacks.get(assetName); - if(!contentListeners) + if (!contentListeners) { contentListeners = []; @@ -3126,7 +3126,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if(asset) + if (asset) { imageResult.image = asset; } @@ -3143,7 +3143,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if(!roomInstance || !this._roomContentLoader) return; + if (!roomInstance || !this._roomContentLoader) return; const objectCategory = this._roomContentLoader.getCategoryForType(type); const objectManager = roomInstance.getManager(objectCategory); @@ -3151,29 +3151,29 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let geometry: RoomGeometry = null; let scale = 0; - if(objectManager && objectManager.objects.length) + if (objectManager && objectManager.objects.length) { - for(const roomObject of objectManager.objects.getValues()) + for (const roomObject of objectManager.objects.getValues()) { - if(roomObject && roomObject.model && (roomObject.type === type)) + if (roomObject && roomObject.model && (roomObject.type === type)) { const objectId = roomObject.id; const visualization = roomObject.visualization; let texture: RenderTexture = null; - if(visualization) + if (visualization) { const imageScale = roomObject.model.getValue(RoomObjectVariable.IMAGE_QUERY_SCALE); - if(geometry && (scale !== imageScale)) + if (geometry && (scale !== imageScale)) { geometry.dispose(); geometry = null; } - if(!geometry) + if (!geometry) { scale = imageScale; @@ -3191,15 +3191,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const imageListeners = this._imageCallbacks.get(objectId.toString()); - if(imageListeners) + if (imageListeners) { this._imageCallbacks.delete(objectId.toString()); - for(const imageListener of imageListeners) + for (const imageListener of imageListeners) { - if(!imageListener) continue; + if (!imageListener) continue; - if(texture) imageListener.imageReady(objectId, texture); + if (texture) imageListener.imageReady(objectId, texture); else imageListener.imageFailed(objectId); } } @@ -3207,19 +3207,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if(geometry) geometry.dispose(); + if (geometry) geometry.dispose(); } public setObjectMoverIconSpriteVisible(k: boolean): void { const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if(!canvas) return; + if (!canvas) return; const overlay = this.getRenderingCanvasOverlay(canvas); const sprite = this.getOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE); - if(sprite) + if (sprite) { sprite.visible = k; } @@ -3229,7 +3229,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if(!canvas) return; + if (!canvas) return; const sprite = this.getRenderingCanvasOverlay(canvas); @@ -3238,32 +3238,32 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getRenderingCanvasOverlay(k: IRoomRenderingCanvas): NitroSprite { - if(!k) return null; + if (!k) return null; const displayObject = (k.master as Container); - if(!displayObject) return null; + if (!displayObject) return null; return ((displayObject.getChildByName(RoomEngine.OVERLAY) as NitroSprite) || null); } private removeOverlayIconSprite(k: NitroSprite, _arg_2: string): boolean { - if(!k) return false; + if (!k) return false; let index = (k.children.length - 1); - while(index >= 0) + while (index >= 0) { const child = (k.getChildAt(index) as NitroSprite); - if(child) + if (child) { - if(child.name === _arg_2) + if (child.name === _arg_2) { k.removeChildAt(index); - if(child.children.length) + if (child.children.length) { const firstChild = (child.getChildAt(0) as NitroSprite); @@ -3284,17 +3284,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getOverlayIconSprite(k: NitroSprite, _arg_2: string): NitroSprite { - if(!k) return null; + if (!k) return null; let index = (k.children.length - 1); - while(index >= 0) + while (index >= 0) { const child = (k.getChildAt(index) as NitroSprite); - if(child) + if (child) { - if(child.name === _arg_2) return child; + if (child.name === _arg_2) return child; } index--; @@ -3305,13 +3305,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomObjects(roomId: number, category: number): IRoomObject[] { - if(this._ready) + if (this._ready) { const _local_3 = this.getRoomId(roomId); const _local_4 = this._roomManager.getRoomInstance(_local_3); - if(_local_4) return _local_4.getRoomObjectsForCategory(category); + if (_local_4) return _local_4.getRoomObjectsForCategory(category); } return []; @@ -3321,21 +3321,21 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const tileObjectMap = this.getRoomInstanceData(k).tileObjectMap; - if(tileObjectMap) tileObjectMap.addRoomObject(_arg_2); + if (tileObjectMap) tileObjectMap.addRoomObject(_arg_2); } public refreshTileObjectMap(k: number, _arg_2: string): void { const tileObjectMap = this.getRoomInstanceData(k).tileObjectMap; - if(tileObjectMap) tileObjectMap.populate(this.getRoomObjects(k, RoomObjectCategory.FLOOR)); + if (tileObjectMap) tileObjectMap.populate(this.getRoomObjects(k, RoomObjectCategory.FLOOR)); } public getRenderRoomMessage(k: Rectangle, _arg_2: number, _arg_3: boolean = false, _arg_4: boolean = true, _arg_5: boolean = false, canvasId: number = -1): IMessageComposer { let canvas: IRoomRenderingCanvas = null; - if(canvasId > -1) + if (canvasId > -1) { canvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, canvasId); } @@ -3344,16 +3344,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato canvas = this.getActiveRoomInstanceRenderingCanvas(); } - if(!canvas) return null; + if (!canvas) return null; - if(_arg_5) + if (_arg_5) { canvas.skipSpriteVisibilityChecking(); } let _local_8 = -1; - if(((!(_arg_4)) && (!(this._roomSessionManager.getSession(this._activeRoomId) == null)))) + if (((!(_arg_4)) && (!(this._roomSessionManager.getSession(this._activeRoomId) == null)))) { _local_8 = this._roomSessionManager.getSession(this._activeRoomId).ownRoomIndex; } @@ -3363,9 +3363,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const _local_11 = _local_9.getRoomRenderingModifiers(this); const _local_12 = _local_9.getRoomPlanes(k, canvas, this, _arg_2); - if(_arg_5) canvas.resumeSpriteVisibilityChecking(); + if (_arg_5) canvas.resumeSpriteVisibilityChecking(); - if(_arg_3) + if (_arg_3) { //return new RenderRoomThumbnailMessageComposer(_local_12, _local_10, _local_11, this._activeRoomId, this._sessionDataManager._Str_8500); } @@ -3381,7 +3381,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let canvas: IRoomRenderingCanvas = null; - if(canvasId > -1) + if (canvasId > -1) { canvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, canvasId); } @@ -3392,7 +3392,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let texture: RenderTexture = null; - if(bounds) + if (bounds) { texture = TextureUtils.generateTexture(canvas.master, bounds); } @@ -3408,7 +3408,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let composer: RenderRoomMessageComposer = null; - if(saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); + if (saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); else composer = new RenderRoomMessageComposer(); composer.assignBitmap(texture); @@ -3420,7 +3420,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let composer: RenderRoomMessageComposer = null; - if(saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); + if (saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); else composer = new RenderRoomMessageComposer(); composer.assignBase64(base64); @@ -3442,18 +3442,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getRoomIdFromString(roomId: string): number { - if(!roomId) return -1; + if (!roomId) return -1; const split = roomId.split('_'); - if(split.length <= 0) return -1; + if (split.length <= 0) return -1; return (parseInt(split[0]) || 0); } private getRoomObjectRoomId(object: IRoomObject): string { - if(!object || !object.model) return null; + if (!object || !object.model) return null; return (object.model.getValue(RoomObjectVariable.OBJECT_ROOM_ID)); } @@ -3467,11 +3467,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let type = -1; - if(figure) + if (figure) { const parts = figure.split(' '); - if(parts.length > 1) type = parseInt(parts[0]); + if (parts.length > 1) type = parseInt(parts[0]); } return type; @@ -3479,15 +3479,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getPetType(type: string): string { - if(!type) return null; + if (!type) return null; const parts = type.split(' '); - if(parts.length > 1) + if (parts.length > 1) { const typeId = parseInt(parts[0]); - if(this._roomContentLoader) return this._roomContentLoader.getPetNameForType(typeId); + if (this._roomContentLoader) return this._roomContentLoader.getPetNameForType(typeId); return 'pet'; } @@ -3497,28 +3497,28 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public isRoomContentTypeLoaded(name: string): boolean { - if(!this._roomContentLoader) return false; + if (!this._roomContentLoader) return false; return (this._roomContentLoader.getCollection(name) !== null); } public getPetColorResult(petIndex: number, paletteIndex: number): IPetColorResult { - if(!this._roomContentLoader) return null; + if (!this._roomContentLoader) return null; return this._roomContentLoader.getPetColorResult(petIndex, paletteIndex); } public getPetColorResultsForTag(petIndex: number, tagName: string): IPetColorResult[] { - if(!this._roomContentLoader) return null; + if (!this._roomContentLoader) return null; return this._roomContentLoader.getPetColorResultsForTag(petIndex, tagName); } public deleteRoomObject(objectId: number, objectCategory: number): boolean { - if(!this._roomObjectEventHandler || (objectCategory !== RoomObjectCategory.WALL)) return false; + if (!this._roomObjectEventHandler || (objectCategory !== RoomObjectCategory.WALL)) return false; return this._roomObjectEventHandler.deleteWallItem(this._activeRoomId, objectId); } @@ -3595,7 +3595,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public get isDecorating(): boolean { - if(!this._roomSessionManager) return false; + if (!this._roomSessionManager) return false; const session = this._roomSessionManager.getSession(this._activeRoomId); @@ -3609,14 +3609,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public get selectedAvatarId(): number { - if(!this._roomObjectEventHandler) return -1; + if (!this._roomObjectEventHandler) return -1; return this._roomObjectEventHandler.selectedAvatarId; } public getRoomObjectCount(roomId: number, categoryId: number): number { - if(this._roomManager == null) return 0; + if (this._roomManager == null) return 0; return this._roomManager.getRoomInstance(roomId.toString()).getRoomObjectsForCategory(categoryId).length; } diff --git a/src/nitro/room/RoomMessageHandler.ts b/src/nitro/room/RoomMessageHandler.ts index 4943979f..1a787184 100644 --- a/src/nitro/room/RoomMessageHandler.ts +++ b/src/nitro/room/RoomMessageHandler.ts @@ -1,11 +1,9 @@ -import { IConnection, IRoomCreator, IVector3D, LegacyDataType, ObjectRolling, PetType, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; +import { AvatarGuideStatus, IConnection, IRoomCreator, IVector3D, LegacyDataType, ObjectRolling, PetType, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; import { Disposable } from '../../core'; -import { AvatarGuideStatus } from '../avatar/enum/AvatarGuideStatus'; import { DiceValueMessageEvent, FloorHeightMapEvent, FurnitureAliasesComposer, FurnitureAliasesEvent, FurnitureDataEvent, FurnitureFloorAddEvent, FurnitureFloorDataParser, FurnitureFloorEvent, FurnitureFloorRemoveEvent, FurnitureFloorUpdateEvent, FurnitureWallAddEvent, FurnitureWallDataParser, FurnitureWallEvent, FurnitureWallRemoveEvent, FurnitureWallUpdateEvent, GetRoomEntryDataMessageComposer, GuideSessionEndedMessageEvent, GuideSessionErrorMessageEvent, GuideSessionStartedMessageEvent, IgnoreResultEvent, ItemDataUpdateMessageEvent, ObjectsDataUpdateEvent, ObjectsRollingEvent, OneWayDoorStatusMessageEvent, PetExperienceEvent, PetFigureUpdateEvent, RoomEntryTileMessageEvent, RoomEntryTileMessageParser, RoomHeightMapEvent, RoomHeightMapUpdateEvent, RoomPaintEvent, RoomReadyMessageEvent, RoomUnitChatEvent, RoomUnitChatShoutEvent, RoomUnitChatWhisperEvent, RoomUnitDanceEvent, RoomUnitEffectEvent, RoomUnitEvent, RoomUnitExpressionEvent, RoomUnitHandItemEvent, RoomUnitIdleEvent, RoomUnitInfoEvent, RoomUnitNumberEvent, RoomUnitRemoveEvent, RoomUnitStatusEvent, RoomUnitTypingEvent, RoomVisualizationSettingsEvent, UserInfoEvent, YouArePlayingGameEvent } from '../communication'; import { RoomPlaneParser } from './object/RoomPlaneParser'; import { RoomVariableEnum } from './RoomVariableEnum'; -import { FurnitureStackingHeightMap } from './utils/FurnitureStackingHeightMap'; -import { LegacyWallGeometry } from './utils/LegacyWallGeometry'; +import { FurnitureStackingHeightMap, LegacyWallGeometry } from './utils'; export class RoomMessageHandler extends Disposable { @@ -44,7 +42,7 @@ export class RoomMessageHandler extends Disposable this._roomCreator = null; this._latestEntryTileEvent = null; - if(this._planeParser) + if (this._planeParser) { this._planeParser.dispose(); @@ -54,7 +52,7 @@ export class RoomMessageHandler extends Disposable public setConnection(connection: IConnection) { - if(this._connection || !connection) return; + if (this._connection || !connection) return; this._connection = connection; @@ -106,9 +104,9 @@ export class RoomMessageHandler extends Disposable public setRoomId(id: number): void { - if(this._currentRoomId !== 0) + if (this._currentRoomId !== 0) { - if(this._roomCreator) this._roomCreator.destroyRoom(this._currentRoomId); + if (this._roomCreator) this._roomCreator.destroyRoom(this._currentRoomId); } this._currentRoomId = id; @@ -123,11 +121,11 @@ export class RoomMessageHandler extends Disposable private onUserInfoEvent(event: UserInfoEvent): void { - if(!(event instanceof UserInfoEvent) || !event.connection) return; + if (!(event instanceof UserInfoEvent) || !event.connection) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._ownUserId = parser.userInfo.userId; } @@ -136,17 +134,17 @@ export class RoomMessageHandler extends Disposable { const parser = event.getParser(); - if(this._currentRoomId !== parser.roomId) + if (this._currentRoomId !== parser.roomId) { this.setRoomId(parser.roomId); } - if(this._roomCreator) + if (this._roomCreator) { this._roomCreator.setRoomInstanceModelName(parser.roomId, parser.name); } - if(this._initialConnection) + if (this._initialConnection) { event.connection.send(new FurnitureAliasesComposer()); @@ -160,17 +158,17 @@ export class RoomMessageHandler extends Disposable private onRoomPaintEvent(event: RoomPaintEvent): void { - if(!(event instanceof RoomPaintEvent)) return; + if (!(event instanceof RoomPaintEvent)) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const floorType = parser.floorType; const wallType = parser.wallType; const landscapeType = parser.landscapeType; - if(this._roomCreator) + if (this._roomCreator) { this._roomCreator.updateRoomInstancePlaneType(this._currentRoomId, floorType, wallType, landscapeType); } @@ -178,15 +176,15 @@ export class RoomMessageHandler extends Disposable private onRoomModelEvent(event: FloorHeightMapEvent): void { - if(!(event instanceof FloorHeightMapEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FloorHeightMapEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const wallGeometry = this._roomCreator.getLegacyWallGeometry(this._currentRoomId); - if(!wallGeometry) return; + if (!wallGeometry) return; this._planeParser.reset(); @@ -197,7 +195,7 @@ export class RoomMessageHandler extends Disposable let entryTile: RoomEntryTileMessageParser = null; - if(this._latestEntryTileEvent) entryTile = this._latestEntryTileEvent.getParser(); + if (this._latestEntryTileEvent) entryTile = this._latestEntryTileEvent.getParser(); let doorX = -1; let doorY = -1; @@ -206,17 +204,17 @@ export class RoomMessageHandler extends Disposable let y = 0; - while(y < height) + while (y < height) { let x = 0; - while(x < width) + while (x < width) { const tileHeight = parser.getHeight(x, y); - if(((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) + if (((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) { - if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) + if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) { doorX = (x + 0.5); doorY = y; @@ -224,7 +222,7 @@ export class RoomMessageHandler extends Disposable doorDirection = 90; } - if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) + if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) { doorX = x; doorY = (y + 0.5); @@ -245,7 +243,7 @@ export class RoomMessageHandler extends Disposable this._planeParser.initializeFromTileData(parser.wallHeight); this._planeParser.setTileHeight(Math.floor(doorX), Math.floor(doorY), (doorZ + this._planeParser.wallHeight)); - if(parser.scale === 64) + if (parser.scale === 64) { this._planeParser.restrictsDragging = true; this._planeParser.restrictsScaling = true; @@ -263,11 +261,11 @@ export class RoomMessageHandler extends Disposable let heightIterator = (parser.height - 1); - while(heightIterator >= 0) + while (heightIterator >= 0) { let widthIterator = (parser.width - 1); - while(widthIterator >= 0) + while (widthIterator >= 0) { wallGeometry.setHeight(widthIterator, heightIterator, this._planeParser.getTileHeight(widthIterator, heightIterator)); widthIterator--; @@ -290,11 +288,11 @@ export class RoomMessageHandler extends Disposable private onRoomHeightMapEvent(event: RoomHeightMapEvent): void { - if(!(event instanceof RoomHeightMapEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomHeightMapEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const width = parser.width; const height = parser.height; @@ -302,11 +300,11 @@ export class RoomMessageHandler extends Disposable let y = 0; - while(y < height) + while (y < height) { let x = 0; - while(x < width) + while (x < width) { heightMap.setTileHeight(x, y, parser.getTileHeight(x, y)); heightMap.setStackingBlocked(x, y, parser.getStackingBlocked(x, y)); @@ -323,17 +321,17 @@ export class RoomMessageHandler extends Disposable private onRoomHeightMapUpdateEvent(event: RoomHeightMapUpdateEvent): void { - if(!(event instanceof RoomHeightMapUpdateEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomHeightMapUpdateEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const heightMap = this._roomCreator.getFurnitureStackingHeightMap(this._currentRoomId); - if(!heightMap) return; + if (!heightMap) return; - while(parser.next()) + while (parser.next()) { heightMap.setTileHeight(parser.x, parser.y, parser.tileHeight()); heightMap.setStackingBlocked(parser.x, parser.y, parser.isStackingBlocked()); @@ -345,18 +343,18 @@ export class RoomMessageHandler extends Disposable private onRoomThicknessEvent(event: RoomVisualizationSettingsEvent): void { - if(!(event instanceof RoomVisualizationSettingsEvent)) return; + if (!(event instanceof RoomVisualizationSettingsEvent)) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const visibleWall = !parser.hideWalls; const visibleFloor = true; const thicknessWall = parser.thicknessWall; const thicknessFloor = parser.thicknessFloor; - if(this._roomCreator) + if (this._roomCreator) { this._roomCreator.updateRoomInstancePlaneVisibility(this._currentRoomId, visibleWall, visibleFloor); this._roomCreator.updateRoomInstancePlaneThickness(this._currentRoomId, thicknessWall, thicknessFloor); @@ -365,14 +363,14 @@ export class RoomMessageHandler extends Disposable private onRoomDoorEvent(event: RoomEntryTileMessageEvent): void { - if(!(event instanceof RoomEntryTileMessageEvent)) return; + if (!(event instanceof RoomEntryTileMessageEvent)) return; this._latestEntryTileEvent = event; } private onRoomRollingEvent(event: ObjectsRollingEvent): void { - if(!(event instanceof ObjectsRollingEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof ObjectsRollingEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -381,11 +379,11 @@ export class RoomMessageHandler extends Disposable const furnitureRolling = parser.itemsRolling; - if(furnitureRolling && furnitureRolling.length) + if (furnitureRolling && furnitureRolling.length) { - for(const rollData of furnitureRolling) + for (const rollData of furnitureRolling) { - if(!rollData) continue; + if (!rollData) continue; this._roomCreator.rollRoomObjectFloor(this._currentRoomId, rollData.id, rollData.location, rollData.targetLocation); } @@ -393,17 +391,17 @@ export class RoomMessageHandler extends Disposable const unitRollData = parser.unitRolling; - if(unitRollData) + if (unitRollData) { this._roomCreator.updateRoomObjectUserLocation(this._currentRoomId, unitRollData.id, unitRollData.location, unitRollData.targetLocation); const object = this._roomCreator.getRoomObjectUser(this._currentRoomId, unitRollData.id); - if(object && object.type !== RoomObjectUserType.MONSTER_PLANT) + if (object && object.type !== RoomObjectUserType.MONSTER_PLANT) { let posture = 'std'; - switch(unitRollData.movementType) + switch (unitRollData.movementType) { case ObjectRolling.MOVE: posture = 'mv'; @@ -420,13 +418,13 @@ export class RoomMessageHandler extends Disposable private onObjectsDataUpdateEvent(event: ObjectsDataUpdateEvent): void { - if(!(event instanceof ObjectsDataUpdateEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof ObjectsDataUpdateEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; - for(const object of parser.objects) + for (const object of parser.objects) { this._roomCreator.updateRoomObjectFloor(this._currentRoomId, object.id, null, null, object.state, object.data); } @@ -434,7 +432,7 @@ export class RoomMessageHandler extends Disposable private onFurnitureAliasesEvent(event: FurnitureAliasesEvent): void { - if(!(event instanceof FurnitureAliasesEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureAliasesEvent) || !event.connection || !this._roomCreator) return; const alises = event.getParser().aliases; @@ -443,32 +441,32 @@ export class RoomMessageHandler extends Disposable private onFurnitureFloorAddEvent(event: FurnitureFloorAddEvent): void { - if(!(event instanceof FurnitureFloorAddEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureFloorAddEvent) || !event.connection || !this._roomCreator) return; const item = event.getParser().item; - if(!item) return; + if (!item) return; this.addRoomObjectFurnitureFloor(this._currentRoomId, item); } private onFurnitureFloorEvent(event: FurnitureFloorEvent): void { - if(!(event instanceof FurnitureFloorEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureFloorEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const totalObjects = parser.items.length; let iterator = 0; - while(iterator < totalObjects) + while (iterator < totalObjects) { const object = parser.items[iterator]; - if(object) this.addRoomObjectFurnitureFloor(this._currentRoomId, object); + if (object) this.addRoomObjectFurnitureFloor(this._currentRoomId, object); iterator++; } @@ -476,13 +474,13 @@ export class RoomMessageHandler extends Disposable private onFurnitureFloorRemoveEvent(event: FurnitureFloorRemoveEvent): void { - if(!(event instanceof FurnitureFloorRemoveEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureFloorRemoveEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; - if(parser.delay > 0) + if (parser.delay > 0) { setTimeout(() => { @@ -497,11 +495,11 @@ export class RoomMessageHandler extends Disposable private onFurnitureFloorUpdateEvent(event: FurnitureFloorUpdateEvent): void { - if(!(event instanceof FurnitureFloorUpdateEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureFloorUpdateEvent) || !event.connection || !this._roomCreator) return; const item = event.getParser().item; - if(!item) return; + if (!item) return; const location: IVector3D = new Vector3d(item.x, item.y, item.z); const direction: IVector3D = new Vector3d(item.direction); @@ -513,32 +511,32 @@ export class RoomMessageHandler extends Disposable private onFurnitureWallAddEvent(event: FurnitureWallAddEvent): void { - if(!(event instanceof FurnitureWallAddEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureWallAddEvent) || !event.connection || !this._roomCreator) return; const data = event.getParser().item; - if(!data) return; + if (!data) return; this.addRoomObjectFurnitureWall(this._currentRoomId, data); } private onFurnitureWallEvent(event: FurnitureWallEvent): void { - if(!(event instanceof FurnitureWallEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureWallEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const totalObjects = parser.items.length; let iterator = 0; - while(iterator < totalObjects) + while (iterator < totalObjects) { const data = parser.items[iterator]; - if(data) this.addRoomObjectFurnitureWall(this._currentRoomId, data); + if (data) this.addRoomObjectFurnitureWall(this._currentRoomId, data); iterator++; } @@ -546,26 +544,26 @@ export class RoomMessageHandler extends Disposable private onFurnitureWallRemoveEvent(event: FurnitureWallRemoveEvent): void { - if(!(event instanceof FurnitureWallRemoveEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureWallRemoveEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._roomCreator.removeRoomObjectWall(this._currentRoomId, parser.itemId, parser.userId); } private onFurnitureWallUpdateEvent(event: FurnitureWallUpdateEvent): void { - if(!(event instanceof FurnitureWallUpdateEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureWallUpdateEvent) || !event.connection || !this._roomCreator) return; const wallGeometry = this._roomCreator.getLegacyWallGeometry(this._currentRoomId); - if(!wallGeometry) return; + if (!wallGeometry) return; const item = event.getParser().item; - if(!item) return; + if (!item) return; const location = wallGeometry.getLocation(item.width, item.height, item.localX, item.localY, item.direction); const direction = new Vector3d(wallGeometry.getDirection(item.direction)); @@ -576,7 +574,7 @@ export class RoomMessageHandler extends Disposable private onFurnitureDataEvent(event: FurnitureDataEvent): void { - if(!(event instanceof FurnitureDataEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof FurnitureDataEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -585,7 +583,7 @@ export class RoomMessageHandler extends Disposable private onItemDataUpdateMessageEvent(event: ItemDataUpdateMessageEvent): void { - if(!(event instanceof ItemDataUpdateMessageEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof ItemDataUpdateMessageEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -594,7 +592,7 @@ export class RoomMessageHandler extends Disposable private onOneWayDoorStatusMessageEvent(event: OneWayDoorStatusMessageEvent): void { - if(!(event instanceof OneWayDoorStatusMessageEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof OneWayDoorStatusMessageEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -603,7 +601,7 @@ export class RoomMessageHandler extends Disposable private onDiceValueMessageEvent(event: DiceValueMessageEvent): void { - if(!(event instanceof DiceValueMessageEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof DiceValueMessageEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -612,36 +610,36 @@ export class RoomMessageHandler extends Disposable private onRoomUnitDanceEvent(event: RoomUnitDanceEvent): void { - if(!(event instanceof RoomUnitDanceEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitDanceEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_DANCE, event.getParser().danceId); } private onRoomUnitEffectEvent(event: RoomUnitEffectEvent): void { - if(!(event instanceof RoomUnitEffectEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitEffectEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserEffect(this._currentRoomId, event.getParser().unitId, event.getParser().effectId, event.getParser().delay); } private onRoomUnitEvent(event: RoomUnitEvent): void { - if(!(event instanceof RoomUnitEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitEvent) || !event.connection || !this._roomCreator) return; const users = event.getParser().users; - if(!users || !users.length) return; + if (!users || !users.length) return; - for(const user of users) + for (const user of users) { - if(!user) continue; + if (!user) continue; const location = new Vector3d(user.x, user.y, user.z); const direction = new Vector3d(user.dir); this._roomCreator.addRoomObjectUser(this._currentRoomId, user.roomIndex, location, direction, user.dir, user.userType, user.figure); - if(user.webID === this._ownUserId) + if (user.webID === this._ownUserId) { this._roomCreator.setRoomSessionOwnUser(this._currentRoomId, user.roomIndex); this._roomCreator.updateRoomObjectUserOwn(this._currentRoomId, user.roomIndex); @@ -649,9 +647,9 @@ export class RoomMessageHandler extends Disposable this._roomCreator.updateRoomObjectUserFigure(this._currentRoomId, user.roomIndex, user.figure, user.sex, user.subType, user.isRiding); - if(RoomObjectUserType.getTypeString(user.userType) === RoomObjectUserType.PET) + if (RoomObjectUserType.getTypeString(user.userType) === RoomObjectUserType.PET) { - if(this._roomCreator.getPetTypeId(user.figure) === PetType.MONSTERPLANT) + if (this._roomCreator.getPetTypeId(user.figure) === PetType.MONSTERPLANT) { this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, user.roomIndex, user.petPosture); } @@ -665,46 +663,46 @@ export class RoomMessageHandler extends Disposable private onRoomUnitExpressionEvent(event: RoomUnitExpressionEvent): void { - if(!(event instanceof RoomUnitExpressionEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitExpressionEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_EXPRESSION, event.getParser().expression); } private onRoomUnitHandItemEvent(event: RoomUnitHandItemEvent): void { - if(!(event instanceof RoomUnitHandItemEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitHandItemEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_CARRY_OBJECT, event.getParser().handId); } private onRoomUnitIdleEvent(event: RoomUnitIdleEvent): void { - if(!(event instanceof RoomUnitIdleEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitIdleEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_SLEEP, (event.getParser().isIdle ? 1 : 0)); } private onRoomUnitInfoEvent(event: RoomUnitInfoEvent): void { - if(!(event instanceof RoomUnitInfoEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitInfoEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserFigure(this._currentRoomId, event.getParser().unitId, event.getParser().figure, event.getParser().gender); } private onRoomUnitNumberEvent(event: RoomUnitNumberEvent): void { - if(!(event instanceof RoomUnitNumberEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitNumberEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, parser.unitId, RoomObjectVariable.FIGURE_NUMBER_VALUE, parser.value); } private onRoomUnitRemoveEvent(event: RoomUnitRemoveEvent): void { - if(!(event instanceof RoomUnitRemoveEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitRemoveEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.removeRoomObjectUser(this._currentRoomId, event.getParser().unitId); @@ -713,32 +711,32 @@ export class RoomMessageHandler extends Disposable private onRoomUnitStatusEvent(event: RoomUnitStatusEvent): void { - if(!(event instanceof RoomUnitStatusEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitStatusEvent) || !event.connection || !this._roomCreator) return; const statuses = event.getParser().statuses; - if(!statuses || !statuses.length) return; + if (!statuses || !statuses.length) return; const roomInstance = this._roomCreator.getRoomInstance(this._currentRoomId); - if(!roomInstance) return; + if (!roomInstance) return; const zScale = (roomInstance.model.getValue(RoomVariableEnum.ROOM_Z_SCALE) || 1); - for(const status of statuses) + for (const status of statuses) { - if(!status) continue; + if (!status) continue; let height = status.height; - if(height) height = (height / zScale); + if (height) height = (height / zScale); const location = new Vector3d(status.x, status.y, (status.z + height)); const direction = new Vector3d(status.direction); let goal: IVector3D = null; - if(status.didMove) goal = new Vector3d(status.targetX, status.targetY, status.targetZ); + if (status.didMove) goal = new Vector3d(status.targetX, status.targetY, status.targetZ); this._roomCreator.updateRoomObjectUserLocation(this._currentRoomId, status.id, location, goal, status.canStandUp, height, direction, status.headDirection); this._roomCreator.updateRoomObjectUserFlatControl(this._currentRoomId, status.id, null); @@ -748,24 +746,24 @@ export class RoomMessageHandler extends Disposable let postureType = RoomObjectVariable.STD; let parameter = ''; - if(status.actions && status.actions.length) + if (status.actions && status.actions.length) { - for(const action of status.actions) + for (const action of status.actions) { - if(!action) continue; + if (!action) continue; - switch(action.action) + switch (action.action) { case 'flatctrl': this._roomCreator.updateRoomObjectUserFlatControl(this._currentRoomId, status.id, action.value); break; case 'sign': - if(status.actions.length === 1) isPosture = false; + if (status.actions.length === 1) isPosture = false; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, status.id, RoomObjectVariable.FIGURE_SIGN, parseInt(action.value)); break; case 'gst': - if(status.actions.length === 1) isPosture = false; + if (status.actions.length === 1) isPosture = false; this._roomCreator.updateRoomObjectUserPetGesture(this._currentRoomId, status.id, action.value); break; @@ -785,8 +783,8 @@ export class RoomMessageHandler extends Disposable } } - if(postureUpdate) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, postureType, parameter); - else if(isPosture) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, RoomObjectVariable.STD, ''); + if (postureUpdate) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, postureType, parameter); + else if (isPosture) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, RoomObjectVariable.STD, ''); } this.updateGuideMarker(); @@ -794,11 +792,11 @@ export class RoomMessageHandler extends Disposable private onRoomUnitChatEvent(event: RoomUnitChatEvent): void { - if(!event.connection || !this._roomCreator) return; + if (!event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._roomCreator.updateRoomObjectUserGesture(this._currentRoomId, parser.roomIndex, parser.gesture); this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, parser.roomIndex, RoomObjectVariable.FIGURE_TALK, (parser.message.length / 10)); @@ -806,18 +804,18 @@ export class RoomMessageHandler extends Disposable private onRoomUnitTypingEvent(event: RoomUnitTypingEvent): void { - if(!(event instanceof RoomUnitTypingEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof RoomUnitTypingEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_IS_TYPING, event.getParser().isTyping ? 1 : 0); } private onPetFigureUpdateEvent(event: PetFigureUpdateEvent): void { - if(!(event instanceof PetFigureUpdateEvent) || !event.connection || !this._roomCreator) return; + if (!(event instanceof PetFigureUpdateEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._roomCreator.updateRoomObjectUserFigure(this._currentRoomId, parser.roomIndex, parser.figureData.figuredata, '', '', parser.isRiding); } @@ -826,30 +824,30 @@ export class RoomMessageHandler extends Disposable { const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, parser.roomIndex, RoomObjectVariable.FIGURE_GAINED_EXPERIENCE, parser.gainedExperience); } private onYouArePlayingGameEvent(event: YouArePlayingGameEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._roomCreator.setRoomEngineGameMode(this._currentRoomId, parser.isPlaying); } private addRoomObjectFurnitureFloor(roomId: number, data: FurnitureFloorDataParser): void { - if(!data || !this._roomCreator) return; + if (!data || !this._roomCreator) return; const location = new Vector3d(data.x, data.y, data.z); const direction = new Vector3d(data.direction); - if(data.spriteName) + if (data.spriteName) { this._roomCreator.addFurnitureFloorByTypeName(roomId, data.itemId, data.spriteName, location, direction, data.state, data.data, data.extra, data.expires, data.usagePolicy, data.userId, data.username, true, true, data.stackHeight); } @@ -861,15 +859,15 @@ export class RoomMessageHandler extends Disposable private addRoomObjectFurnitureWall(roomId: number, data: FurnitureWallDataParser): void { - if(!data || !this._roomCreator) return; + if (!data || !this._roomCreator) return; const wallGeometry = this._roomCreator.getLegacyWallGeometry(roomId); - if(!wallGeometry) return; + if (!wallGeometry) return; let location: IVector3D = null; - if(!data.isOldFormat) + if (!data.isOldFormat) { location = wallGeometry.getLocation(data.width, data.height, data.localX, data.localY, data.direction); } @@ -885,21 +883,21 @@ export class RoomMessageHandler extends Disposable private onIgnoreResultEvent(event: IgnoreResultEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const roomSession = this._roomCreator.roomSessionManager.getSession(this._currentRoomId); - if(!roomSession) return; + if (!roomSession) return; const userData = roomSession.userDataManager.getUserDataByName(parser.name); - if(!userData) return; + if (!userData) return; - switch(parser.result) + switch (parser.result) { case 1: case 2: @@ -950,15 +948,15 @@ export class RoomMessageHandler extends Disposable private setUserGuideStatus(userId: number, status: number): void { - if(!this._roomCreator || !this._roomCreator.roomSessionManager) return; + if (!this._roomCreator || !this._roomCreator.roomSessionManager) return; const roomSession = this._roomCreator.roomSessionManager.getSession(this._currentRoomId); - if(!roomSession) return; + if (!roomSession) return; const userData = roomSession.userDataManager.getDataByType(userId, RoomObjectType.USER); - if(!userData) return; + if (!userData) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, userData.roomIndex, RoomObjectVariable.FIGURE_GUIDE_STATUS, status); } diff --git a/src/nitro/room/object/logic/avatar/AvatarLogic.ts b/src/nitro/room/object/logic/avatar/AvatarLogic.ts index 490dbb86..1bb6eebd 100644 --- a/src/nitro/room/object/logic/avatar/AvatarLogic.ts +++ b/src/nitro/room/object/logic/avatar/AvatarLogic.ts @@ -1,8 +1,7 @@ -import { IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { AvatarAction, IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; -import { AvatarAction } from '../../../../avatar'; -import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui'; import { RoomObjectFurnitureActionEvent, RoomObjectMoveEvent } from '../../../events'; import { ObjectAvatarCarryObjectUpdateMessage, ObjectAvatarChatUpdateMessage, ObjectAvatarDanceUpdateMessage, ObjectAvatarEffectUpdateMessage, ObjectAvatarExpressionUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarFlatControlUpdateMessage, ObjectAvatarGestureUpdateMessage, ObjectAvatarMutedUpdateMessage, ObjectAvatarOwnMessage, ObjectAvatarPlayerValueUpdateMessage, ObjectAvatarPlayingGameUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSelectedMessage, ObjectAvatarSignUpdateMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarTypingUpdateMessage, ObjectAvatarUpdateMessage, ObjectAvatarUseObjectUpdateMessage } from '../../../messages'; @@ -43,7 +42,7 @@ export class AvatarLogic extends MovingObjectLogic this._reportedLocation = null; this._effectChangeTimeStamp = 0; this._newEffect = 0; - this._blinkingStartTimestamp = Nitro.instance.time + this.randomBlinkStartTimestamp(); + this._blinkingStartTimestamp = GetTickerTime() + this.randomBlinkStartTimestamp(); this._blinkingEndTimestamp = 0; this._talkingEndTimestamp = 0; this._talkingPauseStartTimestamp = 0; @@ -66,9 +65,9 @@ export class AvatarLogic extends MovingObjectLogic public dispose(): void { - if(this._selected && this.object) + if (this._selected && this.object) { - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); } super.dispose(); @@ -80,15 +79,15 @@ export class AvatarLogic extends MovingObjectLogic { super.update(time); - if(this._selected && this.object) + if (this._selected && this.object) { - if(this.eventDispatcher) + if (this.eventDispatcher) { const location = this.object.getLocation(); - if(((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) + if (((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) { - if(!this._reportedLocation) this._reportedLocation = new Vector3d(); + if (!this._reportedLocation) this._reportedLocation = new Vector3d(); this._reportedLocation.assign(location); @@ -99,14 +98,14 @@ export class AvatarLogic extends MovingObjectLogic const model = this.object && this.object.model; - if(model) this.updateModel(this.time, model); + if (model) this.updateModel(this.time, model); } private updateModel(time: number, model: IRoomObjectModel): void { - if(this._talkingEndTimestamp > 0) + if (this._talkingEndTimestamp > 0) { - if(time > this._talkingEndTimestamp) + if (time > this._talkingEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -116,14 +115,14 @@ export class AvatarLogic extends MovingObjectLogic } else { - if(!this._talkingPauseEndTimestamp && !this._talkingPauseStartTimestamp) + if (!this._talkingPauseEndTimestamp && !this._talkingPauseStartTimestamp) { this._talkingPauseStartTimestamp = time + this.randomTalkingPauseStartTimestamp(); this._talkingPauseEndTimestamp = this._talkingPauseStartTimestamp + this.randomTalkingPauseEndTimestamp(); } else { - if((this._talkingPauseStartTimestamp > 0) && (time > this._talkingPauseStartTimestamp)) + if ((this._talkingPauseStartTimestamp > 0) && (time > this._talkingPauseStartTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -131,7 +130,7 @@ export class AvatarLogic extends MovingObjectLogic } else { - if((this._talkingPauseEndTimestamp > 0) && (time > this._talkingPauseEndTimestamp)) + if ((this._talkingPauseEndTimestamp > 0) && (time > this._talkingPauseEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -142,30 +141,30 @@ export class AvatarLogic extends MovingObjectLogic } } - if((this._animationEndTimestamp > 0) && (time > this._animationEndTimestamp)) + if ((this._animationEndTimestamp > 0) && (time > this._animationEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, 0); this._animationEndTimestamp = 0; } - if((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) + if ((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, 0); this._gestureEndTimestamp = 0; } - if((this._signEndTimestamp > 0) && (time > this._signEndTimestamp)) + if ((this._signEndTimestamp > 0) && (time > this._signEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_SIGN, -1); this._signEndTimestamp = 0; } - if(this._carryObjectEndTimestamp > 0) + if (this._carryObjectEndTimestamp > 0) { - if(time > this._carryObjectEndTimestamp) + if (time > this._carryObjectEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_CARRY_OBJECT, 0); model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, 0); @@ -176,11 +175,11 @@ export class AvatarLogic extends MovingObjectLogic } } - if(this._allowUseCarryObject) + if (this._allowUseCarryObject) { - if((time - this._carryObjectStartTimestamp) > 5000) + if ((time - this._carryObjectStartTimestamp) > 5000) { - if(((time - this._carryObjectStartTimestamp) % 10000) < 1000) + if (((time - this._carryObjectStartTimestamp) % 10000) < 1000) { model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, 1); } @@ -191,7 +190,7 @@ export class AvatarLogic extends MovingObjectLogic } } - if((this._blinkingStartTimestamp > -1) && (time > this._blinkingStartTimestamp)) + if ((this._blinkingStartTimestamp > -1) && (time > this._blinkingStartTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_BLINK, 1); @@ -199,21 +198,21 @@ export class AvatarLogic extends MovingObjectLogic this._blinkingEndTimestamp = time + this.randomBlinkEndTimestamp(); } - if((this._blinkingEndTimestamp > 0) && (time > this._blinkingEndTimestamp)) + if ((this._blinkingEndTimestamp > 0) && (time > this._blinkingEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_BLINK, 0); this._blinkingEndTimestamp = 0; } - if((this._effectChangeTimeStamp > 0) && (time > this._effectChangeTimeStamp)) + if ((this._effectChangeTimeStamp > 0) && (time > this._effectChangeTimeStamp)) { model.setValue(RoomObjectVariable.FIGURE_EFFECT, this._newEffect); this._effectChangeTimeStamp = 0; } - if((this._numberValueEndTimestamp > 0) && (time > this._numberValueEndTimestamp)) + if ((this._numberValueEndTimestamp > 0) && (time > this._numberValueEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_NUMBER_VALUE, 0); @@ -223,15 +222,15 @@ export class AvatarLogic extends MovingObjectLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(!message || !this.object) return; + if (!message || !this.object) return; super.processUpdateMessage(message); const model = this.object && this.object.model; - if(!model) return; + if (!model) return; - if(message instanceof ObjectAvatarPostureUpdateMessage) + if (message instanceof ObjectAvatarPostureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_POSTURE, message.postureType); model.setValue(RoomObjectVariable.FIGURE_POSTURE_PARAMETER, message.parameter); @@ -239,7 +238,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarChatUpdateMessage) + if (message instanceof ObjectAvatarChatUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -248,28 +247,28 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarTypingUpdateMessage) + if (message instanceof ObjectAvatarTypingUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_IS_TYPING, message.isTyping ? 1 : 0); return; } - if(message instanceof ObjectAvatarMutedUpdateMessage) + if (message instanceof ObjectAvatarMutedUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_IS_MUTED, (message.isMuted ? 1 : 0)); return; } - if(message instanceof ObjectAvatarPlayingGameUpdateMessage) + if (message instanceof ObjectAvatarPlayingGameUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_IS_PLAYING_GAME, (message.isPlayingGame ? 1 : 0)); return; } - if(message instanceof ObjectAvatarUpdateMessage) + if (message instanceof ObjectAvatarUpdateMessage) { model.setValue(RoomObjectVariable.HEAD_DIRECTION, message.headDirection); model.setValue(RoomObjectVariable.FIGURE_CAN_STAND_UP, message.canStandUp); @@ -278,7 +277,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarGestureUpdateMessage) + if (message instanceof ObjectAvatarGestureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, message.gesture); @@ -287,35 +286,35 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarExpressionUpdateMessage) + if (message instanceof ObjectAvatarExpressionUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, message.expressionType); this._animationEndTimestamp = AvatarAction.getExpressionTimeout(model.getValue(RoomObjectVariable.FIGURE_EXPRESSION)); - if(this._animationEndTimestamp > -1) this._animationEndTimestamp += this.time; + if (this._animationEndTimestamp > -1) this._animationEndTimestamp += this.time; return; } - if(message instanceof ObjectAvatarDanceUpdateMessage) + if (message instanceof ObjectAvatarDanceUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_DANCE, message.danceStyle); return; } - if(message instanceof ObjectAvatarSleepUpdateMessage) + if (message instanceof ObjectAvatarSleepUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SLEEP, message.isSleeping ? 1 : 0); - if(message.isSleeping) this._blinkingStartTimestamp = -1; + if (message.isSleeping) this._blinkingStartTimestamp = -1; else this._blinkingStartTimestamp = (this.time + this.randomBlinkStartTimestamp()); return; } - if(message instanceof ObjectAvatarPlayerValueUpdateMessage) + if (message instanceof ObjectAvatarPlayerValueUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_NUMBER_VALUE, message.value); @@ -324,19 +323,19 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarEffectUpdateMessage) + if (message instanceof ObjectAvatarEffectUpdateMessage) { this.updateAvatarEffect(message.effect, message.delayMilliseconds, model); return; } - if(message instanceof ObjectAvatarCarryObjectUpdateMessage) + if (message instanceof ObjectAvatarCarryObjectUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_CARRY_OBJECT, message.itemType); model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, 0); - if(message.itemType === 0) + if (message.itemType === 0) { this._carryObjectStartTimestamp = 0; this._carryObjectEndTimestamp = 0; @@ -346,7 +345,7 @@ export class AvatarLogic extends MovingObjectLogic { this._carryObjectStartTimestamp = this.time; - if(message.itemType < AvatarLogic.MAX_HAND_ID) + if (message.itemType < AvatarLogic.MAX_HAND_ID) { this._carryObjectEndTimestamp = 0; this._allowUseCarryObject = message.itemType <= AvatarLogic.MAX_HAND_USE_ID; @@ -361,14 +360,14 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarUseObjectUpdateMessage) + if (message instanceof ObjectAvatarUseObjectUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, message.itemType); return; } - if(message instanceof ObjectAvatarSignUpdateMessage) + if (message instanceof ObjectAvatarSignUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SIGN, message.signType); @@ -377,14 +376,14 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarFlatControlUpdateMessage) + if (message instanceof ObjectAvatarFlatControlUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_FLAT_CONTROL, message.level); return; } - if(message instanceof ObjectAvatarFigureUpdateMessage) + if (message instanceof ObjectAvatarFigureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE, message.figure); model.setValue(RoomObjectVariable.GENDER, message.gender); @@ -392,7 +391,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarSelectedMessage) + if (message instanceof ObjectAvatarSelectedMessage) { this._selected = message.selected; this._reportedLocation = null; @@ -400,7 +399,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarOwnMessage) + if (message instanceof ObjectAvatarOwnMessage) { model.setValue(RoomObjectVariable.OWN_USER, 1); @@ -410,42 +409,42 @@ export class AvatarLogic extends MovingObjectLogic private updateAvatarEffect(effect: number, delay: number, model: IRoomObjectModel): void { - if(effect === AvatarLogic.EFFECT_TYPE_SPLASH) + if (effect === AvatarLogic.EFFECT_TYPE_SPLASH) { - this._effectChangeTimeStamp = (Nitro.instance.time + AvatarLogic.EFFECT_SPLASH_LENGTH); + this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = AvatarLogic.EFFECT_TYPE_SWIM; } - else if(effect === AvatarLogic.EFFECT_TYPE_SPLASH_DARK) + else if (effect === AvatarLogic.EFFECT_TYPE_SPLASH_DARK) { - this._effectChangeTimeStamp = (Nitro.instance.time + AvatarLogic.EFFECT_SPLASH_LENGTH); + this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = AvatarLogic.EFFECT_TYPE_SWIM_DARK; } - else if(model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM) + else if (model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM) { - this._effectChangeTimeStamp = (Nitro.instance.time + AvatarLogic.EFFECT_SPLASH_LENGTH); + this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = effect; effect = AvatarLogic.EFFECT_TYPE_SPLASH; } - else if(model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM_DARK) + else if (model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM_DARK) { - this._effectChangeTimeStamp = (Nitro.instance.time + AvatarLogic.EFFECT_SPLASH_LENGTH); + this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = effect; effect = AvatarLogic.EFFECT_TYPE_SPLASH_DARK; } - else if(delay === 0) + else if (delay === 0) { this._effectChangeTimeStamp = 0; } else { - this._effectChangeTimeStamp = (Nitro.instance.time + delay); + this._effectChangeTimeStamp = (GetTickerTime() + delay); this._newEffect = effect; return; @@ -458,7 +457,7 @@ export class AvatarLogic extends MovingObjectLogic { let eventType: string = null; - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_CLICK: eventType = RoomObjectMouseEvent.CLICK; @@ -466,20 +465,20 @@ export class AvatarLogic extends MovingObjectLogic case MouseEventType.ROLL_OVER: eventType = RoomObjectMouseEvent.MOUSE_ENTER; - if(this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 1); + if (this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 1); - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); break; case MouseEventType.ROLL_OUT: eventType = RoomObjectMouseEvent.MOUSE_LEAVE; - if(this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 0); + if (this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 0); - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_ARROW, this.object)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_ARROW, this.object)); break; } - if(eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if (eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } private randomTalkingPauseStartTimestamp(): number diff --git a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts index bc3a5499..99a78e19 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts @@ -1,5 +1,5 @@ import { RoomObjectVariable, StringDataType } from '../../../../../api'; -import { PixiApplicationProxy } from '../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage } from '../../../messages'; @@ -18,25 +18,25 @@ export class FurnitureBadgeDisplayLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(!this.object) return; + if (!this.object) return; - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const data = message.data; - if(data instanceof StringDataType) this.updateBadge(data.getValue(1)); + if (data instanceof StringDataType) this.updateBadge(data.getValue(1)); return; } - if(message instanceof ObjectGroupBadgeUpdateMessage) + if (message instanceof ObjectGroupBadgeUpdateMessage) { - if(message.assetName !== 'loading_icon') + if (message.assetName !== 'loading_icon') { this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_ASSET_NAME, message.assetName); this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS, 1); - this.update(PixiApplicationProxy.instance.ticker.lastTime); + this.update(GetTickerTime()); } return; @@ -45,16 +45,16 @@ export class FurnitureBadgeDisplayLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.BADGE_DISPLAY_ENGRAVING, this.object)); } protected updateBadge(badgeId: string): void { - if(badgeId === '') return; + if (badgeId === '') return; - if(this.eventDispatcher) + if (this.eventDispatcher) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS, -1); diff --git a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts index 6b6d145b..10c55e20 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts @@ -1,5 +1,5 @@ import { IRoomGeometry, RoomObjectVariable, StringDataType } from '../../../../../api'; -import { PixiApplicationProxy } from '../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; @@ -28,11 +28,11 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const data = message.data; - if(data instanceof StringDataType) + if (data instanceof StringDataType) { this.updateGroupId(data.getValue(FurnitureGuildCustomizedLogic.GROUPID_KEY)); this.updateBadge(data.getValue(FurnitureGuildCustomizedLogic.BADGE_KEY)); @@ -40,19 +40,19 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic } } - else if(message instanceof ObjectGroupBadgeUpdateMessage) + else if (message instanceof ObjectGroupBadgeUpdateMessage) { - if(message.assetName !== 'loading_icon') + if (message.assetName !== 'loading_icon') { this.object.model.setValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME, message.assetName); - this.update(PixiApplicationProxy.instance.ticker.lastTime); + this.update(GetTickerTime()); } } - else if(message instanceof ObjectSelectedMessage) + else if (message instanceof ObjectSelectedMessage) { - if(!message.selected) + if (!message.selected) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } @@ -77,9 +77,9 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_CLICK: this.openContextMenu(); diff --git a/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts index 74928f4b..3886269b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts @@ -1,5 +1,5 @@ +import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { Nitro } from '../../../../Nitro'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -23,7 +23,7 @@ export class FurnitureScoreLogic extends FurnitureLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(message instanceof ObjectDataUpdateMessage) return this.updateScore(message.state); + if (message instanceof ObjectDataUpdateMessage) return this.updateScore(message.state); super.processUpdateMessage(message); } @@ -34,16 +34,16 @@ export class FurnitureScoreLogic extends FurnitureLogic const currentScore = this.object.getState(0); - if(this._score !== currentScore) + if (this._score !== currentScore) { let difference = (this._score - currentScore); - if(difference < 0) difference = -(difference); + if (difference < 0) difference = -(difference); - if((difference * FurnitureScoreLogic.UPDATE_INTERVAL) > FurnitureScoreLogic.MAX_UPDATE_TIME) this._scoreIncreaser = (FurnitureScoreLogic.MAX_UPDATE_TIME / difference); + if ((difference * FurnitureScoreLogic.UPDATE_INTERVAL) > FurnitureScoreLogic.MAX_UPDATE_TIME) this._scoreIncreaser = (FurnitureScoreLogic.MAX_UPDATE_TIME / difference); else this._scoreIncreaser = FurnitureScoreLogic.UPDATE_INTERVAL; - this._scoreTimer = Nitro.instance.time; + this._scoreTimer = GetTickerTime(); } } @@ -53,15 +53,15 @@ export class FurnitureScoreLogic extends FurnitureLogic const currentScore = this.object.getState(0); - if((currentScore !== this._score) && (time >= (this._scoreTimer + this._scoreIncreaser))) + if ((currentScore !== this._score) && (time >= (this._scoreTimer + this._scoreIncreaser))) { const _local_3 = (time - this._scoreTimer); let _local_4 = (_local_3 / this._scoreIncreaser); let _local_5 = 1; - if(this._score < currentScore) _local_5 = -1; + if (this._score < currentScore) _local_5 = -1; - if(_local_4 > (_local_5 * (this._score - currentScore))) _local_4 = (_local_5 * (this._score - currentScore)); + if (_local_4 > (_local_5 * (this._score - currentScore))) _local_4 = (_local_5 * (this._score - currentScore)); this.object.setState((currentScore + (_local_5 * _local_4)), 0); diff --git a/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts index 92484c05..7df28e05 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts @@ -1,7 +1,6 @@ import { RoomObjectVariable, VoteDataType } from '../../../../../api'; -import { PixiApplicationProxy } from '../../../../../pixi-proxy'; +import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { Nitro } from '../../../../Nitro'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -27,11 +26,11 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const stuffData = (message.data as VoteDataType); - if(!stuffData) return; + if (!stuffData) return; this.updateTotal(stuffData.result); } @@ -41,20 +40,20 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { this._total = k; - if(!this._lastUpdate) + if (!this._lastUpdate) { this.object.model.setValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT, k); - this._lastUpdate = PixiApplicationProxy.instance.ticker.lastTime; + this._lastUpdate = GetTickerTime(); return; } - if(this._total !== this.currentTotal) + if (this._total !== this.currentTotal) { const difference = Math.abs((this._total - this.currentTotal)); - if((difference * FurnitureVoteCounterLogic.UPDATE_INTERVAL) > FurnitureVoteCounterLogic.MAX_UPDATE_TIME) + if ((difference * FurnitureVoteCounterLogic.UPDATE_INTERVAL) > FurnitureVoteCounterLogic.MAX_UPDATE_TIME) { this._interval = (FurnitureVoteCounterLogic.MAX_UPDATE_TIME / difference); } @@ -63,7 +62,7 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic this._interval = FurnitureVoteCounterLogic.UPDATE_INTERVAL; } - this._lastUpdate = Nitro.instance.time; + this._lastUpdate = GetTickerTime(); } } @@ -71,17 +70,17 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { super.update(time); - if(this.object) + if (this.object) { - if((this.currentTotal !== this._total) && (time >= (this._lastUpdate + this._interval))) + if ((this.currentTotal !== this._total) && (time >= (this._lastUpdate + this._interval))) { const _local_2 = (time - this._lastUpdate); let _local_3 = (_local_2 / this._interval); let _local_4 = 1; - if(this._total < this.currentTotal) _local_4 = -1; + if (this._total < this.currentTotal) _local_4 = -1; - if(_local_3 > (_local_4 * (this._total - this.currentTotal))) _local_3 = (_local_4 * (this._total - this.currentTotal)); + if (_local_3 > (_local_4 * (this._total - this.currentTotal))) _local_3 = (_local_4 * (this._total - this.currentTotal)); this.object.model.setValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT, (this.currentTotal + (_local_4 * _local_3))); diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index 92345057..959bb12c 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -1,9 +1,8 @@ import { BLEND_MODES } from '@pixi/constants'; import { Resource, Texture } from '@pixi/core'; -import { AlphaTolerance, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObject, IRoomObjectModel, RoomObjectSpriteType, RoomObjectVariable } from '../../../../../api'; +import { AlphaTolerance, AvatarAction, AvatarGuideStatus, AvatarSetType, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IGraphicAsset, IObjectVisualizationData, IRoomGeometry, IRoomObject, IRoomObjectModel, RoomObjectSpriteType, RoomObjectVariable } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; import { RoomObjectSpriteVisualization } from '../../../../../room'; -import { AvatarAction, AvatarGuideStatus, AvatarSetType, IAvatarEffectListener, IAvatarImage, IAvatarImageListener } from '../../../../avatar'; import { ExpressionAdditionFactory, FloatingIdleZAddition, GameClickTargetAddition, GuideStatusBubbleAddition, IAvatarAddition, MutedBubbleAddition, NumberBubbleAddition, TypingBubbleAddition } from './additions'; import { AvatarVisualizationData } from './AvatarVisualizationData'; @@ -133,7 +132,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement public initialize(data: IObjectVisualizationData): boolean { - if(!(data instanceof AvatarVisualizationData)) return false; + if (!(data instanceof AvatarVisualizationData)) return false; this._data = data; @@ -146,11 +145,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement public dispose(): void { - if(this._disposed) return; + if (this._disposed) return; super.dispose(); - if(this._avatarImage) this._avatarImage.dispose(); + if (this._avatarImage) this._avatarImage.dispose(); this._shadow = null; this._disposed = true; @@ -158,13 +157,13 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { - if(!this.object || !geometry || !this._data) return; + if (!this.object || !geometry || !this._data) return; - if(time < (this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER)) return; + if (time < (this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER)) return; this._lastUpdate += AvatarVisualization.UPDATE_TIME_INCREASER; - if((this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER) < time) this._lastUpdate = (time - AvatarVisualization.UPDATE_TIME_INCREASER); + if ((this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER) < time) this._lastUpdate = (time - AvatarVisualization.UPDATE_TIME_INCREASER); const model = this.object.model; const scale = geometry.scale; @@ -177,41 +176,41 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const updateModel = this.updateModel(model, scale); - if((updateModel || (scale !== this._scale)) || !this._avatarImage) + if ((updateModel || (scale !== this._scale)) || !this._avatarImage) { - if(scale !== this._scale) + if (scale !== this._scale) { didScaleUpdate = true; this.updateScale(scale); } - if(effect !== this._effect) didEffectUpdate = true; + if (effect !== this._effect) didEffectUpdate = true; - if(didScaleUpdate || !this._avatarImage || didEffectUpdate) + if (didScaleUpdate || !this._avatarImage || didEffectUpdate) { this._avatarImage = this.createAvatarImage(scale, this._effect); - if(!this._avatarImage) return; + if (!this._avatarImage) return; otherUpdate = true; const sprite = this.getSprite(AvatarVisualization.AVATAR_LAYER_ID); - if((sprite && this._avatarImage) && this._avatarImage.isPlaceholder()) + if ((sprite && this._avatarImage) && this._avatarImage.isPlaceholder()) { sprite.alpha = 150; } - else if(sprite) + else if (sprite) { sprite.alpha = 255; } } - if(!this._avatarImage) return; + if (!this._avatarImage) return; - if(didEffectUpdate && this._avatarImage.animationHasResetOnToggle) this._avatarImage.resetAnimationFrameCounter(); + if (didEffectUpdate && this._avatarImage.animationHasResetOnToggle) this._avatarImage.resetAnimationFrameCounter(); this.updateShadow(scale); @@ -219,11 +218,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this.processActionsForAvatar(this._avatarImage); - if(this._additions) + if (this._additions) { let index = this._extraSpritesStartIndex; - for(const addition of this._additions.values()) + for (const addition of this._additions.values()) { addition.update(this.getSprite(index++), scale); } @@ -236,29 +235,29 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement objectUpdate = this.updateObject(this.object, geometry, update); } - if(this._additions) + if (this._additions) { let index = this._extraSpritesStartIndex; - for(const addition of this._additions.values()) + for (const addition of this._additions.values()) { - if(addition.animate(this.getSprite(index++))) this.updateSpriteCounter++; + if (addition.animate(this.getSprite(index++))) this.updateSpriteCounter++; } } const update1 = (objectUpdate || updateModel || didScaleUpdate); const update2 = ((this._isAnimating || (this._forcedAnimFrames > 0)) && update); - if(update1) this._forcedAnimFrames = AvatarVisualization.ANIMATION_FRAME_UPDATE_INTERVAL; + if (update1) this._forcedAnimFrames = AvatarVisualization.ANIMATION_FRAME_UPDATE_INTERVAL; - if(update1 || update2) + if (update1 || update2) { this.updateSpriteCounter++; this._forcedAnimFrames--; this._updatesUntilFrameUpdate--; - if((((this._updatesUntilFrameUpdate <= 0) || didScaleUpdate) || updateModel) || otherUpdate) + if ((((this._updatesUntilFrameUpdate <= 0) || didScaleUpdate) || updateModel) || otherUpdate) { this._avatarImage.updateAnimationByFrames(1); @@ -271,21 +270,21 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let _local_20 = this._avatarImage.getCanvasOffsets(); - if(!_local_20 || (_local_20.length < 3)) _local_20 = AvatarVisualization.DEFAULT_CANVAS_OFFSETS; + if (!_local_20 || (_local_20.length < 3)) _local_20 = AvatarVisualization.DEFAULT_CANVAS_OFFSETS; const sprite = this.getSprite(AvatarVisualization.SPRITE_INDEX_AVATAR); - if(sprite) + if (sprite) { const highlightEnabled = ((this.object.model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT_ENABLE) === 1) && (this.object.model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT) === 1)); const avatarImage = this._avatarImage.getImage(AvatarSetType.FULL, highlightEnabled); - if(avatarImage) + if (avatarImage) { sprite.texture = avatarImage; - if(highlightEnabled) + if (highlightEnabled) { // sprite.filters = [ // new GlowFilter({ @@ -300,15 +299,15 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } } - if(sprite.texture) + if (sprite.texture) { sprite.offsetX = ((((-1 * scale) / 2) + _local_20[0]) - ((sprite.texture.width - scale) / 2)); sprite.offsetY = (((-(sprite.texture.height) + (scale / 4)) + _local_20[1]) + this._postureOffset); } - if(this._isLaying) + if (this._isLaying) { - if(this._layInside) sprite.relativeDepth = -0.5; + if (this._layInside) sprite.relativeDepth = -0.5; else sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_LAYING_DEPTH + _local_20[2]); } else @@ -316,7 +315,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH + _local_20[2]); } - if(this._ownUser) + if (this._ownUser) { sprite.relativeDepth -= AvatarVisualization.AVATAR_OWN_DEPTH_ADJUST; sprite.spriteType = RoomObjectSpriteType.AVATAR_OWN; @@ -329,9 +328,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const typingBubble = this.getAddition(AvatarVisualization.TYPING_BUBBLE_ID) as TypingBubbleAddition; - if(typingBubble) + if (typingBubble) { - if(!this._isLaying) typingBubble.relativeDepth = ((AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH - 0.01) + _local_20[2]); + if (!this._isLaying) typingBubble.relativeDepth = ((AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH - 0.01) + _local_20[2]); else typingBubble.relativeDepth = ((AvatarVisualization.AVATAR_SPRITE_LAYING_DEPTH - 0.01) + _local_20[2]); } @@ -340,32 +339,32 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let _local_21 = AvatarVisualization.INITIAL_RESERVED_SPRITES; const direction = this._avatarImage.getDirection(); - for(const spriteData of this._avatarImage.getSprites()) + for (const spriteData of this._avatarImage.getSprites()) { - if(spriteData.id === AvatarVisualization.AVATAR) + if (spriteData.id === AvatarVisualization.AVATAR) { const sprite = this.getSprite(AvatarVisualization.SPRITE_INDEX_AVATAR); - if(sprite) + if (sprite) { const layerData = this._avatarImage.getLayerData(spriteData); let offsetX = spriteData.getDirectionOffsetX(direction); let offsetY = spriteData.getDirectionOffsetY(direction); - if(layerData) + if (layerData) { offsetX += layerData.dx; offsetY += layerData.dy; } - if(scale < 48) + if (scale < 48) { offsetX /= 2; offsetY /= 2; } - if(!this._canStandUp) + if (!this._canStandUp) { sprite.offsetX += offsetX; sprite.offsetY += offsetY; @@ -376,7 +375,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const sprite = this.getSprite(_local_21); - if(sprite) + if (sprite) { sprite.alphaTolerance = AlphaTolerance.MATCH_NOTHING; sprite.visible = true; @@ -389,9 +388,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const offsetZ = spriteData.getDirectionOffsetZ(direction); let dd = 0; - if(spriteData.hasDirections) dd = direction; + if (spriteData.hasDirections) dd = direction; - if(layerData) + if (layerData) { frameNumber = layerData.animationFrame; offsetX += layerData.dx; @@ -399,30 +398,30 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement dd += layerData.dd; } - if(scale < 48) + if (scale < 48) { offsetX /= 2; offsetY /= 2; } - if(dd < 0) dd += 8; + if (dd < 0) dd += 8; else { - if(dd > 7) dd -= 8; + if (dd > 7) dd -= 8; } const assetName = ((((((this._avatarImage.getScale() + '_') + spriteData.member) + '_') + dd) + '_') + frameNumber); const asset = this._avatarImage.getAsset(assetName); - if(!asset) continue; + if (!asset) continue; sprite.texture = asset.texture; sprite.offsetX = ((asset.offsetX - (scale / 2)) + offsetX); sprite.offsetY = (asset.offsetY + offsetY); sprite.flipH = asset.flipH; - if(spriteData.hasStaticY) + if (spriteData.hasStaticY) { sprite.offsetY += ((this._verticalOffset * scale) / (2 * AvatarVisualization.BASE_Y_SCALE)); } @@ -431,7 +430,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement sprite.offsetY += this._postureOffset; } - if(this._isLaying) + if (this._isLaying) { sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_LAYING_DEPTH - ((0.001 * this.totalSprites) * offsetZ)); } @@ -440,7 +439,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH - ((0.001 * this.totalSprites) * offsetZ)); } - if(spriteData.ink === 33) sprite.blendMode = BLEND_MODES.ADD; + if (spriteData.ink === 33) sprite.blendMode = BLEND_MODES.ADD; else sprite.blendMode = BLEND_MODES.NORMAL; } @@ -455,7 +454,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let cachedImage: IAvatarImage = null; let imageName = 'avatarImage' + scale.toString(); - if(!effectId) + if (!effectId) { cachedImage = this._cachedAvatars.getValue(imageName); } @@ -466,24 +465,24 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement cachedImage = this._cachedAvatarEffects.getValue(imageName); } - if(!cachedImage) + if (!cachedImage) { cachedImage = this._data.createAvatarImage(this._figure, scale, this._gender, this, this); - if(cachedImage) + if (cachedImage) { - if(!effectId) + if (!effectId) { this._cachedAvatars.add(imageName, cachedImage); } else { - if(this._cachedAvatarEffects.length >= AvatarVisualization.MAX_EFFECT_CACHE) + if (this._cachedAvatarEffects.length >= AvatarVisualization.MAX_EFFECT_CACHE) { const cached = this._cachedAvatarEffects.remove(this._cachedAvatarEffects.getKey(0)); - if(cached) cached.dispose(); + if (cached) cached.dispose(); } this._cachedAvatarEffects.add(imageName, cachedImage); @@ -496,23 +495,23 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement protected updateObject(object: IRoomObject, geometry: IRoomGeometry, update: boolean, _arg_4: boolean = false): boolean { - if((!_arg_4 && (this.updateObjectCounter === object.updateCounter)) && (this._geometryUpdateCounter === geometry.updateId)) return false; + if ((!_arg_4 && (this.updateObjectCounter === object.updateCounter)) && (this._geometryUpdateCounter === geometry.updateId)) return false; let direction = (object.getDirection().x - geometry.direction.x); let headDirection = (this._headDirection - geometry.direction.x); - if(this._posture === 'float') headDirection = direction; + if (this._posture === 'float') headDirection = direction; direction = (((direction % 360) + 360) % 360); headDirection = (((headDirection % 360) + 360) % 360); - if((this._posture === 'sit') && this._canStandUp) + if ((this._posture === 'sit') && this._canStandUp) { direction -= ((direction % 90) - 45); headDirection -= ((headDirection % 90) - 45); } - if((direction !== this._angle) || _arg_4) + if ((direction !== this._angle) || _arg_4) { update = true; @@ -524,13 +523,13 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this._avatarImage.setDirectionAngle(AvatarSetType.FULL, direction); } - if((headDirection !== this._headAngle) || _arg_4) + if ((headDirection !== this._headAngle) || _arg_4) { update = true; this._headAngle = headDirection; - if(this._headAngle !== this._angle) + if (this._headAngle !== this._angle) { headDirection = (headDirection - (135 - 22.5)); headDirection = ((headDirection + 360) % 360); @@ -548,15 +547,15 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement protected updateModel(model: IRoomObjectModel, scale: number): boolean { - if(!model) return false; + if (!model) return false; - if(this.updateModelCounter === model.updateCounter) return false; + if (this.updateModelCounter === model.updateCounter) return false; let needsUpdate = false; const talk = (model.getValue(RoomObjectVariable.FIGURE_TALK) > 0); - if(talk !== this._talk) + if (talk !== this._talk) { this._talk = talk; @@ -565,7 +564,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const expression = model.getValue(RoomObjectVariable.FIGURE_EXPRESSION); - if(expression !== this._expression) + if (expression !== this._expression) { this._expression = expression; @@ -574,7 +573,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const sleep = (model.getValue(RoomObjectVariable.FIGURE_SLEEP) > 0); - if(sleep !== this._sleep) + if (sleep !== this._sleep) { this._sleep = sleep; @@ -583,7 +582,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const blink = (model.getValue(RoomObjectVariable.FIGURE_BLINK) > 0); - if(blink !== this._blink) + if (blink !== this._blink) { this._blink = blink; @@ -592,7 +591,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const gesture = (model.getValue(RoomObjectVariable.FIGURE_GESTURE) || 0); - if(gesture !== this._gesture) + if (gesture !== this._gesture) { this._gesture = gesture; @@ -601,7 +600,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const posture = model.getValue(RoomObjectVariable.FIGURE_POSTURE); - if(posture !== this._posture) + if (posture !== this._posture) { this._posture = posture; @@ -610,7 +609,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const postureParameter = model.getValue(RoomObjectVariable.FIGURE_POSTURE_PARAMETER); - if(postureParameter !== this._postureParameter) + if (postureParameter !== this._postureParameter) { this._postureParameter = postureParameter; @@ -619,7 +618,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const canStandUp = model.getValue(RoomObjectVariable.FIGURE_CAN_STAND_UP); - if(canStandUp !== this._canStandUp) + if (canStandUp !== this._canStandUp) { this._canStandUp = canStandUp; @@ -628,7 +627,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const verticalOffset = (model.getValue(RoomObjectVariable.FIGURE_VERTICAL_OFFSET) * AvatarVisualization.BASE_Y_SCALE); - if(verticalOffset !== this._verticalOffset) + if (verticalOffset !== this._verticalOffset) { this._verticalOffset = verticalOffset; @@ -637,7 +636,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const dance = (model.getValue(RoomObjectVariable.FIGURE_DANCE) || 0); - if(dance !== this._dance) + if (dance !== this._dance) { this._dance = dance; @@ -646,7 +645,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const effect = (model.getValue(RoomObjectVariable.FIGURE_EFFECT) || 0); - if(effect !== this._effect) + if (effect !== this._effect) { this._effect = effect; @@ -655,7 +654,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const carryObject = (model.getValue(RoomObjectVariable.FIGURE_CARRY_OBJECT) || 0); - if(carryObject !== this._carryObject) + if (carryObject !== this._carryObject) { this._carryObject = carryObject; @@ -664,7 +663,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const useObject = (model.getValue(RoomObjectVariable.FIGURE_USE_OBJECT) || 0); - if(useObject !== this._useObject) + if (useObject !== this._useObject) { this._useObject = useObject; @@ -673,16 +672,16 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const headDirection = model.getValue(RoomObjectVariable.HEAD_DIRECTION); - if(headDirection !== this._headDirection) + if (headDirection !== this._headDirection) { this._headDirection = headDirection; needsUpdate = true; } - if((this._carryObject > 0) && (useObject > 0)) + if ((this._carryObject > 0) && (useObject > 0)) { - if(this._useObject !== this._carryObject) + if (this._useObject !== this._carryObject) { this._useObject = this._carryObject; @@ -691,7 +690,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } else { - if(this._useObject !== 0) + if (this._useObject !== 0) { this._useObject = 0; @@ -701,30 +700,30 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let idleAddition = this.getAddition(AvatarVisualization.FLOATING_IDLE_Z_ID); - if(this._sleep) + if (this._sleep) { - if(!idleAddition) idleAddition = this.addAddition(new FloatingIdleZAddition(AvatarVisualization.FLOATING_IDLE_Z_ID, this)); + if (!idleAddition) idleAddition = this.addAddition(new FloatingIdleZAddition(AvatarVisualization.FLOATING_IDLE_Z_ID, this)); needsUpdate = true; } else { - if(idleAddition) this.removeAddition(AvatarVisualization.FLOATING_IDLE_Z_ID); + if (idleAddition) this.removeAddition(AvatarVisualization.FLOATING_IDLE_Z_ID); } const isMuted = (model.getValue(RoomObjectVariable.FIGURE_IS_MUTED) > 0); let mutedAddition = this.getAddition(AvatarVisualization.MUTED_BUBBLE_ID); - if(isMuted) + if (isMuted) { - if(!mutedAddition) mutedAddition = this.addAddition(new MutedBubbleAddition(AvatarVisualization.MUTED_BUBBLE_ID, this)); + if (!mutedAddition) mutedAddition = this.addAddition(new MutedBubbleAddition(AvatarVisualization.MUTED_BUBBLE_ID, this)); needsUpdate = true; } else { - if(mutedAddition) + if (mutedAddition) { this.removeAddition(AvatarVisualization.MUTED_BUBBLE_ID); @@ -735,15 +734,15 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let typingAddition = this.getAddition(AvatarVisualization.TYPING_BUBBLE_ID); - if(isTyping) + if (isTyping) { - if(!typingAddition) typingAddition = this.addAddition(new TypingBubbleAddition(AvatarVisualization.TYPING_BUBBLE_ID, this)); + if (!typingAddition) typingAddition = this.addAddition(new TypingBubbleAddition(AvatarVisualization.TYPING_BUBBLE_ID, this)); needsUpdate = true; } else { - if(typingAddition) + if (typingAddition) { this.removeAddition(AvatarVisualization.TYPING_BUBBLE_ID); @@ -754,7 +753,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const guideStatusValue = (model.getValue(RoomObjectVariable.FIGURE_GUIDE_STATUS) || 0); - if(guideStatusValue !== AvatarGuideStatus.NONE) + if (guideStatusValue !== AvatarGuideStatus.NONE) { this.removeAddition(AvatarVisualization.GUIDE_BUBBLE_ID); this.addAddition(new GuideStatusBubbleAddition(AvatarVisualization.GUIDE_BUBBLE_ID, this, guideStatusValue)); @@ -763,7 +762,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } else { - if(this.getAddition(AvatarVisualization.GUIDE_BUBBLE_ID)) + if (this.getAddition(AvatarVisualization.GUIDE_BUBBLE_ID)) { this.removeAddition(AvatarVisualization.GUIDE_BUBBLE_ID); @@ -775,66 +774,66 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let gameClickAddition = this.getAddition(AvatarVisualization.GAME_CLICK_TARGET_ID); - if(isPlayingGame) + if (isPlayingGame) { - if(!gameClickAddition) gameClickAddition = this.addAddition(new GameClickTargetAddition(AvatarVisualization.GAME_CLICK_TARGET_ID)); + if (!gameClickAddition) gameClickAddition = this.addAddition(new GameClickTargetAddition(AvatarVisualization.GAME_CLICK_TARGET_ID)); needsUpdate = true; } else { - if(gameClickAddition) this.removeAddition(AvatarVisualization.GAME_CLICK_TARGET_ID); + if (gameClickAddition) this.removeAddition(AvatarVisualization.GAME_CLICK_TARGET_ID); } const numberValue = model.getValue(RoomObjectVariable.FIGURE_NUMBER_VALUE); let numberAddition = this.getAddition(AvatarVisualization.NUMBER_BUBBLE_ID); - if(numberValue > 0) + if (numberValue > 0) { - if(!numberAddition) numberAddition = this.addAddition(new NumberBubbleAddition(AvatarVisualization.NUMBER_BUBBLE_ID, numberValue, this)); + if (!numberAddition) numberAddition = this.addAddition(new NumberBubbleAddition(AvatarVisualization.NUMBER_BUBBLE_ID, numberValue, this)); needsUpdate = true; } else { - if(numberAddition) this.removeAddition(AvatarVisualization.NUMBER_BUBBLE_ID); + if (numberAddition) this.removeAddition(AvatarVisualization.NUMBER_BUBBLE_ID); } let expressionAddition = this.getAddition(AvatarVisualization.EXPRESSION_ID); - if(this._expression > 0) + if (this._expression > 0) { - if(!expressionAddition) + if (!expressionAddition) { expressionAddition = ExpressionAdditionFactory.getExpressionAddition(AvatarVisualization.EXPRESSION_ID, this._expression, this); - if(expressionAddition) this.addAddition(expressionAddition); + if (expressionAddition) this.addAddition(expressionAddition); } } else { - if(expressionAddition) this.removeAddition(AvatarVisualization.EXPRESSION_ID); + if (expressionAddition) this.removeAddition(AvatarVisualization.EXPRESSION_ID); } this.updateScale(scale); const gender = model.getValue(RoomObjectVariable.GENDER); - if(gender !== this._gender) + if (gender !== this._gender) { this._gender = gender; needsUpdate = true; } - if(this.updateFigure(model.getValue(RoomObjectVariable.FIGURE))) needsUpdate = true; + if (this.updateFigure(model.getValue(RoomObjectVariable.FIGURE))) needsUpdate = true; let sign = model.getValue(RoomObjectVariable.FIGURE_SIGN); - if(sign === null) sign = -1; + if (sign === null) sign = -1; - if(this._sign !== sign) + if (this._sign !== sign) { this._sign = sign; @@ -843,18 +842,18 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const highlightEnabled = (model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT_ENABLE) > 0); - if(highlightEnabled !== this._highlightEnabled) + if (highlightEnabled !== this._highlightEnabled) { this._highlightEnabled = highlightEnabled; needsUpdate = true; } - if(this._highlightEnabled) + if (this._highlightEnabled) { const highlight = (model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT) > 0); - if(highlight !== this._highlight) + if (highlight !== this._highlight) { this._highlight = highlight; @@ -864,7 +863,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const ownUser = (model.getValue(RoomObjectVariable.OWN_USER) > 0); - if(ownUser !== this._ownUser) + if (ownUser !== this._ownUser) { this._ownUser = ownUser; @@ -878,7 +877,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement protected setDirection(direction: number): void { - if(this._direction === direction) return; + if (this._direction === direction) return; this._direction = direction; @@ -887,9 +886,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private updateScale(scale: number): void { - if(scale < 48) this._blink = false; + if (scale < 48) this._blink = false; - if((this._posture === 'sit') || (this._posture === 'lay')) + if ((this._posture === 'sit') || (this._posture === 'lay')) { this._postureOffset = (scale / 2); } @@ -901,45 +900,45 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this._layInside = false; this._isLaying = false; - if(this._posture === 'lay') + if (this._posture === 'lay') { this._isLaying = true; const _local_2 = parseInt(this._postureParameter); - if(_local_2 < 0) this._layInside = true; + if (_local_2 < 0) this._layInside = true; } } private processActionsForAvatar(avatar: IAvatarImage): void { - if(!avatar) return; + if (!avatar) return; avatar.initActionAppends(); avatar.appendAction(AvatarAction.POSTURE, this._posture, this._postureParameter); - if(this._gesture > 0) this._avatarImage.appendAction(AvatarAction.GESTURE, AvatarAction.getGesture(this._gesture)); + if (this._gesture > 0) this._avatarImage.appendAction(AvatarAction.GESTURE, AvatarAction.getGesture(this._gesture)); - if(this._dance > 0) this._avatarImage.appendAction(AvatarAction.DANCE, this._dance); + if (this._dance > 0) this._avatarImage.appendAction(AvatarAction.DANCE, this._dance); - if(this._sign > -1) this._avatarImage.appendAction(AvatarAction.SIGN, this._sign); + if (this._sign > -1) this._avatarImage.appendAction(AvatarAction.SIGN, this._sign); - if(this._carryObject > 0) this._avatarImage.appendAction(AvatarAction.CARRY_OBJECT, this._carryObject); + if (this._carryObject > 0) this._avatarImage.appendAction(AvatarAction.CARRY_OBJECT, this._carryObject); - if(this._useObject > 0) this._avatarImage.appendAction(AvatarAction.USE_OBJECT, this._useObject); + if (this._useObject > 0) this._avatarImage.appendAction(AvatarAction.USE_OBJECT, this._useObject); - if(this._talk) this._avatarImage.appendAction(AvatarAction.TALK); + if (this._talk) this._avatarImage.appendAction(AvatarAction.TALK); - if(this._sleep || this._blink) this._avatarImage.appendAction(AvatarAction.SLEEP); + if (this._sleep || this._blink) this._avatarImage.appendAction(AvatarAction.SLEEP); - if(this._expression > 0) + if (this._expression > 0) { const expression = AvatarAction.getExpression(this._expression); - if(expression !== '') + if (expression !== '') { - switch(expression) + switch (expression) { case AvatarAction.DANCE: this._avatarImage.appendAction(AvatarAction.DANCE, 2); @@ -951,7 +950,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } } - if(this._effect > 0) this._avatarImage.appendAction(AvatarAction.EFFECT, this._effect); + if (this._effect > 0) this._avatarImage.appendAction(AvatarAction.EFFECT, this._effect); avatar.endActionAppends(); @@ -959,24 +958,24 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let spriteCount = AvatarVisualization.INITIAL_RESERVED_SPRITES; - for(const sprite of this._avatarImage.getSprites()) + for (const sprite of this._avatarImage.getSprites()) { - if(sprite.id !== AvatarVisualization.AVATAR) spriteCount++; + if (sprite.id !== AvatarVisualization.AVATAR) spriteCount++; } - if(spriteCount !== this.totalSprites) this.createSprites(spriteCount); + if (spriteCount !== this.totalSprites) this.createSprites(spriteCount); this._extraSpritesStartIndex = spriteCount; - if(this._additions) + if (this._additions) { - for(const addition of this._additions.values()) this.createSprite(); + for (const addition of this._additions.values()) this.createSprite(); } } private updateFigure(figure: string): boolean { - if(this._figure === figure) return false; + if (this._figure === figure) return false; this._figure = figure; @@ -997,9 +996,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private clearAvatar(): void { - for(const avatar of this._cachedAvatars.getValues()) avatar && avatar.dispose(); + for (const avatar of this._cachedAvatars.getValues()) avatar && avatar.dispose(); - for(const avatar of this._cachedAvatarEffects.getValues()) avatar && avatar.dispose(); + for (const avatar of this._cachedAvatarEffects.getValues()) avatar && avatar.dispose(); this._cachedAvatars.reset(); this._cachedAvatarEffects.reset(); @@ -1008,7 +1007,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const sprite = this.getSprite(AvatarVisualization.AVATAR_LAYER_ID); - if(sprite) + if (sprite) { sprite.texture = Texture.EMPTY; sprite.alpha = 255; @@ -1017,11 +1016,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private getAddition(id: number): IAvatarAddition { - if(!this._additions) return null; + if (!this._additions) return null; const existing = this._additions.get(id); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -1030,7 +1029,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const existing = this.getAddition(addition.id); - if(existing) return; + if (existing) return; this._additions.set(addition.id, addition); @@ -1041,7 +1040,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const addition = this.getAddition(id); - if(!addition) return; + if (!addition) return; this._additions.delete(addition.id); @@ -1054,22 +1053,22 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const sprite = this.getSprite(AvatarVisualization.SHADOW_LAYER_ID); - if(!sprite) return; + if (!sprite) return; let hasShadow = (((this._posture === 'mv') || (this._posture === 'std')) || ((this._posture === 'sit') && this._canStandUp)); - if(this._effect === AvatarVisualization.SNOWBOARDING_EFFECT) hasShadow = false; + if (this._effect === AvatarVisualization.SNOWBOARDING_EFFECT) hasShadow = false; - if(hasShadow) + if (hasShadow) { sprite.visible = true; - if(!this._shadow || (scale !== this._scale)) + if (!this._shadow || (scale !== this._scale)) { let offsetX = 0; let offsetY = 0; - if(scale < 48) + if (scale < 48) { sprite.libraryAssetName = 'sh_std_sd_1_0_0'; @@ -1088,7 +1087,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement offsetY = ((this._canStandUp) ? 10 : -7); } - if(this._shadow) + if (this._shadow) { sprite.texture = this._shadow.texture; sprite.offsetX = offsetX; diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts index 6ab961ab..0b9fd904 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts @@ -1,7 +1,6 @@ import { Resource, Texture } from '@pixi/core'; -import { IAssetData, IObjectVisualizationData } from '../../../../../api'; +import { AvatarScaleType, IAssetData, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IObjectVisualizationData } from '../../../../../api'; import { Disposable } from '../../../../../core'; -import { AvatarScaleType, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager } from '../../../../avatar'; export class AvatarVisualizationData extends Disposable implements IObjectVisualizationData { @@ -26,7 +25,7 @@ export class AvatarVisualizationData extends Disposable implements IObjectVisual { let avatarImage: IAvatarImage = null; - if(size > 48) avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.LARGE, gender, avatarListener, effectListener); + if (size > 48) avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.LARGE, gender, avatarListener, effectListener); else avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.SMALL, gender, avatarListener, effectListener); return avatarImage; @@ -34,7 +33,7 @@ export class AvatarVisualizationData extends Disposable implements IObjectVisual public getAvatarRendererAsset(name: string): Texture { - if(!this._avatarRenderer) return null; + if (!this._avatarRenderer) return null; return this._avatarRenderer.assets.getTexture(name); } diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts index e127a8f9..6d1571b9 100644 --- a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts @@ -1,7 +1,6 @@ import { Resource, Texture } from '@pixi/core'; -import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar'; -import { Nitro } from '../../../../../Nitro'; +import { AvatarAction, IRoomObjectSprite } from '../../../../../../api'; +import { GetTickerTime } from '../../../../../../pixi-proxy'; import { AvatarVisualization } from '../AvatarVisualization'; import { ExpressionAddition } from './ExpressionAddition'; @@ -25,7 +24,7 @@ export class FloatingHeartAddition extends ExpressionAddition super(id, type, visualization); this._asset = null; - this._startTime = Nitro.instance.time; + this._startTime = GetTickerTime(); this._delta = 0; this._offsetY = 0; this._scale = 0; @@ -34,23 +33,23 @@ export class FloatingHeartAddition extends ExpressionAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if(!sprite) return; + if (!sprite) return; this._scale = scale; let additionScale = 64; let offsetX = 0; - if(scale < 48) + if (scale < 48) { this._asset = this.visualization.getAvatarRenderAsset('avatar_addition_user_blowkiss_small'); - if((this.visualization.angle === 90) || (this.visualization.angle === 270)) + if ((this.visualization.angle === 90) || (this.visualization.angle === 270)) { offsetX = 0; } - else if((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) + else if ((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) { offsetX = 6; } @@ -65,12 +64,12 @@ export class FloatingHeartAddition extends ExpressionAddition { this._asset = this.visualization.getAvatarRenderAsset('avatar_addition_user_blowkiss'); - if((this.visualization.angle === 90) || (this.visualization.angle === 270)) + if ((this.visualization.angle === 90) || (this.visualization.angle === 270)) { offsetX = -3; } - else if((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) + else if ((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) { offsetX = 22; } @@ -80,17 +79,17 @@ export class FloatingHeartAddition extends ExpressionAddition this._offsetY = -70; } - if(this.visualization.posture === AvatarAction.POSTURE_SIT) + if (this.visualization.posture === AvatarAction.POSTURE_SIT) { this._offsetY += (additionScale / 2); } - else if(this.visualization.posture === AvatarAction.POSTURE_LAY) + else if (this.visualization.posture === AvatarAction.POSTURE_LAY) { this._offsetY += additionScale; } - if(this._asset) + if (this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -108,13 +107,13 @@ export class FloatingHeartAddition extends ExpressionAddition public animate(sprite: IRoomObjectSprite): boolean { - if(!sprite) return false; + if (!sprite) return false; - if(this._asset) sprite.texture = this._asset; + if (this._asset) sprite.texture = this._asset; - if(this._state === FloatingHeartAddition.STATE_DELAY) + if (this._state === FloatingHeartAddition.STATE_DELAY) { - if((Nitro.instance.time - this._startTime) < FloatingHeartAddition.DELAY_BEFORE_ANIMATION) return false; + if ((GetTickerTime() - this._startTime) < FloatingHeartAddition.DELAY_BEFORE_ANIMATION) return false; this._state = FloatingHeartAddition.STATE_FADE_IN; @@ -126,14 +125,14 @@ export class FloatingHeartAddition extends ExpressionAddition return true; } - if(this._state === FloatingHeartAddition.STATE_FADE_IN) + if (this._state === FloatingHeartAddition.STATE_FADE_IN) { this._delta += 0.1; sprite.offsetY = this._offsetY; sprite.alpha = (Math.pow(this._delta, 0.9) * 255); - if(this._delta >= 1) + if (this._delta >= 1) { sprite.alpha = 255; @@ -144,7 +143,7 @@ export class FloatingHeartAddition extends ExpressionAddition return true; } - if(this._state === FloatingHeartAddition.STATE_FLOAT) + if (this._state === FloatingHeartAddition.STATE_FLOAT) { const alpha = Math.pow(this._delta, 0.9); @@ -155,7 +154,7 @@ export class FloatingHeartAddition extends ExpressionAddition sprite.offsetY = (this._offsetY + (((this._delta < 1) ? alpha : 1) * offset)); sprite.alpha = ((1 - alpha) * 255); - if(sprite.alpha <= 0) + if (sprite.alpha <= 0) { sprite.visible = false; diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts index 542548f0..c6ce4160 100644 --- a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts @@ -1,7 +1,6 @@ import { Resource, Texture } from '@pixi/core'; -import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar'; -import { Nitro } from '../../../../../Nitro'; +import { AvatarAction, IRoomObjectSprite } from '../../../../../../api'; +import { GetTickerTime } from '../../../../../../pixi-proxy'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; @@ -26,7 +25,7 @@ export class FloatingIdleZAddition implements IAvatarAddition this._id = id; this._visualization = visualization; this._asset = null; - this._startTime = Nitro.instance.time; + this._startTime = GetTickerTime(); this._offsetY = 0; this._scale = 0; this._state = 0; @@ -42,14 +41,14 @@ export class FloatingIdleZAddition implements IAvatarAddition { let side = 'left'; - if((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) side = 'right'; + if ((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) side = 'right'; return ('avatar_addition_user_idle_' + side + '_' + state + ((this._scale < 48) ? '_small' : '')); } public update(sprite: IRoomObjectSprite, scale: number): void { - if(!sprite) return; + if (!sprite) return; this._scale = scale; this._asset = this._visualization.getAvatarRenderAsset(this.getSpriteAssetName((this._state === FloatingIdleZAddition.STATE_FRAME_A) ? 1 : 2)); @@ -57,9 +56,9 @@ export class FloatingIdleZAddition implements IAvatarAddition let additionScale = 64; let offsetX = 0; - if(scale < 48) + if (scale < 48) { - if((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) + if ((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) { offsetX = 10; } @@ -74,7 +73,7 @@ export class FloatingIdleZAddition implements IAvatarAddition } else { - if((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) + if ((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) { offsetX = 22; } @@ -86,17 +85,17 @@ export class FloatingIdleZAddition implements IAvatarAddition this._offsetY = -70; } - if(this._visualization.posture === AvatarAction.POSTURE_SIT) + if (this._visualization.posture === AvatarAction.POSTURE_SIT) { this._offsetY += (additionScale / 2); } - else if(this._visualization.posture === AvatarAction.POSTURE_LAY) + else if (this._visualization.posture === AvatarAction.POSTURE_LAY) { this._offsetY += (additionScale - (0.3 * additionScale)); } - if(this._asset) + if (this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -108,13 +107,13 @@ export class FloatingIdleZAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if(!sprite) return false; + if (!sprite) return false; - const totalTimeRunning = Nitro.instance.time; + const totalTimeRunning = GetTickerTime(); - if(this._state === FloatingIdleZAddition.STATE_DELAY) + if (this._state === FloatingIdleZAddition.STATE_DELAY) { - if((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_BEFORE_ANIMATION) + if ((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_BEFORE_ANIMATION) { this._state = FloatingIdleZAddition.STATE_FRAME_A; this._startTime = totalTimeRunning; @@ -122,9 +121,9 @@ export class FloatingIdleZAddition implements IAvatarAddition } } - if(this._state === FloatingIdleZAddition.STATE_FRAME_A) + if (this._state === FloatingIdleZAddition.STATE_FRAME_A) { - if((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) + if ((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) { this._state = FloatingIdleZAddition.STATE_FRAME_B; this._startTime = totalTimeRunning; @@ -132,9 +131,9 @@ export class FloatingIdleZAddition implements IAvatarAddition } } - if(this._state === FloatingIdleZAddition.STATE_FRAME_B) + if (this._state === FloatingIdleZAddition.STATE_FRAME_B) { - if((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) + if ((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) { this._state = FloatingIdleZAddition.STATE_FRAME_A; this._startTime = totalTimeRunning; @@ -142,7 +141,7 @@ export class FloatingIdleZAddition implements IAvatarAddition } } - if(this._asset) + if (this._asset) { sprite.texture = this._asset; sprite.alpha = 255; diff --git a/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts index ff218838..ff2903f7 100644 --- a/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts @@ -1,6 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction, AvatarGuideStatus } from '../../../../../avatar'; +import { AvatarAction, AvatarGuideStatus, IRoomObjectSprite } from '../../../../../../api'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; @@ -29,7 +28,7 @@ export class GuideStatusBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if(!sprite) return; + if (!sprite) return; sprite.visible = true; sprite.relativeDepth = this._relativeDepth; @@ -41,7 +40,7 @@ export class GuideStatusBubbleAddition implements IAvatarAddition this._asset = this._visualization.getAvatarRenderAsset((this._status === AvatarGuideStatus.GUIDE) ? 'avatar_addition_user_guide_bubble' : 'avatar_addition_user_guide_requester_bubble'); - if(scale < 48) + if (scale < 48) { offsetX = -19; offsetY = -80; @@ -53,17 +52,17 @@ export class GuideStatusBubbleAddition implements IAvatarAddition offsetY = -120; } - if(this._visualization.posture === AvatarAction.POSTURE_SIT) + if (this._visualization.posture === AvatarAction.POSTURE_SIT) { offsetY += (additionScale / 2); } - else if(this._visualization.posture === AvatarAction.POSTURE_LAY) + else if (this._visualization.posture === AvatarAction.POSTURE_LAY) { offsetY += scale; } - if(this._asset) + if (this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -74,7 +73,7 @@ export class GuideStatusBubbleAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if(this._asset && sprite) + if (this._asset && sprite) { sprite.texture = this._asset; } diff --git a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts index 327ca01f..f26446ea 100644 --- a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts @@ -1,6 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar'; +import { AvatarAction, IRoomObjectSprite } from '../../../../../../api'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; @@ -25,13 +24,13 @@ export class MutedBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if(!sprite) return; + if (!sprite) return; let additionScale = 64; let offsetX = 0; let offsetY = 0; - if(scale < 48) + if (scale < 48) { this._asset = this._visualization.getAvatarRenderAsset('avatar_addition_user_muted_small'); @@ -47,10 +46,10 @@ export class MutedBubbleAddition implements IAvatarAddition offsetY = -110; } - if(this._visualization.posture === AvatarAction.POSTURE_SIT) offsetY += (additionScale / 2); - else if(this._visualization.posture === AvatarAction.POSTURE_LAY) offsetY += scale; + if (this._visualization.posture === AvatarAction.POSTURE_SIT) offsetY += (additionScale / 2); + else if (this._visualization.posture === AvatarAction.POSTURE_LAY) offsetY += scale; - if(this._asset) + if (this._asset) { sprite.visible = true; sprite.texture = this._asset; @@ -66,7 +65,7 @@ export class MutedBubbleAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if(this._asset && sprite) + if (this._asset && sprite) { sprite.texture = this._asset; } diff --git a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts index 7517ebfc..dd0f9008 100644 --- a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts @@ -1,6 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar'; +import { AvatarAction, IRoomObjectSprite } from '../../../../../../api'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; @@ -35,7 +34,7 @@ export class NumberBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if(!sprite) return; + if (!sprite) return; this._scale = scale; @@ -43,9 +42,9 @@ export class NumberBubbleAddition implements IAvatarAddition let offsetX = 0; let offsetY = 0; - if(this._number > 0) + if (this._number > 0) { - if(scale < 48) + if (scale < 48) { this._asset = this._visualization.getAvatarRenderAsset('avatar_addition_number_' + this._number + '_small'); @@ -61,17 +60,17 @@ export class NumberBubbleAddition implements IAvatarAddition offsetY = -105; } - if(this._visualization.posture === AvatarAction.POSTURE_SIT) + if (this._visualization.posture === AvatarAction.POSTURE_SIT) { offsetY += (additionScale / 2); } - else if(this._visualization.posture === AvatarAction.POSTURE_LAY) + else if (this._visualization.posture === AvatarAction.POSTURE_LAY) { offsetY += scale; } - if(this._asset) + if (this._asset) { sprite.visible = true; sprite.texture = this._asset; @@ -91,15 +90,15 @@ export class NumberBubbleAddition implements IAvatarAddition } else { - if(sprite.visible) this._numberValueFadeDirection = -1; + if (sprite.visible) this._numberValueFadeDirection = -1; } } public animate(sprite: IRoomObjectSprite): boolean { - if(!sprite) return false; + if (!sprite) return false; - if(this._asset) + if (this._asset) { sprite.texture = this._asset; } @@ -107,15 +106,15 @@ export class NumberBubbleAddition implements IAvatarAddition let alpha = sprite.alpha; let didAnimate = false; - if(this._numberValueMoving) + if (this._numberValueMoving) { this._numberValueMoveCounter++; - if(this._numberValueMoveCounter < 10) return false; + if (this._numberValueMoveCounter < 10) return false; - if(this._numberValueFadeDirection < 0) + if (this._numberValueFadeDirection < 0) { - if(this._scale < 48) + if (this._scale < 48) { sprite.offsetY -= 2; } @@ -128,9 +127,9 @@ export class NumberBubbleAddition implements IAvatarAddition { let count = 4; - if(this._scale < 48) count = 8; + if (this._scale < 48) count = 8; - if(!(this._numberValueMoveCounter % count)) + if (!(this._numberValueMoveCounter % count)) { sprite.offsetY--; @@ -139,11 +138,11 @@ export class NumberBubbleAddition implements IAvatarAddition } } - if(this._numberValueFadeDirection > 0) + if (this._numberValueFadeDirection > 0) { - if(alpha < 255) alpha += 32; + if (alpha < 255) alpha += 32; - if(alpha >= 255) + if (alpha >= 255) { alpha = 255; @@ -155,11 +154,11 @@ export class NumberBubbleAddition implements IAvatarAddition return true; } - if(this._numberValueFadeDirection < 0) + if (this._numberValueFadeDirection < 0) { - if(alpha >= 0) alpha -= 32; + if (alpha >= 0) alpha -= 32; - if(alpha <= 0) + if (alpha <= 0) { this._numberValueFadeDirection = 0; this._numberValueMoving = false; diff --git a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts index 87ae943b..b61e3df3 100644 --- a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts @@ -1,6 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { IRoomObjectSprite } from '../../../../../../api'; -import { AvatarAction } from '../../../../../avatar'; +import { AvatarAction, IRoomObjectSprite } from '../../../../../../api'; import { AvatarVisualization } from '../AvatarVisualization'; import { IAvatarAddition } from './IAvatarAddition'; @@ -27,7 +26,7 @@ export class TypingBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if(!sprite) return; + if (!sprite) return; sprite.visible = true; sprite.relativeDepth = this._relativeDepth; @@ -37,7 +36,7 @@ export class TypingBubbleAddition implements IAvatarAddition let offsetX = 0; let offsetY = 0; - if(scale < 48) + if (scale < 48) { this._asset = this._visualization.getAvatarRenderAsset('avatar_addition_user_typing_small'); @@ -54,17 +53,17 @@ export class TypingBubbleAddition implements IAvatarAddition offsetY = -83; } - if(this._visualization.posture === AvatarAction.POSTURE_SIT) + if (this._visualization.posture === AvatarAction.POSTURE_SIT) { offsetY += (additionScale / 2); } - else if(this._visualization.posture === AvatarAction.POSTURE_LAY) + else if (this._visualization.posture === AvatarAction.POSTURE_LAY) { offsetY += scale; } - if(this._asset) + if (this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -75,7 +74,7 @@ export class TypingBubbleAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if(this._asset && sprite) + if (this._asset && sprite) { sprite.texture = this._asset; } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts index c27c1fb1..61cbbd7e 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts @@ -1,5 +1,4 @@ -import { IObjectVisualizationData, RoomObjectVariable } from '../../../../../api'; -import { AvatarSetType, IAvatarImageListener } from '../../../../avatar'; +import { AvatarSetType, IAvatarImageListener, IObjectVisualizationData, RoomObjectVariable } from '../../../../../api'; import { FurnitureMannequinVisualizationData } from './FurnitureMannequinVisualizationData'; import { FurnitureVisualization } from './FurnitureVisualization'; @@ -36,18 +35,18 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl public initialize(data: IObjectVisualizationData): boolean { - if(!(data instanceof FurnitureMannequinVisualizationData)) return false; + if (!(data instanceof FurnitureMannequinVisualizationData)) return false; return super.initialize(data); } public dispose(): void { - if(this._disposed) return; + if (this._disposed) return; this._disposed = true; - if(this._dynamicAssetName && this.asset) + if (this._dynamicAssetName && this.asset) { this.asset.disposeAsset(this._dynamicAssetName); @@ -61,9 +60,9 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { const updateObject = super.updateObject(scale, direction); - if(updateObject) + if (updateObject) { - if(this._mannequinScale !== scale) + if (this._mannequinScale !== scale) { this._mannequinScale = scale; @@ -78,11 +77,11 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { let updateModel = super.updateModel(scale); - if(updateModel) + if (updateModel) { const figure = (this.object.model.getValue(RoomObjectVariable.FURNITURE_MANNEQUIN_FIGURE) || null); - if(figure) + if (figure) { this._figure = (figure + '.' + this._placeHolderFigure); this._gender = (this.object.model.getValue(RoomObjectVariable.FURNITURE_MANNEQUIN_GENDER) || null); @@ -100,15 +99,15 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl private updateAvatar(forceUpdate: boolean = false): void { - if(!this.avatarExists() || forceUpdate) + if (!this.avatarExists() || forceUpdate) { const avatarImage = this._data.createAvatarImage(this._figure, this._mannequinScale, this._gender, this); - if(avatarImage) + if (avatarImage) { avatarImage.setDirection(AvatarSetType.FULL, this.direction); - if(this._dynamicAssetName) this.asset.disposeAsset(this._dynamicAssetName); + if (this._dynamicAssetName) this.asset.disposeAsset(this._dynamicAssetName); this.asset.addAsset(this.getAvatarAssetName(), avatarImage.getImage(AvatarSetType.FULL, false, 1, false), true); @@ -132,14 +131,14 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl public resetFigure(figure: string): void { - if(figure === this._figure) this.updateAvatar(true); + if (figure === this._figure) this.updateAvatar(true); } protected getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this.direction, layerId); - if(this._figure && (tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) + if (this._figure && (tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) { return this.getAvatarAssetName(); } @@ -151,7 +150,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { const tag = this.getLayerTag(scale, direction, layerId); - if((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return (-(this.getSprite(layerId).width) / 2); + if ((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return (-(this.getSprite(layerId).width) / 2); return super.getLayerXOffset(scale, direction, layerId); } @@ -160,7 +159,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { const tag = this.getLayerTag(scale, direction, layerId); - if((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return -(this.getSprite(layerId).height); + if ((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return -(this.getSprite(layerId).height); return super.getLayerYOffset(scale, direction, layerId); } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts index 2db37dbc..9a0742a9 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts @@ -1,4 +1,4 @@ -import { IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager } from '../../../../avatar'; +import { IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager } from '../../../../../api'; import { AvatarVisualizationData } from '../avatar'; import { FurnitureVisualizationData } from './FurnitureVisualizationData'; @@ -17,7 +17,7 @@ export class FurnitureMannequinVisualizationData extends FurnitureVisualizationD { super.dispose(); - if(this._avatarData) + if (this._avatarData) { this._avatarData.dispose(); diff --git a/src/nitro/room/preview/RoomPreviewer.ts b/src/nitro/room/preview/RoomPreviewer.ts index b0af1d2a..2f32895e 100644 --- a/src/nitro/room/preview/RoomPreviewer.ts +++ b/src/nitro/room/preview/RoomPreviewer.ts @@ -3,10 +3,9 @@ import { Container, DisplayObject } from '@pixi/display'; import { Point, Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; import { IGetImageListener, IImageResult, IObjectData, IRoomEngine, IRoomObjectController, IRoomRenderingCanvas, IVector3D, LegacyDataType, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../../api'; -import { NitroSprite } from '../../../pixi-proxy'; +import { GetTickerTime, NitroSprite } from '../../../pixi-proxy'; import { RoomId } from '../../../room'; import { FloorHeightMapMessageParser, RoomEntryTileMessageParser } from '../../communication'; -import { Nitro } from '../../Nitro'; import { RoomEngineEvent, RoomEngineObjectEvent } from '../events'; import { ObjectRoomMapUpdateMessage } from '../messages'; import { RoomPlaneParser } from '../object/RoomPlaneParser'; @@ -55,7 +54,7 @@ export class RoomPreviewer this.onRoomObjectAdded = this.onRoomObjectAdded.bind(this); this.onRoomInitializedonRoomInitialized = this.onRoomInitializedonRoomInitialized.bind(this); - if(this.isRoomEngineReady && this._roomEngine.events) + if (this.isRoomEngineReady && this._roomEngine.events) { this._roomEngine.events.addEventListener(RoomEngineObjectEvent.ADDED, this.onRoomObjectAdded); this._roomEngine.events.addEventListener(RoomEngineObjectEvent.CONTENT_UPDATED, this.onRoomObjectAdded); @@ -69,21 +68,21 @@ export class RoomPreviewer { this.reset(true); - if(this.isRoomEngineReady && this._roomEngine.events) + if (this.isRoomEngineReady && this._roomEngine.events) { this._roomEngine.events.removeEventListener(RoomEngineObjectEvent.ADDED, this.onRoomObjectAdded); this._roomEngine.events.removeEventListener(RoomEngineObjectEvent.CONTENT_UPDATED, this.onRoomObjectAdded); this._roomEngine.events.removeEventListener(RoomEngineEvent.INITIALIZED, this.onRoomInitializedonRoomInitialized); } - if(this._backgroundSprite) + if (this._backgroundSprite) { this._backgroundSprite.destroy(); this._backgroundSprite = null; } - if(this._planeParser) + if (this._planeParser) { this._planeParser.dispose(); @@ -93,7 +92,7 @@ export class RoomPreviewer private createRoomForPreview(): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const size = 7; @@ -103,11 +102,11 @@ export class RoomPreviewer let y = 1; - while(y < (1 + size)) + while (y < (1 + size)) { let x = 1; - while(x < (1 + size)) + while (x < (1 + size)) { planeParser.setTileHeight(x, y, 0); @@ -127,13 +126,13 @@ export class RoomPreviewer public reset(k: boolean): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this._roomEngine.removeRoomObjectFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID); this._roomEngine.removeRoomObjectWall(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID); this._roomEngine.removeRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID); - if(!k) this.updatePreviewRoomView(); + if (!k) this.updatePreviewRoomView(); } this._currentPreviewObjectCategory = RoomObjectCategory.MINIMUM; @@ -149,7 +148,7 @@ export class RoomPreviewer //@ts-ignore const wallGeometry = (this._roomEngine as IRoomCreator).getLegacyWallGeometry(this._previewRoomId); - if(!wallGeometry) return; + if (!wallGeometry) return; this._planeParser.reset(); @@ -167,17 +166,17 @@ export class RoomPreviewer let y = 0; - while(y < height) + while (y < height) { let x = 0; - while(x < width) + while (x < width) { const tileHeight = parser.getHeight(x, y); - if(((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) + if (((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) { - if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) + if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) { doorX = (x + 0.5); doorY = y; @@ -185,7 +184,7 @@ export class RoomPreviewer doorDirection = 90; } - if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) + if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) { doorX = x; doorY = (y + 0.5); @@ -211,11 +210,11 @@ export class RoomPreviewer let heightIterator = (parser.height - 1); - while(heightIterator >= 0) + while (heightIterator >= 0) { let widthIterator = (parser.width - 1); - while(widthIterator >= 0) + while (widthIterator >= 0) { wallGeometry.setHeight(widthIterator, heightIterator, this._planeParser.getTileHeight(widthIterator, heightIterator)); widthIterator--; @@ -235,14 +234,14 @@ export class RoomPreviewer const roomObject = this.getRoomPreviewOwnRoomObject(); - if(roomObject) roomObject.processUpdateMessage(new ObjectRoomMapUpdateMessage(roomMap)); + if (roomObject) roomObject.processUpdateMessage(new ObjectRoomMapUpdateMessage(roomMap)); } public addFurnitureIntoRoom(classId: number, direction: IVector3D, objectData: IObjectData = null, extra: string = null): number { - if(!objectData) objectData = new LegacyDataType(); + if (!objectData) objectData = new LegacyDataType(); - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this.reset(false); @@ -250,14 +249,14 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.FLOOR; this._currentPreviewObjectData = ''; - if(this._roomEngine.addFurnitureFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), direction, 0, objectData, NaN, -1, 0, -1, '', true, false)) + if (this._roomEngine.addFurnitureFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), direction, 0, objectData, NaN, -1, 0, -1, '', true, false)) { - this._previousAutomaticStateChangeTime = Nitro.instance.time; + this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = true; const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if(roomObject && extra) roomObject.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, extra); + if (roomObject && extra) roomObject.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, extra); this.updatePreviewRoomView(); @@ -270,9 +269,9 @@ export class RoomPreviewer public addWallItemIntoRoom(classId: number, direction: IVector3D, objectData: string): number { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { - if((this._currentPreviewObjectCategory === RoomObjectCategory.WALL) && (this._currentPreviewObjectType === classId) && (this._currentPreviewObjectData === objectData)) return RoomPreviewer.PREVIEW_OBJECT_ID; + if ((this._currentPreviewObjectCategory === RoomObjectCategory.WALL) && (this._currentPreviewObjectType === classId) && (this._currentPreviewObjectData === objectData)) return RoomPreviewer.PREVIEW_OBJECT_ID; this.reset(false); @@ -280,9 +279,9 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.WALL; this._currentPreviewObjectData = objectData; - if(this._roomEngine.addFurnitureWall(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(0.5, 2.3, 1.8), direction, 0, objectData, 0, 0, -1, '', false)) + if (this._roomEngine.addFurnitureWall(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(0.5, 2.3, 1.8), direction, 0, objectData, 0, 0, -1, '', false)) { - this._previousAutomaticStateChangeTime = Nitro.instance.time; + this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = true; this.updatePreviewRoomView(); @@ -296,7 +295,7 @@ export class RoomPreviewer public addAvatarIntoRoom(figure: string, effect: number): number { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this.reset(false); @@ -304,9 +303,9 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.UNIT; this._currentPreviewObjectData = figure; - if(this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 135, RoomObjectUserType.getTypeNumber(RoomObjectUserType.USER), figure)) + if (this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 135, RoomObjectUserType.getTypeNumber(RoomObjectUserType.USER), figure)) { - this._previousAutomaticStateChangeTime = Nitro.instance.time; + this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = true; this.updateUserGesture(1); @@ -324,7 +323,7 @@ export class RoomPreviewer public addPetIntoRoom(figure: string): number { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this.reset(false); @@ -332,9 +331,9 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.UNIT; this._currentPreviewObjectData = figure; - if(this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 90, RoomObjectUserType.getTypeNumber(RoomObjectUserType.PET), figure)) + if (this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 90, RoomObjectUserType.getTypeNumber(RoomObjectUserType.PET), figure)) { - this._previousAutomaticStateChangeTime = Nitro.instance.time; + this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = false; this.updateUserGesture(1); @@ -351,57 +350,57 @@ export class RoomPreviewer public updateUserPosture(type: string, parameter: string = ''): void { - if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserPosture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, type, parameter); + if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserPosture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, type, parameter); } public updateUserGesture(gestureId: number): void { - if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserGesture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, gestureId); + if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserGesture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, gestureId); } public updateUserEffect(effectId: number): void { - if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserEffect(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, effectId); + if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserEffect(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, effectId); } public updateObjectUserFigure(figure: string, gender: string = null, subType: string = null, isRiding: boolean = false): boolean { - if(this.isRoomEngineReady) return this._roomEngine.updateRoomObjectUserFigure(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, figure, gender, subType, isRiding); + if (this.isRoomEngineReady) return this._roomEngine.updateRoomObjectUserFigure(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, figure, gender, subType, isRiding); return false; } public updateObjectUserAction(action: string, value: number, parameter: string = null): void { - if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserAction(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, action, value, parameter); + if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserAction(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, action, value, parameter); } public updateObjectStuffData(stuffData: IObjectData): void { - if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, null, null, stuffData.state, stuffData); + if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, null, null, stuffData.state, stuffData); } public changeRoomObjectState(): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this._automaticStateChange = false; - if(this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); + if (this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); } } public changeRoomObjectDirection(): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if(!roomObject) return; + if (!roomObject) return; const direction = this._roomEngine.objectEventHandler.getValidRoomObjectDirection(roomObject, true); - switch(this._currentPreviewObjectCategory) + switch (this._currentPreviewObjectCategory) { case RoomObjectCategory.FLOOR: { const floorLocation = new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y); @@ -419,30 +418,30 @@ export class RoomPreviewer private checkAutomaticRoomObjectStateChange(): void { - if(this._automaticStateChange) + if (this._automaticStateChange) { - const time = Nitro.instance.time; + const time = GetTickerTime(); - if(time > (this._previousAutomaticStateChangeTime + RoomPreviewer.AUTOMATIC_STATE_CHANGE_INTERVAL)) + if (time > (this._previousAutomaticStateChangeTime + RoomPreviewer.AUTOMATIC_STATE_CHANGE_INTERVAL)) { this._previousAutomaticStateChangeTime = time; - if(this.isRoomEngineReady) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); + if (this.isRoomEngineReady) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); } } } public getRoomCanvas(width: number, height: number): DisplayObject { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const displayObject = (this._roomEngine.getRoomInstanceDisplay(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, width, height, this._currentPreviewScale) as Container); - if(displayObject && (this._backgroundColor !== null)) + if (displayObject && (this._backgroundColor !== null)) { let backgroundSprite = this._backgroundSprite; - if(!backgroundSprite) + if (!backgroundSprite) { backgroundSprite = new NitroSprite(Texture.WHITE); @@ -458,7 +457,7 @@ export class RoomPreviewer const geometry = this._roomEngine.getRoomInstanceGeometry(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if(geometry) geometry.adjustLocation(new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), 30); + if (geometry) geometry.adjustLocation(new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), 30); this._currentPreviewCanvasWidth = width; this._currentPreviewCanvasHeight = height; @@ -471,12 +470,12 @@ export class RoomPreviewer public modifyRoomCanvas(width: number, height: number): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this._currentPreviewCanvasWidth = width; this._currentPreviewCanvasHeight = height; - if(this._backgroundSprite) + if (this._backgroundSprite) { this._backgroundSprite.width = width; this._backgroundSprite.height = height; @@ -500,7 +499,7 @@ export class RoomPreviewer { const objectBounds = this._roomEngine.getRoomObjectBoundingRectangle(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory, RoomPreviewer.PREVIEW_CANVAS_ID); - if(objectBounds && point) + if (objectBounds && point) { objectBounds.x += -(this._currentPreviewCanvasWidth >> 1); objectBounds.y += -(this._currentPreviewCanvasHeight >> 1); @@ -508,7 +507,7 @@ export class RoomPreviewer objectBounds.x += -(point.x); objectBounds.y += -(point.y); - if(!this._currentPreviewRectangle) + if (!this._currentPreviewRectangle) { this._currentPreviewRectangle = objectBounds; } @@ -516,27 +515,27 @@ export class RoomPreviewer { const bounds = this._currentPreviewRectangle.clone().enlarge(objectBounds); - if(((((bounds.width - this._currentPreviewRectangle.width) > ((this._currentPreviewCanvasWidth - this._currentPreviewRectangle.width) >> 1)) || ((bounds.height - this._currentPreviewRectangle.height) > ((this._currentPreviewCanvasHeight - this._currentPreviewRectangle.height) >> 1))) || (this._currentPreviewRectangle.width < 1)) || (this._currentPreviewRectangle.height < 1)) this._currentPreviewRectangle = bounds; + if (((((bounds.width - this._currentPreviewRectangle.width) > ((this._currentPreviewCanvasWidth - this._currentPreviewRectangle.width) >> 1)) || ((bounds.height - this._currentPreviewRectangle.height) > ((this._currentPreviewCanvasHeight - this._currentPreviewRectangle.height) >> 1))) || (this._currentPreviewRectangle.width < 1)) || (this._currentPreviewRectangle.height < 1)) this._currentPreviewRectangle = bounds; } } } private validatePreviewSize(point: Point): Point { - if(((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) + if (((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) { return point; } - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const geometry = this._roomEngine.getRoomInstanceGeometry(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if((this._currentPreviewRectangle.width > (this._currentPreviewCanvasWidth * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT))) || (this._currentPreviewRectangle.height > (this._currentPreviewCanvasHeight * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT)))) + if ((this._currentPreviewRectangle.width > (this._currentPreviewCanvasWidth * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT))) || (this._currentPreviewRectangle.height > (this._currentPreviewCanvasHeight * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT)))) { - if(RoomPreviewer.ZOOM_ENABLED) + if (RoomPreviewer.ZOOM_ENABLED) { - if(this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 0.5) + if (this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 0.5) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 0.5, null, null); @@ -554,7 +553,7 @@ export class RoomPreviewer } else { - if(geometry.isZoomedIn()) + if (geometry.isZoomedIn()) { geometry.performZoomOut(); @@ -564,11 +563,11 @@ export class RoomPreviewer } } - else if(!this._currentPreviewNeedsZoomOut) + else if (!this._currentPreviewNeedsZoomOut) { - if(RoomPreviewer.ZOOM_ENABLED) + if (RoomPreviewer.ZOOM_ENABLED) { - if(this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 1) + if (this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 1) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 1, null, null); @@ -577,7 +576,7 @@ export class RoomPreviewer } else { - if(!geometry.isZoomedIn()) + if (!geometry.isZoomedIn()) { geometry.performZoomIn(); @@ -592,9 +591,9 @@ export class RoomPreviewer public zoomIn(): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { - if(RoomPreviewer.ZOOM_ENABLED) + if (RoomPreviewer.ZOOM_ENABLED) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 1); } @@ -611,9 +610,9 @@ export class RoomPreviewer public zoomOut(): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { - if(RoomPreviewer.ZOOM_ENABLED) + if (RoomPreviewer.ZOOM_ENABLED) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 0.5); } @@ -630,7 +629,7 @@ export class RoomPreviewer public updateAvatarDirection(direction: number, headDirection: number): void { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { this._roomEngine.updateRoomObjectUserLocation(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), false, 0, new Vector3d((direction * 45), 0, 0), (headDirection * 45)); } @@ -638,31 +637,31 @@ export class RoomPreviewer public updateObjectRoom(floorType: string = null, wallType: string = null, landscapeType: string = null, _arg_4: boolean = false): boolean { - if(this.isRoomEngineReady) return this._roomEngine.updateRoomInstancePlaneType(this._previewRoomId, floorType, wallType, landscapeType, _arg_4); + if (this.isRoomEngineReady) return this._roomEngine.updateRoomInstancePlaneType(this._previewRoomId, floorType, wallType, landscapeType, _arg_4); return false; } public updateRoomWallsAndFloorVisibility(wallsVisible: boolean, floorsVisible: boolean = true): void { - if(this.isRoomEngineReady) this._roomEngine.updateRoomInstancePlaneVisibility(this._previewRoomId, wallsVisible, floorsVisible); + if (this.isRoomEngineReady) this._roomEngine.updateRoomInstancePlaneVisibility(this._previewRoomId, wallsVisible, floorsVisible); } private getCanvasOffset(point: Point): Point { - if(((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) return point; + if (((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) return point; let x = (-(this._currentPreviewRectangle.left + this._currentPreviewRectangle.right) >> 1); let y = (-(this._currentPreviewRectangle.top + this._currentPreviewRectangle.bottom) >> 1); const height = ((this._currentPreviewCanvasHeight - this._currentPreviewRectangle.height) >> 1); - if(height > 10) + if (height > 10) { y = (y + Math.min(15, (height - 10))); } else { - if(this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) + if (this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) { y = (y + (5 - Math.max(0, (height / 2)))); } @@ -678,11 +677,11 @@ export class RoomPreviewer const offsetX = (x - point.x); const offsetY = (y - point.y); - if((offsetX !== 0) || (offsetY !== 0)) + if ((offsetX !== 0) || (offsetY !== 0)) { const _local_7 = Math.sqrt(((offsetX * offsetX) + (offsetY * offsetY))); - if(_local_7 > 10) + if (_local_7 > 10) { x = (point.x + ((offsetX * 10) / _local_7)); y = (point.y + ((offsetY * 10) / _local_7)); @@ -696,19 +695,19 @@ export class RoomPreviewer public updatePreviewRoomView(k: boolean = false): void { - if(this._disableUpdate && !k) return; + if (this._disableUpdate && !k) return; this.checkAutomaticRoomObjectStateChange(); - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { let offset = this._roomEngine.getRoomInstanceRenderingCanvasOffset(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if(offset) + if (offset) { this.updatePreviewObjectBoundingRectangle(offset); - if(this._currentPreviewRectangle) + if (this._currentPreviewRectangle) { const scale = this._currentPreviewScale; @@ -716,12 +715,12 @@ export class RoomPreviewer const canvasOffset = this.getCanvasOffset(offset); - if(canvasOffset) + if (canvasOffset) { this._roomEngine.setRoomInstanceRenderingCanvasOffset(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, canvasOffset); } - if(this._currentPreviewScale !== scale) this._currentPreviewRectangle = null; + if (this._currentPreviewScale !== scale) this._currentPreviewRectangle = null; } } } @@ -734,17 +733,17 @@ export class RoomPreviewer public set disableRoomEngineUpdate(flag: boolean) { - if(this.isRoomEngineReady) this._roomEngine.disableUpdate(flag); + if (this.isRoomEngineReady) this._roomEngine.disableUpdate(flag); } private onRoomInitializedonRoomInitialized(event: RoomEngineEvent): void { - if(!event) return; + if (!event) return; - switch(event.type) + switch (event.type) { case RoomEngineEvent.INITIALIZED: - if((event.roomId === this._previewRoomId) && this.isRoomEngineReady) + if ((event.roomId === this._previewRoomId) && this.isRoomEngineReady) { this._roomEngine.updateRoomInstancePlaneType(this._previewRoomId, '110', '99999'); } @@ -754,19 +753,19 @@ export class RoomPreviewer private onRoomObjectAdded(event: RoomEngineObjectEvent): void { - if((event.roomId === this._previewRoomId) && (event.objectId === RoomPreviewer.PREVIEW_OBJECT_ID) && (event.category === this._currentPreviewObjectCategory)) + if ((event.roomId === this._previewRoomId) && (event.objectId === RoomPreviewer.PREVIEW_OBJECT_ID) && (event.category === this._currentPreviewObjectCategory)) { this._currentPreviewRectangle = null; this._currentPreviewNeedsZoomOut = false; const roomObject = this._roomEngine.getRoomObject(event.roomId, event.objectId, event.category); - if(roomObject && roomObject.model && (event.category === RoomObjectCategory.WALL)) + if (roomObject && roomObject.model && (event.category === RoomObjectCategory.WALL)) { const sizeZ = roomObject.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Z); const centerZ = roomObject.model.getValue(RoomObjectVariable.FURNITURE_CENTER_Z); - if((sizeZ !== null) || (centerZ !== null)) + if ((sizeZ !== null) || (centerZ !== null)) { this._roomEngine.updateRoomObjectWallLocation(event.roomId, event.objectId, new Vector3d(0.5, 2.3, (((3.6 - sizeZ) / 2) + centerZ))); } @@ -776,21 +775,21 @@ export class RoomPreviewer public updateRoomEngine(): void { - if(this.isRoomEngineReady) this._roomEngine.runUpdate(); + if (this.isRoomEngineReady) this._roomEngine.runUpdate(); } public getRenderingCanvas(): IRoomRenderingCanvas { const renderingCanvas = this._roomEngine.getRoomInstanceRenderingCanvas(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if(!renderingCanvas) return null; + if (!renderingCanvas) return null; return renderingCanvas; } public getGenericRoomObjectImage(type: string, value: string, direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0, extras: string = null, objectData: IObjectData = null, state: number = -1, frame: number = -1, posture: string = null): IImageResult { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { return this._roomEngine.getGenericRoomObjectImage(type, value, direction, scale, listener, bgColor, extras, objectData, state, frame, posture); } @@ -800,7 +799,7 @@ export class RoomPreviewer public getRoomObjectImage(direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0): IImageResult { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { return this._roomEngine.getRoomObjectImage(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory, direction, scale, listener, bgColor); } @@ -810,11 +809,11 @@ export class RoomPreviewer public getRoomObjectCurrentImage(): RenderTexture { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if(roomObject && roomObject.visualization) return roomObject.visualization.getImage(0xFFFFFF, -1); + if (roomObject && roomObject.visualization) return roomObject.visualization.getImage(0xFFFFFF, -1); } return null; @@ -822,11 +821,11 @@ export class RoomPreviewer public getRoomPreviewObject(): IRoomObjectController { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if(roomObject) return roomObject; + if (roomObject) return roomObject; } return null; @@ -834,11 +833,11 @@ export class RoomPreviewer public getRoomPreviewOwnRoomObject(): IRoomObjectController { - if(this.isRoomEngineReady) + if (this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomEngine.ROOM_OBJECT_ID, RoomObjectCategory.ROOM); - if(roomObject) return roomObject; + if (roomObject) return roomObject; } return null; diff --git a/src/nitro/sound/ISoundManager.ts b/src/nitro/sound/ISoundManager.ts deleted file mode 100644 index 7b7031e0..00000000 --- a/src/nitro/sound/ISoundManager.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { INitroManager } from '../../api'; -import { IMusicManager } from './music/IMusicManager'; - -export interface ISoundManager extends INitroManager -{ - musicManager: IMusicManager; -} diff --git a/src/nitro/sound/SoundManager.ts b/src/nitro/sound/SoundManager.ts index 4c46a460..f03cd3b0 100644 --- a/src/nitro/sound/SoundManager.ts +++ b/src/nitro/sound/SoundManager.ts @@ -1,10 +1,9 @@ +import { IMusicManager, ISoundManager } from '../../api'; import { AdvancedMap, NitroEvent, NitroManager } from '../../core'; import { NitroSettingsEvent, NitroSoundEvent } from '../events'; import { Nitro } from '../Nitro'; import { RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../room'; -import { ISoundManager } from './ISoundManager'; -import { IMusicManager } from './music/IMusicManager'; -import { MusicManager } from './music/MusicManager'; +import { MusicManager } from './music'; export class SoundManager extends NitroManager implements ISoundManager { @@ -48,7 +47,7 @@ export class SoundManager extends NitroManager implements ISoundManager public onDispose(): void { - if(this._musicManager) + if (this._musicManager) { this._musicManager.dispose(); this._musicManager = null; @@ -63,7 +62,7 @@ export class SoundManager extends NitroManager implements ISoundManager private onEvent(event: NitroEvent) { - switch(event.type) + switch (event.type) { case RoomEngineSamplePlaybackEvent.PLAY_SAMPLE: { const castedEvent = (event as RoomEngineSamplePlaybackEvent); @@ -93,7 +92,7 @@ export class SoundManager extends NitroManager implements ISoundManager this._volumeFurni = (castedEvent.volumeFurni / 100); this._volumeTrax = (castedEvent.volumeTrax / 100); - if(volumeFurniUpdated) this.updateFurniSamplesVolume(this._volumeFurni); + if (volumeFurniUpdated) this.updateFurniSamplesVolume(this._volumeFurni); return; } case NitroSoundEvent.PLAY_SOUND: { @@ -124,7 +123,7 @@ export class SoundManager extends NitroManager implements ISoundManager { let sample = this._internalSamples.getValue(code); - if(!sample) + if (!sample) { const sampleUrl = Nitro.instance.getConfiguration('sounds.url'); @@ -139,7 +138,7 @@ export class SoundManager extends NitroManager implements ISoundManager { let sample = this._furniSamples.getValue(code); - if(!sample) + if (!sample) { const sampleUrl = Nitro.instance.getConfiguration('external.samples.url'); @@ -147,7 +146,7 @@ export class SoundManager extends NitroManager implements ISoundManager this._furniSamples.add(code, sample); } - if(!this._furnitureBeingPlayed.hasKey(objectId)) this._furnitureBeingPlayed.add(objectId, code); + if (!this._furnitureBeingPlayed.hasKey(objectId)) this._furnitureBeingPlayed.add(objectId, code); sample.onended = (event) => { @@ -171,7 +170,7 @@ export class SoundManager extends NitroManager implements ISoundManager { const sample = this._internalSamples.getValue(code); - if(!sample) return; + if (!sample) return; try { @@ -187,13 +186,13 @@ export class SoundManager extends NitroManager implements ISoundManager { const furnitureBeingPlayed = this._furnitureBeingPlayed.getValue(objectId); - if(!furnitureBeingPlayed) return; + if (!furnitureBeingPlayed) return; const sample = this._furniSamples.getValue(furnitureBeingPlayed); this._furnitureBeingPlayed.remove(objectId); - if(!sample) return; + if (!sample) return; try { diff --git a/src/nitro/sound/common/SongStartRequestData.ts b/src/nitro/sound/common/SongStartRequestData.ts index 025cc191..5b589599 100644 --- a/src/nitro/sound/common/SongStartRequestData.ts +++ b/src/nitro/sound/common/SongStartRequestData.ts @@ -1,4 +1,4 @@ -import { Nitro } from './../../Nitro'; +import { GetTickerTime } from '../../../pixi-proxy'; export class SongStartRequestData { @@ -26,9 +26,9 @@ export class SongStartRequestData public get startPos(): number { - if(this._startPos < 0) return 0; + if (this._startPos < 0) return 0; - return this._startPos + ((Nitro.instance.time - this._playRequestTime) / 1000); + return this._startPos + ((GetTickerTime() - this._playRequestTime) / 1000); } public get playLength(): number diff --git a/src/nitro/sound/common/index.ts b/src/nitro/sound/common/index.ts new file mode 100644 index 00000000..58a0347e --- /dev/null +++ b/src/nitro/sound/common/index.ts @@ -0,0 +1,6 @@ +export * from './SongStartRequestData'; +export * from './TraxChannel'; +export * from './TraxChannelItem'; +export * from './TraxData'; +export * from './TraxSample'; +export * from './TraxSequencer'; diff --git a/src/nitro/sound/index.ts b/src/nitro/sound/index.ts index fb75f4a2..283166d8 100644 --- a/src/nitro/sound/index.ts +++ b/src/nitro/sound/index.ts @@ -1,12 +1,4 @@ -export * from './common/SongStartRequestData'; -export * from './common/TraxChannel'; -export * from './common/TraxChannelItem'; -export * from './common/TraxData'; -export * from './common/TraxSample'; -export * from './common/TraxSequencer'; +export * from './common'; export * from './events'; -export * from './ISoundManager'; -export * from './music/IMusicManager'; -export * from './music/MusicManager'; -export * from './music/MusicPriorities'; +export * from './music'; export * from './SoundManager'; diff --git a/src/nitro/sound/music/MusicManager.ts b/src/nitro/sound/music/MusicManager.ts index de19160f..0c15d2c3 100644 --- a/src/nitro/sound/music/MusicManager.ts +++ b/src/nitro/sound/music/MusicManager.ts @@ -1,10 +1,10 @@ +import { IMusicManager } from '../../../api'; import { NitroEvent, NitroManager } from '../../../core'; import { GetSongInfoMessageComposer, JukeboxPlayListFullMessageEvent, JukeboxSongDisksMessageEvent, NowPlayingMessageEvent, SongInfoEntry, TraxSongInfoMessageEvent, UserSongDisksInventoryMessageEvent } from '../../communication'; import { Nitro } from '../../Nitro'; import { RoomObjectSoundMachineEvent } from '../../room/events'; -import { SongStartRequestData } from '../common/SongStartRequestData'; +import { SongStartRequestData } from '../common'; import { SoundManagerEvent } from '../events'; -import { IMusicManager } from './IMusicManager'; import { MusicPriorities } from './MusicPriorities'; export class MusicManager extends NitroManager implements IMusicManager @@ -57,7 +57,7 @@ export class MusicManager extends NitroManager implements IMusicManager public onDispose(): void { - if(this._timerInstance) + if (this._timerInstance) { clearInterval(this._timerInstance); this._timerInstance = null; @@ -84,14 +84,14 @@ export class MusicManager extends NitroManager implements IMusicManager { const parser = event.getParser(); - for(const song of parser.songs) + for (const song of parser.songs) { const songAvailable: boolean = (this._availableSongs.get(song.id) !== null); const areSamplesRequested: boolean = (this._requestedSongs.get(song.id) !== null); - if(!songAvailable) + if (!songAvailable) { - if(areSamplesRequested) + if (areSamplesRequested) { //LoadTraxSong } @@ -113,7 +113,7 @@ export class MusicManager extends NitroManager implements IMusicManager this._isPlaying = (parser.currentSongId !== -1); - if(parser.currentSongId >= 0) + if (parser.currentSongId >= 0) { this.playSong(parser.currentSongId, MusicPriorities.PRIORITY_ROOM_PLAYLIST, (parser.syncCount / 1000), 0, 1, 1); } @@ -122,7 +122,7 @@ export class MusicManager extends NitroManager implements IMusicManager this.stopPlaying(); } - if(parser.nextSongId >= 0) this.requestSong(parser.nextSongId, true); + if (parser.nextSongId >= 0) this.requestSong(parser.nextSongId, true); this._playPosition = parser.currentPosition; //Dispatch local event NowPlayingEvent @@ -130,7 +130,7 @@ export class MusicManager extends NitroManager implements IMusicManager private onTick(): void { - if(this._songRequestList.length === 0) return; + if (this._songRequestList.length === 0) return; Nitro.instance.communication.connection.send(new GetSongInfoMessageComposer(...this._songRequestList)); this._songRequestList = []; @@ -138,7 +138,7 @@ export class MusicManager extends NitroManager implements IMusicManager private requestSong(songId: number, arg2: boolean): void { - if(this._requestedSongs.get(songId) === null) + if (this._requestedSongs.get(songId) === null) { this._requestedSongs.set(songId, arg2); this._songRequestList.push(songId); @@ -164,9 +164,9 @@ export class MusicManager extends NitroManager implements IMusicManager private getSongIdRequestedAtPriority(priorityIndex: number): number { - if(priorityIndex < 0 || priorityIndex >= MusicPriorities.PRIORITY_COUNT) return -1; + if (priorityIndex < 0 || priorityIndex >= MusicPriorities.PRIORITY_COUNT) return -1; - if(!this._songRequestsPerPriority[priorityIndex]) return -1; + if (!this._songRequestsPerPriority[priorityIndex]) return -1; return this._songRequestsPerPriority[priorityIndex].songId; } diff --git a/src/nitro/sound/music/index.ts b/src/nitro/sound/music/index.ts new file mode 100644 index 00000000..11d21659 --- /dev/null +++ b/src/nitro/sound/music/index.ts @@ -0,0 +1,2 @@ +export * from './MusicManager'; +export * from './MusicPriorities'; diff --git a/src/nitro/utils/FigureDataContainer.ts b/src/nitro/utils/FigureDataContainer.ts index 5ca6fda5..743746e8 100644 --- a/src/nitro/utils/FigureDataContainer.ts +++ b/src/nitro/utils/FigureDataContainer.ts @@ -27,13 +27,13 @@ private _isDisposed: boolean; private _avatarEffectType: number = -1; - public loadAvatarData(k: string, _arg_2: string): void + public loadAvatarData(figure: string, gender: string): void { this._data = new Map(); this._colors = new Map(); - this._gender = _arg_2; + this._gender = gender; - this.parseFigureString(k); + this.parseFigureString(figure); } public dispose(): void @@ -50,13 +50,13 @@ private parseFigureString(k: string): void { - if(!k) return; + if (!k) return; - for(const set of k.split('.')) + for (const set of k.split('.')) { const _local_3 = set.split('-'); - if(_local_3.length > 0) + if (_local_3.length > 0) { const part = _local_3[0]; const setId = parseInt(_local_3[1]); @@ -64,14 +64,14 @@ let i = 2; - while(i < _local_3.length) + while (i < _local_3.length) { colors.push(parseInt(_local_3[i])); i++; } - if(!colors.length) colors.push(0); + if (!colors.length) colors.push(0); this.savePartSetId(part, setId, false); this.savePartSetColourId(part, colors, false); @@ -86,14 +86,14 @@ public getPartSetId(k: string): number { - if(this.hasSetType(k)) return this._data.get(k); + if (this.hasSetType(k)) return this._data.get(k); return -1; } public getColourIds(k: string): number[] { - if(this._colors.get(k)) return this._colors.get(k); + if (this._colors.get(k)) return this._colors.get(k); return []; } @@ -104,24 +104,24 @@ const sets: string[] = []; - for(const [ key, value ] of this._data.entries()) + for (const [key, value] of this._data.entries()) { let set = ((key + '-') + value); const colors = this._colors.get(key); - if(colors) for(const color of colors) set = (set + ('-' + color)); + if (colors) for (const color of colors) set = (set + ('-' + color)); sets.push(set); } let i = 0; - while(i < sets.length) + while (i < sets.length) { figure = (figure + sets[i]); - if(i < (sets.length - 1)) figure = (figure + '.'); + if (i < (sets.length - 1)) figure = (figure + '.'); i++; } @@ -137,7 +137,7 @@ private savePartSetId(k: string, _arg_2: number, _arg_3: boolean = true): void { - switch(k) + switch (k) { case FigureDataContainer.HD: case FigureDataContainer.HAIR: @@ -152,7 +152,7 @@ case FigureDataContainer.TROUSERS: case FigureDataContainer.SHOES: case FigureDataContainer.TROUSER_ACCESSORIES: - if(_arg_2 >= 0) + if (_arg_2 >= 0) { this._data.set(k, _arg_2); } @@ -165,7 +165,7 @@ public savePartSetColourId(k: string, _arg_2: number[], _arg_3: boolean = true): void { - switch(k) + switch (k) { case FigureDataContainer.HD: case FigureDataContainer.HAIR: @@ -187,28 +187,28 @@ public getFigureStringWithFace(k: number): string { - const partSets: string[] = [ FigureDataContainer.HD ]; + const partSets: string[] = [FigureDataContainer.HD]; let figure = ''; const sets: string[] = []; - for(const part of partSets) + for (const part of partSets) { const colors = this._colors.get(part); - if(colors) + if (colors) { let setId = this._data.get(part); - if(part === FigureDataContainer.HD) setId = k; + if (part === FigureDataContainer.HD) setId = k; let set = ((part + '-') + setId); - if(setId >= 0) + if (setId >= 0) { let i = 0; - while(i < colors.length) + while (i < colors.length) { set = (set + ('-' + colors[i])); @@ -222,11 +222,11 @@ let i = 0; - while(i < sets.length) + while (i < sets.length) { figure = (figure + sets[i]); - if(i < (sets.length - 1)) figure = (figure + '.'); + if (i < (sets.length - 1)) figure = (figure + '.'); i++; } diff --git a/src/nitro/window/motion/Interval.ts b/src/nitro/window/motion/Interval.ts index 763235e3..fa055e98 100644 --- a/src/nitro/window/motion/Interval.ts +++ b/src/nitro/window/motion/Interval.ts @@ -1,4 +1,4 @@ -import { Nitro } from '../../Nitro'; +import { GetTickerTime } from '../../../pixi-proxy'; import { Motion } from './Motion'; export class Interval extends Motion @@ -24,7 +24,7 @@ export class Interval extends Motion super.start(); this._complete = false; - this._startTimeMs = Nitro.instance.time; + this._startTimeMs = GetTickerTime(); } public tick(time: number): void @@ -33,7 +33,7 @@ export class Interval extends Motion const elapsed = ((time - this._startTimeMs) / this._duration); - if(elapsed < 1) + if (elapsed < 1) { this.update(elapsed); } diff --git a/src/nitro/window/motion/Motions.ts b/src/nitro/window/motion/Motions.ts index 31f5009d..79b9cd33 100644 --- a/src/nitro/window/motion/Motions.ts +++ b/src/nitro/window/motion/Motions.ts @@ -1,4 +1,5 @@ -import { Nitro } from '../../Nitro'; +import { GetTickerTime } from '../../../pixi-proxy'; +import { Nitro } from '../../Nitro'; import { Motion } from './Motion'; export class Motions @@ -16,9 +17,9 @@ export class Motions public static runMotion(k: Motion): Motion { - if(((Motions._RUNNING_MOTIONS.indexOf(k) === -1) && (Motions._QUEUED_MOTIONS.indexOf(k) === -1))) + if (((Motions._RUNNING_MOTIONS.indexOf(k) === -1) && (Motions._QUEUED_MOTIONS.indexOf(k) === -1))) { - if(Motions._IS_UPDATING) + if (Motions._IS_UPDATING) { Motions._QUEUED_MOTIONS.push(k); } @@ -35,75 +36,75 @@ export class Motions return k; } - public static removeMotion(k:Motion): void + public static removeMotion(k: Motion): void { let _local_2: number = Motions._RUNNING_MOTIONS.indexOf(k); - if(_local_2 > -1) + if (_local_2 > -1) { - if(Motions._IS_UPDATING) + if (Motions._IS_UPDATING) { _local_2 = Motions._REMOVED_MOTIONS.indexOf(k); - if(_local_2 == -1) Motions._REMOVED_MOTIONS.push(k); + if (_local_2 == -1) Motions._REMOVED_MOTIONS.push(k); } else { Motions._RUNNING_MOTIONS.splice(_local_2, 1); - if(k.running) k.stop(); + if (k.running) k.stop(); - if(!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); + if (!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); } } else { _local_2 = Motions._QUEUED_MOTIONS.indexOf(k); - if(_local_2 > -1) Motions._QUEUED_MOTIONS.splice(_local_2, 1); + if (_local_2 > -1) Motions._QUEUED_MOTIONS.splice(_local_2, 1); } } - public static getMotionByTag(k: string):Motion + public static getMotionByTag(k: string): Motion { - for(const _local_2 of Motions._RUNNING_MOTIONS) + for (const _local_2 of Motions._RUNNING_MOTIONS) { - if(_local_2.tag == k) return _local_2; + if (_local_2.tag == k) return _local_2; } - for(const _local_2 of Motions._QUEUED_MOTIONS) + for (const _local_2 of Motions._QUEUED_MOTIONS) { - if(_local_2.tag == k) return _local_2; + if (_local_2.tag == k) return _local_2; } return null; } - public static getMotionByTarget(k: HTMLElement):Motion + public static getMotionByTarget(k: HTMLElement): Motion { - for(const _local_2 of Motions._RUNNING_MOTIONS) + for (const _local_2 of Motions._RUNNING_MOTIONS) { - if(_local_2.target == k) return _local_2; + if (_local_2.target == k) return _local_2; } - for(const _local_2 of Motions._QUEUED_MOTIONS) + for (const _local_2 of Motions._QUEUED_MOTIONS) { - if(_local_2.target == k) return _local_2; + if (_local_2.target == k) return _local_2; } return null; } - public static getMotionByTagAndTarget(k: string, _arg_2: HTMLElement):Motion + public static getMotionByTagAndTarget(k: string, _arg_2: HTMLElement): Motion { - for(const _local_3 of Motions._RUNNING_MOTIONS) + for (const _local_3 of Motions._RUNNING_MOTIONS) { - if(((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; + if (((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; } - for(const _local_3 of Motions._QUEUED_MOTIONS) + for (const _local_3 of Motions._QUEUED_MOTIONS) { - if(((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; + if (((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; } return null; @@ -123,28 +124,28 @@ export class Motions { Motions._IS_UPDATING = true; - const _local_2: number = Nitro.instance.time; + const _local_2: number = GetTickerTime(); let _local_3: Motion = null; // eslint-disable-next-line no-cond-assign - while(_local_3 = Motions._QUEUED_MOTIONS.pop()) Motions._RUNNING_MOTIONS.push(_local_3); + while (_local_3 = Motions._QUEUED_MOTIONS.pop()) Motions._RUNNING_MOTIONS.push(_local_3); // eslint-disable-next-line no-cond-assign - while(_local_3 = Motions._REMOVED_MOTIONS.pop()) + while (_local_3 = Motions._REMOVED_MOTIONS.pop()) { Motions._RUNNING_MOTIONS.splice(Motions._RUNNING_MOTIONS.indexOf(_local_3), 1); - if(_local_3.running) _local_3.stop(); + if (_local_3.running) _local_3.stop(); } - for(_local_3 of Motions._RUNNING_MOTIONS) + for (_local_3 of Motions._RUNNING_MOTIONS) { - if(_local_3.running) + if (_local_3.running) { _local_3.tick(_local_2); - if(_local_3.complete) + if (_local_3.complete) { Motions.removeMotion(_local_3); } @@ -155,14 +156,14 @@ export class Motions } } - if(!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); + if (!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); Motions._IS_UPDATING = false; } private static startTimer(): void { - if(!Motions._TIMER) + if (!Motions._TIMER) { Motions._TIMER = setInterval(Motions.onTick, Motions.TIMER_TIME); } @@ -170,7 +171,7 @@ export class Motions private static stopTimer(): void { - if(Motions._TIMER) + if (Motions._TIMER) { clearInterval(Motions._TIMER); @@ -183,9 +184,9 @@ export class Motions { let _local_2 = 0; - for(const _local_3 of Motions._RUNNING_MOTIONS) + for (const _local_3 of Motions._RUNNING_MOTIONS) { - if(_local_3.target === k) _local_2++; + if (_local_3.target === k) _local_2++; } return _local_2; diff --git a/src/nitro/window/motion/Wait.ts b/src/nitro/window/motion/Wait.ts index 04a6ec21..f4d789fb 100644 --- a/src/nitro/window/motion/Wait.ts +++ b/src/nitro/window/motion/Wait.ts @@ -1,4 +1,4 @@ -import { Nitro } from '../../Nitro'; +import { GetTickerTime } from '../../../pixi-proxy'; import { Motion } from './Motion'; export class Wait extends Motion @@ -23,7 +23,7 @@ export class Wait extends Motion super.start(); this._complete = false; - this._startTimeMs = Nitro.instance.time; + this._startTimeMs = GetTickerTime(); } public tick(k: number): void @@ -32,6 +32,6 @@ export class Wait extends Motion this._complete = ((k - this._startTimeMs) >= this._waitTimeMs); - if(this._complete) this.stop(); + if (this._complete) this.stop(); } } diff --git a/src/pixi-proxy/GetTickerTime.ts b/src/pixi-proxy/GetTickerTime.ts new file mode 100644 index 00000000..a6ef72b6 --- /dev/null +++ b/src/pixi-proxy/GetTickerTime.ts @@ -0,0 +1,3 @@ +import { PixiApplicationProxy } from './PixiApplicationProxy'; + +export const GetTickerTime = () => (PixiApplicationProxy.instance?.ticker?.lastTime || 0); diff --git a/src/pixi-proxy/index.ts b/src/pixi-proxy/index.ts index 78d38af8..7ee75edb 100644 --- a/src/pixi-proxy/index.ts +++ b/src/pixi-proxy/index.ts @@ -1,3 +1,4 @@ +export * from './GetTickerTime'; export * from './INitroPoint'; export * from './NitroAdjustmentFilter'; export * from './NitroAlphaFilter'; diff --git a/src/room/utils/RoomEnterEffect.ts b/src/room/utils/RoomEnterEffect.ts index 9e8fd201..ae85dba7 100644 --- a/src/room/utils/RoomEnterEffect.ts +++ b/src/room/utils/RoomEnterEffect.ts @@ -1,4 +1,4 @@ -import { PixiApplicationProxy } from '../../pixi-proxy'; +import { GetTickerTime } from '../../pixi-proxy'; export class RoomEnterEffect { @@ -19,17 +19,17 @@ export class RoomEnterEffect RoomEnterEffect._currentDelta = 0; RoomEnterEffect._startDelayMs = delay; RoomEnterEffect._effectDurationMs = duration; - RoomEnterEffect._initializationTimeMs = PixiApplicationProxy.instance.ticker.lastTime; + RoomEnterEffect._initializationTimeMs = GetTickerTime(); RoomEnterEffect._state = RoomEnterEffect.STATE_START_DELAY; } public static turnVisualizationOn(): void { - if((RoomEnterEffect._state === RoomEnterEffect.STATE_NOT_INITIALIZED) || (RoomEnterEffect._state === RoomEnterEffect.STATE_OVER)) return; + if ((RoomEnterEffect._state === RoomEnterEffect.STATE_NOT_INITIALIZED) || (RoomEnterEffect._state === RoomEnterEffect.STATE_OVER)) return; - const k = (PixiApplicationProxy.instance.ticker.lastTime - RoomEnterEffect._initializationTimeMs); + const k = (GetTickerTime() - RoomEnterEffect._initializationTimeMs); - if(k > (RoomEnterEffect._startDelayMs + RoomEnterEffect._effectDurationMs)) + if (k > (RoomEnterEffect._startDelayMs + RoomEnterEffect._effectDurationMs)) { RoomEnterEffect._state = RoomEnterEffect.STATE_OVER; @@ -38,7 +38,7 @@ export class RoomEnterEffect RoomEnterEffect._visualizationOn = true; - if(k < RoomEnterEffect._startDelayMs) + if (k < RoomEnterEffect._startDelayMs) { RoomEnterEffect._state = RoomEnterEffect.STATE_START_DELAY; @@ -61,7 +61,7 @@ export class RoomEnterEffect public static isRunning(): boolean { - if((RoomEnterEffect._state === RoomEnterEffect.STATE_START_DELAY) || (RoomEnterEffect._state === RoomEnterEffect.STATE_RUNNING)) return true; + if ((RoomEnterEffect._state === RoomEnterEffect.STATE_START_DELAY) || (RoomEnterEffect._state === RoomEnterEffect.STATE_RUNNING)) return true; return false; } diff --git a/src/room/utils/RoomRotatingEffect.ts b/src/room/utils/RoomRotatingEffect.ts index da60956f..81568ef1 100644 --- a/src/room/utils/RoomRotatingEffect.ts +++ b/src/room/utils/RoomRotatingEffect.ts @@ -1,4 +1,4 @@ -import { PixiApplicationProxy } from '../../pixi-proxy'; +import { GetTickerTime } from '../../pixi-proxy'; export class RoomRotatingEffect { @@ -20,19 +20,19 @@ export class RoomRotatingEffect this._SafeStr_4513 = 0; this._SafeStr_4515 = _arg_1; this._SafeStr_4516 = _arg_2; - this._SafeStr_4514 = PixiApplicationProxy.instance.ticker.lastTime; + this._SafeStr_4514 = GetTickerTime(); this._SafeStr_448 = 1; } public static turnVisualizationOn(): void { - if((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; + if ((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; - if(!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); + if (!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); - const _local_1 = (PixiApplicationProxy.instance.ticker.lastTime - this._SafeStr_4514); + const _local_1 = (GetTickerTime() - this._SafeStr_4514); - if(_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) + if (_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) { this._SafeStr_448 = 3; @@ -41,7 +41,7 @@ export class RoomRotatingEffect this._SafeStr_4512 = true; - if(_local_1 < this._SafeStr_4515) + if (_local_1 < this._SafeStr_4515) { this._SafeStr_448 = 1; @@ -68,7 +68,7 @@ export class RoomRotatingEffect private static isRunning(): boolean { - if((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; + if ((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; return false; } diff --git a/src/room/utils/RoomShakingEffect.ts b/src/room/utils/RoomShakingEffect.ts index 94f76aac..ce1e0e74 100644 --- a/src/room/utils/RoomShakingEffect.ts +++ b/src/room/utils/RoomShakingEffect.ts @@ -1,4 +1,4 @@ -import { PixiApplicationProxy } from '../../pixi-proxy'; +import { GetTickerTime } from '../../pixi-proxy'; export class RoomShakingEffect { @@ -20,19 +20,19 @@ export class RoomShakingEffect this._SafeStr_4513 = 0; this._SafeStr_4515 = _arg_1; this._SafeStr_4516 = _arg_2; - this._SafeStr_4514 = PixiApplicationProxy.instance.ticker.lastTime; + this._SafeStr_4514 = GetTickerTime(); this._SafeStr_448 = 1; } public static turnVisualizationOn(): void { - if((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; + if ((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; - if(!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); + if (!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); - const _local_1 = (PixiApplicationProxy.instance.ticker.lastTime - this._SafeStr_4514); + const _local_1 = (GetTickerTime() - this._SafeStr_4514); - if(_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) + if (_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) { this._SafeStr_448 = 3; @@ -41,7 +41,7 @@ export class RoomShakingEffect this._SafeStr_4512 = true; - if(_local_1 < this._SafeStr_4515) + if (_local_1 < this._SafeStr_4515) { this._SafeStr_448 = 1; @@ -68,7 +68,7 @@ export class RoomShakingEffect private static isRunning(): boolean { - if((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; + if ((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; return false; }