diff --git a/src/core/asset/interfaces/IAsset.ts b/src/api/asset/IAsset.ts similarity index 100% rename from src/core/asset/interfaces/IAsset.ts rename to src/api/asset/IAsset.ts diff --git a/src/core/asset/interfaces/IAssetAlias.ts b/src/api/asset/IAssetAlias.ts similarity index 100% rename from src/core/asset/interfaces/IAssetAlias.ts rename to src/api/asset/IAssetAlias.ts diff --git a/src/core/asset/interfaces/IAssetData.ts b/src/api/asset/IAssetData.ts similarity index 100% rename from src/core/asset/interfaces/IAssetData.ts rename to src/api/asset/IAssetData.ts diff --git a/src/core/asset/IAssetManager.ts b/src/api/asset/IAssetManager.ts similarity index 72% rename from src/core/asset/IAssetManager.ts rename to src/api/asset/IAssetManager.ts index a8771a50..0474c71c 100644 --- a/src/core/asset/IAssetManager.ts +++ b/src/api/asset/IAssetManager.ts @@ -1,9 +1,9 @@ import { Resource, Texture } from '@pixi/core'; import { Spritesheet } from '@pixi/spritesheet'; -import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset'; -import { IGraphicAssetCollection } from '../../room/object/visualization/utils/IGraphicAssetCollection'; -import { IAssetData } from './interfaces'; +import { IAssetData } from './IAssetData'; +import { IGraphicAsset } from './IGraphicAsset'; +import { IGraphicAssetCollection } from './IGraphicAssetCollection'; export interface IAssetManager { diff --git a/src/core/asset/interfaces/IAssetPalette.ts b/src/api/asset/IAssetPalette.ts similarity index 100% rename from src/core/asset/interfaces/IAssetPalette.ts rename to src/api/asset/IAssetPalette.ts diff --git a/src/room/object/visualization/utils/IGraphicAsset.ts b/src/api/asset/IGraphicAsset.ts similarity index 100% rename from src/room/object/visualization/utils/IGraphicAsset.ts rename to src/api/asset/IGraphicAsset.ts diff --git a/src/room/object/visualization/utils/IGraphicAssetCollection.ts b/src/api/asset/IGraphicAssetCollection.ts similarity index 82% rename from src/room/object/visualization/utils/IGraphicAssetCollection.ts rename to src/api/asset/IGraphicAssetCollection.ts index 5e6a5603..50b797a5 100644 --- a/src/room/object/visualization/utils/IGraphicAssetCollection.ts +++ b/src/api/asset/IGraphicAssetCollection.ts @@ -1,7 +1,7 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; -import { IAssetData } from '../../../../core/asset/interfaces'; -import { GraphicAssetPalette } from './GraphicAssetPalette'; +import { IAssetData } from './IAssetData'; import { IGraphicAsset } from './IGraphicAsset'; +import { IGraphicAssetPalette } from './IGraphicAssetPalette'; export interface IGraphicAssetCollection { @@ -14,7 +14,7 @@ export interface IGraphicAssetCollection getTexture(name: string): Texture; getPaletteNames(): string[]; getPaletteColors(paletteName: string): number[]; - getPalette(name: string): GraphicAssetPalette; + getPalette(name: string): IGraphicAssetPalette; addAsset(name: string, texture: Texture, override: boolean, x?: number, y?: number, flipH?: boolean, flipV?: boolean): boolean; disposeAsset(name: string): void; referenceCount: number; diff --git a/src/api/asset/IGraphicAssetPalette.ts b/src/api/asset/IGraphicAssetPalette.ts new file mode 100644 index 00000000..60e82235 --- /dev/null +++ b/src/api/asset/IGraphicAssetPalette.ts @@ -0,0 +1,9 @@ +import { Resource, Texture } from '@pixi/core'; + +export interface IGraphicAssetPalette +{ + dispose: () => void; + applyPalette(texture: Texture): Texture; + primaryColor: number; + secondaryColor: number; +} diff --git a/src/core/asset/interfaces/animation/IAssetAnimation.ts b/src/api/asset/animation/IAssetAnimation.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimation.ts rename to src/api/asset/animation/IAssetAnimation.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationAdd.ts b/src/api/asset/animation/IAssetAnimationAdd.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationAdd.ts rename to src/api/asset/animation/IAssetAnimationAdd.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationAvatar.ts b/src/api/asset/animation/IAssetAnimationAvatar.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationAvatar.ts rename to src/api/asset/animation/IAssetAnimationAvatar.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationDirection.ts b/src/api/asset/animation/IAssetAnimationDirection.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationDirection.ts rename to src/api/asset/animation/IAssetAnimationDirection.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationFrame.ts b/src/api/asset/animation/IAssetAnimationFrame.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationFrame.ts rename to src/api/asset/animation/IAssetAnimationFrame.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationFramePart.ts b/src/api/asset/animation/IAssetAnimationFramePart.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationFramePart.ts rename to src/api/asset/animation/IAssetAnimationFramePart.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationFramePartItem.ts b/src/api/asset/animation/IAssetAnimationFramePartItem.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationFramePartItem.ts rename to src/api/asset/animation/IAssetAnimationFramePartItem.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationOverride.ts b/src/api/asset/animation/IAssetAnimationOverride.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationOverride.ts rename to src/api/asset/animation/IAssetAnimationOverride.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationRemove.ts b/src/api/asset/animation/IAssetAnimationRemove.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationRemove.ts rename to src/api/asset/animation/IAssetAnimationRemove.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationShadow.ts b/src/api/asset/animation/IAssetAnimationShadow.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationShadow.ts rename to src/api/asset/animation/IAssetAnimationShadow.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationSprite.ts b/src/api/asset/animation/IAssetAnimationSprite.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationSprite.ts rename to src/api/asset/animation/IAssetAnimationSprite.ts diff --git a/src/core/asset/interfaces/animation/IAssetAnimationSpriteDirection.ts b/src/api/asset/animation/IAssetAnimationSpriteDirection.ts similarity index 100% rename from src/core/asset/interfaces/animation/IAssetAnimationSpriteDirection.ts rename to src/api/asset/animation/IAssetAnimationSpriteDirection.ts diff --git a/src/core/asset/interfaces/animation/index.ts b/src/api/asset/animation/index.ts similarity index 100% rename from src/core/asset/interfaces/animation/index.ts rename to src/api/asset/animation/index.ts diff --git a/src/api/asset/index.ts b/src/api/asset/index.ts new file mode 100644 index 00000000..374f7efc --- /dev/null +++ b/src/api/asset/index.ts @@ -0,0 +1,18 @@ +export * from './animation'; +export * from './IAsset'; +export * from './IAssetAlias'; +export * from './IAssetData'; +export * from './IAssetManager'; +export * from './IAssetPalette'; +export * from './IGraphicAsset'; +export * from './IGraphicAssetCollection'; +export * from './IGraphicAssetPalette'; +export * from './logic'; +export * from './logic/model'; +export * from './logic/particlesystem'; +export * from './spritesheet'; +export * from './visualization'; +export * from './visualization/animation'; +export * from './visualization/color'; +export * from './visualization/gestures'; +export * from './visualization/postures'; diff --git a/src/core/asset/interfaces/logic/IAssetLogicCustomVars.ts b/src/api/asset/logic/IAssetLogicCustomVars.ts similarity index 100% rename from src/core/asset/interfaces/logic/IAssetLogicCustomVars.ts rename to src/api/asset/logic/IAssetLogicCustomVars.ts diff --git a/src/core/asset/interfaces/logic/IAssetLogicData.ts b/src/api/asset/logic/IAssetLogicData.ts similarity index 100% rename from src/core/asset/interfaces/logic/IAssetLogicData.ts rename to src/api/asset/logic/IAssetLogicData.ts diff --git a/src/core/asset/interfaces/logic/IAssetLogicPlanetSystem.ts b/src/api/asset/logic/IAssetLogicPlanetSystem.ts similarity index 100% rename from src/core/asset/interfaces/logic/IAssetLogicPlanetSystem.ts rename to src/api/asset/logic/IAssetLogicPlanetSystem.ts diff --git a/src/core/asset/interfaces/logic/ISoundSample.ts b/src/api/asset/logic/ISoundSample.ts similarity index 100% rename from src/core/asset/interfaces/logic/ISoundSample.ts rename to src/api/asset/logic/ISoundSample.ts diff --git a/src/core/asset/interfaces/logic/index.ts b/src/api/asset/logic/index.ts similarity index 100% rename from src/core/asset/interfaces/logic/index.ts rename to src/api/asset/logic/index.ts diff --git a/src/core/asset/interfaces/logic/model/IAssetDimension.ts b/src/api/asset/logic/model/IAssetDimension.ts similarity index 100% rename from src/core/asset/interfaces/logic/model/IAssetDimension.ts rename to src/api/asset/logic/model/IAssetDimension.ts diff --git a/src/core/asset/interfaces/logic/model/IAssetLogicModel.ts b/src/api/asset/logic/model/IAssetLogicModel.ts similarity index 100% rename from src/core/asset/interfaces/logic/model/IAssetLogicModel.ts rename to src/api/asset/logic/model/IAssetLogicModel.ts diff --git a/src/core/asset/interfaces/logic/model/index.ts b/src/api/asset/logic/model/index.ts similarity index 100% rename from src/core/asset/interfaces/logic/model/index.ts rename to src/api/asset/logic/model/index.ts diff --git a/src/core/asset/interfaces/logic/particlesystem/IParticleSystem.ts b/src/api/asset/logic/particlesystem/IParticleSystem.ts similarity index 100% rename from src/core/asset/interfaces/logic/particlesystem/IParticleSystem.ts rename to src/api/asset/logic/particlesystem/IParticleSystem.ts diff --git a/src/core/asset/interfaces/logic/particlesystem/IParticleSystemEmitter.ts b/src/api/asset/logic/particlesystem/IParticleSystemEmitter.ts similarity index 100% rename from src/core/asset/interfaces/logic/particlesystem/IParticleSystemEmitter.ts rename to src/api/asset/logic/particlesystem/IParticleSystemEmitter.ts diff --git a/src/core/asset/interfaces/logic/particlesystem/IParticleSystemParticle.ts b/src/api/asset/logic/particlesystem/IParticleSystemParticle.ts similarity index 100% rename from src/core/asset/interfaces/logic/particlesystem/IParticleSystemParticle.ts rename to src/api/asset/logic/particlesystem/IParticleSystemParticle.ts diff --git a/src/core/asset/interfaces/logic/particlesystem/IParticleSystemSimulation.ts b/src/api/asset/logic/particlesystem/IParticleSystemSimulation.ts similarity index 100% rename from src/core/asset/interfaces/logic/particlesystem/IParticleSystemSimulation.ts rename to src/api/asset/logic/particlesystem/IParticleSystemSimulation.ts diff --git a/src/core/asset/interfaces/logic/particlesystem/index.ts b/src/api/asset/logic/particlesystem/index.ts similarity index 100% rename from src/core/asset/interfaces/logic/particlesystem/index.ts rename to src/api/asset/logic/particlesystem/index.ts diff --git a/src/core/asset/interfaces/spritesheet/ISpritesheetData.ts b/src/api/asset/spritesheet/ISpritesheetData.ts similarity index 100% rename from src/core/asset/interfaces/spritesheet/ISpritesheetData.ts rename to src/api/asset/spritesheet/ISpritesheetData.ts diff --git a/src/core/asset/interfaces/spritesheet/ISpritesheetFrame.ts b/src/api/asset/spritesheet/ISpritesheetFrame.ts similarity index 100% rename from src/core/asset/interfaces/spritesheet/ISpritesheetFrame.ts rename to src/api/asset/spritesheet/ISpritesheetFrame.ts diff --git a/src/core/asset/interfaces/spritesheet/ISpritesheetMeta.ts b/src/api/asset/spritesheet/ISpritesheetMeta.ts similarity index 100% rename from src/core/asset/interfaces/spritesheet/ISpritesheetMeta.ts rename to src/api/asset/spritesheet/ISpritesheetMeta.ts diff --git a/src/core/asset/interfaces/spritesheet/index.ts b/src/api/asset/spritesheet/index.ts similarity index 100% rename from src/core/asset/interfaces/spritesheet/index.ts rename to src/api/asset/spritesheet/index.ts diff --git a/src/core/asset/interfaces/visualization/IAssetVisualizationData.ts b/src/api/asset/visualization/IAssetVisualizationData.ts similarity index 100% rename from src/core/asset/interfaces/visualization/IAssetVisualizationData.ts rename to src/api/asset/visualization/IAssetVisualizationData.ts diff --git a/src/core/asset/interfaces/visualization/IAssetVisualizationDirection.ts b/src/api/asset/visualization/IAssetVisualizationDirection.ts similarity index 100% rename from src/core/asset/interfaces/visualization/IAssetVisualizationDirection.ts rename to src/api/asset/visualization/IAssetVisualizationDirection.ts diff --git a/src/core/asset/interfaces/visualization/IAssetVisualizationLayer.ts b/src/api/asset/visualization/IAssetVisualizationLayer.ts similarity index 100% rename from src/core/asset/interfaces/visualization/IAssetVisualizationLayer.ts rename to src/api/asset/visualization/IAssetVisualizationLayer.ts diff --git a/src/core/asset/interfaces/visualization/animation/IAssetVisualAnimation.ts b/src/api/asset/visualization/animation/IAssetVisualAnimation.ts similarity index 100% rename from src/core/asset/interfaces/visualization/animation/IAssetVisualAnimation.ts rename to src/api/asset/visualization/animation/IAssetVisualAnimation.ts diff --git a/src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationLayer.ts b/src/api/asset/visualization/animation/IAssetVisualAnimationLayer.ts similarity index 100% rename from src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationLayer.ts rename to src/api/asset/visualization/animation/IAssetVisualAnimationLayer.ts diff --git a/src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationSequence.ts b/src/api/asset/visualization/animation/IAssetVisualAnimationSequence.ts similarity index 100% rename from src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationSequence.ts rename to src/api/asset/visualization/animation/IAssetVisualAnimationSequence.ts diff --git a/src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationSequenceFrame.ts b/src/api/asset/visualization/animation/IAssetVisualAnimationSequenceFrame.ts similarity index 100% rename from src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationSequenceFrame.ts rename to src/api/asset/visualization/animation/IAssetVisualAnimationSequenceFrame.ts diff --git a/src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationSequenceFrameOffset.ts b/src/api/asset/visualization/animation/IAssetVisualAnimationSequenceFrameOffset.ts similarity index 100% rename from src/core/asset/interfaces/visualization/animation/IAssetVisualAnimationSequenceFrameOffset.ts rename to src/api/asset/visualization/animation/IAssetVisualAnimationSequenceFrameOffset.ts diff --git a/src/core/asset/interfaces/visualization/animation/index.ts b/src/api/asset/visualization/animation/index.ts similarity index 100% rename from src/core/asset/interfaces/visualization/animation/index.ts rename to src/api/asset/visualization/animation/index.ts diff --git a/src/core/asset/interfaces/visualization/color/IAssetColor.ts b/src/api/asset/visualization/color/IAssetColor.ts similarity index 100% rename from src/core/asset/interfaces/visualization/color/IAssetColor.ts rename to src/api/asset/visualization/color/IAssetColor.ts diff --git a/src/core/asset/interfaces/visualization/color/IAssetColorLayer.ts b/src/api/asset/visualization/color/IAssetColorLayer.ts similarity index 100% rename from src/core/asset/interfaces/visualization/color/IAssetColorLayer.ts rename to src/api/asset/visualization/color/IAssetColorLayer.ts diff --git a/src/core/asset/interfaces/visualization/color/index.ts b/src/api/asset/visualization/color/index.ts similarity index 100% rename from src/core/asset/interfaces/visualization/color/index.ts rename to src/api/asset/visualization/color/index.ts diff --git a/src/core/asset/interfaces/visualization/gestures/IAssetGesture.ts b/src/api/asset/visualization/gestures/IAssetGesture.ts similarity index 100% rename from src/core/asset/interfaces/visualization/gestures/IAssetGesture.ts rename to src/api/asset/visualization/gestures/IAssetGesture.ts diff --git a/src/core/asset/interfaces/visualization/gestures/index.ts b/src/api/asset/visualization/gestures/index.ts similarity index 100% rename from src/core/asset/interfaces/visualization/gestures/index.ts rename to src/api/asset/visualization/gestures/index.ts diff --git a/src/core/asset/interfaces/visualization/index.ts b/src/api/asset/visualization/index.ts similarity index 100% rename from src/core/asset/interfaces/visualization/index.ts rename to src/api/asset/visualization/index.ts diff --git a/src/core/asset/interfaces/visualization/postures/IAssetPosture.ts b/src/api/asset/visualization/postures/IAssetPosture.ts similarity index 100% rename from src/core/asset/interfaces/visualization/postures/IAssetPosture.ts rename to src/api/asset/visualization/postures/IAssetPosture.ts diff --git a/src/core/asset/interfaces/visualization/postures/index.ts b/src/api/asset/visualization/postures/index.ts similarity index 100% rename from src/core/asset/interfaces/visualization/postures/index.ts rename to src/api/asset/visualization/postures/index.ts diff --git a/src/api/index.ts b/src/api/index.ts new file mode 100644 index 00000000..ff64c4f8 --- /dev/null +++ b/src/api/index.ts @@ -0,0 +1,11 @@ +export * from './asset'; +export * from './asset/animation'; +export * from './asset/logic'; +export * from './asset/logic/model'; +export * from './asset/logic/particlesystem'; +export * from './asset/spritesheet'; +export * from './asset/visualization'; +export * from './asset/visualization/animation'; +export * from './asset/visualization/color'; +export * from './asset/visualization/gestures'; +export * from './asset/visualization/postures'; diff --git a/src/core/INitroCore.ts b/src/core/INitroCore.ts index e9a068a9..288e1c5f 100644 --- a/src/core/INitroCore.ts +++ b/src/core/INitroCore.ts @@ -1,4 +1,4 @@ -import { IAssetManager } from './asset/IAssetManager'; +import { IAssetManager } from '../api'; import { IDisposable } from './common/disposable/IDisposable'; import { ICommunicationManager } from './communication/ICommunicationManager'; import { IConfigurationManager } from './configuration/IConfigurationManager'; diff --git a/src/core/NitroCore.ts b/src/core/NitroCore.ts index d84bccf6..1929b00d 100644 --- a/src/core/NitroCore.ts +++ b/src/core/NitroCore.ts @@ -1,5 +1,5 @@ +import { IAssetManager } from '../api'; import { AssetManager } from './asset/AssetManager'; -import { IAssetManager } from './asset/IAssetManager'; import { Disposable } from './common/disposable/Disposable'; import { CommunicationManager } from './communication/CommunicationManager'; import { ICommunicationManager } from './communication/ICommunicationManager'; @@ -27,14 +27,14 @@ export class NitroCore extends Disposable implements INitroCore protected onDispose(): void { - if(this._asset) + if (this._asset) { this._asset.dispose(); this._asset = null; } - if(this._communication) + if (this._communication) { this._communication.dispose(); diff --git a/src/core/asset/AssetManager.ts b/src/core/asset/AssetManager.ts index d7b2aa1b..699c0238 100644 --- a/src/core/asset/AssetManager.ts +++ b/src/core/asset/AssetManager.ts @@ -1,15 +1,12 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; -import { IGraphicAsset } from '../../room/object/visualization/utils'; +import { IAssetData, IAssetManager, IGraphicAsset, IGraphicAssetCollection } from '../../api'; import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection'; -import { IGraphicAssetCollection } from '../../room/object/visualization/utils/IGraphicAssetCollection'; import { Disposable } from '../common/disposable/Disposable'; import { INitroLogger } from '../common/logger/INitroLogger'; import { NitroLogger } from '../common/logger/NitroLogger'; import { ArrayBufferToBase64 } from '../utils'; -import { IAssetManager } from './IAssetManager'; -import { IAssetData } from './interfaces'; import { NitroBundle } from './NitroBundle'; export class AssetManager extends Disposable implements IAssetManager @@ -34,33 +31,33 @@ export class AssetManager extends Disposable implements IAssetManager public getTexture(name: string): Texture { - if(!name) return null; + if (!name) return null; const existing = this._textures.get(name); - if(!existing) return null; + if (!existing) return null; return existing; } public setTexture(name: string, texture: Texture): void { - if(!name || !texture) return; + if (!name || !texture) return; this._textures.set(name, texture); } public getAsset(name: string): IGraphicAsset { - if(!name) return null; + if (!name) return null; - for(const collection of this._collections.values()) + for (const collection of this._collections.values()) { - if(!collection) continue; + if (!collection) continue; const existing = collection.getAsset(name); - if(!existing) continue; + if (!existing) continue; return existing; } @@ -70,24 +67,24 @@ export class AssetManager extends Disposable implements IAssetManager public getCollection(name: string): IGraphicAssetCollection { - if(!name) return null; + if (!name) return null; const existing = this._collections.get(name); - if(!existing) return null; + if (!existing) return null; return existing; } public createCollection(data: IAssetData, spritesheet: Spritesheet): IGraphicAssetCollection { - if(!data) return null; + if (!data) return null; const collection = new GraphicAssetCollection(data, spritesheet); - if(collection) + if (collection) { - for(const [name, texture] of collection.textures.entries()) this.setTexture(name, texture); + for (const [name, texture] of collection.textures.entries()) this.setTexture(name, texture); this._collections.set(collection.name, collection); } @@ -102,7 +99,7 @@ export class AssetManager extends Disposable implements IAssetManager public downloadAssets(assetUrls: string[], cb: (status: boolean) => void): void { - if(!assetUrls || !assetUrls.length) + if (!assetUrls || !assetUrls.length) { cb(true); @@ -111,9 +108,9 @@ export class AssetManager extends Disposable implements IAssetManager const loader = new Loader(); - for(const url of assetUrls) + for (const url of assetUrls) { - if(!url) continue; + if (!url) continue; loader .add({ @@ -128,7 +125,7 @@ export class AssetManager extends Disposable implements IAssetManager const onDownloaded = (status: boolean, url: string) => { - if(!status) + if (!status) { this._logger.error('Failed to download asset', url); @@ -141,7 +138,7 @@ export class AssetManager extends Disposable implements IAssetManager remaining--; - if(!remaining) + if (!remaining) { loader.destroy(); @@ -153,11 +150,11 @@ export class AssetManager extends Disposable implements IAssetManager loader.load((loader, resources) => { - for(const key in resources) + for (const key in resources) { const resource = resources[key]; - if(!resource || resource.error || !resource.xhr) + if (!resource || resource.error || !resource.xhr) { onDownloaded(false, resource.url); @@ -166,7 +163,7 @@ export class AssetManager extends Disposable implements IAssetManager const resourceType = (resource.xhr.getResponseHeader('Content-Type') || 'application/octet-stream'); - if(resourceType === 'application/octet-stream') + if (resourceType === 'application/octet-stream') { const nitroBundle = new NitroBundle(resource.data); @@ -178,12 +175,12 @@ export class AssetManager extends Disposable implements IAssetManager continue; } - if((resourceType === 'image/png') || (resourceType === 'image/jpeg') || (resourceType === 'image/gif')) + if ((resourceType === 'image/png') || (resourceType === 'image/jpeg') || (resourceType === 'image/gif')) { const base64 = ArrayBufferToBase64(resource.data); const baseTexture = new BaseTexture(`data:${resourceType};base64,${base64}`); - if(baseTexture.valid) + if (baseTexture.valid) { const texture = new Texture(baseTexture); @@ -215,7 +212,7 @@ export class AssetManager extends Disposable implements IAssetManager { const spritesheetData = data.spritesheet; - if(!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) + if (!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) { this.createCollection(data, null); @@ -236,7 +233,7 @@ export class AssetManager extends Disposable implements IAssetManager }); }; - if(baseTexture.valid) + if (baseTexture.valid) { createAsset(); } diff --git a/src/core/asset/index.ts b/src/core/asset/index.ts index a66a117d..5dca55f3 100644 --- a/src/core/asset/index.ts +++ b/src/core/asset/index.ts @@ -1,4 +1,2 @@ export * from './AssetManager'; -export * from './IAssetManager'; -export * from './interfaces'; export * from './NitroBundle'; diff --git a/src/core/asset/interfaces/index.ts b/src/core/asset/interfaces/index.ts deleted file mode 100644 index 3d5fabbc..00000000 --- a/src/core/asset/interfaces/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './animation'; -export * from './IAsset'; -export * from './IAssetAlias'; -export * from './IAssetData'; -export * from './IAssetPalette'; -export * from './logic'; -export * from './spritesheet'; -export * from './visualization'; diff --git a/src/index.ts b/src/index.ts index 1c028683..471a0790 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +export * from './api'; export * from './core'; export * from './nitro'; export * from './room'; diff --git a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts index 221e1a54..d02f0482 100644 --- a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts +++ b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts @@ -1,4 +1,4 @@ -import { IAssetManager } from '../../core/asset/IAssetManager'; +import { IAssetManager } from '../../api'; import { EventDispatcher } from '../../core/events/EventDispatcher'; import { AvatarRenderLibraryEvent } from './events/AvatarRenderLibraryEvent'; @@ -31,16 +31,16 @@ export class AvatarAssetDownloadLibrary extends EventDispatcher const asset = this._assets.getCollection(this._libraryName); - if(asset) this._state = AvatarAssetDownloadLibrary.LOADED; + if (asset) this._state = AvatarAssetDownloadLibrary.LOADED; } public downloadAsset(): void { - if(!this._assets || (this._state === AvatarAssetDownloadLibrary.LOADING) || (this._state === AvatarAssetDownloadLibrary.LOADED)) return; + if (!this._assets || (this._state === AvatarAssetDownloadLibrary.LOADING) || (this._state === AvatarAssetDownloadLibrary.LOADED)) return; const asset = this._assets.getCollection(this._libraryName); - if(asset) + if (asset) { this._state = AvatarAssetDownloadLibrary.LOADED; @@ -53,7 +53,7 @@ export class AvatarAssetDownloadLibrary extends EventDispatcher this._assets.downloadAsset(this._downloadUrl, (flag: boolean) => { - if(flag) + if (flag) { this._state = AvatarAssetDownloadLibrary.LOADED; diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index 736dbdf6..50434c3a 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -1,4 +1,4 @@ -import { IAssetManager } from '../../core/asset/IAssetManager'; +import { IAssetManager } from '../../api'; import { EventDispatcher } from '../../core/events/EventDispatcher'; import { NitroEvent } from '../../core/events/NitroEvent'; import { Nitro } from '../Nitro'; @@ -66,7 +66,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if(request.responseText) + if (request.responseText) { const data = JSON.parse(request.responseText); @@ -94,16 +94,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); @@ -111,7 +111,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); @@ -119,7 +119,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher let existing = this._figureMap.get(partString); - if(!existing) existing = []; + if (!existing) existing = []; existing.push(downloadLibrary); @@ -130,9 +130,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); } @@ -142,34 +142,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); } @@ -181,22 +181,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++; @@ -207,19 +207,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; } @@ -233,38 +233,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); } @@ -276,7 +276,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]); @@ -286,13 +286,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 = []; @@ -304,24 +304,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); @@ -330,7 +330,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/AvatarImage.ts b/src/nitro/avatar/AvatarImage.ts index b68fb4b1..7198a2e3 100644 --- a/src/nitro/avatar/AvatarImage.ts +++ b/src/nitro/avatar/AvatarImage.ts @@ -3,10 +3,10 @@ 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 { NitroContainer, NitroSprite } from '../../core'; import { AdvancedMap } from '../../core/utils/AdvancedMap'; import { PaletteMapFilter } from '../../core/utils/PaletteMapFilter'; -import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset'; import { TextureUtils } from '../../room/utils/TextureUtils'; import { Nitro } from '../Nitro'; import { ActiveActionData } from './actions/ActiveActionData'; @@ -92,11 +92,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-'); } @@ -120,7 +120,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public dispose(): void { - if(this._disposed) return; + if (this._disposed) return; this._structure = null; this._assets = null; @@ -129,22 +129,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; } @@ -178,24 +178,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; } @@ -241,34 +241,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); } @@ -280,7 +280,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; @@ -293,18 +293,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); @@ -314,19 +314,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); @@ -346,16 +346,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 @@ -368,7 +368,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; @@ -380,7 +380,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partContainer.addChild(partCacheContainer); - if(partContainer) + if (partContainer) { partContainer.position.set(point.x, point.y); @@ -392,13 +392,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); @@ -406,12 +406,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) { Nitro.instance.renderer.render(container, { renderTexture: this._reusableTexture, @@ -423,7 +423,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) @@ -448,35 +448,35 @@ 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; + let paletteColor = reds[data[i]]; + if (paletteColor === undefined) paletteColor = 0; - data[ i ] = ((paletteColor >> 16) & 0xFF); - data[ i + 1] = ((paletteColor >> 8) & 0xFF); - data[ i + 2] = (paletteColor & 0xFF); + 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; + let paletteColor = greens[data[i + 1]]; + if (paletteColor === undefined) paletteColor = 0; - data[ i ] = ((paletteColor >> 16) & 0xFF); - data[ i + 1] = ((paletteColor >> 8) & 0xFF); - data[ i + 2] = (paletteColor & 0xFF); + 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; + let paletteColor = greens[data[i + 2]]; + if (paletteColor === undefined) paletteColor = 0; - data[ i ] = ((paletteColor >> 16) & 0xFF); - data[ i + 1] = ((paletteColor >> 8) & 0xFF); - data[ i + 2] = (paletteColor & 0xFF); + data[i] = ((paletteColor >> 16) & 0xFF); + data[i + 1] = ((paletteColor >> 8) & 0xFF); + data[i + 2] = (paletteColor & 0xFF); } } @@ -494,13 +494,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(); @@ -513,16 +513,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 @@ -533,7 +533,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; @@ -559,29 +559,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 @@ -592,7 +592,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; @@ -604,7 +604,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partContainer.addChild(partCacheContainer); - if(partContainer) + if (partContainer) { partContainer.position.set(point.x, point.y); @@ -620,7 +620,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const image = TextureUtils.generateImage(texture); - if(!image) return null; + if (!image) return null; return image; } @@ -629,9 +629,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); @@ -648,18 +648,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,15 +690,15 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public endActionAppends(): void { - let k:ActiveActionData; + 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); } } @@ -712,14 +712,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: @@ -732,11 +732,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); } @@ -755,7 +755,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: @@ -779,9 +779,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; } @@ -792,7 +792,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; } @@ -801,16 +801,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener return true; } - protected addActionData(k: string, _arg_2: string=''): void + protected addActionData(k: string, _arg_2: string = ''): void { - let _local_3:ActiveActionData; - if(!this._actions) this._actions = []; + let _local_3: ActiveActionData; + 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; } @@ -843,14 +843,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; } @@ -862,7 +862,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { let _local_2: boolean; let _local_3: boolean; - let _local_4:ActiveActionData; + let _local_4: ActiveActionData; let _local_5: number; let k: boolean; @@ -870,11 +870,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 ]; + this._canvasOffsets = [0, 0, 0]; - if(this._lastActionsString !== '') + if (this._lastActionsString !== '') { k = true; @@ -885,15 +885,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; @@ -901,16 +901,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; @@ -925,60 +925,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_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; } } } @@ -987,15 +987,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); @@ -1006,11 +1006,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); @@ -1032,7 +1032,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; @@ -1100,7 +1100,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public resetEffect(effect: number): void { - if(effect === this._effectIdInUse) + if (effect === this._effectIdInUse) { this.resetActions(); this.setActionsToParts(); @@ -1108,7 +1108,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/AvatarRenderManager.ts b/src/nitro/avatar/AvatarRenderManager.ts index cea740cb..1913b98b 100644 --- a/src/nitro/avatar/AvatarRenderManager.ts +++ b/src/nitro/avatar/AvatarRenderManager.ts @@ -1,7 +1,6 @@ -import { IAssetManager } from '../../core/asset/IAssetManager'; +import { IAssetManager, IGraphicAsset } from '../../api'; import { NitroManager } from '../../core/common/NitroManager'; import { NitroEvent } from '../../core/events/NitroEvent'; -import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset'; import { Nitro } from '../Nitro'; import { FigureDataContainer } from '../utils/FigureDataContainer'; import { AssetAliasCollection } from './alias/AssetAliasCollection'; @@ -86,7 +85,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); @@ -94,7 +93,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); @@ -107,14 +106,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); @@ -124,7 +123,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadGeometry(): void { - if(!this._structure) return; + if (!this._structure) return; this._structure.initGeometry(HabboAvatarGeometry.geometry); @@ -135,7 +134,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadPartSets(): void { - if(!this._structure) return; + if (!this._structure) return; this._structure.initPartSets(HabboAvatarPartSets.partSets); @@ -148,7 +147,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(); @@ -160,7 +159,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)); @@ -183,7 +182,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadAnimations(): void { - if(!this._structure) return; + if (!this._structure) return; this._structure.initAnimation(HabboAvatarAnimations.animations); @@ -196,14 +195,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)); @@ -221,7 +220,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaderReady(event: NitroEvent): void { - if(!event) return; + if (!event) return; this._figureMapReady = true; @@ -230,14 +229,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; @@ -246,20 +245,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 @@ -269,25 +268,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); @@ -296,7 +295,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); } @@ -307,17 +306,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]); @@ -328,15 +327,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]); @@ -353,49 +352,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; @@ -417,7 +416,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa 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)); } @@ -430,11 +429,11 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa const structure = this.structureData; const partSets: IFigurePartSet[] = []; - for(const _local_4 of k) + for (const _local_4 of k) { const partSet = structure.getFigurePartSet(_local_4); - if(partSet) partSets.push(partSet); + if (partSet) partSets.push(partSet); } return partSets; @@ -442,7 +441,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); } @@ -469,7 +468,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 9a405b44..e222f5bc 100644 --- a/src/nitro/avatar/AvatarStructure.ts +++ b/src/nitro/avatar/AvatarStructure.ts @@ -1,6 +1,5 @@ import { Point } from '@pixi/math'; -import { IAssetManager } from '../../core/asset/IAssetManager'; -import { IAssetAnimation } from '../../core/asset/interfaces'; +import { IAssetAnimation, IAssetManager } from '../../api'; import { EventDispatcher } from '../../core/events/EventDispatcher'; import { ActionDefinition } from './actions/ActionDefinition'; import { AvatarActionManager } from './actions/AvatarActionManager'; @@ -61,7 +60,7 @@ export class AvatarStructure extends EventDispatcher public dispose(): void { - if(this.disposed) return; + if (this.disposed) return; super.dispose(); @@ -74,14 +73,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(); @@ -96,9 +95,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; @@ -111,14 +110,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); } @@ -132,11 +131,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; @@ -156,15 +155,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]); } @@ -203,7 +202,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)); } @@ -212,12 +211,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]; } @@ -254,16 +253,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: '', @@ -281,11 +280,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); @@ -295,30 +294,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); } } @@ -337,48 +336,48 @@ export class AvatarStructure extends EventDispatcher return this._geometry.getBodyPartsAtAngle(k, _local_4, _arg_2); } - public getFrameBodyPartOffset(k:IActiveActionData, _arg_2: number, _arg_3: number, _arg_4: string): Point + public getFrameBodyPartOffset(k: IActiveActionData, _arg_2: number, _arg_3: number, _arg_4: string): Point { 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; } - public getParts(k: string, _arg_2:IAvatarFigureContainer, _arg_3:IActiveActionData, _arg_4: string, _arg_5: number, removes: string[], _arg_7: IAvatarImage, _arg_8: Map = null): AvatarImagePartContainer[] + public getParts(k: string, _arg_2: IAvatarFigureContainer, _arg_3: IActiveActionData, _arg_4: string, _arg_5: number, removes: string[], _arg_7: IAvatarImage, _arg_8: Map = null): AvatarImagePartContainer[] { const _local_10: Animation = null; let _local_34: IActionDefinition = null; let _local_20: AvatarAnimationFrame[] = []; - let _local_36:IPartColor = null; + 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 ]; + 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); } @@ -391,11 +390,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); @@ -404,27 +403,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; } @@ -440,15 +439,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)]); } @@ -466,18 +465,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; } @@ -485,31 +484,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; } @@ -529,11 +528,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) { // } @@ -544,36 +543,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; } @@ -606,7 +605,7 @@ export class AvatarStructure extends EventDispatcher let index = 0; - while(index < k) + while (index < k) { _local_2.push(index); @@ -618,13 +617,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/EffectAssetDownloadLibrary.ts b/src/nitro/avatar/EffectAssetDownloadLibrary.ts index 1829bc14..ce35a98f 100644 --- a/src/nitro/avatar/EffectAssetDownloadLibrary.ts +++ b/src/nitro/avatar/EffectAssetDownloadLibrary.ts @@ -1,5 +1,4 @@ -import { IAssetManager } from '../../core/asset/IAssetManager'; -import { IAssetAnimation } from '../../core/asset/interfaces'; +import { IAssetAnimation, IAssetManager } from '../../api'; import { EventDispatcher } from '../../core/events/EventDispatcher'; import { AvatarRenderEffectLibraryEvent } from './events/AvatarRenderEffectLibraryEvent'; @@ -34,16 +33,16 @@ export class EffectAssetDownloadLibrary extends EventDispatcher const asset = this._assets.getCollection(this._libraryName); - if(asset) this._state = EffectAssetDownloadLibrary.LOADED; + if (asset) this._state = EffectAssetDownloadLibrary.LOADED; } public downloadAsset(): void { - if(!this._assets || (this._state === EffectAssetDownloadLibrary.LOADING) || (this._state === EffectAssetDownloadLibrary.LOADED)) return; + if (!this._assets || (this._state === EffectAssetDownloadLibrary.LOADING) || (this._state === EffectAssetDownloadLibrary.LOADED)) return; const asset = this._assets.getCollection(this._libraryName); - if(asset) + if (asset) { this._state = EffectAssetDownloadLibrary.LOADED; @@ -56,13 +55,13 @@ export class EffectAssetDownloadLibrary extends EventDispatcher this._assets.downloadAsset(this._downloadUrl, (flag: boolean) => { - if(flag) + if (flag) { this._state = EffectAssetDownloadLibrary.LOADED; const collection = this._assets.getCollection(this._libraryName); - if(collection) this._animation = collection.data.animations; + if (collection) this._animation = collection.data.animations; this.dispatchEvent(new AvatarRenderEffectLibraryEvent(AvatarRenderEffectLibraryEvent.DOWNLOAD_COMPLETE, this)); } diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index a6341e1c..f3ee9f09 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -1,4 +1,4 @@ -import { IAssetManager } from '../../core/asset/IAssetManager'; +import { IAssetManager } from '../../api'; import { EventDispatcher } from '../../core/events/EventDispatcher'; import { NitroEvent } from '../../core/events/NitroEvent'; import { Nitro } from '../Nitro'; @@ -65,7 +65,7 @@ export class EffectAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if(request.responseText) + if (request.responseText) { const data = JSON.parse(request.responseText); @@ -93,17 +93,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); @@ -113,7 +113,7 @@ export class EffectAssetDownloadManager extends EventDispatcher let existing = this._effectMap.get(id); - if(!existing) existing = []; + if (!existing) existing = []; existing.push(downloadLibrary); @@ -123,7 +123,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]); @@ -132,13 +132,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); @@ -147,24 +147,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); } @@ -174,34 +174,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)); } @@ -212,17 +212,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++; @@ -233,19 +233,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; } @@ -259,17 +259,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); } } @@ -278,9 +278,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); @@ -289,7 +289,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/IAvatarImage.ts b/src/nitro/avatar/IAvatarImage.ts index a0dd8d64..a3260b71 100644 --- a/src/nitro/avatar/IAvatarImage.ts +++ b/src/nitro/avatar/IAvatarImage.ts @@ -1,7 +1,7 @@ import { RenderTexture } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; +import { IGraphicAsset } from '../../api'; import { IDisposable } from '../../core/common/disposable/IDisposable'; -import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset'; import { IAnimationLayerData } from './animation/IAnimationLayerData'; import { IAvatarDataContainer } from './animation/IAvatarDataContainer'; import { ISpriteDataContainer } from './animation/ISpriteDataContainer'; diff --git a/src/nitro/avatar/IAvatarRenderManager.ts b/src/nitro/avatar/IAvatarRenderManager.ts index 5b380022..6fcda479 100644 --- a/src/nitro/avatar/IAvatarRenderManager.ts +++ b/src/nitro/avatar/IAvatarRenderManager.ts @@ -1,6 +1,5 @@ -import { IAssetManager } from '../../core/asset/IAssetManager'; +import { IAssetManager, IGraphicAsset } from '../../api'; import { INitroManager } from '../../core/common/INitroManager'; -import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset'; import { AvatarAssetDownloadManager } from './AvatarAssetDownloadManager'; import { AvatarStructure } from './AvatarStructure'; import { IAvatarEffectListener } from './IAvatarEffectListener'; diff --git a/src/nitro/avatar/actions/AvatarActionManager.ts b/src/nitro/avatar/actions/AvatarActionManager.ts index 618c9585..4dd0bbcd 100644 --- a/src/nitro/avatar/actions/AvatarActionManager.ts +++ b/src/nitro/avatar/actions/AvatarActionManager.ts @@ -1,4 +1,4 @@ -import { IAssetManager } from '../../../core/asset/IAssetManager'; +import { IAssetManager } from '../../../api'; import { ActionDefinition } from './ActionDefinition'; import { IActiveActionData } from './IActiveActionData'; @@ -19,53 +19,53 @@ 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); const z = (canvasOffset.z || 0); - action.setOffsets(size, direction, [ x, y, z ]); + action.setOffsets(size, direction, [x, y, z]); } } } 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 +77,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 +102,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 +117,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 +146,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 +173,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/alias/AssetAlias.ts b/src/nitro/avatar/alias/AssetAlias.ts index 7389812f..b1a20a33 100644 --- a/src/nitro/avatar/alias/AssetAlias.ts +++ b/src/nitro/avatar/alias/AssetAlias.ts @@ -1,4 +1,4 @@ -import { IAssetAlias } from '../../../core/asset/interfaces'; +import { IAssetAlias } from '../../../api'; export class AssetAlias { diff --git a/src/nitro/avatar/alias/AssetAliasCollection.ts b/src/nitro/avatar/alias/AssetAliasCollection.ts index b689e4e0..467a434a 100644 --- a/src/nitro/avatar/alias/AssetAliasCollection.ts +++ b/src/nitro/avatar/alias/AssetAliasCollection.ts @@ -1,5 +1,4 @@ -import { IAssetManager } from '../../../core/asset/IAssetManager'; -import { IGraphicAsset } from '../../../room/object/visualization/utils/IGraphicAsset'; +import { IAssetManager, IGraphicAsset } from '../../../api'; import { AvatarRenderManager } from '../AvatarRenderManager'; import { AssetAlias } from './AssetAlias'; @@ -31,19 +30,19 @@ export class AssetAliasCollection public init(): void { - for(const collection of this._assets.collections.values()) + for (const collection of this._assets.collections.values()) { - if(!collection) continue; + if (!collection) continue; const aliases = collection.data && collection.data.aliases; - if(!aliases) continue; + if (!aliases) continue; - for(const name in aliases) + for (const name in aliases) { const alias = aliases[name]; - if(!alias) continue; + if (!alias) continue; this._aliases.set(name, new AssetAlias(name, alias)); } @@ -54,7 +53,7 @@ export class AssetAliasCollection { const alias = this._aliases.get(k); - if(alias) return true; + if (alias) return true; return false; } @@ -64,7 +63,7 @@ export class AssetAliasCollection let _local_2 = k; let _local_3 = 5; - while(this.hasAlias(_local_2) && (_local_3 >= 0)) + while (this.hasAlias(_local_2) && (_local_3 >= 0)) { const _local_4 = this._aliases.get(_local_2); @@ -77,13 +76,13 @@ export class AssetAliasCollection public getAsset(name: string): IGraphicAsset { - if(!this._assets) return null; + if (!this._assets) return null; name = this.getAssetName(name); const asset = this._assets.getAsset(name); - if(!asset) return null; + if (!asset) return null; return asset; } diff --git a/src/nitro/avatar/animation/AddDataContainer.ts b/src/nitro/avatar/animation/AddDataContainer.ts index 86948e15..1c7ee335 100644 --- a/src/nitro/avatar/animation/AddDataContainer.ts +++ b/src/nitro/avatar/animation/AddDataContainer.ts @@ -1,4 +1,4 @@ -import { IAssetAnimationAdd } from '../../../core/asset/interfaces'; +import { IAssetAnimationAdd } from '../../../api'; export class AddDataContainer { @@ -18,13 +18,13 @@ export class AddDataContainer const _local_2 = k.blend; - if(_local_2) + if (_local_2) { - if(_local_2.length > 0) + if (_local_2.length > 0) { this._blend = parseInt(_local_2); - if(this._blend > 1) this._blend = (this._blend / 100); + if (this._blend > 1) this._blend = (this._blend / 100); } } } diff --git a/src/nitro/avatar/animation/Animation.ts b/src/nitro/avatar/animation/Animation.ts index bff95839..1e2c6ca3 100644 --- a/src/nitro/avatar/animation/Animation.ts +++ b/src/nitro/avatar/animation/Animation.ts @@ -1,4 +1,4 @@ -import { IAssetAnimation, IAssetAnimationFrame } from '../../../core/asset/interfaces'; +import { IAssetAnimation, IAssetAnimationFrame } from '../../../api'; import { AvatarStructure } from '../AvatarStructure'; import { AddDataContainer } from './AddDataContainer'; import { AvatarAnimationLayerData } from './AvatarAnimationLayerData'; @@ -37,37 +37,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 +87,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 +112,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 +132,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 +146,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 +186,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)]; } @@ -195,24 +195,24 @@ export class Animation implements IAnimation return layers; } - public getAnimatedBodyPartIds(k: number, _arg_2: string=null): string[] + public getAnimatedBodyPartIds(k: number, _arg_2: string = null): string[] { 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 +223,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 +259,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 0f76b210..3f8b0e69 100644 --- a/src/nitro/avatar/animation/AnimationManager.ts +++ b/src/nitro/avatar/animation/AnimationManager.ts @@ -1,4 +1,4 @@ -import { IAssetAnimation } from '../../../core/asset/interfaces'; +import { IAssetAnimation } from '../../../api'; import { AvatarStructure } from '../AvatarStructure'; import { Animation } from './Animation'; import { IAnimation } from './IAnimation'; @@ -29,7 +29,7 @@ export class AnimationManager implements IAnimationManager { const existing = this._animations.get(animation); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -38,7 +38,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 f4bde731..4ee3929d 100644 --- a/src/nitro/avatar/animation/AvatarAnimationLayerData.ts +++ b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts @@ -1,4 +1,4 @@ -import { IAssetAnimationFramePart } from '../../../core/asset/interfaces/animation/IAssetAnimationFramePart'; +import { IAssetAnimationFramePart } from '../../../api'; import { ActiveActionData } from '../actions/ActiveActionData'; import { IActionDefinition } from '../actions/IActionDefinition'; import { IActiveActionData } from '../actions/IActiveActionData'; @@ -32,13 +32,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 +55,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 caa528df..999e2e3c 100644 --- a/src/nitro/avatar/animation/AvatarDataContainer.ts +++ b/src/nitro/avatar/animation/AvatarDataContainer.ts @@ -1,5 +1,5 @@ import { AdjustmentFilter } from '@pixi/filter-adjustment'; -import { IAssetAnimationAvatar } from '../../../core/asset/interfaces'; +import { IAssetAnimationAvatar } from '../../../api'; import { IAvatarDataContainer } from './IAvatarDataContainer'; export class AvatarDataContainer implements IAvatarDataContainer @@ -42,7 +42,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 +111,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/DirectionDataContainer.ts b/src/nitro/avatar/animation/DirectionDataContainer.ts index d9ae4627..74cb2462 100644 --- a/src/nitro/avatar/animation/DirectionDataContainer.ts +++ b/src/nitro/avatar/animation/DirectionDataContainer.ts @@ -1,4 +1,4 @@ -import { IAssetAnimationDirection } from '../../../core/asset/interfaces'; +import { IAssetAnimationDirection } from '../../../api'; export class DirectionDataContainer { diff --git a/src/nitro/avatar/animation/SpriteDataContainer.ts b/src/nitro/avatar/animation/SpriteDataContainer.ts index 5a5aae73..06744065 100644 --- a/src/nitro/avatar/animation/SpriteDataContainer.ts +++ b/src/nitro/avatar/animation/SpriteDataContainer.ts @@ -1,4 +1,4 @@ -import { IAssetAnimationSprite } from '../../../core/asset/interfaces'; +import { IAssetAnimationSprite } from '../../../api'; import { IAnimation } from './IAnimation'; import { ISpriteDataContainer } from './ISpriteDataContainer'; @@ -28,13 +28,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 +45,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/camera/RoomCameraWidgetManager.ts b/src/nitro/camera/RoomCameraWidgetManager.ts index 0a56c0d0..0475fee3 100644 --- a/src/nitro/camera/RoomCameraWidgetManager.ts +++ b/src/nitro/camera/RoomCameraWidgetManager.ts @@ -24,20 +24,20 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager public init(): void { - if(this._isLoaded) return; + if (this._isLoaded) return; this._isLoaded = true; const imagesUrl = Nitro.instance.getConfiguration('image.library.url') + 'Habbo-Stories/'; const effects = Nitro.instance.getConfiguration<{ name: string, colorMatrix?: ColorMatrix, minLevel: number, blendMode?: number, enabled: boolean }[]>('camera.available.effects'); - for(const effect of effects) + for (const effect of effects) { - if(!effect.enabled) continue; + if (!effect.enabled) continue; const cameraEffect = new RoomCameraWidgetEffect(effect.name, effect.minLevel); - if(effect.colorMatrix.length) + if (effect.colorMatrix.length) { cameraEffect.colorMatrix = effect.colorMatrix; } @@ -60,20 +60,22 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager container.addChild(sprite); - for(const selectedEffect of selectedEffects) + if (isZoomed) sprite.scale.set(2); + + for (const selectedEffect of selectedEffects) { const effect = selectedEffect.effect; - if(!effect) continue; + if (!effect) continue; - if(effect.colorMatrix) + if (effect.colorMatrix) { const filter = new ColorMatrixFilter(); filter.matrix = effect.colorMatrix; filter.alpha = selectedEffect.alpha; - if(!sprite.filters) sprite.filters = []; + if (!sprite.filters) sprite.filters = []; sprite.filters.push(filter); } diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index 7746b051..587e00a7 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -1,7 +1,7 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; -import { IAssetData } from '../../core/asset/interfaces'; +import { IAssetData, IGraphicAssetCollection } from '../../api'; import { NitroBundle } from '../../core/asset/NitroBundle'; import { INitroLogger } from '../../core/common/logger/INitroLogger'; import { NitroLogger } from '../../core/common/logger/NitroLogger'; @@ -11,7 +11,6 @@ import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent import { IRoomObject } from '../../room/object/IRoomObject'; import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection'; import { GraphicAssetGifCollection } from '../../room/object/visualization/utils/GraphicAssetGifCollection'; -import { IGraphicAssetCollection } from '../../room/object/visualization/utils/IGraphicAssetCollection'; import { Nitro } from '../Nitro'; import { FurnitureType } from '../session/furniture/FurnitureType'; import { IFurnitureData } from '../session/furniture/IFurnitureData'; @@ -98,7 +97,7 @@ export class RoomContentLoader implements IFurnitureDataListener this.setFurnitureData(); - for(const [index, name] of Nitro.instance.getConfiguration('pet.types').entries()) this._pets[name] = index; + for (const [index, name] of Nitro.instance.getConfiguration('pet.types').entries()) this._pets[name] = index; } public dispose(): void @@ -110,7 +109,7 @@ export class RoomContentLoader implements IFurnitureDataListener { this._sessionDataManager = sessionData; - if(this._waitingForSessionDataManager) + if (this._waitingForSessionDataManager) { this._waitingForSessionDataManager = false; @@ -125,7 +124,7 @@ export class RoomContentLoader implements IFurnitureDataListener private setFurnitureData(): void { - if(!this._sessionDataManager) + if (!this._sessionDataManager) { this._waitingForSessionDataManager = true; @@ -134,7 +133,7 @@ export class RoomContentLoader implements IFurnitureDataListener const furnitureData = this._sessionDataManager.getAllFurnitureData(this); - if(!furnitureData) return; + if (!furnitureData) return; this._sessionDataManager.removePendingFurniDataListener(this); @@ -145,42 +144,42 @@ export class RoomContentLoader implements IFurnitureDataListener private processFurnitureData(furnitureData: IFurnitureData[]): void { - if(!furnitureData) return; + if (!furnitureData) return; - for(const furniture of furnitureData) + for (const furniture of furnitureData) { - if(!furniture) continue; + if (!furniture) continue; const id = furniture.id; let className = furniture.className; - if(furniture.hasIndexedColor) className = ((className + '*') + furniture.colorIndex); + if (furniture.hasIndexedColor) className = ((className + '*') + furniture.colorIndex); const revision = furniture.revision; const adUrl = furniture.adUrl; - if(adUrl && adUrl.length > 0) this._objectTypeAdUrls.set(className, adUrl); + if (adUrl && adUrl.length > 0) this._objectTypeAdUrls.set(className, adUrl); let name = furniture.className; - if(furniture.type === FurnitureType.FLOOR) + if (furniture.type === FurnitureType.FLOOR) { this._activeObjectTypes.set(id, className); this._activeObjectTypeIds.set(className, id); - if(!this._activeObjects[name]) this._activeObjects[name] = 1; + if (!this._activeObjects[name]) this._activeObjects[name] = 1; } - else if(furniture.type === FurnitureType.WALL) + else if (furniture.type === FurnitureType.WALL) { - if(name === 'post.it') + if (name === 'post.it') { className = 'post_it'; name = 'post_it'; } - if(name === 'post.it.vd') + if (name === 'post.it.vd') { className = 'post_it_vd'; name = 'post_id_vd'; @@ -189,12 +188,12 @@ export class RoomContentLoader implements IFurnitureDataListener this._wallItemTypes.set(id, className); this._wallItemTypeIds.set(className, id); - if(!this._wallItems[name]) this._wallItems[name] = 1; + if (!this._wallItems[name]) this._wallItems[name] = 1; } const existingRevision = this._furniRevisions.get(name); - if(revision > existingRevision) + if (revision > existingRevision) { this._furniRevisions.delete(name); this._furniRevisions.set(name, revision); @@ -213,7 +212,7 @@ export class RoomContentLoader implements IFurnitureDataListener { let type = this._wallItemTypes.get(typeId); - if((type === 'poster') && (extra !== null)) type = (type + extra); + if ((type === 'poster') && (extra !== null)) type = (type + extra); return this.removeColorIndex(type); } @@ -222,7 +221,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const type = this._activeObjectTypes.get(typeId); - if(!type) return -1; + if (!type) return -1; return this.getColorIndexFromName(type); } @@ -231,29 +230,29 @@ export class RoomContentLoader implements IFurnitureDataListener { const type = this._wallItemTypes.get(typeId); - if(!type) return -1; + if (!type) return -1; return this.getColorIndexFromName(type); } private getColorIndexFromName(name: string): number { - if(!name) return -1; + if (!name) return -1; const index = name.indexOf('*'); - if(index === -1) return 0; + if (index === -1) return 0; return parseInt(name.substr(index + 1)); } private removeColorIndex(name: string): string { - if(!name) return null; + if (!name) return null; const index = name.indexOf('*'); - if(index === -1) return name; + if (index === -1) return name; return name.substr(0, index); } @@ -262,7 +261,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const value = this._objectTypeAdUrls.get(type); - if(!value) return ''; + if (!value) return ''; return value; } @@ -271,7 +270,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const colorResults = this._petColors.get(petIndex); - if(!colorResults) return null; + if (!colorResults) return null; return colorResults.get(paletteIndex); } @@ -281,11 +280,11 @@ export class RoomContentLoader implements IFurnitureDataListener const colorResults = this._petColors.get(petIndex); const results: PetColorResult[] = []; - if(colorResults) + if (colorResults) { - for(const result of colorResults.values()) + for (const result of colorResults.values()) { - if(result.tag === tagName) results.push(result); + if (result.tag === tagName) results.push(result); } } @@ -294,15 +293,15 @@ export class RoomContentLoader implements IFurnitureDataListener public getCollection(name: string): IGraphicAssetCollection { - if(!name) return null; + if (!name) return null; const existing = this._collections.get(name); - if(!existing) + if (!existing) { const globalCollection = Nitro.instance.core.asset.getCollection(name); - if(globalCollection) + if (globalCollection) { this._collections.set(name, globalCollection); @@ -317,18 +316,18 @@ export class RoomContentLoader implements IFurnitureDataListener public getGifCollection(name: string): GraphicAssetGifCollection { - if(!name) return null; + if (!name) return null; return this._gifCollections.get(name) || null; } public getImage(name: string): HTMLImageElement { - if(!name) return null; + if (!name) return null; const existing = this._images.get(name); - if(!existing) return null; + if (!existing) return null; const image = new Image(); @@ -341,14 +340,14 @@ export class RoomContentLoader implements IFurnitureDataListener { const collection = this.getCollection(collectionName); - if(!collection) return false; + if (!collection) return false; return collection.addAsset(assetName, texture, override, 0, 0, false, false); } public createGifCollection(collectionName: string, textures: Texture[], durations: number[]): GraphicAssetGifCollection { - if(!collectionName || !textures || !durations) return null; + if (!collectionName || !textures || !durations) return null; const collection = new GraphicAssetGifCollection(collectionName, textures, durations); @@ -359,7 +358,7 @@ export class RoomContentLoader implements IFurnitureDataListener private createCollection(data: IAssetData, spritesheet: Spritesheet): GraphicAssetCollection { - if(!data || !spritesheet) return null; + if (!data || !spritesheet) return null; const collection = new GraphicAssetCollection(data, spritesheet); @@ -367,12 +366,12 @@ export class RoomContentLoader implements IFurnitureDataListener const petIndex = this._pets[collection.name]; - if(petIndex !== undefined) + if (petIndex !== undefined) { const keys = collection.getPaletteNames(); const palettes: Map = new Map(); - for(const key of keys) + for (const key of keys) { const palette = collection.getPalette(key); const paletteData = data.palettes[key]; @@ -395,14 +394,14 @@ export class RoomContentLoader implements IFurnitureDataListener { const category = this.getCategoryForType(type); - switch(category) + switch (category) { case RoomObjectCategory.FLOOR: return RoomContentLoader.PLACE_HOLDER; case RoomObjectCategory.WALL: return RoomContentLoader.PLACE_HOLDER_WALL; default: - if(this._pets[type] !== undefined) return RoomContentLoader.PLACE_HOLDER_PET; + if (this._pets[type] !== undefined) return RoomContentLoader.PLACE_HOLDER_PET; return RoomContentLoader.PLACE_HOLDER_DEFAULT; } @@ -410,27 +409,27 @@ export class RoomContentLoader implements IFurnitureDataListener public getCategoryForType(type: string): number { - if(!type) return RoomObjectCategory.MINIMUM; + if (!type) return RoomObjectCategory.MINIMUM; - if(this._activeObjects[type] !== undefined) return RoomObjectCategory.FLOOR; + if (this._activeObjects[type] !== undefined) return RoomObjectCategory.FLOOR; - if(this._wallItems[type] !== undefined) return RoomObjectCategory.WALL; + if (this._wallItems[type] !== undefined) return RoomObjectCategory.WALL; - if(this._pets[type] !== undefined) return RoomObjectCategory.UNIT; + if (this._pets[type] !== undefined) return RoomObjectCategory.UNIT; - if(type.indexOf('poster') === 0) return RoomObjectCategory.WALL; + if (type.indexOf('poster') === 0) return RoomObjectCategory.WALL; - if(type === 'room') return RoomObjectCategory.ROOM; + if (type === 'room') return RoomObjectCategory.ROOM; - if(type === RoomObjectUserType.USER) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.USER) return RoomObjectCategory.UNIT; - if(type === RoomObjectUserType.PET) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.PET) return RoomObjectCategory.UNIT; - if(type === RoomObjectUserType.BOT) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.BOT) return RoomObjectCategory.UNIT; - if(type === RoomObjectUserType.RENTABLE_BOT) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.RENTABLE_BOT) return RoomObjectCategory.UNIT; - if((type === RoomContentLoader.TILE_CURSOR) || (type === RoomContentLoader.SELECTION_ARROW)) return RoomObjectCategory.CURSOR; + if ((type === RoomContentLoader.TILE_CURSOR) || (type === RoomContentLoader.SELECTION_ARROW)) return RoomObjectCategory.CURSOR; return RoomObjectCategory.MINIMUM; } @@ -444,7 +443,7 @@ export class RoomContentLoader implements IFurnitureDataListener { type = RoomObjectUserType.getRealType(type); - if(type === RoomObjectVisualizationType.USER) return false; + if (type === RoomObjectVisualizationType.USER) return false; return true; } @@ -454,13 +453,13 @@ export class RoomContentLoader implements IFurnitureDataListener let typeName: string = null; let assetUrls: string[] = []; - if(type && (type.indexOf(',') >= 0)) + if (type && (type.indexOf(',') >= 0)) { typeName = type; type = typeName.split(',')[0]; } - if(typeName) + if (typeName) { assetUrls = this.getAssetUrls(typeName, param, true); } @@ -469,7 +468,7 @@ export class RoomContentLoader implements IFurnitureDataListener assetUrls = this.getAssetUrls(type, param, true); } - if(assetUrls && assetUrls.length) + if (assetUrls && assetUrls.length) { const url = assetUrls[0]; @@ -505,18 +504,18 @@ export class RoomContentLoader implements IFurnitureDataListener { const assetUrls: string[] = this.getAssetUrls(type); - if(!assetUrls || !assetUrls.length) return; + if (!assetUrls || !assetUrls.length) return; - if((this._pendingContentTypes.indexOf(type) >= 0) || this.getOrRemoveEventDispatcher(type)) return; + if ((this._pendingContentTypes.indexOf(type) >= 0) || this.getOrRemoveEventDispatcher(type)) return; this._pendingContentTypes.push(type); this._events.set(type, events); const loader = new Loader(); - for(const url of assetUrls) + for (const url of assetUrls) { - if(!url || !url.length) continue; + if (!url || !url.length) continue; loader .add({ @@ -531,7 +530,7 @@ export class RoomContentLoader implements IFurnitureDataListener const onDownloaded = (status: boolean, url: string) => { - if(!status) + if (!status) { this._logger.error('Failed to download asset', url); @@ -544,13 +543,13 @@ export class RoomContentLoader implements IFurnitureDataListener remaining--; - if(!remaining) + if (!remaining) { loader.destroy(); const events = this._events.get(type); - if(!events) return; + if (!events) return; events.dispatchEvent(new RoomContentLoadedEvent(RoomContentLoadedEvent.RCLE_SUCCESS, type)); @@ -560,11 +559,11 @@ export class RoomContentLoader implements IFurnitureDataListener loader.load((loader, resources) => { - for(const key in resources) + for (const key in resources) { const resource = resources[key]; - if(!resource || resource.error || !resource.xhr) + if (!resource || resource.error || !resource.xhr) { onDownloaded(false, resource.url); @@ -573,7 +572,7 @@ export class RoomContentLoader implements IFurnitureDataListener const resourceType = (resource.xhr.getResponseHeader('Content-Type') || 'application/octet-stream'); - if(resourceType === 'application/octet-stream') + if (resourceType === 'application/octet-stream') { const nitroBundle = new NitroBundle(resource.data); @@ -592,7 +591,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const spritesheetData = data.spritesheet; - if(!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) + if (!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) { this.createCollection(data, null); @@ -613,7 +612,7 @@ export class RoomContentLoader implements IFurnitureDataListener }); }; - if(baseTexture.valid) + if (baseTexture.valid) { createAsset(); } @@ -633,7 +632,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const existing = this._objectAliases.get(name); - if(!existing) return name; + if (!existing) return name; return existing; } @@ -642,14 +641,14 @@ export class RoomContentLoader implements IFurnitureDataListener { const existing = this._objectOriginalNames.get(name); - if(!existing) return name; + if (!existing) return name; return existing; } public getAssetUrls(type: string, param: string = null, icon: boolean = false): string[] { - switch(type) + switch (type) { case RoomContentLoader.PLACE_HOLDER: return [this.getAssetUrlWithGenericBase(RoomContentLoader.PLACE_HOLDER)]; @@ -666,13 +665,13 @@ export class RoomContentLoader implements IFurnitureDataListener default: { const category = this.getCategoryForType(type); - if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) + if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) { const name = this.getAssetAliasName(type); let assetUrl = (icon ? this.getAssetUrlWithFurniIconBase(name) : this.getAssetUrlWithFurniBase(type)); - if(icon) + if (icon) { const active = (param && (param !== '') && (this._activeObjectTypeIds.has((name + '*' + param)))); @@ -682,7 +681,7 @@ export class RoomContentLoader implements IFurnitureDataListener return [assetUrl]; } - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { return [this.getAssetUrlWithPetBase(type)]; } @@ -697,14 +696,14 @@ export class RoomContentLoader implements IFurnitureDataListener let assetName: string = null; let assetUrls: string[] = []; - if(type && (type.indexOf(',') >= 0)) + if (type && (type.indexOf(',') >= 0)) { assetName = type; type = assetName.split(',')[0]; } - if(assetName) + if (assetName) { assetUrls = this.getAssetUrls(assetName, colorIndex, true); } @@ -713,7 +712,7 @@ export class RoomContentLoader implements IFurnitureDataListener assetUrls = this.getAssetUrls(type, colorIndex, true); } - if(assetUrls && assetUrls.length) return assetUrls[0]; + if (assetUrls && assetUrls.length) return assetUrls[0]; return null; } @@ -742,7 +741,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const model = object && object.model; - if(!model) return; + if (!model) return; model.setValue(RoomObjectVariable.OBJECT_ROOM_ID, roomId); } @@ -751,7 +750,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const existing = this._events.get(type); - if(remove) this._events.delete(type); + if (remove) this._events.delete(type); return existing; } diff --git a/src/nitro/room/object/RoomObjectVisualizationFactory.ts b/src/nitro/room/object/RoomObjectVisualizationFactory.ts index f6f33839..0a0ee92a 100644 --- a/src/nitro/room/object/RoomObjectVisualizationFactory.ts +++ b/src/nitro/room/object/RoomObjectVisualizationFactory.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../core/asset/interfaces'; +import { IAssetData } from '../../../api'; import { NitroLogger } from '../../../core/common/logger/NitroLogger'; import { IRoomObjectGraphicVisualization } from '../../../room/object/visualization/IRoomObjectGraphicVisualization'; import { IObjectVisualizationData } from '../../../room/object/visualization/IRoomObjectVisualizationData'; @@ -63,18 +63,18 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF { const visualization = this.getVisualizationType(type); - if(!visualization) return null; + if (!visualization) return null; return new visualization(); } public getVisualizationType(type: string): typeof RoomObjectSpriteVisualization { - if(!type) return null; + if (!type) return null; let visualization: typeof RoomObjectSpriteVisualization = null; - switch(type) + switch (type) { case RoomObjectVisualizationType.ROOM: visualization = RoomVisualization; @@ -185,7 +185,7 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF break; } - if(!visualization) + if (!visualization) { NitroLogger.log('Unknown Visualization', type); @@ -199,11 +199,11 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF { const existing = this._visualizationDatas.get(type); - if(existing) return existing; + if (existing) return existing; let visualizationData: IObjectVisualizationData = null; - switch(visualization) + switch (visualization) { case RoomObjectVisualizationType.FURNITURE_STATIC: case RoomObjectVisualizationType.FURNITURE_GIFT_WRAPPED: @@ -255,21 +255,21 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF break; } - if(!visualizationData) return null; + if (!visualizationData) return null; - if(!visualizationData.initialize(asset)) + if (!visualizationData.initialize(asset)) { visualizationData.dispose(); return null; } - if((visualizationData instanceof AvatarVisualizationData) || (visualizationData instanceof FurnitureMannequinVisualizationData)) + if ((visualizationData instanceof AvatarVisualizationData) || (visualizationData instanceof FurnitureMannequinVisualizationData)) { visualizationData.avatarManager = Nitro.instance.avatar; } - if(RoomObjectVisualizationFactory.CACHING_ENABLED) this._visualizationDatas.set(type, visualizationData); + if (RoomObjectVisualizationFactory.CACHING_ENABLED) this._visualizationDatas.set(type, visualizationData); return visualizationData; } diff --git a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts index 2ca21e1e..604f32e1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomToObjectOwnAvatarMoveEvent } from '../../../events/RoomToObjectOwnAvatarMoveEvent'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; @@ -16,33 +16,33 @@ export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic { super.initialize(asset); - if(this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); + if (this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); } public tearDown(): void { - if(this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); + if (this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); super.tearDown(); } private onRoomToObjectOwnAvatarMoveEvent(event: RoomToObjectOwnAvatarMoveEvent): void { - if(!event || !this.object) return; + if (!event || !this.object) return; const location = this.object.getLocation(); const targetLocation = event.targetLocation; - if(!targetLocation) return; + if (!targetLocation) return; let sizeX = this.object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = this.object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); const direction = (((Math.floor(this.object.getDirection().x) + 45) % 360) / 90); - if((direction === 1) || (direction === 3)) [ sizeX, sizeY ] = [ sizeY, sizeX ]; + if ((direction === 1) || (direction === 3)) [sizeX, sizeY] = [sizeY, sizeX]; - if(((targetLocation.x >= location.x) && (targetLocation.x < (location.x + sizeX))) && ((targetLocation.y >= location.y) && (targetLocation.y < (location.y + sizeY)))) + if (((targetLocation.x >= location.x) && (targetLocation.x < (location.x + sizeX))) && ((targetLocation.y >= location.y) && (targetLocation.y < (location.y + sizeY)))) { this.object.setState(1, 0); } @@ -51,4 +51,4 @@ export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic this.object.setState(0, 0); } } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts index 1446fc4d..bc455b74 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core'; +import { IAssetData } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; @@ -9,7 +9,7 @@ export class FurnitureClothingChangeLogic extends FurnitureLogic { public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.CLOTHING_CHANGE ]; + const types = [RoomObjectWidgetRequestEvent.CLOTHING_CHANGE]; return this.mergeTypes(super.getEventTypes(), types); } @@ -27,22 +27,22 @@ export class FurnitureClothingChangeLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); + if (message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); } private updateClothingData(furnitureData: string): void { - if(!furnitureData || !furnitureData.length) return; + if (!furnitureData || !furnitureData.length) return; - const [ boyClothing, girlClothing ] = furnitureData.split(','); + const [boyClothing, girlClothing] = furnitureData.split(','); - if(boyClothing && boyClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_BOY, boyClothing); - if(girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); + if (boyClothing && boyClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_BOY, boyClothing); + if (girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOTHING_CHANGE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts index 7f9613b1..b67b3305 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; @@ -20,9 +20,9 @@ export class FurnitureCreditLogic extends FurnitureLogic let creditValue = 0; - if(asset.logic) + if (asset.logic) { - if(asset.logic.credits && (asset.logic.credits !== '') && (asset.logic.credits.length > 0)) creditValue = parseInt(asset.logic.credits); + if (asset.logic.credits && (asset.logic.credits !== '') && (asset.logic.credits.length > 0)) creditValue = parseInt(asset.logic.credits); } this.object.model.setValue(RoomObjectVariable.FURNITURE_CREDIT_VALUE, creditValue); @@ -30,7 +30,7 @@ export class FurnitureCreditLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CREDITFURNI, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts index 4bf87ad9..4e98a62f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -18,12 +18,12 @@ export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); + if (this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts index ef4290de..e2d1a7b6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { MouseEventType } from '../../../../ui/MouseEventType'; @@ -21,7 +21,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.INERNAL_LINK ]; + const types = [RoomObjectWidgetRequestEvent.INERNAL_LINK]; return this.mergeTypes(super.getEventTypes(), types); } @@ -30,11 +30,11 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.action) + if (asset.logic.action) { - if(asset.logic.action.startState === 1) this._showStateOnceRendered = true; + if (asset.logic.action.startState === 1) this._showStateOnceRendered = true; } } } @@ -43,11 +43,11 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.update(time); - if(!this._showStateOnceRendered) return; + if (!this._showStateOnceRendered) return; this._updateCount++; - if(this._showStateOnceRendered && (this._updateCount > 20)) + if (this._showStateOnceRendered && (this._updateCount > 20)) { this.setAutomaticStateIndex(1); @@ -57,9 +57,9 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if(!this.object) return; + if (!this.object) return; - if(this.object.model) + if (this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -67,9 +67,9 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if(event.type === MouseEventType.DOUBLE_CLICK) + if (event.type === MouseEventType.DOUBLE_CLICK) { this.setAutomaticStateIndex(0); } @@ -79,7 +79,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts index 580074cf..1a16c65c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; @@ -9,7 +9,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.ROOM_LINK ]; + const types = [RoomObjectWidgetRequestEvent.ROOM_LINK]; return this.mergeTypes(super.getEventTypes(), types); } @@ -18,11 +18,11 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.action) + if (asset.logic.action) { - if(asset.logic.action.link && (asset.logic.action.link !== '') && (asset.logic.action.link.length > 0)) + if (asset.logic.action.link && (asset.logic.action.link !== '') && (asset.logic.action.link.length > 0)) { (this.object && this.object.model && this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, asset.logic.action.link)); } @@ -32,7 +32,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic protected onDispose(): void { - if(this._timer) + if (this._timer) { clearTimeout(this._timer); @@ -44,9 +44,9 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if(!this.object) return; + if (!this.object) return; - if(this.object.model) + if (this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -56,7 +56,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { this.setAutomaticStateIndex(1); - if(this._timer) + if (this._timer) { clearTimeout(this._timer); @@ -70,7 +70,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic this._timer = null; }, 2500); - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ROOM_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts index 09d2436b..e76f735a 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectWidgetRequestEvent } from '../../../events'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -18,15 +18,15 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(!asset) return; + if (!asset) return; - if(this.object && this.object.model) + if (this.object && this.object.model) { let maskType = ''; - if(asset.logic) + if (asset.logic) { - if(asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; + if (asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; } this.object.model.setValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK, 0); @@ -36,7 +36,7 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts index 458624cf..6c468547 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData, IParticleSystem } from '../../../../../core'; +import { IAssetData, IParticleSystem } from '../../../../../api'; import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; @@ -11,7 +11,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic { public getEventTypes(): string[] { - const types = [ RoomObjectStateChangedEvent.STATE_CHANGE ]; + const types = [RoomObjectStateChangedEvent.STATE_CHANGE]; return this.mergeTypes(super.getEventTypes(), types); } @@ -20,9 +20,9 @@ export class FurnitureFireworksLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.particleSystems && asset.logic.particleSystems.length) + if (asset.logic.particleSystems && asset.logic.particleSystems.length) { this.object.model.setValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA, asset.logic.particleSystems); } @@ -31,14 +31,14 @@ export class FurnitureFireworksLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event|| !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch(event.type) + switch (event.type) { case MouseEventType.DOUBLE_CLICK: - switch(event.spriteTag) + switch (event.spriteTag) { case 'start_stop': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1); @@ -48,7 +48,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic break; } - if(this.eventDispatcher && objectEvent) + if (this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -62,7 +62,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 0)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts index 1fcbdaee..b321403b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { ContextMenuEnum } from '../../../../ui'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; @@ -19,16 +19,16 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); + if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const data = (message.data as StringDataType); - if(data) + if (data) { this._state = data.state; } @@ -43,16 +43,16 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic public getEventTypes(): string[] { - const types = [ RoomObjectWidgetRequestEvent.FRIEND_FURNITURE_ENGRAVING ]; + const types = [RoomObjectWidgetRequestEvent.FRIEND_FURNITURE_ENGRAVING]; return this.mergeTypes(super.getEventTypes(), types); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; - if(this._state === FurnitureFriendFurniLogic.STATE_LOCKED) + if (this._state === FurnitureFriendFurniLogic.STATE_LOCKED) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.FRIEND_FURNITURE_ENGRAVING, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts index ef9529dc..1a35fd26 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { MouseEventType } from '../../../../ui/MouseEventType'; @@ -24,13 +24,13 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.action) + if (asset.logic.action) { this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, asset.logic.action.link); - if(asset.logic.action.startState === 1) this._showStateOnceRendered = true; + if (asset.logic.action.startState === 1) this._showStateOnceRendered = true; } } } @@ -39,11 +39,11 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.update(time); - if(!this._showStateOnceRendered) return; + if (!this._showStateOnceRendered) return; this._updateCount++; - if(this._showStateOnceRendered && (this._updateCount === 20)) + if (this._showStateOnceRendered && (this._updateCount === 20)) { this.setAutomaticStateIndex(1); @@ -53,9 +53,9 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if(!this.object) return; + if (!this.object) return; - if(this.object.model) + if (this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -63,9 +63,9 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if((event.type === MouseEventType.DOUBLE_CLICK) && this._showStateOnceRendered) + if ((event.type === MouseEventType.DOUBLE_CLICK) && this._showStateOnceRendered) { this.setAutomaticStateIndex(0); } @@ -75,7 +75,7 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts index ffd199c9..1ddc3062 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; @@ -61,12 +61,12 @@ export class FurnitureLogic extends MovingObjectLogic this._storedRotateMessage = null; this._directionInitialized = false; - if(FurnitureLogic.BOUNCING_STEPS === -1) + if (FurnitureLogic.BOUNCING_STEPS === -1) { FurnitureLogic.BOUNCING_STEPS = Nitro.instance.getConfiguration('furni.rotation.bounce.steps', 8); } - if(FurnitureLogic.BOUNCING_Z === -1) + if (FurnitureLogic.BOUNCING_Z === -1) { FurnitureLogic.BOUNCING_Z = Nitro.instance.getConfiguration('furni.rotation.bounce.height', 0.0625); } @@ -82,30 +82,30 @@ export class FurnitureLogic extends MovingObjectLogic RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_SHOW, RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK, - RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK ]; + RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK]; - if(this.widget) types.push(RoomObjectWidgetRequestEvent.OPEN_WIDGET, RoomObjectWidgetRequestEvent.CLOSE_WIDGET); + if (this.widget) types.push(RoomObjectWidgetRequestEvent.OPEN_WIDGET, RoomObjectWidgetRequestEvent.CLOSE_WIDGET); - if(this.contextMenu) types.push(RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU, RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU); + if (this.contextMenu) types.push(RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU, RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU); return this.mergeTypes(super.getEventTypes(), types); } public initialize(asset: IAssetData): void { - if(!asset) return; + if (!asset) return; const model = this.object && this.object.model; - if(!model) return; + if (!model) return; - if(asset.logic) + if (asset.logic) { - if(asset.logic.model) + if (asset.logic.model) { const dimensions = asset.logic.model.dimensions; - if(dimensions) + if (dimensions) { this._sizeX = dimensions.x; this._sizeY = dimensions.y; @@ -118,19 +118,19 @@ export class FurnitureLogic extends MovingObjectLogic const directions = asset.logic.model.directions; - if(directions && directions.length) + if (directions && directions.length) { - for(const direction of directions) this._directions.push(direction); + for (const direction of directions) this._directions.push(direction); this._directions.sort((a, b) => (a - b)); } } - if(asset.logic.customVars) + if (asset.logic.customVars) { const variables = asset.logic.customVars.variables; - if(variables && variables.length) + if (variables && variables.length) { model.setValue(RoomObjectVariable.FURNITURE_CUSTOM_VARIABLES, variables); } @@ -159,7 +159,7 @@ export class FurnitureLogic extends MovingObjectLogic { super.setObject(object); - if(object && object.getLocation().length) this._directionInitialized = true; + if (object && object.getLocation().length) this._directionInitialized = true; } protected getAdClickUrl(model: IRoomObjectModel): string @@ -167,9 +167,9 @@ export class FurnitureLogic extends MovingObjectLogic return model.getValue(RoomObjectVariable.FURNITURE_AD_URL); } - protected handleAdClick(objectId: number, objectType: string, clickUrl: string):void + protected handleAdClick(objectId: number, objectType: string, clickUrl: string): void { - if(!this.eventDispatcher) return; + if (!this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object)); } @@ -178,31 +178,31 @@ export class FurnitureLogic extends MovingObjectLogic { super.update(time); - if(this._bouncingStep > 0) + if (this._bouncingStep > 0) { this._bouncingStep++; - if(this._bouncingStep > FurnitureLogic.BOUNCING_STEPS) this._bouncingStep = 0; + if (this._bouncingStep > FurnitureLogic.BOUNCING_STEPS) this._bouncingStep = 0; } } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { this.processDataUpdateMessage(message); return; } - if(message instanceof ObjectHeightUpdateMessage) + if (message instanceof ObjectHeightUpdateMessage) { this.processObjectHeightUpdateMessage(message); return; } - if(message instanceof ObjectItemDataUpdateMessage) + if (message instanceof ObjectItemDataUpdateMessage) { this.processItemDataUpdateMessage(message); @@ -211,16 +211,16 @@ export class FurnitureLogic extends MovingObjectLogic this._mouseOver = false; - if(message.location && message.direction) + if (message.location && message.direction) { - if(!(message instanceof ObjectMoveUpdateMessage)) + if (!(message instanceof ObjectMoveUpdateMessage)) { const direction = this.object.getDirection(); const location = this.object.getLocation(); - if((direction.x !== message.direction.x) && this._directionInitialized) + if ((direction.x !== message.direction.x) && this._directionInitialized) { - if((location.x === message.location.x) && (location.y === message.location.y) && (location.z === message.location.z)) + if ((location.x === message.location.x) && (location.y === message.location.y) && (location.z === message.location.z)) { this._bouncingStep = 1; this._storedRotateMessage = new RoomObjectUpdateMessage(message.location, message.direction); @@ -233,9 +233,9 @@ export class FurnitureLogic extends MovingObjectLogic this._directionInitialized = true; } - if(message instanceof ObjectSelectedMessage) + if (message instanceof ObjectSelectedMessage) { - if(this.contextMenu && this.eventDispatcher && this.object) + if (this.contextMenu && this.eventDispatcher && this.object) { const eventType = (message.selected) ? RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU : RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU; @@ -248,27 +248,27 @@ export class FurnitureLogic extends MovingObjectLogic private processDataUpdateMessage(message: ObjectDataUpdateMessage): void { - if(!message) return; + if (!message) return; this.object.setState(message.state, 0); - if(message.data) message.data.writeRoomObjectModel(this.object.model); + if (message.data) message.data.writeRoomObjectModel(this.object.model); - if(message.extra !== null) this.object.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, message.extra.toString()); + if (message.extra !== null) this.object.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, message.extra.toString()); this.object.model.setValue(RoomObjectVariable.FURNITURE_STATE_UPDATE_TIME, this.lastUpdateTime); } private processObjectHeightUpdateMessage(message: ObjectHeightUpdateMessage): void { - if(!message) return; + if (!message) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_SIZE_Z, message.height); } private processItemDataUpdateMessage(message: ObjectItemDataUpdateMessage): void { - if(!message) return; + if (!message) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ITEMDATA, message.data); } @@ -277,10 +277,10 @@ export class FurnitureLogic extends MovingObjectLogic { const adUrl = this.getAdClickUrl(this.object.model); - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_MOVE: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_MOVE, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -293,11 +293,11 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.ROLL_OVER: - if(!this._mouseOver) + if (!this._mouseOver) { - if(this.eventDispatcher) + if (this.eventDispatcher) { - if(adUrl && (adUrl.indexOf('http') === 0)) + if (adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_SHOW, this.object)); } @@ -316,11 +316,11 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.ROLL_OUT: - if(this._mouseOver) + if (this._mouseOver) { - if(this.eventDispatcher) + if (this.eventDispatcher) { - if(adUrl && (adUrl.indexOf('http') === 0)) + if (adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, this.object)); } @@ -342,7 +342,7 @@ export class FurnitureLogic extends MovingObjectLogic this.useObject(); return; case MouseEventType.MOUSE_CLICK: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.CLICK, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -353,16 +353,16 @@ export class FurnitureLogic extends MovingObjectLogic this.eventDispatcher.dispatchEvent(mouseEvent); - if(adUrl && (adUrl.indexOf('http') === 0)) + if (adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, this.object)); } - if(adUrl && adUrl.length) this.handleAdClick(this.object.id, this.object.type, adUrl); + if (adUrl && adUrl.length) this.handleAdClick(this.object.id, this.object.type, adUrl); } return; case MouseEventType.MOUSE_DOWN: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -370,7 +370,7 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.MOUSE_DOWN_LONG: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN_LONG, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -382,20 +382,20 @@ export class FurnitureLogic extends MovingObjectLogic protected getLocationOffset(): IVector3D { - if(this._bouncingStep <= 0) return null; + if (this._bouncingStep <= 0) return null; this._locationOffset.x = 0; this._locationOffset.y = 0; - if(this._bouncingStep <= (FurnitureLogic.BOUNCING_STEPS / 2)) + if (this._bouncingStep <= (FurnitureLogic.BOUNCING_STEPS / 2)) { this._locationOffset.z = FurnitureLogic.BOUNCING_Z * this._bouncingStep; } else { - if(this._bouncingStep <= FurnitureLogic.BOUNCING_STEPS) + if (this._bouncingStep <= FurnitureLogic.BOUNCING_STEPS) { - if(this._storedRotateMessage) + if (this._storedRotateMessage) { super.processUpdateMessage(this._storedRotateMessage); @@ -411,27 +411,27 @@ export class FurnitureLogic extends MovingObjectLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; const clickUrl = this.getAdClickUrl(this.object.model); - if(clickUrl && clickUrl.length) + if (clickUrl && clickUrl.length) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK, this.object, null, clickUrl)); } - if(this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.OPEN_WIDGET, this.object)); + if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.OPEN_WIDGET, this.object)); this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); } public tearDown(): void { - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { - if(this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); + if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); - if(this.contextMenu) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); + if (this.contextMenu) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } super.tearDown(); diff --git a/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts index ac9e6dbd..b568a32b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMultiHeightLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -8,6 +8,6 @@ export class FurnitureMultiHeightLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT, 1); + if (this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT, 1); } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts index 56d97ff7..66f0d747 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePlanetSystemLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData, IAssetLogicPlanetSystem } from '../../../../../core/asset/interfaces'; +import { IAssetData, IAssetLogicPlanetSystem } from '../../../../../api'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureLogic } from './FurnitureLogic'; @@ -8,9 +8,9 @@ export class FurniturePlanetSystemLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.planetSystems) + if (asset.logic.planetSystems) { this.object.model.setValue(RoomObjectVariable.FURNITURE_PLANETSYSTEM_DATA, asset.logic.planetSystems); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts index 5212b2ae..beb1ea73 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData, IParticleSystem } from '../../../../../core/asset/interfaces'; +import { IAssetData, IParticleSystem } from '../../../../../api'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; @@ -32,9 +32,9 @@ export class FurniturePresentLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.particleSystems && asset.logic.particleSystems.length) + if (asset.logic.particleSystems && asset.logic.particleSystems.length) { this.object.model.setValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA, asset.logic.particleSystems); } @@ -45,16 +45,16 @@ export class FurniturePresentLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); this.updateStuffData(); } - if(message instanceof ObjectModelDataUpdateMessage) + if (message instanceof ObjectModelDataUpdateMessage) { - if(message.numberKey === RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) + if (message.numberKey === RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) { this.object.model.setValue(RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION, message.numberValue); } @@ -63,7 +63,7 @@ export class FurniturePresentLogic extends FurnitureLogic private updateStuffData(): void { - if(!this.object || !this.object.model) return; + if (!this.object || !this.object.model) return; const stuffData = new MapDataType(); @@ -72,7 +72,7 @@ export class FurniturePresentLogic extends FurnitureLogic const message = stuffData.getValue(FurniturePresentLogic.MESSAGE); const data = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); - if(!message && (typeof data === 'string')) + if (!message && (typeof data === 'string')) { this.object.model.setValue(RoomObjectVariable.FURNITURE_DATA, data.substr(1)); } @@ -88,16 +88,16 @@ export class FurniturePresentLogic extends FurnitureLogic private writeToModel(key: string, value: string): void { - if(!value) return; + if (!value) return; this.object.model.setValue(key, value); } 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.ROLL_OVER: this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); @@ -112,7 +112,7 @@ export class FurniturePresentLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PRESENT, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts index fa7dff3d..961c0cc6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts @@ -1,6 +1,6 @@ import { BaseTexture, Texture } from '@pixi/core'; import { decompressFrames, parseGIF } from 'gifuct-js'; -import { IAssetData } from '../../../../../core'; +import { IAssetData } from '../../../../../api'; import { IRoomGeometry, RoomSpriteMouseEvent } from '../../../../../room'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { Nitro } from '../../../../Nitro'; @@ -35,7 +35,7 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic public getEventTypes(): string[] { - const types = [ RoomObjectRoomAdEvent.ROOM_AD_LOAD_IMAGE ]; + const types = [RoomObjectRoomAdEvent.ROOM_AD_LOAD_IMAGE]; return this.mergeTypes(super.getEventTypes(), types); } @@ -44,7 +44,7 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { super.initialize(asset); - if(this._disableFurnitureSelection) + if (this._disableFurnitureSelection) { this.object.model.setValue(RoomObjectVariable.FURNITURE_SELECTION_DISABLED, 1); } @@ -54,14 +54,14 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); + if (message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); - if(message instanceof ObjectAdUpdateMessage) this.processAdUpdate(message); + if (message instanceof ObjectAdUpdateMessage) this.processAdUpdate(message); } private processAdDataUpdateMessage(message: ObjectDataUpdateMessage): void { - if(!message) return; + if (!message) return; const objectData = new MapDataType(); @@ -69,12 +69,12 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const state = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.STATE)); - if(!isNaN(state) && (this.object.getState(0) !== state)) this.object.setState(state, 0); + if (!isNaN(state) && (this.object.getState(0) !== state)) this.object.setState(state, 0); const imageUrl = objectData.getValue(FurnitureRoomBrandingLogic.IMAGEURL_KEY); const existingUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); - if(!existingUrl || (existingUrl !== imageUrl)) + if (!existingUrl || (existingUrl !== imageUrl)) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL, imageUrl); this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS, 0); @@ -84,13 +84,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const clickUrl = objectData.getValue(FurnitureRoomBrandingLogic.CLICKURL_KEY); - if(clickUrl) + if (clickUrl) { const existingUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_URL); - if(!existingUrl || existingUrl !== clickUrl) + if (!existingUrl || existingUrl !== clickUrl) { - if(this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_URL, clickUrl); + if (this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_URL, clickUrl); } } @@ -98,13 +98,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const offsetY = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.OFFSETY_KEY)); const offsetZ = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.OFFSETZ_KEY)); - if(!isNaN(offsetX)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, offsetX); - if(!isNaN(offsetY)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, offsetY); - if(!isNaN(offsetZ)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, offsetZ); + if (!isNaN(offsetX)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, offsetX); + if (!isNaN(offsetY)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, offsetY); + if (!isNaN(offsetZ)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, offsetZ); let options = (((FurnitureRoomBrandingLogic.IMAGEURL_KEY + '=') + ((imageUrl !== null) ? imageUrl : '')) + '\t'); - if(this._hasClickUrl) + if (this._hasClickUrl) { options = (options + (((FurnitureRoomBrandingLogic.CLICKURL_KEY + '=') + ((clickUrl !== null) ? clickUrl : '')) + '\t')); } @@ -118,9 +118,9 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic private processAdUpdate(message: ObjectAdUpdateMessage): void { - if(!message || !this.object) return; + if (!message || !this.object) return; - switch(message.type) + switch (message.type) { case ObjectAdUpdateMessage.IMAGE_LOADED: this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS, 1); @@ -133,9 +133,9 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.DOUBLE_CLICK)) return; + if ((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.DOUBLE_CLICK)) return; super.mouseEvent(event, geometry); } @@ -144,14 +144,14 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { const model = this.object && this.object.model; - if(!model) return; + if (!model) return; const imageUrl = model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); const imageStatus = model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS); - if(!imageUrl || (imageUrl === '') || (imageStatus === 1)) return; + if (!imageUrl || (imageUrl === '') || (imageStatus === 1)) return; - if(imageUrl.endsWith('.gif')) + if (imageUrl.endsWith('.gif')) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IS_ANIMATED, true); @@ -169,30 +169,30 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic let frame = new Uint8Array(wh * 4); - for(let ind = 0; ind < frames.length; ind++) + for (let ind = 0; ind < frames.length; ind++) { - if(ind > 0) frame = frame.slice(0); + if (ind > 0) frame = frame.slice(0); const pixels = frames[ind].pixels; const colorTable = frames[ind].colorTable; const trans = frames[ind].transparentIndex; const dims = frames[ind].dims; - for(let j = 0; j < dims.height; j++) + for (let j = 0; j < dims.height; j++) { - for(let i = 0; i < dims.width; i++) + for (let i = 0; i < dims.width; i++) { - const pixel = pixels[j*dims.width + i]; + const pixel = pixels[j * dims.width + i]; const coord = (j + dims.top) * width + (i + dims.left); - if(trans !== pixel) + if (trans !== pixel) { const c = colorTable[pixel]; - frame[ 4 * coord ] = c[0]; - frame[ 4 * coord + 1 ] = c[1]; - frame[ 4 * coord + 2 ] = c[2]; - frame[ 4 * coord + 3 ] = 255; + frame[4 * coord] = c[0]; + frame[4 * coord + 1] = c[1]; + frame[4 * coord + 2] = c[2]; + frame[4 * coord + 3] = 255; } } } @@ -216,15 +216,15 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { const asset = Nitro.instance.core && Nitro.instance.core.asset; - if(!asset) return; + if (!asset) return; const texture = asset.getTexture(imageUrl); - if(!texture) + if (!texture) { asset.downloadAsset(imageUrl, (flag: boolean) => { - if(flag) + if (flag) { this.processUpdateMessage(new ObjectAdUpdateMessage(ObjectAdUpdateMessage.IMAGE_LOADED)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts index b4b411e8..6834f925 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { RoomObjectSamplePlaybackEvent } from '../../../events/RoomObjectSamplePlaybackEvent'; import { ObjectDataUpdateMessage } from '../../../messages/ObjectDataUpdateMessage'; @@ -32,9 +32,9 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.soundSample) + if (asset.logic.soundSample) { this._sampleId = asset.logic.soundSample.id; this._noPitch = asset.logic.soundSample.noPitch; @@ -46,7 +46,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) + if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) { this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_DISPOSED, this.object, this._sampleId)); } @@ -58,27 +58,27 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); + if (message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); } private updateSoundBlockMessage(message: ObjectDataUpdateMessage): void { - if(!message) return; + if (!message) return; const model = this.object && this.object.model; const location = this.object && this.object.location; - if(!model || !location) return; + if (!model || !location) return; - if(this._state === FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this._state === FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this._lastLocZ = location.z; this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED, this.object, this._sampleId, this.getPitchForHeight(location.z))); } - if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { - if(this._lastLocZ !== location.z) + if (this._lastLocZ !== location.z) { this._lastLocZ = location.z; this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.CHANGE_PITCH, this.object, this._sampleId, this.getPitchForHeight(location.z))); @@ -86,7 +86,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic } - if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && message.state !== this._state) + if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && message.state !== this._state) { this.playSoundAt(location.z); } @@ -96,7 +96,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic private playSoundAt(height: number): void { - if(!this.object) return; + if (!this.object) return; const pitch: number = this.getPitchForHeight(height); @@ -107,11 +107,11 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic private getPitchForHeight(height: number): number { - if(this._noPitch) return 1; + if (this._noPitch) return 1; let heightScaled: number = (height * 2); - if(heightScaled > FurnitureSoundBlockLogic.HIGHEST_SEMITONE) + if (heightScaled > FurnitureSoundBlockLogic.HIGHEST_SEMITONE) { heightScaled = Math.min(0, (FurnitureSoundBlockLogic.LOWEST_SEMITONE + ((heightScaled - FurnitureSoundBlockLogic.HIGHEST_SEMITONE) - 1))); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts index f6bd9c40..847a6351 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { RoomObjectFurnitureActionEvent } from '../../../events/RoomObjectFurnitureActionEvent'; import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent'; @@ -8,7 +8,7 @@ import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureStickieLogic extends FurnitureLogic { - private static STICKIE_COLORS: string[] = [ '9CCEFF', 'FF9CFF', '9CFF9C', 'FFFF33' ]; + private static STICKIE_COLORS: string[] = ['9CCEFF', 'FF9CFF', '9CFF9C', 'FFFF33']; public getEventTypes(): string[] { @@ -26,14 +26,14 @@ export class FurnitureStickieLogic extends FurnitureLogic this.updateColor(); - if(this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ''); + if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ''); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); - if(message instanceof ObjectItemDataUpdateMessage) + if (message instanceof ObjectItemDataUpdateMessage) { this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STICKIE, this.object)); } @@ -43,20 +43,20 @@ export class FurnitureStickieLogic extends FurnitureLogic protected updateColor(): void { - if(!this.object) return; + if (!this.object) return; const furnitureData = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); let colorIndex = FurnitureStickieLogic.STICKIE_COLORS.indexOf(furnitureData); - if(colorIndex < 0) colorIndex = 3; + if (colorIndex < 0) colorIndex = 3; this.object.model.setValue(RoomObjectVariable.FURNITURE_COLOR, (colorIndex + 1)); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.STICKIE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts index 84d3d9d6..ee11caeb 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureWindowLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -10,9 +10,9 @@ export class FurnitureWindowLogic extends FurnitureMultiStateLogic let maskType = ''; - if(asset.logic) + if (asset.logic) { - if(asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; + if (asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; } this.object.model.setValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK, 0); diff --git a/src/nitro/room/object/logic/pet/PetLogic.ts b/src/nitro/room/object/logic/pet/PetLogic.ts index d07af0cf..754eb544 100644 --- a/src/nitro/room/object/logic/pet/PetLogic.ts +++ b/src/nitro/room/object/logic/pet/PetLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; @@ -51,28 +51,28 @@ export class PetLogic extends MovingObjectLogic public getEventTypes(): string[] { - const types = [ RoomObjectMouseEvent.CLICK, RoomObjectMoveEvent.POSITION_CHANGED ]; + const types = [RoomObjectMouseEvent.CLICK, RoomObjectMoveEvent.POSITION_CHANGED]; return this.mergeTypes(super.getEventTypes(), types); } public initialize(asset: IAssetData): void { - if(!asset) return; + if (!asset) return; const model = this.object && this.object.model; - if(!model) return; + if (!model) return; - if(asset.logic) + if (asset.logic) { - if(asset.logic.model) + if (asset.logic.model) { const directions = asset.logic.model.directions; - if(directions && directions.length) + if (directions && directions.length) { - for(const direction of directions) this._directions.push(direction); + for (const direction of directions) this._directions.push(direction); this._directions.sort(); } @@ -84,9 +84,9 @@ export class PetLogic 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)); } this._directions = null; @@ -97,15 +97,15 @@ export class PetLogic extends MovingObjectLogic { super.update(totalTimeRunning); - 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); @@ -114,21 +114,21 @@ export class PetLogic extends MovingObjectLogic } } - if(this.object && this.object.model) this.updateModel(totalTimeRunning, this.object.model); + if (this.object && this.object.model) this.updateModel(totalTimeRunning, this.object.model); } private updateModel(time: number, model: IRoomObjectModel): void { - if((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) + if ((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, null); this._gestureEndTimestamp = 0; } - if(this._talkingEndTimestamp > 0) + if (this._talkingEndTimestamp > 0) { - if(time > this._talkingEndTimestamp) + if (time > this._talkingEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -136,7 +136,7 @@ export class PetLogic extends MovingObjectLogic } } - if((this._expressionEndTimestamp > 0) && (time > this._expressionEndTimestamp)) + if ((this._expressionEndTimestamp > 0) && (time > this._expressionEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, 0); @@ -146,22 +146,22 @@ export class PetLogic 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 ObjectAvatarUpdateMessage) + if (message instanceof ObjectAvatarUpdateMessage) { model.setValue(RoomObjectVariable.HEAD_DIRECTION, message.headDirection); return; } - if(message instanceof ObjectAvatarFigureUpdateMessage) + if (message instanceof ObjectAvatarFigureUpdateMessage) { const petFigureData = new PetFigureData(message.figure); @@ -178,14 +178,14 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarPostureUpdateMessage) + if (message instanceof ObjectAvatarPostureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_POSTURE, message.postureType); return; } - if(message instanceof ObjectAvatarChatUpdateMessage) + if (message instanceof ObjectAvatarChatUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -194,14 +194,14 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarSleepUpdateMessage) + if (message instanceof ObjectAvatarSleepUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SLEEP, message.isSleeping ? 1 : 0); return; } - if(message instanceof ObjectAvatarPetGestureUpdateMessage) + if (message instanceof ObjectAvatarPetGestureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, message.gesture); @@ -210,7 +210,7 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarSelectedMessage) + if (message instanceof ObjectAvatarSelectedMessage) { this._selected = message.selected; this._reportedLocation = null; @@ -218,7 +218,7 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarExperienceUpdateMessage) + if (message instanceof ObjectAvatarExperienceUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_EXPERIENCE_TIMESTAMP, this.time); model.setValue(RoomObjectVariable.FIGURE_GAINED_EXPERIENCE, message.gainedExperience); @@ -231,7 +231,7 @@ export class PetLogic extends MovingObjectLogic { let eventType: string = null; - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_CLICK: eventType = RoomObjectMouseEvent.CLICK; @@ -241,14 +241,14 @@ export class PetLogic extends MovingObjectLogic case MouseEventType.MOUSE_DOWN: { const petType = this.object.model.getValue(RoomObjectVariable.PET_TYPE); - if(petType === PetType.MONSTERPLANT) + if (petType === PetType.MONSTERPLANT) { - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } 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)); } } diff --git a/src/nitro/room/object/logic/room/SelectionArrowLogic.ts b/src/nitro/room/object/logic/room/SelectionArrowLogic.ts index 056a4936..9457491b 100644 --- a/src/nitro/room/object/logic/room/SelectionArrowLogic.ts +++ b/src/nitro/room/object/logic/room/SelectionArrowLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { RoomObjectLogicBase } from '../../../../../room/object/logic/RoomObjectLogicBase'; import { ObjectVisibilityUpdateMessage } from '../../../messages/ObjectVisibilityUpdateMessage'; @@ -8,7 +8,7 @@ export class SelectionArrowLogic extends RoomObjectLogicBase { public initialize(data: IAssetData): void { - if(!this.object) return; + if (!this.object) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, 1); @@ -19,11 +19,11 @@ export class SelectionArrowLogic extends RoomObjectLogicBase { super.processUpdateMessage(message); - if(!(message instanceof ObjectVisibilityUpdateMessage)) return; + if (!(message instanceof ObjectVisibilityUpdateMessage)) return; - if(this.object) + if (this.object) { - switch(message.type) + switch (message.type) { case ObjectVisibilityUpdateMessage.ENABLED: this.object.setState(0, 0); @@ -34,4 +34,4 @@ export class SelectionArrowLogic extends RoomObjectLogicBase } } } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/logic/room/TileCursorLogic.ts b/src/nitro/room/object/logic/room/TileCursorLogic.ts index 309b4dfe..8894486e 100644 --- a/src/nitro/room/object/logic/room/TileCursorLogic.ts +++ b/src/nitro/room/object/logic/room/TileCursorLogic.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage'; import { RoomObjectLogicBase } from '../../../../../room/object/logic/RoomObjectLogicBase'; import { ObjectTileCursorUpdateMessage } from '../../../messages/ObjectTileCursorUpdateMessage'; @@ -23,7 +23,7 @@ export class TileCursorLogic extends RoomObjectLogicBase public initialize(data: IAssetData): void { - if(!this.object) return; + if (!this.object) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, 1); @@ -32,23 +32,23 @@ export class TileCursorLogic extends RoomObjectLogicBase public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(!(message instanceof ObjectTileCursorUpdateMessage)) return; + if (!(message instanceof ObjectTileCursorUpdateMessage)) return; - if(this._lastEventId && (this._lastEventId === message.sourceEventId)) return; + if (this._lastEventId && (this._lastEventId === message.sourceEventId)) return; - if(message.toggleVisibility) this._isHidden = !this._isHidden; + if (message.toggleVisibility) this._isHidden = !this._isHidden; super.processUpdateMessage(message); - if(this.object) + if (this.object) { - if(this._isHidden) + if (this._isHidden) { this.object.setState(TileCursorLogic.CURSOR_HIDDEN_STATE, 0); } else { - if(!message.visible) + if (!message.visible) { this.object.setState(TileCursorLogic.CURSOR_HIDDEN_STATE, 0); } diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index 02c347f8..e31c12f3 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -1,5 +1,6 @@ import { BLEND_MODES } from '@pixi/constants'; import { Resource, Texture } from '@pixi/core'; +import { IGraphicAsset } from '../../../../../api'; import { AdvancedMap } from '../../../../../core/utils/AdvancedMap'; import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance'; import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType'; @@ -7,7 +8,6 @@ import { IRoomObject } from '../../../../../room/object/IRoomObject'; import { IRoomObjectModel } from '../../../../../room/object/IRoomObjectModel'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { RoomObjectSpriteVisualization } from '../../../../../room/object/visualization/RoomObjectSpriteVisualization'; -import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { AvatarAction } from '../../../../avatar/enum/AvatarAction'; import { AvatarGuideStatus } from '../../../../avatar/enum/AvatarGuideStatus'; @@ -152,7 +152,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; @@ -165,11 +165,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; @@ -177,13 +177,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; @@ -196,41 +196,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); @@ -238,11 +238,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); } @@ -255,29 +255,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); @@ -290,21 +290,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({ @@ -319,15 +319,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 @@ -335,7 +335,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; @@ -348,9 +348,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]); } @@ -359,32 +359,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; @@ -395,7 +395,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; @@ -408,9 +408,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; @@ -418,30 +418,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)); } @@ -450,7 +450,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)); } @@ -459,7 +459,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; } @@ -474,7 +474,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); } @@ -485,24 +485,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); @@ -515,23 +515,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; @@ -543,13 +543,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); @@ -567,15 +567,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; @@ -584,7 +584,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; @@ -593,7 +593,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; @@ -602,7 +602,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; @@ -611,7 +611,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; @@ -620,7 +620,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; @@ -629,7 +629,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; @@ -638,7 +638,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; @@ -647,7 +647,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; @@ -656,7 +656,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; @@ -665,7 +665,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; @@ -674,7 +674,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; @@ -683,7 +683,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; @@ -692,16 +692,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; @@ -710,7 +710,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } else { - if(this._useObject !== 0) + if (this._useObject !== 0) { this._useObject = 0; @@ -720,30 +720,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); @@ -754,15 +754,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); @@ -773,7 +773,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)); @@ -782,7 +782,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); @@ -794,66 +794,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; @@ -862,18 +862,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; @@ -883,7 +883,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; @@ -897,7 +897,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; @@ -906,9 +906,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); } @@ -920,45 +920,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); @@ -970,7 +970,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(); @@ -978,24 +978,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; @@ -1016,9 +1016,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(); @@ -1027,7 +1027,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; @@ -1036,11 +1036,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; } @@ -1049,7 +1049,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); @@ -1060,7 +1060,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const addition = this.getAddition(id); - if(!addition) return; + if (!addition) return; this._additions.delete(addition.id); @@ -1073,22 +1073,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'; @@ -1107,7 +1107,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 3bdd9ec0..a60b647d 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts @@ -1,5 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData } from '../../../../../api'; import { Disposable } from '../../../../../core/common/disposable/Disposable'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { AvatarScaleType } from '../../../../avatar/enum/AvatarScaleType'; @@ -31,7 +31,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; @@ -39,7 +39,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/data/AnimationData.ts b/src/nitro/room/object/visualization/data/AnimationData.ts index 440fa940..8dadac8c 100644 --- a/src/nitro/room/object/visualization/data/AnimationData.ts +++ b/src/nitro/room/object/visualization/data/AnimationData.ts @@ -1,4 +1,4 @@ -import { IAssetVisualAnimation, IAssetVisualAnimationLayer, IAssetVisualAnimationSequenceFrame } from '../../../../../core/asset/interfaces'; +import { IAssetVisualAnimation, IAssetVisualAnimationLayer, IAssetVisualAnimationSequenceFrame } from '../../../../../api'; import { AnimationFrame } from './AnimationFrame'; import { AnimationLayerData } from './AnimationLayerData'; import { DirectionalOffsetData } from './DirectionalOffsetData'; @@ -45,9 +45,9 @@ export class AnimationData public dispose(): void { - for(const layer of this._layers.values()) + for (const layer of this._layers.values()) { - if(!layer) continue; + if (!layer) continue; layer.dispose(); } @@ -64,29 +64,29 @@ export class AnimationData public isImmediateChange(k: number): boolean { - if(!this._immediateChanges || (this._immediateChanges.indexOf(k) === -1)) return false; + if (!this._immediateChanges || (this._immediateChanges.indexOf(k) === -1)) return false; return true; } public getStartFrame(direction: number): number { - if(!this._randomStart) return 0; + if (!this._randomStart) return 0; return Math.random() * this._frameCount; } public initialize(k: IAssetVisualAnimation): boolean { - if(k.randomStart) this._randomStart = true; + if (k.randomStart) this._randomStart = true; - if(k.layers) + if (k.layers) { - for(const key in k.layers) + for (const key in k.layers) { const layer = k.layers[key]; - if(!layer) return false; + if (!layer) return false; const animationId = parseInt(key); @@ -94,7 +94,7 @@ export class AnimationData const frameRepeat = (layer.frameRepeat !== undefined) ? layer.frameRepeat : 1; const isRandom = ((layer.random !== undefined) && (layer.random !== 0)) ? true : false; - if(!this.addLayer(animationId, loopCount, frameRepeat, isRandom, layer)) return false; + if (!this.addLayer(animationId, loopCount, frameRepeat, isRandom, layer)) return false; } } @@ -105,26 +105,26 @@ export class AnimationData { const layerData = new AnimationLayerData(loopCount, frameRepeat, isRandom); - if(layer.frameSequences) + if (layer.frameSequences) { - for(const key in layer.frameSequences) + for (const key in layer.frameSequences) { const animationSequence = layer.frameSequences[key]; - if(!animationSequence) continue; + if (!animationSequence) continue; const loopCount = (animationSequence.loopCount !== undefined) ? animationSequence.loopCount : 1; const isSequenceRandom = ((animationSequence.random !== undefined) && (animationSequence.random !== 0)) ? true : false; const frame = layerData.addFrameSequence(loopCount, isSequenceRandom); - if(animationSequence.frames) + if (animationSequence.frames) { - for(const key in animationSequence.frames) + for (const key in animationSequence.frames) { const animationFrame = animationSequence.frames[key]; - if(!animationFrame) + if (!animationFrame) { layerData.dispose(); @@ -145,7 +145,7 @@ export class AnimationData const frameCount: number = layerData.frameCount; - if(frameCount > this._frameCount) this._frameCount = frameCount; + if (frameCount > this._frameCount) this._frameCount = frameCount; return true; } @@ -154,15 +154,15 @@ export class AnimationData { let directionalOffset: DirectionalOffsetData = null; - if(frame && frame.offsets) + if (frame && frame.offsets) { - for(const directionId in frame.offsets) + for (const directionId in frame.offsets) { const offset = frame.offsets[directionId]; - if(!offset) continue; + if (!offset) continue; - if(!directionalOffset) directionalOffset = new DirectionalOffsetData(); + if (!directionalOffset) directionalOffset = new DirectionalOffsetData(); directionalOffset.setDirection(offset.direction, offset.x, offset.y); } @@ -175,7 +175,7 @@ export class AnimationData { const layer = this._layers.get(layerId); - if(!layer) return null; + if (!layer) return null; return layer.getFrame(direction, frameCount); } @@ -184,7 +184,7 @@ export class AnimationData { const layer = this._layers.get(layerId); - if(!layer) return null; + if (!layer) return null; return layer.getFrameFromSequence(direction, sequenceId, offset, frameCount); } diff --git a/src/nitro/room/object/visualization/data/AnimationSizeData.ts b/src/nitro/room/object/visualization/data/AnimationSizeData.ts index c96a38ab..4b698e3f 100644 --- a/src/nitro/room/object/visualization/data/AnimationSizeData.ts +++ b/src/nitro/room/object/visualization/data/AnimationSizeData.ts @@ -1,4 +1,4 @@ -import { IAssetVisualAnimation } from '../../../../../core/asset/interfaces/visualization'; +import { IAssetVisualAnimation } from '../../../../../api'; import { AnimationData } from './AnimationData'; import { AnimationFrame } from './AnimationFrame'; import { SizeData } from './SizeData'; @@ -20,9 +20,9 @@ export class AnimationSizeData extends SizeData { super.dispose(); - for(const animation of this._animations.values()) + for (const animation of this._animations.values()) { - if(!animation) continue; + if (!animation) continue; animation.dispose(); } @@ -34,13 +34,13 @@ export class AnimationSizeData extends SizeData public defineAnimations(animations: { [index: string]: IAssetVisualAnimation }): boolean { - if(!animations) return true; + if (!animations) return true; - for(const key in animations) + for (const key in animations) { const animation = animations[key]; - if(!animation) return false; + if (!animation) return false; let animationId = parseInt(key.split('_')[0]); let isTransition = false; @@ -48,13 +48,13 @@ export class AnimationSizeData extends SizeData const transitionTo = animation.transitionTo; const transitionFrom = animation.transitionFrom; - if(transitionTo !== undefined) + if (transitionTo !== undefined) { animationId = AnimationData.getTransitionToAnimationId(transitionTo); isTransition = true; } - if(transitionFrom !== undefined) + if (transitionFrom !== undefined) { animationId = AnimationData.getTransitionFromAnimationId(transitionFrom); isTransition = true; @@ -62,7 +62,7 @@ export class AnimationSizeData extends SizeData const animationData = this.createAnimationData(); - if(!animationData.initialize(animation)) + if (!animationData.initialize(animation)) { animationData.dispose(); @@ -71,16 +71,16 @@ export class AnimationSizeData extends SizeData const immediateChangeFrom = animation.immediateChangeFrom; - if(immediateChangeFrom !== undefined) + if (immediateChangeFrom !== undefined) { const changes = immediateChangeFrom.split(','); const changeIds = []; - for(const change of changes) + for (const change of changes) { const changeId = parseInt(change); - if(changeIds.indexOf(changeId) === -1) changeIds.push(changeId); + if (changeIds.indexOf(changeId) === -1) changeIds.push(changeId); } animationData.setImmediateChanges(changeIds); @@ -88,7 +88,7 @@ export class AnimationSizeData extends SizeData this._animations.set(animationId, animationData); - if(!isTransition) this._animationIds.push(animationId); + if (!isTransition) this._animationIds.push(animationId); } return true; @@ -101,7 +101,7 @@ export class AnimationSizeData extends SizeData public hasAnimation(animationId: number): boolean { - if(!this._animations.get(animationId)) return false; + if (!this._animations.get(animationId)) return false; return true; } @@ -115,7 +115,7 @@ export class AnimationSizeData extends SizeData { const totalAnimations = this.getAnimationCount(); - if((animationId < 0) || (totalAnimations <= 0)) return 0; + if ((animationId < 0) || (totalAnimations <= 0)) return 0; return this._animationIds[(animationId % totalAnimations)]; } @@ -124,7 +124,7 @@ export class AnimationSizeData extends SizeData { const animation = this._animations.get(animationId); - if(!animation) return false; + if (!animation) return false; return animation.isImmediateChange(_arg_2); } @@ -133,7 +133,7 @@ export class AnimationSizeData extends SizeData { const animation = this._animations.get(animationId); - if(!animation) return 0; + if (!animation) return 0; return animation.getStartFrame(direction); } @@ -142,7 +142,7 @@ export class AnimationSizeData extends SizeData { const animation = this._animations.get(animationId); - if(!animation) return null; + if (!animation) return null; return animation.getFrame(direction, layerId, frameCount); } @@ -151,7 +151,7 @@ export class AnimationSizeData extends SizeData { const animation = this._animations.get(animationId); - if(!animation) return null; + if (!animation) return null; return animation.getFrameFromSequence(direction, layerId, sequenceId, offset, frameCount); } diff --git a/src/nitro/room/object/visualization/data/ParticleSystemParticle.ts b/src/nitro/room/object/visualization/data/ParticleSystemParticle.ts index 2c603ad7..0dda906f 100644 --- a/src/nitro/room/object/visualization/data/ParticleSystemParticle.ts +++ b/src/nitro/room/object/visualization/data/ParticleSystemParticle.ts @@ -1,4 +1,4 @@ -import { IGraphicAsset } from '../../../../../room'; +import { IGraphicAsset } from '../../../../../api'; export interface ParticleSystemParticle { diff --git a/src/nitro/room/object/visualization/data/PetSizeData.ts b/src/nitro/room/object/visualization/data/PetSizeData.ts index dc4caa54..a254362a 100644 --- a/src/nitro/room/object/visualization/data/PetSizeData.ts +++ b/src/nitro/room/object/visualization/data/PetSizeData.ts @@ -1,4 +1,4 @@ -import { IAssetGesture, IAssetPosture } from '../../../../../core/asset/interfaces/visualization'; +import { IAssetGesture, IAssetPosture } from '../../../../../api'; import { AnimationSizeData } from './AnimationSizeData'; export class PetSizeData extends AnimationSizeData @@ -20,33 +20,33 @@ export class PetSizeData extends AnimationSizeData public processPostures(postures: { defaultPosture?: string, postures: IAssetPosture[] }): boolean { - if(!postures) return false; + if (!postures) return false; - if(postures.defaultPosture && postures.defaultPosture.length) this._defaultPosture = postures.defaultPosture; + if (postures.defaultPosture && postures.defaultPosture.length) this._defaultPosture = postures.defaultPosture; - if(!postures.postures) return false; + if (!postures.postures) return false; - for(const posture of postures.postures) + for (const posture of postures.postures) { - if(this._posturesToAnimations.get(posture.id)) continue; + if (this._posturesToAnimations.get(posture.id)) continue; - if(this._defaultPosture === null) this._defaultPosture = posture.id; + if (this._defaultPosture === null) this._defaultPosture = posture.id; this._posturesToAnimations.set(posture.id, posture.animationId); } - if(this._posturesToAnimations.get(this._defaultPosture) === undefined) return false; + if (this._posturesToAnimations.get(this._defaultPosture) === undefined) return false; return true; } public processGestures(gestures: IAssetGesture[]): boolean { - if(!gestures) return false; + if (!gestures) return false; - for(const gesture of gestures) + for (const gesture of gestures) { - if(this._gesturesToAnimations.get(gesture.id)) continue; + if (this._gesturesToAnimations.get(gesture.id)) continue; this._gesturesToAnimations.set(gesture.id, gesture.animationId); } @@ -56,38 +56,38 @@ export class PetSizeData extends AnimationSizeData public postureToAnimation(posture: string): number { - if(!this._posturesToAnimations.get(posture)) posture = this._defaultPosture; + if (!this._posturesToAnimations.get(posture)) posture = this._defaultPosture; return this._posturesToAnimations.get(posture); } public getGestureDisabled(k: string): boolean { - if(k === 'ded') return true; + if (k === 'ded') return true; return false; } public gestureToAnimation(gesture: string): number { - if(!this._gesturesToAnimations.get(gesture)) return PetSizeData.DEFAULT; + if (!this._gesturesToAnimations.get(gesture)) return PetSizeData.DEFAULT; return this._gesturesToAnimations.get(gesture); } public animationToPosture(k: number, _arg_2: boolean): string { - if((k >= 0) && (k < this._posturesToAnimations.size)) + if ((k >= 0) && (k < this._posturesToAnimations.size)) { const keys = this._posturesToAnimations.keys(); - for(;;) + for (; ;) { const key = keys.next(); - if(key.done) return null; + if (key.done) return null; - if(k <= 0) return key.value; + if (k <= 0) return key.value; --k; } @@ -98,17 +98,17 @@ export class PetSizeData extends AnimationSizeData public animationToGesture(index: number): string { - if((index >= 0) && (index < this._gesturesToAnimations.size)) + if ((index >= 0) && (index < this._gesturesToAnimations.size)) { const keys = this._gesturesToAnimations.keys(); - for(;;) + for (; ;) { const key = keys.next(); - if(key.done) return null; + if (key.done) return null; - if(index <= 0) return key.value; + if (index <= 0) return key.value; --index; } @@ -119,9 +119,9 @@ export class PetSizeData extends AnimationSizeData public getGestureForAnimationId(k: number): string { - for(const _local_2 of this._gesturesToAnimations.keys()) + for (const _local_2 of this._gesturesToAnimations.keys()) { - if(this._gesturesToAnimations.get(_local_2) === k) return _local_2; + if (this._gesturesToAnimations.get(_local_2) === k) return _local_2; } return null; diff --git a/src/nitro/room/object/visualization/data/SizeData.ts b/src/nitro/room/object/visualization/data/SizeData.ts index bffcfe0b..4317fe0f 100644 --- a/src/nitro/room/object/visualization/data/SizeData.ts +++ b/src/nitro/room/object/visualization/data/SizeData.ts @@ -1,4 +1,4 @@ -import { IAssetColor, IAssetVisualizationDirection, IAssetVisualizationLayer } from '../../../../../core/asset/interfaces/visualization'; +import { IAssetColor, IAssetVisualizationDirection, IAssetVisualizationLayer } from '../../../../../api'; import { SpriteUtilities } from '../../../../../room/utils/SpriteUtilities'; import { ColorData } from './ColorData'; import { DirectionData } from './DirectionData'; @@ -31,18 +31,18 @@ export class SizeData public dispose(): void { - if(this._defaultDirection) this._defaultDirection.dispose(); + if (this._defaultDirection) this._defaultDirection.dispose(); - for(const direction of this._directions.values()) + for (const direction of this._directions.values()) { - if(!direction) continue; + if (!direction) continue; direction.dispose(); } - for(const color of this._colors) + for (const color of this._colors) { - if(!color) continue; + if (!color) continue; color.dispose(); } @@ -62,24 +62,24 @@ export class SizeData public processLayers(layers: { [index: string]: IAssetVisualizationLayer }): boolean { - if(!layers) return false; + if (!layers) return false; return this.setDirectionLayers(this._defaultDirection, layers); } public processDirections(directions: { [index: string]: IAssetVisualizationDirection }): boolean { - if(!directions) return false; + if (!directions) return false; - for(const key in directions) + for (const key in directions) { const direction = directions[key]; - if(!direction) continue; + if (!direction) continue; const directionNumber = parseInt(key); - if(this._directions.get(directionNumber)) return false; + if (this._directions.get(directionNumber)) return false; const directionData = new DirectionData(this._layerCount); @@ -98,25 +98,25 @@ export class SizeData public processColors(colors: { [index: string]: IAssetColor }): boolean { - if(!colors) return false; + if (!colors) return false; - for(const key in colors) + for (const key in colors) { const color = colors[key]; - if(!color) continue; + if (!color) continue; const colorNumber = parseInt(key); - if(this._colors[colorNumber]) return false; + if (this._colors[colorNumber]) return false; const colorData = new ColorData(this._layerCount); - for(const layer in color.layers) + for (const layer in color.layers) { const colorLayer = color.layers[layer]; - if(!colorLayer) continue; + if (!colorLayer) continue; const layerId = parseInt(layer); const colorId = colorLayer.color; @@ -132,31 +132,31 @@ export class SizeData private setDirectionLayers(directionData: DirectionData, layers: { [index: string]: IAssetVisualizationLayer }): boolean { - if(!directionData || !layers) return false; + if (!directionData || !layers) return false; - for(const key in layers) + for (const key in layers) { const layer = layers[key]; - if(!layer) continue; + if (!layer) continue; const layerId = parseInt(key); - if(layerId < 0 || (layerId >= this._layerCount)) return false; + if (layerId < 0 || (layerId >= this._layerCount)) return false; - if(layer.ink !== undefined) directionData.setLayerInk(layerId, SpriteUtilities.inkToBlendMode(layer.ink)); + if (layer.ink !== undefined) directionData.setLayerInk(layerId, SpriteUtilities.inkToBlendMode(layer.ink)); - if(layer.tag !== undefined) directionData.setLayerTag(layerId, layer.tag); + if (layer.tag !== undefined) directionData.setLayerTag(layerId, layer.tag); - if(layer.alpha !== undefined) directionData.setLayerAlpha(layerId, layer.alpha); + if (layer.alpha !== undefined) directionData.setLayerAlpha(layerId, layer.alpha); - if(layer.ignoreMouse !== undefined) directionData.setLayerIgnoreMouse(layerId, layer.ignoreMouse); + if (layer.ignoreMouse !== undefined) directionData.setLayerIgnoreMouse(layerId, layer.ignoreMouse); - if(layer.x !== undefined) directionData.setLayerXOffset(layerId, layer.x); + if (layer.x !== undefined) directionData.setLayerXOffset(layerId, layer.x); - if(layer.y !== undefined) directionData.setLayerYOffset(layerId, layer.y); + if (layer.y !== undefined) directionData.setLayerYOffset(layerId, layer.y); - if(layer.z !== undefined) directionData.setLayerZOffset(layerId, (layer.z / -1000)); + if (layer.z !== undefined) directionData.setLayerZOffset(layerId, (layer.z / -1000)); } return true; @@ -166,38 +166,38 @@ export class SizeData { const existing = this._directions.get(direction); - if(existing) return direction; + if (existing) return direction; direction = (((direction % 360) + 360) % 360); let currentAngle = -1; let validDirection = -1; - for(const key of this._directions.keys()) + for (const key of this._directions.keys()) { let angle = ((((key * this._angle) - direction) + 360) % 360); - if(angle > 180) angle = (360 - angle); + if (angle > 180) angle = (360 - angle); - if((angle < currentAngle) || (currentAngle < 0)) + if ((angle < currentAngle) || (currentAngle < 0)) { currentAngle = angle; validDirection = key; } } - if(validDirection >= 0) return Math.trunc(validDirection); + if (validDirection >= 0) return Math.trunc(validDirection); return 0; } public getDirectionData(direction: number): DirectionData { - if(direction === this._lastDirection && this._lastDirectionData) return this._lastDirectionData; + if (direction === this._lastDirection && this._lastDirectionData) return this._lastDirectionData; let directionData = this._directions.get(direction); - if(!directionData) directionData = this._defaultDirection; + if (!directionData) directionData = this._defaultDirection; this._lastDirection = direction; this._lastDirectionData = directionData; @@ -209,7 +209,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_TAG; + if (!directionData) return LayerData.DEFAULT_TAG; return directionData.getLayerTag(layerId); } @@ -218,7 +218,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_INK; + if (!directionData) return LayerData.DEFAULT_INK; return directionData.getLayerInk(layerId); } @@ -227,7 +227,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_ALPHA; + if (!directionData) return LayerData.DEFAULT_ALPHA; return directionData.getLayerAlpha(layerId); } @@ -236,7 +236,7 @@ export class SizeData { const existing = this._colors[colorId] as ColorData; - if(!existing) return ColorData.DEFAULT_COLOR; + if (!existing) return ColorData.DEFAULT_COLOR; return existing.getLayerColor(layerId); } @@ -245,7 +245,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_IGNORE_MOUSE; + if (!directionData) return LayerData.DEFAULT_IGNORE_MOUSE; return directionData.getLayerIgnoreMouse(layerId); } @@ -254,7 +254,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_XOFFSET; + if (!directionData) return LayerData.DEFAULT_XOFFSET; return directionData.getLayerXOffset(layerId); } @@ -263,7 +263,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_YOFFSET; + if (!directionData) return LayerData.DEFAULT_YOFFSET; return directionData.getLayerYOffset(layerId); } @@ -272,7 +272,7 @@ export class SizeData { const directionData = this.getDirectionData(direction); - if(!directionData) return LayerData.DEFAULT_ZOFFSET; + if (!directionData) return LayerData.DEFAULT_ZOFFSET; return directionData.getLayerZOffset(layerId); } @@ -281,4 +281,4 @@ export class SizeData { return this._layerCount; } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts index 59e61533..0669084a 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts @@ -1,4 +1,5 @@ -import { AdvancedMap, IParticleSystem, NitroLogger } from '../../../../../core'; +import { IParticleSystem } from '../../../../../api'; +import { AdvancedMap, NitroLogger } from '../../../../../core'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; import { FurnitureParticleSystem } from './FurnitureParticleSystem'; @@ -14,9 +15,9 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat this._currentParticleSystem = null; - if(this._particleSystems) + if (this._particleSystems) { - for(const particleSystem of this._particleSystems.getValues()) particleSystem.dispose(); + for (const particleSystem of this._particleSystems.getValues()) particleSystem.dispose(); this._particleSystems = null; } @@ -24,25 +25,25 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat protected updateObject(scale: number, direction: number): boolean { - if(super.updateObject(scale, direction)) + if (super.updateObject(scale, direction)) { - if(!this._particleSystems) + if (!this._particleSystems) { this._Str_18684(); - if(this._particleSystems) this._currentParticleSystem = this._particleSystems.getValue(scale); + if (this._particleSystems) this._currentParticleSystem = this._particleSystems.getValue(scale); else NitroLogger.log('ERROR Particle systems could not be read!', this.object.type); } else { - if((scale !== this._scale) || (this._particleSystems.getValue(scale) !== this._currentParticleSystem)) + if ((scale !== this._scale) || (this._particleSystems.getValue(scale) !== this._currentParticleSystem)) { const particleSystem = this._particleSystems.getValue(scale); particleSystem._Str_17988(this._currentParticleSystem); - if(this._currentParticleSystem) this._currentParticleSystem.reset(); + if (this._currentParticleSystem) this._currentParticleSystem.reset(); this._currentParticleSystem = particleSystem; } @@ -58,26 +59,26 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat { super.updateSprites(scale, update, animation); - if(this._currentParticleSystem) this._currentParticleSystem.updateSprites(); + if (this._currentParticleSystem) this._currentParticleSystem.updateSprites(); } protected updateAnimation(scale: number): number { - if(this._currentParticleSystem) this._currentParticleSystem.updateAnimation(); + if (this._currentParticleSystem) this._currentParticleSystem.updateAnimation(); return super.updateAnimation(scale); } protected setAnimation(id: number): void { - if(this._currentParticleSystem) this._currentParticleSystem.setAnimation(id); + if (this._currentParticleSystem) this._currentParticleSystem.setAnimation(id); super.setAnimation(id); } protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(this._currentParticleSystem && this._currentParticleSystem.controlsSprite(layerId)) + if (this._currentParticleSystem && this._currentParticleSystem.controlsSprite(layerId)) { return this._currentParticleSystem.getLayerYOffset(scale, direction, layerId); } @@ -87,15 +88,15 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat private _Str_18684(): boolean { - if(!this.object || !this.object.model) return false; + if (!this.object || !this.object.model) return false; const fireworksData = this.object.model.getValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA); - if(!fireworksData || !fireworksData.length) return false; + if (!fireworksData || !fireworksData.length) return false; this._particleSystems = new AdvancedMap(); - for(const particleData of fireworksData) + for (const particleData of fireworksData) { const size = particleData.size; const particleSystem = new FurnitureParticleSystem(this); diff --git a/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts index ed9c2506..cd646295 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureGuildCustomizedVisualization.ts @@ -1,4 +1,5 @@ -import { IGraphicAsset, IRoomObjectSprite } from '../../../../../room'; +import { IGraphicAsset } from '../../../../../api'; +import { IRoomObjectSprite } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; @@ -29,11 +30,11 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu { const flag = super.updateModel(scale); - if(this._badgeAssetNameNormalScale === '') + if (this._badgeAssetNameNormalScale === '') { const assetName = this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME); - if(assetName) + if (assetName) { this._badgeAssetNameNormalScale = assetName; this._badgeAssetNameSmallScale = (this._badgeAssetNameNormalScale + '_32'); @@ -42,11 +43,11 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu const color1 = this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_COLOR_1); - this._color1 = color1 ? color1: FurnitureGuildCustomizedVisualization.DEFAULT_COLOR_1; + this._color1 = color1 ? color1 : FurnitureGuildCustomizedVisualization.DEFAULT_COLOR_1; const color2 = this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_COLOR_2); - this._color2 = color2 ? color2: FurnitureGuildCustomizedVisualization.DEFAULT_COLOR_2; + this._color2 = color2 ? color2 : FurnitureGuildCustomizedVisualization.DEFAULT_COLOR_2; return flag; } @@ -55,7 +56,7 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu { const tag = this.getLayerTag(scale, this._direction, layerId); - switch(tag) + switch (tag) { case FurnitureGuildCustomizedVisualization.PRIMARY_COLOUR_SPRITE_TAG: return this._color1; case FurnitureGuildCustomizedVisualization.SECONDARY_COLOUR_SPRITE_TAG: return this._color2; @@ -68,9 +69,9 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu { const tag = this.getLayerTag(scale, this._direction, layerId); - if(tag === FurnitureGuildCustomizedVisualization.BADGE) + if (tag === FurnitureGuildCustomizedVisualization.BADGE) { - if(scale === 32) return this._badgeAssetNameSmallScale; + if (scale === 32) return this._badgeAssetNameSmallScale; return this._badgeAssetNameNormalScale; } @@ -80,7 +81,7 @@ export class FurnitureGuildCustomizedVisualization extends FurnitureAnimatedVisu protected getLibraryAssetNameForSprite(asset: IGraphicAsset, sprite: IRoomObjectSprite): string { - if(sprite.tag === FurnitureGuildCustomizedVisualization.BADGE) + if (sprite.tag === FurnitureGuildCustomizedVisualization.BADGE) { return '%group.badge.url%' + sprite.libraryAssetName.replace('badge_', ''); } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts index 66efd952..b5f89b34 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureGuildIsometricBadgeVisualization.ts @@ -1,4 +1,5 @@ -import { IGraphicAsset, IRoomObjectSprite } from '../../../../../room'; +import { IGraphicAsset } from '../../../../../api'; +import { IRoomObjectSprite } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { IsometricImageFurniVisualization } from './IsometricImageFurniVisualization'; @@ -16,20 +17,20 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur { const flag = super.updateModel(scale); - if(!this.hasThumbnailImage) + if (!this.hasThumbnailImage) { const assetName = this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME); - if(assetName && assetName.length) this.setThumbnailImages(this.getBitmapAsset(assetName)); + if (assetName && assetName.length) this.setThumbnailImages(this.getBitmapAsset(assetName)); } const color1 = this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_COLOR_1); - this._color1 = color1 ? color1: FurnitureGuildIsometricBadgeVisualization.DEFAULT_COLOR_1; + this._color1 = color1 ? color1 : FurnitureGuildIsometricBadgeVisualization.DEFAULT_COLOR_1; const color2 = this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_COLOR_2); - this._color2 = color2 ? color2: FurnitureGuildIsometricBadgeVisualization.DEFAULT_COLOR_2; + this._color2 = color2 ? color2 : FurnitureGuildIsometricBadgeVisualization.DEFAULT_COLOR_2; return flag; } @@ -38,7 +39,7 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur { const tag = this.getLayerTag(scale, this._direction, layerId); - switch(tag) + switch (tag) { case FurnitureGuildIsometricBadgeVisualization.PRIMARY_COLOUR_SPRITE_TAG: return this._color1; case FurnitureGuildIsometricBadgeVisualization.SECONDARY_COLOUR_SPRITE_TAG: return this._color2; @@ -49,9 +50,9 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur protected getLibraryAssetNameForSprite(asset: IGraphicAsset, sprite: IRoomObjectSprite): string { - if(sprite.tag === FurnitureGuildIsometricBadgeVisualization.THUMBNAIL) + if (sprite.tag === FurnitureGuildIsometricBadgeVisualization.THUMBNAIL) { - if(this.object && this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME)) + if (this.object && this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME)) { return '%group.badge.url%' + this.object.model.getValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME); } @@ -64,7 +65,7 @@ export class FurnitureGuildIsometricBadgeVisualization extends IsometricImageFur { const asset = this.asset.getAsset(name); - if(!asset || !asset.texture) return null; + if (!asset || !asset.texture) return null; return asset.texture; } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts index 2b3ec331..31312d9c 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureIsometricBBVisualization.ts @@ -1,7 +1,7 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Matrix } from '@pixi/math'; +import { IGraphicAsset } from '../../../../../api'; import { NitroSprite } from '../../../../../core/utils/proxy/NitroSprite'; -import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset'; import { Nitro } from '../../../../Nitro'; import { FurnitureBBVisualization } from './FurnitureBBVisualization'; import { FurnitureBrandedImageVisualization } from './FurnitureBrandedImageVisualization'; @@ -12,27 +12,27 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization protected transformGifTextures(asset: IGraphicAsset): void { - if(!this._gifCollection) return; + if (!this._gifCollection) return; const textures = this._gifCollection.textures; - if(!textures.length) return; + if (!textures.length) return; - for(let i = 0; i < textures.length; i++) + for (let i = 0; i < textures.length; i++) { const texture = textures[i]; - if(!texture) continue; + if (!texture) continue; - const existingAsset = this.getAsset(`${ this._imageUrl }_${ i }`); + const existingAsset = this.getAsset(`${this._imageUrl}_${i}`); - if(!existingAsset) continue; + if (!existingAsset) continue; const scale = 1.1; const matrix = new Matrix(); const difference = (asset.width / texture.width); - switch(this.direction) + switch (this.direction) { case 2: matrix.a = difference; @@ -73,8 +73,8 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization transform: matrix }); - this.asset.disposeAsset(`${ this._imageUrl }_${ i }`); - this.asset.addAsset(`${ this._imageUrl }_${ i }`, renderTexture, true, asset.x, asset.y, asset.flipH, asset.flipV); + this.asset.disposeAsset(`${this._imageUrl}_${i}`); + this.asset.addAsset(`${this._imageUrl}_${i}`, renderTexture, true, asset.x, asset.y, asset.flipH, asset.flipV); } this._needsTransform = false; @@ -86,7 +86,7 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization const matrix = new Matrix(); const difference = (asset.width / texture.width); - switch(this.direction) + switch (this.direction) { case 2: matrix.a = difference; @@ -127,8 +127,8 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization transform: matrix }); - this.asset.disposeAsset(`${ this._imageUrl }_0`); - this.asset.addAsset(`${ this._imageUrl }_0`, renderTexture, true, sprite.x, sprite.y, asset.flipH, asset.flipV); + this.asset.disposeAsset(`${this._imageUrl}_0`); + this.asset.addAsset(`${this._imageUrl}_0`, renderTexture, true, sprite.x, sprite.y, asset.flipH, asset.flipV); this._needsTransform = false; } @@ -144,11 +144,11 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization { const tag = this.getLayerTag(scale, this._direction, layerId); - if((tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE) && this._imageUrl) + if ((tag === FurnitureBrandedImageVisualization.BRANDED_IMAGE) && this._imageUrl) { - if(this._needsTransform) + if (this._needsTransform) { - if(this._isAnimated) + if (this._isAnimated) { this.transformGifTextures(this.getAsset(super.getSpriteAssetName(scale, layerId))); } @@ -158,7 +158,7 @@ export class FurnitureIsometricBBVisualization extends FurnitureBBVisualization } } - return `${ this._imageUrl }_${ this.getFrameNumber(scale, layerId) }`; + return `${this._imageUrl}_${this.getFrameNumber(scale, layerId)}`; } return super.getSpriteAssetName(scale, layerId); diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts index 302029da..d0bbc1cc 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts @@ -2,8 +2,9 @@ import { RenderTexture, Texture } from '@pixi/core'; import { AlphaFilter } from '@pixi/filter-alpha'; import { Graphics } from '@pixi/graphics'; import { Matrix } from '@pixi/math'; -import { AdvancedMap, IParticleSystem, NitroPoint, NitroSprite } from '../../../../../core'; -import { IGraphicAsset, IRoomObjectSprite } from '../../../../../room'; +import { IGraphicAsset, IParticleSystem } from '../../../../../api'; +import { AdvancedMap, NitroPoint, NitroSprite } from '../../../../../core'; +import { IRoomObjectSprite } from '../../../../../room'; import { Vector3D } from '../../../../avatar'; import { Nitro } from '../../../../Nitro'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; @@ -46,23 +47,23 @@ export class FurnitureParticleSystem public dispose(): void { - for(const emitter of this._emitters.getValues()) emitter.dispose(); + for (const emitter of this._emitters.getValues()) emitter.dispose(); this._emitters = null; - if(this._canvasTexture) + if (this._canvasTexture) { this._canvasTexture.destroy(); this._canvasTexture = null; } - if(this._blackOverlay) + if (this._blackOverlay) { this._blackOverlay.destroy(); this._blackOverlay = null; } - if(this._emptySprite) + if (this._emptySprite) { this._emptySprite.destroy(); this._emptySprite = null; @@ -76,7 +77,7 @@ export class FurnitureParticleSystem public reset(): void { - if(this._currentEmitter) this._currentEmitter.reset(); + if (this._currentEmitter) this._currentEmitter.reset(); this._currentEmitter = null; this._hasIgnited = false; @@ -87,7 +88,7 @@ export class FurnitureParticleSystem public setAnimation(id: number): void { - if(this._currentEmitter) this._currentEmitter.reset(); + if (this._currentEmitter) this._currentEmitter.reset(); this._currentEmitter = this._emitters.getValue(id); this._hasIgnited = false; @@ -98,15 +99,15 @@ export class FurnitureParticleSystem private updateCanvas(): void { - if(!this._currentEmitter || (this._canvasId === -1)) return; + if (!this._currentEmitter || (this._canvasId === -1)) return; this._roomSprite = this._visualization.getSprite(this._canvasId); - if(this._roomSprite && this._roomSprite.texture) + if (this._roomSprite && this._roomSprite.texture) { - if((this._roomSprite.width <= 1) || (this._roomSprite.height <= 1)) return; + if ((this._roomSprite.width <= 1) || (this._roomSprite.height <= 1)) return; - if(this._canvasTexture && ((this._canvasTexture.width !== this._roomSprite.width) || (this._canvasTexture.height !== this._roomSprite.height))) this._canvasTexture = null; + if (this._canvasTexture && ((this._canvasTexture.width !== this._roomSprite.width) || (this._canvasTexture.height !== this._roomSprite.height))) this._canvasTexture = null; this.clearCanvas(); @@ -118,7 +119,7 @@ export class FurnitureParticleSystem public getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(this._currentEmitter && (this._currentEmitter.roomObjectSpriteId === layerId)) + if (this._currentEmitter && (this._currentEmitter.roomObjectSpriteId === layerId)) { return this._currentEmitter.y * this._scaleMultiplier; } @@ -128,58 +129,58 @@ export class FurnitureParticleSystem public controlsSprite(k: number): boolean { - if(this._currentEmitter) return this._currentEmitter.roomObjectSpriteId == k; + if (this._currentEmitter) return this._currentEmitter.roomObjectSpriteId == k; return false; } public updateSprites(): void { - if(!this._currentEmitter || !this._roomSprite) return; + if (!this._currentEmitter || !this._roomSprite) return; - if(this._canvasTexture && (this._roomSprite.texture !== this._canvasTexture)) + if (this._canvasTexture && (this._roomSprite.texture !== this._canvasTexture)) { this._roomSprite.texture = this._canvasTexture; } - if(this._hasIgnited) + if (this._hasIgnited) { - if(this._currentEmitter.roomObjectSpriteId >= 0) this._visualization.getSprite(this._currentEmitter.roomObjectSpriteId).visible = false; + if (this._currentEmitter.roomObjectSpriteId >= 0) this._visualization.getSprite(this._currentEmitter.roomObjectSpriteId).visible = false; } } public updateAnimation(): void { - if(!this._currentEmitter || !this._roomSprite || this._isDone) return; + if (!this._currentEmitter || !this._roomSprite || this._isDone) return; const k = 10; - if(!this._hasIgnited && this._currentEmitter.hasIgnited) this._hasIgnited = true; + if (!this._hasIgnited && this._currentEmitter.hasIgnited) this._hasIgnited = true; const offsetY = (this._offsetY * this._scaleMultiplier); this._currentEmitter.update(); - if(this._hasIgnited) + if (this._hasIgnited) { - if(this._currentEmitter.roomObjectSpriteId >= 0) + if (this._currentEmitter.roomObjectSpriteId >= 0) { this._visualization.getSprite(this._currentEmitter.roomObjectSpriteId).visible = false; } - if(!this._canvasTexture) this.updateCanvas(); + if (!this._canvasTexture) this.updateCanvas(); this.clearCanvas(); - for(const particle of this._currentEmitter.particles) + for (const particle of this._currentEmitter.particles) { const tx = (this._centerX + ((((particle.x - particle.z) * k) / 10) * this._scaleMultiplier)); const ty = ((this._centerY - offsetY) + ((((particle.y + ((particle.x + particle.z) / 2)) * k) / 10) * this._scaleMultiplier)); const asset = particle.getAsset(); - if(asset && asset.texture) + if (asset && asset.texture) { - if(particle.fade && (particle.alphaMultiplier < 1)) + if (particle.fade && (particle.alphaMultiplier < 1)) { this._translationMatrix.identity(); this._translationMatrix.translate((tx + asset.offsetX), (ty + asset.offsetY)); @@ -188,7 +189,7 @@ export class FurnitureParticleSystem this._particleColorTransform.alpha = particle.alphaMultiplier; - sprite.filters = [ this._particleColorTransform ]; + sprite.filters = [this._particleColorTransform]; Nitro.instance.renderer.render(sprite, { renderTexture: this._canvasTexture, @@ -227,7 +228,7 @@ export class FurnitureParticleSystem } } - if(!this._currentEmitter.particles.length) + if (!this._currentEmitter.particles.length) { this._isDone = true; @@ -251,9 +252,9 @@ export class FurnitureParticleSystem this._bgColor = (parseInt(bgColor, 16) || 0x000000); - if(!particleSystem.emitters || !particleSystem.emitters.length) return; + if (!particleSystem.emitters || !particleSystem.emitters.length) return; - for(const emitter of particleSystem.emitters) + for (const emitter of particleSystem.emitters) { const emitterId = emitter.id; const emitterName = emitter.name; @@ -274,7 +275,7 @@ export class FurnitureParticleSystem const simulationShape = emitter.simulation.shape; const simulationEnergy = emitter.simulation.energy; - for(const particle of emitter.particles) + for (const particle of emitter.particles) { const lifeTime = particle.lifeTime; const isEmitter = (particle.isEmitter || false); @@ -282,7 +283,7 @@ export class FurnitureParticleSystem const frames: IGraphicAsset[] = []; - for(const name of particle.frames) frames.push(this._visualization.asset.getAsset(name)); + for (const name of particle.frames) frames.push(this._visualization.asset.getAsset(name)); particleEmitter.configureParticle(lifeTime, isEmitter, frames, fade); } @@ -295,28 +296,28 @@ export class FurnitureParticleSystem { let emitterId = 0; - if(particleSystem._emitters && particleSystem._currentEmitter) + if (particleSystem._emitters && particleSystem._currentEmitter) { emitterId = particleSystem._emitters.getKey(particleSystem._emitters.getValues().indexOf(particleSystem._currentEmitter)); } this.setAnimation(emitterId); - if(this._currentEmitter) this._currentEmitter.copyStateFrom(particleSystem._currentEmitter, (particleSystem._size / this._size)); + if (this._currentEmitter) this._currentEmitter.copyStateFrom(particleSystem._currentEmitter, (particleSystem._size / this._size)); this._canvasTexture = null; } private clearCanvas(): void { - if(!this._emptySprite) + if (!this._emptySprite) { this._emptySprite = new NitroSprite(Texture.EMPTY); this._emptySprite.alpha = 0; } - if(!this._canvasTexture) + if (!this._canvasTexture) { this._canvasTexture = RenderTexture.create({ width: this._roomSprite.width, diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts index dfbb179c..3538f487 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemEmitter.ts @@ -1,4 +1,4 @@ -import { IGraphicAsset } from '../../../../../room'; +import { IGraphicAsset } from '../../../../../api'; import { Vector3D } from '../../../../avatar/geometry/Vector3D'; import { ParticleSystemParticle } from '../data'; import { FurnitureParticleSystemParticle } from './FurnitureParticleSystemParticle'; @@ -39,7 +39,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti public dispose(): void { - for(const k of this._particles) k.dispose(); + for (const k of this._particles) k.dispose(); this._particles = null; this._particleConfigurations = null; @@ -65,7 +65,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti public reset(): void { - for(const particle of this._particles) particle.dispose(); + for (const particle of this._particles) particle.dispose(); this._particles = []; this._emittedParticles = 0; @@ -106,24 +106,24 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti { this._hasIgnited = true; - if(this._emittedParticles < this._maxNumberOfParticles) + if (this._emittedParticles < this._maxNumberOfParticles) { - if(this.age > 1) this.releaseParticles(this, this.direction); + if (this.age > 1) this.releaseParticles(this, this.direction); } } private releaseParticles(particle: FurnitureParticleSystemParticle, direction: Vector3D = null): void { - if(!direction) direction = new Vector3D(); + if (!direction) direction = new Vector3D(); const newDirection = new Vector3D(); const randomParticle = this.getRandomParticleConfiguration(); let i = 0; - while(i < this._particlesPerFrame) + while (i < this._particlesPerFrame) { - switch(this._explosionShape) + switch (this._explosionShape) { case FurnitureParticleSystemEmitter.CONE: newDirection.x = ((this.randomBoolean(0.5)) ? Math.random() : -(Math.random())); @@ -151,7 +151,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti let fade = false; let frames: IGraphicAsset[] = []; - if(randomParticle) + if (randomParticle) { lifeTime = Math.floor(((Math.random() * randomParticle.lifeTime) + 10)); isEmitter = randomParticle.isEmitter; @@ -189,15 +189,15 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti this.verlet(); this.satisfyConstraints(); - if(!this.isAlive && (this._emittedParticles < this._maxNumberOfParticles)) + if (!this.isAlive && (this._emittedParticles < this._maxNumberOfParticles)) { - if((this.age % this._burstPulse) === 0) this.releaseParticles(this, this.direction); + if ((this.age % this._burstPulse) === 0) this.releaseParticles(this, this.direction); } } public verlet(): void { - if(this.isAlive || (this._emittedParticles < this._maxNumberOfParticles)) + if (this.isAlive || (this._emittedParticles < this._maxNumberOfParticles)) { const x = this.x; const y = this.y; @@ -213,7 +213,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti const particles: FurnitureParticleSystemParticle[] = []; - for(const particle of this._particles) + for (const particle of this._particles) { particle.update(); @@ -227,12 +227,12 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti particle.lastY = y; particle.lastZ = z; - if((particle.y > 10) || !particle.isAlive) particles.push(particle); + if ((particle.y > 10) || !particle.isAlive) particles.push(particle); } - for(const particle of particles) + for (const particle of particles) { - if(particle.isEmitter) + if (particle.isEmitter) { // } @@ -249,7 +249,7 @@ export class FurnitureParticleSystemEmitter extends FurnitureParticleSystemParti private accumulateForces(): void { - for(const k of this._particles) + for (const k of this._particles) { // } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts index aa26c464..f92859be 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystemParticle.ts @@ -1,4 +1,4 @@ -import { IGraphicAsset } from '../../../../../room'; +import { IGraphicAsset } from '../../../../../api'; import { Vector3D } from '../../../../avatar/geometry/Vector3D'; export class FurnitureParticleSystemParticle @@ -49,11 +49,11 @@ export class FurnitureParticleSystemParticle { this._age++; - if(this._age === this._lifeTime) this.ignite(); + if (this._age === this._lifeTime) this.ignite(); - if(this._fade) + if (this._fade) { - if((this._age / this._lifeTime) > this._fadeTime) + if ((this._age / this._lifeTime) > this._fadeTime) { this._alphaMultiplier = ((this._lifeTime - this._age) / (this._lifeTime * (1 - this._fadeTime))); } @@ -62,7 +62,7 @@ export class FurnitureParticleSystemParticle public getAsset(): IGraphicAsset { - if(((this._frames) && (this._frames.length > 0))) + if (((this._frames) && (this._frames.length > 0))) { return this._frames[(this._age % this._frames.length)]; } @@ -173,7 +173,7 @@ export class FurnitureParticleSystemParticle public toString(): string { - return [ this._x, this._y, this._z ].toString(); + return [this._x, this._y, this._z].toString(); } public copy(particle: FurnitureParticleSystemParticle, scale: number): void diff --git a/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts b/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts index 3753defd..865f955b 100644 --- a/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurniturePlanetSystemVisualization.ts @@ -1,4 +1,4 @@ -import { IAssetLogicPlanetSystem } from '../../../../../core'; +import { IAssetLogicPlanetSystem } from '../../../../../api'; import { Vector3d } from '../../../../../room'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; @@ -19,11 +19,11 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali this._rootPosition = new Vector3d(); } - public dispose():void + public dispose(): void { - if(this._planetIndex) + if (this._planetIndex) { - while(this._planetIndex.length > 0) + while (this._planetIndex.length > 0) { const planet = this._planetIndex.shift(); @@ -37,14 +37,14 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali protected updateAnimation(scale: number): number { - if(!this._planetIndex && (this.spriteCount > 0)) + if (!this._planetIndex && (this.spriteCount > 0)) { - if(!this.processPlanets()) return 0; + if (!this.processPlanets()) return 0; } - if(this._planetIndex) + if (this._planetIndex) { - for(const planet of this._planetIndex) planet.update(this._offsetArray, this._rootPosition, scale); + for (const planet of this._planetIndex) planet.update(this._offsetArray, this._rootPosition, scale); return super.updateAnimation(scale); } @@ -54,7 +54,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali protected getLayerXOffset(scale: number, direction: number, layerId: number): number { - if(this._offsetArray[layerId]) + if (this._offsetArray[layerId]) { return this._offsetArray[layerId].x; } @@ -64,7 +64,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(this._offsetArray[layerId]) + if (this._offsetArray[layerId]) { return this._offsetArray[layerId].y; } @@ -74,7 +74,7 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali protected getLayerZOffset(scale: number, direction: number, layerId: number): number { - if(this._offsetArray[layerId]) + if (this._offsetArray[layerId]) { return this._offsetArray[layerId].z; } @@ -84,20 +84,20 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali private processPlanets(): boolean { - if(!this.object || !this.object.model) return; + if (!this.object || !this.object.model) return; const planetSystems = this.object.model.getValue(RoomObjectVariable.FURNITURE_PLANETSYSTEM_DATA); - if(!planetSystems) return false; + if (!planetSystems) return false; this._planetIndex = []; this._planetNameIndex = []; - for(const planet of planetSystems) + for (const planet of planetSystems) { const sprite = this.getSprite(planet.id); - if(sprite) + if (sprite) { this.addPlanet(planet.name, planet.id, planet.parent, (planet.radius || 0), (planet.arcSpeed || 0), (planet.arcOffset || 0), (planet.height || 0)); } @@ -106,14 +106,14 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali return true; } - private addPlanet(name: string, index: number, parentName: string, radius: number, arcSpeed: number, arcOffset: number, height: number):void + private addPlanet(name: string, index: number, parentName: string, radius: number, arcSpeed: number, arcOffset: number, height: number): void { - if(!this._planetIndex) return; + if (!this._planetIndex) return; const planet = new FurniturePlanetSystemVisualizationPlanetObject(name, index, radius, arcSpeed, arcOffset, height); const existingPlanet = this.getPlanet(parentName); - if(existingPlanet) existingPlanet.addChild(planet); + if (existingPlanet) existingPlanet.addChild(planet); else { this._planetIndex.push(planet); @@ -123,11 +123,11 @@ export class FurniturePlanetSystemVisualization extends FurnitureAnimatedVisuali private getPlanet(name: string): FurniturePlanetSystemVisualizationPlanetObject { - for(const planet of this._planetIndex) + for (const planet of this._planetIndex) { - if(planet.name === name) return planet; + if (planet.name === name) return planet; - if(planet.hasChild(name)) return planet.getChild(name); + if (planet.hasChild(name)) return planet.getChild(name); } return null; diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts index 6843e10e..e1f79e72 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts @@ -1,8 +1,8 @@ +import { IGraphicAsset } from '../../../../../api'; import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance'; import { IRoomObjectSprite } from '../../../../../room/object/visualization/IRoomObjectSprite'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { RoomObjectSpriteVisualization } from '../../../../../room/object/visualization/RoomObjectSpriteVisualization'; -import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { RoomObjectVariable } from '../../RoomObjectVariable'; import { RoomObjectVisualizationType } from '../../RoomObjectVisualizationType'; @@ -87,7 +87,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { this.reset(); - if(!(data instanceof FurnitureVisualizationData)) return false; + if (!(data instanceof FurnitureVisualizationData)) return false; this._type = data.type; this._data = data; @@ -135,7 +135,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected resetLayers(scale: number, direction: number): void { - if((this._cacheDirection === direction) && (this._cacheScale === scale)) return; + if ((this._cacheDirection === direction) && (this._cacheScale === scale)) return; this._updatedLayers = []; this._assetNames = []; @@ -157,18 +157,18 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { - if(!geometry) return; + if (!geometry) return; const scale = geometry.scale; let updateSprites = false; - if(this.updateObject(scale, geometry.direction.x)) updateSprites = true; + if (this.updateObject(scale, geometry.direction.x)) updateSprites = true; - if(this.updateModel(scale)) updateSprites = true; + if (this.updateModel(scale)) updateSprites = true; let number = 0; - if(skipUpdate) + if (skipUpdate) { this._animationNumber = (this._animationNumber | this.updateAnimation(scale)); } @@ -179,7 +179,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization this._animationNumber = 0; } - if(updateSprites || (number !== 0)) + if (updateSprites || (number !== 0)) { this.updateSprites(scale, updateSprites, number); @@ -191,15 +191,15 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected updateObject(scale: number, direction: number): boolean { - if(!this.object) return false; + if (!this.object) return false; - if((this.updateObjectCounter === this.object.updateCounter) && (scale === this._scale) && (this._lastCameraAngle === direction)) return false; + if ((this.updateObjectCounter === this.object.updateCounter) && (scale === this._scale) && (this._lastCameraAngle === direction)) return false; let offsetDirection = (this.object.getDirection().x - (direction + 135)); offsetDirection = ((((offsetDirection) % 360) + 360) % 360); - if(this._data) + if (this._data) { const validDirection = this._data.getValidDirection(scale, offsetDirection); @@ -220,9 +220,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const model = this.object && this.object.model; - if(!model) return false; + if (!model) return false; - if(this.updateModelCounter === model.updateCounter) return false; + if (this.updateModelCounter === model.updateCounter) return false; this._selectedColor = model.getValue(RoomObjectVariable.FURNITURE_COLOR); this._clickUrl = model.getValue(RoomObjectVariable.FURNITURE_AD_URL); @@ -231,9 +231,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization let alphaMultiplier = model.getValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER); - if(isNaN(alphaMultiplier)) alphaMultiplier = 1; + if (isNaN(alphaMultiplier)) alphaMultiplier = 1; - if(this._alphaMultiplier !== alphaMultiplier) + if (this._alphaMultiplier !== alphaMultiplier) { this._alphaMultiplier = alphaMultiplier; @@ -247,13 +247,13 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected updateSprites(scale: number, update: boolean, animation: number): void { - if(this._layerCount !== this.totalSprites) this.createSprites(this._layerCount); + if (this._layerCount !== this.totalSprites) this.createSprites(this._layerCount); - if(update) + if (update) { let layerId = (this.totalSprites - 1); - while(layerId >= 0) + while (layerId >= 0) { this.updateSprite(scale, layerId); @@ -264,9 +264,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { let layerId = 0; - while(animation > 0) + while (animation > 0) { - if(animation) this.updateSprite(scale, layerId); + if (animation) this.updateSprite(scale, layerId); layerId++; animation = (animation >> 1); @@ -281,11 +281,11 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization const assetName = this.getSpriteAssetName(scale, layerId); const sprite = this.getSprite(layerId); - if(assetName && sprite) + if (assetName && sprite) { const assetData = this.getAsset(assetName, layerId); - if(assetData && assetData.texture) + if (assetData && assetData.texture) { sprite.visible = true; sprite.type = this._type; @@ -296,7 +296,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization let relativeDepth = 0; - if(layerId !== this._shadowLayerIndex) + if (layerId !== this._shadowLayerIndex) { sprite.tag = this.getLayerTag(scale, this._direction, layerId); sprite.alpha = this.getLayerAlpha(scale, this._direction, layerId); @@ -332,7 +332,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization } else { - if(sprite) this.resetSprite(sprite); + if (sprite) this.resetSprite(sprite); } } @@ -348,7 +348,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization private resetSprite(sprite: IRoomObjectSprite): void { - if(!sprite) return; + if (!sprite) return; sprite.texture = null; sprite.libraryAssetName = ''; @@ -364,18 +364,18 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected getSpriteAssetName(scale: number, layerId: number): string { - if(!this._data || (layerId >= FurnitureVisualizationData.LAYER_LETTERS.length)) return ''; + if (!this._data || (layerId >= FurnitureVisualizationData.LAYER_LETTERS.length)) return ''; let assetName = this._assetNames[layerId]; let updated = this._updatedLayers[layerId]; - if(!assetName || !assetName.length) + if (!assetName || !assetName.length) { assetName = this.cacheSpriteAssetName(scale, layerId, true); updated = (this._cacheSize !== 1); } - if(updated) assetName += this.getFrameNumber(scale, layerId); + if (updated) assetName += this.getFrameNumber(scale, layerId); return assetName; } @@ -387,7 +387,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization let layerCode = ''; const isntIcon = (size !== 1); - if(layerId !== this._shadowLayerIndex) + if (layerId !== this._shadowLayerIndex) { layerCode = FurnitureVisualizationData.LAYER_LETTERS[layerId] || ''; } @@ -396,11 +396,11 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization layerCode = 'sd'; } - if(layerCode === '') return null; + if (layerCode === '') return null; const assetName = (this._type + ((isntIcon) ? ('_' + size + '_' + layerCode + '_' + this._direction + '_') : ('_icon_' + layerCode))); - if(cache) + if (cache) { this._assetNames[layerId] = assetName; this._updatedLayers[layerId] = isntIcon; @@ -413,9 +413,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const existing = this._spriteTags[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return LayerData.DEFAULT_TAG; + if (!this._data) return LayerData.DEFAULT_TAG; const tag = this._data.getLayerTag(scale, direction, layerId); @@ -428,9 +428,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const existing = this._spriteInks[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return LayerData.DEFAULT_INK; + if (!this._data) return LayerData.DEFAULT_INK; const ink = this._data.getLayerInk(scale, direction, layerId); @@ -441,18 +441,18 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected getLayerAlpha(scale: number, direction: number, layerId: number): number { - if(!this._alphaChanged) + if (!this._alphaChanged) { const existing = this._spriteAlphas[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; } - if(!this._data) return LayerData.DEFAULT_ALPHA; + if (!this._data) return LayerData.DEFAULT_ALPHA; let alpha = this._data.getLayerAlpha(scale, direction, layerId); - if(this._alphaMultiplier !== null) alpha = (alpha * this._alphaMultiplier); + if (this._alphaMultiplier !== null) alpha = (alpha * this._alphaMultiplier); this._spriteAlphas[layerId] = alpha; @@ -463,9 +463,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const existing = this._spriteColors[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return ColorData.DEFAULT_COLOR; + if (!this._data) return ColorData.DEFAULT_COLOR; const color = this._data.getLayerColor(scale, layerId, colorId); @@ -478,9 +478,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const existing = this._spriteMouseCaptures[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return LayerData.DEFAULT_IGNORE_MOUSE; + if (!this._data) return LayerData.DEFAULT_IGNORE_MOUSE; const ignoreMouse = this._data.getLayerIgnoreMouse(scale, direction, layerId); @@ -493,9 +493,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const existing = this._spriteXOffsets[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return LayerData.DEFAULT_XOFFSET; + if (!this._data) return LayerData.DEFAULT_XOFFSET; const xOffset = this._data.getLayerXOffset(scale, direction, layerId); @@ -506,13 +506,13 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(layerId === this._shadowLayerIndex) return Math.ceil((this._furnitureLift * (scale / 2))); + if (layerId === this._shadowLayerIndex) return Math.ceil((this._furnitureLift * (scale / 2))); const existing = this._spriteYOffsets[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return LayerData.DEFAULT_YOFFSET; + if (!this._data) return LayerData.DEFAULT_YOFFSET; const yOffset = this._data.getLayerYOffset(scale, direction, layerId); @@ -525,9 +525,9 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization { const existing = this._spriteZOffsets[layerId]; - if(existing !== undefined) return existing; + if (existing !== undefined) return existing; - if(!this._data) return LayerData.DEFAULT_ZOFFSET; + if (!this._data) return LayerData.DEFAULT_ZOFFSET; const zOffset = this._data.getLayerZOffset(scale, direction, layerId); @@ -538,7 +538,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected getValidSize(scale: number): number { - if(!this._data) return scale; + if (!this._data) return scale; return this._data.getValidSize(scale); } @@ -551,7 +551,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected setDirection(direction: number): void { - if(this._direction === direction) return; + if (this._direction === direction) return; this._direction = direction; } @@ -578,7 +578,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization public getAsset(name: string, layerId: number = -1): IGraphicAsset { - if(!this.asset) return null; + if (!this.asset) return null; return this.asset.getAsset(name); } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts b/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts index afeecdcb..f5b6863e 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVisualizationData.ts @@ -1,5 +1,4 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; -import { IAssetVisualizationData } from '../../../../../core/asset/interfaces/visualization'; +import { IAssetData, IAssetVisualizationData } from '../../../../../api'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { ColorData } from '../data/ColorData'; import { LayerData } from '../data/LayerData'; @@ -32,11 +31,11 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { this.reset(); - if(!asset) return false; + if (!asset) return false; this._type = asset.name; - if(!this.defineVisualizations(asset.visualizations)) + if (!this.defineVisualizations(asset.visualizations)) { this.reset(); @@ -48,9 +47,9 @@ export class FurnitureVisualizationData implements IObjectVisualizationData public dispose(): void { - if(this._sizeDatas && this._sizeDatas.size) + if (this._sizeDatas && this._sizeDatas.size) { - for(const size of this._sizeDatas.values()) size && size.dispose(); + for (const size of this._sizeDatas.values()) size && size.dispose(); this._sizeDatas = null; } @@ -63,9 +62,9 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { this._type = ''; - if(this._sizeDatas && this._sizeDatas.size) + if (this._sizeDatas && this._sizeDatas.size) { - for(const size of this._sizeDatas.values()) size && size.dispose(); + for (const size of this._sizeDatas.values()) size && size.dispose(); } this._sizeDatas.clear(); @@ -82,9 +81,9 @@ export class FurnitureVisualizationData implements IObjectVisualizationData protected defineVisualizations(visualizations: IAssetVisualizationData[]): boolean { - if(!visualizations) return false; + if (!visualizations) return false; - for(const visualizationId in visualizations) + for (const visualizationId in visualizations) { const visualization = visualizations[visualizationId]; @@ -93,20 +92,20 @@ export class FurnitureVisualizationData implements IObjectVisualizationData let size = visualization.size; - if(size < 1) size = 1; + if (size < 1) size = 1; - if(this._sizeDatas.get(size)) return false; + if (this._sizeDatas.get(size)) return false; const sizeData = this.createSizeData(size, layerCount, angle); - if(!sizeData) return false; + if (!sizeData) return false; - for(const key in visualization) + for (const key in visualization) { //@ts-ignore const data = visualization[key]; - if(!this.processVisualElement(sizeData, key, data)) + if (!this.processVisualElement(sizeData, key, data)) { sizeData.dispose(); @@ -126,18 +125,18 @@ export class FurnitureVisualizationData implements IObjectVisualizationData protected processVisualElement(sizeData: SizeData, key: string, data: any): boolean { - if(!sizeData || !key || !data) return false; + if (!sizeData || !key || !data) return false; - switch(key) + switch (key) { case 'layers': - if(!sizeData.processLayers(data)) return false; + if (!sizeData.processLayers(data)) return false; break; case 'directions': - if(!sizeData.processDirections(data)) return false; + if (!sizeData.processDirections(data)) return false; break; case 'colors': - if(!sizeData.processColors(data)) return false; + if (!sizeData.processColors(data)) return false; break; } @@ -146,13 +145,13 @@ export class FurnitureVisualizationData implements IObjectVisualizationData public getValidSize(scale: number): number { - if(scale === this._lastSizeScale) return this._lastSize; + if (scale === this._lastSizeScale) return this._lastSize; const sizeIndex = this.getSizeIndex(scale); let newScale = -1; - if(sizeIndex < this._sizes.length) newScale = this._sizes[sizeIndex]; + if (sizeIndex < this._sizes.length) newScale = this._sizes[sizeIndex]; this._lastSizeScale = scale; this._lastSize = newScale; @@ -162,16 +161,16 @@ export class FurnitureVisualizationData implements IObjectVisualizationData private getSizeIndex(size: number): number { - if(size <= 0) return 0; + if (size <= 0) return 0; let index = 0; let iterator = 1; - while(iterator < this._sizes.length) + while (iterator < this._sizes.length) { - if(this._sizes[iterator] > size) + if (this._sizes[iterator] > size) { - if((this._sizes[iterator] / size) < (size / this._sizes[(iterator - 1)])) index = iterator; + if ((this._sizes[iterator] / size) < (size / this._sizes[(iterator - 1)])) index = iterator; break; } @@ -186,11 +185,11 @@ export class FurnitureVisualizationData implements IObjectVisualizationData protected getSizeData(size: number): SizeData { - if(size === this._lastSizeDataScale) return this._lastSizeData; + if (size === this._lastSizeDataScale) return this._lastSizeData; const sizeIndex = this.getSizeIndex(size); - if(sizeIndex < this._sizes.length) this._lastSizeData = this._sizeDatas.get(this._sizes[sizeIndex]); + if (sizeIndex < this._sizes.length) this._lastSizeData = this._sizeDatas.get(this._sizes[sizeIndex]); else this._lastSizeData = null; this._lastSizeDataScale = size; @@ -202,7 +201,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_COUNT; + if (!size) return LayerData.DEFAULT_COUNT; return size.layerCount; } @@ -211,7 +210,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_DIRECTION; + if (!size) return LayerData.DEFAULT_DIRECTION; return size.getValidDirection(direction); } @@ -220,7 +219,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_TAG; + if (!size) return LayerData.DEFAULT_TAG; return size.getLayerTag(direction, layerId); } @@ -229,7 +228,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_INK; + if (!size) return LayerData.DEFAULT_INK; return size.getLayerInk(direction, layerId); } @@ -238,7 +237,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_ALPHA; + if (!size) return LayerData.DEFAULT_ALPHA; return size.getLayerAlpha(direction, layerId); } @@ -247,7 +246,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return ColorData.DEFAULT_COLOR; + if (!size) return ColorData.DEFAULT_COLOR; return size.getLayerColor(layerId, colorId); } @@ -256,7 +255,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_IGNORE_MOUSE; + if (!size) return LayerData.DEFAULT_IGNORE_MOUSE; return size.getLayerIgnoreMouse(direction, layerId); } @@ -265,7 +264,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_XOFFSET; + if (!size) return LayerData.DEFAULT_XOFFSET; return size.getLayerXOffset(direction, layerId); } @@ -274,7 +273,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_YOFFSET; + if (!size) return LayerData.DEFAULT_YOFFSET; return size.getLayerYOffset(direction, layerId); } @@ -283,7 +282,7 @@ export class FurnitureVisualizationData implements IObjectVisualizationData { const size = this.getSizeData(scale); - if(!size) return LayerData.DEFAULT_ZOFFSET; + if (!size) return LayerData.DEFAULT_ZOFFSET; return size.getLayerZOffset(direction, layerId); } diff --git a/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts b/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts index 93184e81..87512e6d 100644 --- a/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/IsometricImageFurniVisualization.ts @@ -1,7 +1,7 @@ import { Resource, Texture } from '@pixi/core'; import { Matrix } from '@pixi/math'; +import { IGraphicAsset } from '../../../../../api'; import { NitroSprite, NitroTexture } from '../../../../../core'; -import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset'; import { TextureUtils } from '../../../../../room/utils/TextureUtils'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; @@ -41,7 +41,7 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza { const flag = super.updateModel(scale); - if(!this._thumbnailChanged && (this._thumbnailDirection === this.direction)) return flag; + if (!this._thumbnailChanged && (this._thumbnailDirection === this.direction)) return flag; this.refreshThumbnail(); @@ -50,9 +50,9 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza private refreshThumbnail(): void { - if(this.asset == null) return; + if (this.asset == null) return; - if(this._thumbnailImageNormal) + if (this._thumbnailImageNormal) { this.addThumbnailAsset(this._thumbnailImageNormal, 64); } @@ -69,14 +69,14 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza { let layerId = 0; - while(layerId < this.totalSprites) + while (layerId < this.totalSprites) { - if(this.getLayerTag(scale, this.direction, layerId) === IsometricImageFurniVisualization.THUMBNAIL) + if (this.getLayerTag(scale, this.direction, layerId) === IsometricImageFurniVisualization.THUMBNAIL) { const assetName = (this.cacheSpriteAssetName(scale, layerId, false) + this.getFrameNumber(scale, layerId)); const asset = this.getAsset(assetName, layerId); - if(asset) + if (asset) { const _local_6 = this.generateTransformedThumbnail(k, asset); const _local_7 = this.getThumbnailAssetName(scale); @@ -94,7 +94,7 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza private generateTransformedThumbnail(texture: Texture, asset: IGraphicAsset): Texture { - if(this._hasOutline) + if (this._hasOutline) { const container = new NitroSprite(); const background = new NitroSprite(NitroTexture.WHITE); @@ -118,7 +118,7 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza const matrix = new Matrix(); const difference = (asset.width / texture.width); - switch(this.direction) + switch (this.direction) { case 2: matrix.a = difference; @@ -155,7 +155,7 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza protected getSpriteAssetName(scale: number, layerId: number): string { - if(this._thumbnailImageNormal && (this.getLayerTag(scale, this.direction, layerId) === IsometricImageFurniVisualization.THUMBNAIL)) return this.getThumbnailAssetName(scale); + if (this._thumbnailImageNormal && (this.getLayerTag(scale, this.direction, layerId) === IsometricImageFurniVisualization.THUMBNAIL)) return this.getThumbnailAssetName(scale); return super.getSpriteAssetName(scale, layerId); } diff --git a/src/nitro/room/object/visualization/pet/PetVisualization.ts b/src/nitro/room/object/visualization/pet/PetVisualization.ts index 78b98b60..fe77f7ef 100644 --- a/src/nitro/room/object/visualization/pet/PetVisualization.ts +++ b/src/nitro/room/object/visualization/pet/PetVisualization.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; +import { IGraphicAsset } from '../../../../../api'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; -import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { Nitro } from '../../../../Nitro'; import { RoomObjectVariable } from '../../RoomObjectVariable'; @@ -82,16 +82,16 @@ export class PetVisualization extends FurnitureAnimatedVisualization this._previousAnimationDirection = -1; this._animationStates = []; - while(this._animationStates.length < PetVisualization.ANIMATION_INDEX_COUNT) this._animationStates.push(new AnimationStateData()); + while (this._animationStates.length < PetVisualization.ANIMATION_INDEX_COUNT) this._animationStates.push(new AnimationStateData()); } public initialize(data: IObjectVisualizationData): boolean { - if(!(data instanceof PetVisualizationData)) return false; + if (!(data instanceof PetVisualizationData)) return false; const texture = this.getPetAdditionAsset(PetVisualization.PET_EXPERIENCE_BUBBLE); - if(texture) + if (texture) { this._experienceData = new ExperienceData(texture); } @@ -103,13 +103,13 @@ export class PetVisualization extends FurnitureAnimatedVisualization { super.dispose(); - if(this._animationStates) + if (this._animationStates) { - while(this._animationStates.length) + while (this._animationStates.length) { const animationState = this._animationStates[0]; - if(animationState) animationState.dispose(); + if (animationState) animationState.dispose(); this._animationStates.pop(); } @@ -132,15 +132,15 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected updateExperienceBubble(time: number): void { - if(!this._experienceData) return; + if (!this._experienceData) return; this._experienceData.alpha = 0; - if(this._experienceTimestamp) + if (this._experienceTimestamp) { const difference = (time - this._experienceTimestamp); - if(difference < PetVisualization.EXPERIENCE_BUBBLE_VISIBLE_IN_MS) + if (difference < PetVisualization.EXPERIENCE_BUBBLE_VISIBLE_IN_MS) { this._experienceData.alpha = (Math.sin(((difference / PetVisualization.EXPERIENCE_BUBBLE_VISIBLE_IN_MS) * Math.PI)) * 0xFF); } @@ -151,13 +151,13 @@ export class PetVisualization extends FurnitureAnimatedVisualization const sprite = this.getSprite((this.totalSprites - 1)); - if(sprite) + if (sprite) { - if(this._experienceData.alpha > 0) + if (this._experienceData.alpha > 0) { const texture = this._experienceData.renderBubble(this._experience); - if(texture) + if (texture) { sprite.texture = texture; sprite.offsetX = -20; @@ -180,9 +180,9 @@ export class PetVisualization extends FurnitureAnimatedVisualization { const model = this.object && this.object.model; - if(!model) return false; + if (!model) return false; - if(this.updateModelCounter === model.updateCounter) return false; + if (this.updateModelCounter === model.updateCounter) return false; const posture = model.getValue(RoomObjectVariable.FIGURE_POSTURE); const gesture = model.getValue(RoomObjectVariable.FIGURE_GESTURE); @@ -191,9 +191,9 @@ export class PetVisualization extends FurnitureAnimatedVisualization let alphaMultiplier = (model.getValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER) || null); - if(alphaMultiplier === null || isNaN(alphaMultiplier)) alphaMultiplier = 1; + if (alphaMultiplier === null || isNaN(alphaMultiplier)) alphaMultiplier = 1; - if(this._alphaMultiplier !== alphaMultiplier) + if (this._alphaMultiplier !== alphaMultiplier) { this._alphaMultiplier = alphaMultiplier; @@ -204,7 +204,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization const headDirection = model.getValue(RoomObjectVariable.HEAD_DIRECTION); - if(!isNaN(headDirection) && this._data.isAllowedToTurnHead) + if (!isNaN(headDirection) && this._data.isAllowedToTurnHead) { this._headDirection = headDirection; } @@ -224,7 +224,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization const headOnly = model.getValue(RoomObjectVariable.PET_HEAD_ONLY); const color = model.getValue(RoomObjectVariable.PET_COLOR); - if(customPaletteIndex !== this._paletteIndex) + if (customPaletteIndex !== this._paletteIndex) { this._paletteIndex = customPaletteIndex; this._paletteName = this._paletteIndex.toString(); @@ -236,7 +236,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization this._isRiding = (!isNaN(isRiding) && (isRiding > 0)); this._headOnly = (!isNaN(headOnly) && (headOnly > 0)); - if(!isNaN(color) && this._color !== color) this._color = color; + if (!isNaN(color) && this._color !== color) this._color = color; this.updateModelCounter = model.updateCounter; @@ -245,11 +245,11 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected updateAnimation(scale: number): number { - if(this.object) + if (this.object) { const direction = this.object.getDirection().x; - if(direction !== this._previousAnimationDirection) + if (direction !== this._previousAnimationDirection) { this._previousAnimationDirection = direction; @@ -262,18 +262,18 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected setPostureAndGesture(posture: string, gesture: string): void { - if(!this._data) return; + if (!this._data) return; - if(posture !== this._posture) + if (posture !== this._posture) { this._posture = posture; this.setAnimationForIndex(PetVisualization.POSTURE_ANIMATION_INDEX, this._data.postureToAnimation(this._scale, posture)); } - if(this._data.getGestureDisabled(this._scale, posture)) gesture = null; + if (this._data.getGestureDisabled(this._scale, posture)) gesture = null; - if(gesture !== this._gesture) + if (gesture !== this._gesture) { this._gesture = gesture; @@ -283,7 +283,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization private getAnimationStateData(k: number): AnimationStateData { - if((k >= 0) && (k < this._animationStates.length)) return this._animationStates[k]; + if ((k >= 0) && (k < this._animationStates.length)) return this._animationStates[k]; return null; } @@ -292,9 +292,9 @@ export class PetVisualization extends FurnitureAnimatedVisualization { const animationStateData = this.getAnimationStateData(k); - if(animationStateData) + if (animationStateData) { - if(this.setSubAnimation(animationStateData, _arg_2)) this._animationOver = false; + if (this.setSubAnimation(animationStateData, _arg_2)) this._animationOver = false; } } @@ -304,11 +304,11 @@ export class PetVisualization extends FurnitureAnimatedVisualization let index = (this._animationStates.length - 1); - while(index >= 0) + while (index >= 0) { const stateData = this._animationStates[index]; - if(stateData) stateData.setLayerCount(this.animatedLayerCount); + if (stateData) stateData.setLayerCount(this.animatedLayerCount); index--; } @@ -316,31 +316,31 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected updateAnimations(scale: number): number { - if(this._animationOver) return 0; + if (this._animationOver) return 0; let animationOver = true; let _local_3 = 0; let index = 0; - while(index < this._animationStates.length) + while (index < this._animationStates.length) { const stateData = this._animationStates[index]; - if(stateData) + if (stateData) { - if(!stateData.animationOver) + if (!stateData.animationOver) { const _local_6 = this.updateFramesForAnimation(stateData, scale); _local_3 = (_local_3 | _local_6); - if(!stateData.animationOver) + if (!stateData.animationOver) { animationOver = false; } else { - if(AnimationData.isTransitionFromAnimation(stateData.animationId) || AnimationData.isTransitionToAnimation(stateData.animationId)) + if (AnimationData.isTransitionFromAnimation(stateData.animationId) || AnimationData.isTransitionToAnimation(stateData.animationId)) { this.setAnimationForIndex(index, stateData.animationAfterTransitionId); @@ -360,23 +360,23 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected getSpriteAssetName(scale: number, layerId: number): string { - if(this._headOnly && this.isNonHeadSprite(layerId)) return null; + if (this._headOnly && this.isNonHeadSprite(layerId)) return null; - if(this._isRiding && this._parser3(layerId)) return null; + if (this._isRiding && this._parser3(layerId)) return null; const totalSprites = this.totalSprites; - if(layerId < (totalSprites - PetVisualization.ADDITIONAL_SPRITE_COUNT)) + if (layerId < (totalSprites - PetVisualization.ADDITIONAL_SPRITE_COUNT)) { const validScale = this.getValidSize(scale); - if(layerId < (totalSprites - (1 + PetVisualization.ADDITIONAL_SPRITE_COUNT))) + if (layerId < (totalSprites - (1 + PetVisualization.ADDITIONAL_SPRITE_COUNT))) { - if(layerId >= FurnitureVisualizationData.LAYER_LETTERS.length) return null; + if (layerId >= FurnitureVisualizationData.LAYER_LETTERS.length) return null; const layerLetter = FurnitureVisualizationData.LAYER_LETTERS[layerId]; - if(validScale === 1) return (this._type + '_icon_' + layerLetter); + if (validScale === 1) return (this._type + '_icon_' + layerLetter); return (this._type + '_' + validScale + '_' + layerLetter + '_' + this.getDirection(scale, layerId) + '_' + this.getFrameNumber(validScale, layerId)); } @@ -389,7 +389,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected getLayerColor(scale: number, layerId: number, colorId: number): number { - if(layerId < (this.totalSprites - PetVisualization.ADDITIONAL_SPRITE_COUNT)) return this._color; + if (layerId < (this.totalSprites - PetVisualization.ADDITIONAL_SPRITE_COUNT)) return this._color; return 0xFFFFFF; } @@ -399,15 +399,15 @@ export class PetVisualization extends FurnitureAnimatedVisualization let offset = super.getLayerXOffset(scale, direction, layerId); let index = (this._animationStates.length - 1); - while(index >= 0) + while (index >= 0) { const stateData = this._animationStates[index]; - if(stateData) + if (stateData) { const frame = stateData.getFrame(layerId); - if(frame) offset += frame.x; + if (frame) offset += frame.x; } index--; @@ -421,15 +421,15 @@ export class PetVisualization extends FurnitureAnimatedVisualization let offset = super.getLayerYOffset(scale, direction, layerId); let index = (this._animationStates.length - 1); - while(index >= 0) + while (index >= 0) { const stateData = this._animationStates[index]; - if(stateData) + if (stateData) { const frame = stateData.getFrame(layerId); - if(frame) offset += frame.y; + if (frame) offset += frame.y; } index--; @@ -440,14 +440,14 @@ export class PetVisualization extends FurnitureAnimatedVisualization protected getLayerZOffset(scale: number, direction: number, layerId: number): number { - if(!this._data) return LayerData.DEFAULT_ZOFFSET; + if (!this._data) return LayerData.DEFAULT_ZOFFSET; return this._data.getLayerZOffset(scale, this.getDirection(scale, layerId), layerId); } private getDirection(scale: number, layerId: number): number { - if(!this.isHeadSprite(layerId)) return this._direction; + if (!this.isHeadSprite(layerId)) return this._direction; return this._data.getValidDirection(scale, this._headDirection); } @@ -456,15 +456,15 @@ export class PetVisualization extends FurnitureAnimatedVisualization { let index = (this._animationStates.length - 1); - while(index >= 0) + while (index >= 0) { const stateData = this._animationStates[index]; - if(stateData) + if (stateData) { const frame = stateData.getFrame(layerId); - if(frame) return frame.id; + if (frame) return frame.id; } index--; @@ -475,12 +475,12 @@ export class PetVisualization extends FurnitureAnimatedVisualization private isHeadSprite(layerId: number): boolean { - if(this._headSprites[layerId] === undefined) + if (this._headSprites[layerId] === undefined) { const isHead = (this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.HEAD); const isHair = (this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.HAIR); - if(isHead || isHair) this._headSprites[layerId] = true; + if (isHead || isHair) this._headSprites[layerId] = true; else this._headSprites[layerId] = false; } @@ -489,13 +489,13 @@ export class PetVisualization extends FurnitureAnimatedVisualization private isNonHeadSprite(layerId: number): boolean { - if(this._nonHeadSprites[layerId] === undefined) + if (this._nonHeadSprites[layerId] === undefined) { - if(layerId < (this.totalSprites - (1 + PetVisualization.ADDITIONAL_SPRITE_COUNT))) + if (layerId < (this.totalSprites - (1 + PetVisualization.ADDITIONAL_SPRITE_COUNT))) { const tag = this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId); - if(((tag && (tag.length > 0)) && (tag !== PetVisualization.HEAD)) && (tag !== PetVisualization.HAIR)) + if (((tag && (tag.length > 0)) && (tag !== PetVisualization.HEAD)) && (tag !== PetVisualization.HAIR)) { this._nonHeadSprites[layerId] = true; } @@ -515,9 +515,9 @@ export class PetVisualization extends FurnitureAnimatedVisualization private _parser3(layerId: number): boolean { - if(this._saddleSprites[layerId] === undefined) + if (this._saddleSprites[layerId] === undefined) { - if(this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.SADDLE) + if (this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.SADDLE) { this._saddleSprites[layerId] = true; } @@ -532,21 +532,21 @@ export class PetVisualization extends FurnitureAnimatedVisualization public getAsset(name: string, layerId: number = -1): IGraphicAsset { - if(!this.asset) return null; + if (!this.asset) return null; const layerIndex = this._customLayerIds.indexOf(layerId); let paletteName = this._paletteName; let partId = -1; let paletteId = -1; - if(layerIndex > -1) + if (layerIndex > -1) { partId = this._customPartIds[layerIndex]; paletteId = this._customPaletteIds[layerIndex]; paletteName = ((paletteId > -1) ? paletteId.toString() : this._paletteName); } - if(!(isNaN(partId)) && (partId > -1)) + if (!(isNaN(partId)) && (partId > -1)) { name = (name + '_' + partId); } @@ -572,9 +572,9 @@ export class PetVisualization extends FurnitureAnimatedVisualization let length = parts.length; let i = 0; - while(i < parts.length) + while (i < parts.length) { - if((parts[i] === '64') || (parts[i] === '32')) + if ((parts[i] === '64') || (parts[i] === '32')) { length = (i + 3); @@ -586,7 +586,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization let posture: string = null; - if(length < parts.length) + if (length < parts.length) { let part = parts[length]; @@ -594,7 +594,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization posture = this._data.animationToPosture(scale, (parseInt(part) / 100), false); - if(!posture) posture = this._data.getGestureForAnimationId(scale, (parseInt(part) / 100)); + if (!posture) posture = this._data.getGestureForAnimationId(scale, (parseInt(part) / 100)); } return posture; diff --git a/src/nitro/room/object/visualization/pet/PetVisualizationData.ts b/src/nitro/room/object/visualization/pet/PetVisualizationData.ts index d62d5f13..19df484e 100644 --- a/src/nitro/room/object/visualization/pet/PetVisualizationData.ts +++ b/src/nitro/room/object/visualization/pet/PetVisualizationData.ts @@ -1,4 +1,4 @@ -import { IAssetVisualizationData } from '../../../../../core/asset/interfaces'; +import { IAssetVisualizationData } from '../../../../../api'; import { AnimationSizeData } from '../data/AnimationSizeData'; import { PetSizeData } from '../data/PetSizeData'; import { SizeData } from '../data/SizeData'; @@ -17,7 +17,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData protected createSizeData(scale: number, layerCount: number, angle: number): SizeData { - if(scale > 1) return new PetSizeData(layerCount, angle); + if (scale > 1) return new PetSizeData(layerCount, angle); else return new AnimationSizeData(layerCount, angle); } @@ -30,18 +30,18 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData protected processVisualElement(sizeData: SizeData, key: string, data: any): boolean { - if(!sizeData || !key || !data) return false; + if (!sizeData || !key || !data) return false; - switch(key) + switch (key) { case 'postures': - if(!(sizeData instanceof PetSizeData) || !sizeData.processPostures(data)) return false; + if (!(sizeData instanceof PetSizeData) || !sizeData.processPostures(data)) return false; break; case 'gestures': - if(!(sizeData instanceof PetSizeData) || !sizeData.processGestures(data)) return false; + if (!(sizeData instanceof PetSizeData) || !sizeData.processGestures(data)) return false; break; default: - if(!super.processVisualElement(sizeData, key, data)) return false; + if (!super.processVisualElement(sizeData, key, data)) return false; break; } @@ -52,7 +52,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return PetSizeData.DEFAULT; + if (!size) return PetSizeData.DEFAULT; return size.postureToAnimation(posture); } @@ -61,7 +61,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return false; + if (!size) return false; return size.getGestureDisabled(posture); } @@ -70,7 +70,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return PetSizeData.DEFAULT; + if (!size) return PetSizeData.DEFAULT; return size.gestureToAnimation(gesture); } @@ -79,7 +79,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return null; + if (!size) return null; return size.animationToPosture(index, useDefault); } @@ -88,7 +88,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return null; + if (!size) return null; return size.animationToGesture(index); } @@ -97,7 +97,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return null; + if (!size) return null; return size.getGestureForAnimationId(_arg_2); } @@ -106,7 +106,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return 0; + if (!size) return 0; return size.totalPostures; } @@ -115,7 +115,7 @@ export class PetVisualizationData extends FurnitureAnimatedVisualizationData { const size = this.getSizeData(scale) as PetSizeData; - if(!size) return 0; + if (!size) return 0; return size.totalGestures; } diff --git a/src/nitro/room/object/visualization/room/RoomVisualizationData.ts b/src/nitro/room/object/visualization/room/RoomVisualizationData.ts index 303f6189..bbc3cb0a 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualizationData.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualizationData.ts @@ -1,7 +1,6 @@ -import { IAssetData } from '../../../../../core/asset/interfaces'; +import { IAssetData, IGraphicAssetCollection } from '../../../../../api'; import { Disposable } from '../../../../../core/common/disposable/Disposable'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; -import { IGraphicAssetCollection } from '../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { PlaneMaskManager } from './mask/PlaneMaskManager'; import { LandscapeRasterizer } from './rasterizer/animated/LandscapeRasterizer'; import { FloorRasterizer } from './rasterizer/basic/FloorRasterizer'; @@ -31,50 +30,50 @@ export class RoomVisualizationData extends Disposable implements IObjectVisualiz //@ts-ignore const wallData = asset.wallData; - if(wallData) this._wallRasterizer.initialize(wallData); + if (wallData) this._wallRasterizer.initialize(wallData); //@ts-ignore const floorData = asset.floorData; - if(floorData) this._floorRasterizer.initialize(floorData); + if (floorData) this._floorRasterizer.initialize(floorData); //@ts-ignore const landscapeData = asset.landscapeData; - if(landscapeData) this._landscapeRasterizer.initialize(landscapeData); + if (landscapeData) this._landscapeRasterizer.initialize(landscapeData); //@ts-ignore const maskData = asset.maskData; - if(maskData) this._maskManager.initialize(maskData); + if (maskData) this._maskManager.initialize(maskData); return true; } protected onDispose(): void { - if(this._wallRasterizer) + if (this._wallRasterizer) { this._wallRasterizer.dispose(); this._wallRasterizer = null; } - if(this._floorRasterizer) + if (this._floorRasterizer) { this._floorRasterizer.dispose(); this._floorRasterizer = null; } - if(this._landscapeRasterizer) + if (this._landscapeRasterizer) { this._landscapeRasterizer.dispose(); this._landscapeRasterizer = null; } - if(this._maskManager) + if (this._maskManager) { this._maskManager.dispose(); @@ -86,7 +85,7 @@ export class RoomVisualizationData extends Disposable implements IObjectVisualiz public setGraphicAssetCollection(collection: IGraphicAssetCollection): void { - if(this._initialized) return; + if (this._initialized) return; this._wallRasterizer.initializeAssetCollection(collection); this._floorRasterizer.initializeAssetCollection(collection); @@ -98,11 +97,11 @@ export class RoomVisualizationData extends Disposable implements IObjectVisualiz public clearCache(): void { - if(this._wallRasterizer) this._wallRasterizer.clearCache(); + if (this._wallRasterizer) this._wallRasterizer.clearCache(); - if(this._floorRasterizer) this._floorRasterizer.clearCache(); + if (this._floorRasterizer) this._floorRasterizer.clearCache(); - if(this._landscapeRasterizer) this._landscapeRasterizer.clearCache(); + if (this._landscapeRasterizer) this._landscapeRasterizer.clearCache(); } public get wallRasterizer(): WallRasterizer diff --git a/src/nitro/room/object/visualization/room/mask/PlaneMask.ts b/src/nitro/room/object/visualization/room/mask/PlaneMask.ts index 5bffa4ef..76d0215f 100644 --- a/src/nitro/room/object/visualization/room/mask/PlaneMask.ts +++ b/src/nitro/room/object/visualization/room/mask/PlaneMask.ts @@ -1,4 +1,4 @@ -import { IGraphicAsset } from '../../../../../../room/object/visualization/utils/IGraphicAsset'; +import { IGraphicAsset } from '../../../../../../api'; import { IVector3D } from '../../../../../../room/utils/IVector3D'; import { PlaneMaskVisualization } from './PlaneMaskVisualization'; @@ -21,11 +21,11 @@ export class PlaneMask public dispose(): void { - if(this._maskVisualizations) + if (this._maskVisualizations) { - for(const mask of this._maskVisualizations.values()) + for (const mask of this._maskVisualizations.values()) { - if(!mask) continue; + if (!mask) continue; mask.dispose(); } @@ -41,7 +41,7 @@ export class PlaneMask { const existing = this._maskVisualizations.get(size); - if(existing) return null; + if (existing) return null; const visualization = new PlaneMaskVisualization(); @@ -58,11 +58,11 @@ export class PlaneMask let sizeIndex = 0; const index = 1; - while(index < this._sizes.length) + while (index < this._sizes.length) { - if(this._sizes[index] > k) + if (this._sizes[index] > k) { - if((this._sizes[index] - k) < (k - this._sizes[(index - 1)])) sizeIndex = index; + if ((this._sizes[index] - k) < (k - this._sizes[(index - 1)])) sizeIndex = index; break; } @@ -75,11 +75,11 @@ export class PlaneMask protected getMaskVisualization(k: number): PlaneMaskVisualization { - if(k === this._lastSize) return this._lastMaskVisualization; + if (k === this._lastSize) return this._lastMaskVisualization; const sizeIndex = this.getSizeIndex(k); - if(sizeIndex < this._sizes.length) + if (sizeIndex < this._sizes.length) { this._lastMaskVisualization = (this._maskVisualizations.get(this._sizes[sizeIndex])); } @@ -97,21 +97,21 @@ export class PlaneMask { const visualization = this.getMaskVisualization(k); - if(!visualization) return null; + if (!visualization) return null; return visualization.getAsset(_arg_2); } public getAssetName(k: number): string { - if(!this._assetNames) return null; + if (!this._assetNames) return null; return this._assetNames.get(k) || null; } public setAssetName(k: number, _arg_2: string): void { - if(!this._assetNames) return; + if (!this._assetNames) return; this._assetNames.set(k, _arg_2); } diff --git a/src/nitro/room/object/visualization/room/mask/PlaneMaskBitmap.ts b/src/nitro/room/object/visualization/room/mask/PlaneMaskBitmap.ts index 8f509443..1920247c 100644 --- a/src/nitro/room/object/visualization/room/mask/PlaneMaskBitmap.ts +++ b/src/nitro/room/object/visualization/room/mask/PlaneMaskBitmap.ts @@ -1,4 +1,4 @@ -import { IGraphicAsset } from '../../../../../../room/object/visualization/utils/IGraphicAsset'; +import { IGraphicAsset } from '../../../../../../api'; export class PlaneMaskBitmap { diff --git a/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts b/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts index 1f7a1699..d8484f62 100644 --- a/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts +++ b/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts @@ -1,6 +1,6 @@ import { Graphics } from '@pixi/graphics'; import { Matrix, Point } from '@pixi/math'; -import { IGraphicAssetCollection } from '../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; +import { IGraphicAssetCollection } from '../../../../../../api'; import { IVector3D } from '../../../../../../room/utils/IVector3D'; import { PlaneMask } from './PlaneMask'; import { PlaneMaskVisualization } from './PlaneMaskVisualization'; @@ -28,11 +28,11 @@ export class PlaneMaskManager this._assetCollection = null; this._data = null; - if(this._masks && this._masks.size) + if (this._masks && this._masks.size) { - for(const mask of this._masks.values()) + for (const mask of this._masks.values()) { - if(!mask) continue; + if (!mask) continue; mask.dispose(); } @@ -48,7 +48,7 @@ export class PlaneMaskManager public initializeAssetCollection(k: IGraphicAssetCollection): void { - if(!this.data) return; + if (!this.data) return; this._assetCollection = k; @@ -57,39 +57,39 @@ export class PlaneMaskManager private parseMasks(k: any, _arg_2: IGraphicAssetCollection): void { - if(!k || !_arg_2) return; + if (!k || !_arg_2) return; - if(k.masks && k.masks.length) + if (k.masks && k.masks.length) { let index = 0; - while(index < k.masks.length) + while (index < k.masks.length) { const mask = k.masks[index]; - if(mask) + if (mask) { const id = mask.id; const existing = this._masks.get(id); - if(existing) continue; + if (existing) continue; const newMask = new PlaneMask(); - if(mask.visualizations && mask.visualizations.length) + if (mask.visualizations && mask.visualizations.length) { let visualIndex = 0; - while(visualIndex < mask.visualizations.length) + while (visualIndex < mask.visualizations.length) { const visualization = mask.visualizations[visualIndex]; - if(visualization) + if (visualization) { const size = visualization.size as number; const maskVisualization = newMask.createMaskVisualization(size); - if(maskVisualization) + if (maskVisualization) { const assetName = this.parseMaskBitmaps(visualization.bitmaps, maskVisualization, _arg_2); @@ -111,30 +111,30 @@ export class PlaneMaskManager private parseMaskBitmaps(k: any, _arg_2: PlaneMaskVisualization, _arg_3: IGraphicAssetCollection): string { - if(!k || !k.length) return null; + if (!k || !k.length) return null; let graphicName: string = null; - for(const bitmap of k) + for (const bitmap of k) { - if(!bitmap) continue; + if (!bitmap) continue; const assetName = bitmap.assetName; const asset = _arg_3.getAsset(assetName); - if(!asset) continue; + if (!asset) continue; let normalMinX = PlaneMaskVisualization.MIN_NORMAL_COORDINATE_VALUE; let normalMaxX = PlaneMaskVisualization.MAX_NORMAL_COORDINATE_VALUE; let normalMinY = PlaneMaskVisualization.MIN_NORMAL_COORDINATE_VALUE; let normalMaxY = PlaneMaskVisualization.MAX_NORMAL_COORDINATE_VALUE; - if(bitmap.normalMinX !== undefined) normalMinX = bitmap.normalMinX; - if(bitmap.normalMaxX !== undefined) normalMaxX = bitmap.normalMaxX; - if(bitmap.normalMinY !== undefined) normalMinY = bitmap.normalMinY; - if(bitmap.normalMaxY !== undefined) normalMaxY = bitmap.normalMaxY; + if (bitmap.normalMinX !== undefined) normalMinX = bitmap.normalMinX; + if (bitmap.normalMaxX !== undefined) normalMaxX = bitmap.normalMaxX; + if (bitmap.normalMinY !== undefined) normalMinY = bitmap.normalMinY; + if (bitmap.normalMaxY !== undefined) normalMaxY = bitmap.normalMaxY; - if(!asset.flipH) graphicName = assetName; + if (!asset.flipH) graphicName = assetName; _arg_2.addBitmap(asset, normalMinX, normalMaxX, normalMinY, normalMaxY); } @@ -146,15 +146,15 @@ export class PlaneMaskManager { const mask = this._masks.get(_arg_2); - if(!mask) return true; + if (!mask) return true; const asset = mask.getGraphicAsset(_arg_3, _arg_4); - if(!asset) return true; + if (!asset) return true; const texture = asset.texture; - if(!texture) return true; + if (!texture) return true; const point = new Point((_arg_5 + asset.offsetX), (_arg_6 + asset.offsetY)); @@ -165,13 +165,13 @@ export class PlaneMaskManager let c = 0; let d = 0; - if(asset.flipH) + if (asset.flipH) { a = -1; c = -(texture.width); } - if(asset.flipV) + if (asset.flipV) { b = -1; d = -(texture.height); @@ -190,7 +190,7 @@ export class PlaneMaskManager public getMask(k: string): PlaneMask { - if(!this._masks || !this._masks.size) return null; + if (!this._masks || !this._masks.size) return null; return this._masks.get(k) || null; } diff --git a/src/nitro/room/object/visualization/room/mask/PlaneMaskVisualization.ts b/src/nitro/room/object/visualization/room/mask/PlaneMaskVisualization.ts index 5e770c89..04feb627 100644 --- a/src/nitro/room/object/visualization/room/mask/PlaneMaskVisualization.ts +++ b/src/nitro/room/object/visualization/room/mask/PlaneMaskVisualization.ts @@ -1,4 +1,4 @@ -import { IGraphicAsset } from '../../../../../../room/object/visualization/utils/IGraphicAsset'; +import { IGraphicAsset } from '../../../../../../api'; import { IVector3D } from '../../../../../../room/utils/IVector3D'; import { PlaneMaskBitmap } from './PlaneMaskBitmap'; @@ -16,9 +16,9 @@ export class PlaneMaskVisualization public dispose(): void { - for(const mask of this._bitmaps) + for (const mask of this._bitmaps) { - if(!mask) continue; + if (!mask) continue; mask.dispose(); } @@ -33,13 +33,13 @@ export class PlaneMaskVisualization public getAsset(k: IVector3D): IGraphicAsset { - if(!k) return null; + if (!k) return null; - for(const mask of this._bitmaps) + for (const mask of this._bitmaps) { - if(!mask) continue; + if (!mask) continue; - if((((k.x >= mask.normalMinX) && (k.x <= mask.normalMaxX)) && (k.y >= mask.normalMinY)) && (k.y <= mask.normalMaxY)) + if ((((k.x >= mask.normalMinX) && (k.x <= mask.normalMaxX)) && (k.y >= mask.normalMinY)) && (k.y <= mask.normalMaxY)) { return mask.asset; } diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts index cdaf94cd..a58f3f1a 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts @@ -1,5 +1,5 @@ import { Point } from '@pixi/math'; -import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset'; +import { IGraphicAsset } from '../../../../../../../api'; export class AnimationItem { @@ -17,13 +17,13 @@ export class AnimationItem this._speedY = _arg_4; this._bitmapData = _arg_5; - if(isNaN(this._x)) this._x = 0; + if (isNaN(this._x)) this._x = 0; - if(isNaN(this._y)) this._y = 0; + if (isNaN(this._y)) this._y = 0; - if(isNaN(this._speedX)) this._speedX = 0; + if (isNaN(this._speedX)) this._speedX = 0; - if(isNaN(this._speedY)) this._speedY = 0; + if (isNaN(this._speedY)) this._speedY = 0; } public get bitmapData(): IGraphicAsset @@ -41,9 +41,9 @@ export class AnimationItem let _local_6 = this._x; let _local_7 = this._y; - if(_arg_3 > 0) _local_6 = (_local_6 + (((this._speedX / _arg_3) * _arg_5) / 1000)); + if (_arg_3 > 0) _local_6 = (_local_6 + (((this._speedX / _arg_3) * _arg_5) / 1000)); - if(_arg_4 > 0) _local_7 = (_local_7 + (((this._speedY / _arg_4) * _arg_5) / 1000)); + if (_arg_4 > 0) _local_7 = (_local_7 + (((this._speedY / _arg_4) * _arg_5) / 1000)); const _local_8 = ((_local_6 % 1) * k); const _local_9 = ((_local_7 % 1) * _arg_2); diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts index fee11632..2d5b0ec4 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts @@ -1,7 +1,7 @@ import { Graphics } from '@pixi/graphics'; import { Matrix } from '@pixi/math'; +import { IGraphicAssetCollection } from '../../../../../../../api'; import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable'; -import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { AnimationItem } from './AnimationItem'; @@ -19,19 +19,19 @@ export class PlaneVisualizationAnimationLayer implements IDisposable this._isDisposed = false; this._items = []; - if(k && _arg_2) + if (k && _arg_2) { - for(const item of k) + for (const item of k) { - if(!item) continue; + if (!item) continue; const assetName = item.asset; - if(assetName) + if (assetName) { const asset = _arg_2.getAsset(assetName); - if(asset) this._items.push(new AnimationItem(item.x, item.y, item.speedX, item.speedY, asset)); + if (asset) this._items.push(new AnimationItem(item.x, item.y, item.speedX, item.speedY, asset)); } } } @@ -46,16 +46,16 @@ export class PlaneVisualizationAnimationLayer implements IDisposable { this._isDisposed = true; - if(this._bitmapData) + if (this._bitmapData) { this._bitmapData.destroy(); this._bitmapData = null; } - if(this._items) + if (this._items) { - for(const item of this._items) item && item.dispose(); + for (const item of this._items) item && item.dispose(); this._items = []; } @@ -63,7 +63,7 @@ export class PlaneVisualizationAnimationLayer implements IDisposable public clearCache(): void { - if(this._bitmapData) + if (this._bitmapData) { this._bitmapData.destroy(); @@ -73,11 +73,11 @@ export class PlaneVisualizationAnimationLayer implements IDisposable public render(canvas: Graphics, width: number, height: number, normal: IVector3D, offsetX: number, offsetY: number, maxX: number, maxY: number, dimensionX: number, dimensionY: number, timeSinceStartMs: number): Graphics { - if((((canvas == null) || (!(canvas.width == width))) || (!(canvas.height == height)))) + if ((((canvas == null) || (!(canvas.width == width))) || (!(canvas.height == height)))) { - if((((this._bitmapData == null) || (!(this._bitmapData.width == width))) || (!(this._bitmapData.height == height)))) + if ((((this._bitmapData == null) || (!(this._bitmapData.width == width))) || (!(this._bitmapData.height == height)))) { - if(this._bitmapData != null) + if (this._bitmapData != null) { this._bitmapData.destroy(); } @@ -97,23 +97,23 @@ export class PlaneVisualizationAnimationLayer implements IDisposable canvas = this._bitmapData; } - if(((maxX > 0) && (maxY > 0))) + if (((maxX > 0) && (maxY > 0))) { let _local_12 = 0; - while(_local_12 < this._items.length) + while (_local_12 < this._items.length) { const _local_13 = (this._items[_local_12] as AnimationItem); - if(_local_13 != null) + if (_local_13 != null) { const _local_14 = _local_13.getPosition(maxX, maxY, dimensionX, dimensionY, timeSinceStartMs); _local_14.x = (_local_14.x - offsetX); _local_14.y = (_local_14.y - offsetY); - if(_local_13.bitmapData) + if (_local_13.bitmapData) { - if(_local_14.x > 0 && (_local_14.x + _local_13.bitmapData.width < canvas.width)) + if (_local_14.x > 0 && (_local_14.x + _local_13.bitmapData.width < canvas.width)) { canvas .beginFill(0x00FF00) @@ -121,7 +121,7 @@ export class PlaneVisualizationAnimationLayer implements IDisposable .drawRect(_local_14.x, _local_14.y, _local_13.bitmapData.width, _local_13.bitmapData.height) .endFill(); } - else if(_local_14.x > 0) + else if (_local_14.x > 0) { const difference = canvas.width - _local_14.x; canvas diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts index f4894031..4120a7c6 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts @@ -1,6 +1,6 @@ import { Matrix, Point } from '@pixi/math'; +import { IGraphicAsset } from '../../../../../../../api'; import { NitroSprite } from '../../../../../../../core'; -import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset'; import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { Randomizer } from '../../utils'; import { PlaneTexture } from './PlaneTexture'; @@ -21,30 +21,30 @@ export class PlaneMaterialCell this._extraItemAssets = []; this._extraItemCount = 0; - if(assets && assets.length && (limit > 0)) + if (assets && assets.length && (limit > 0)) { let assetIndex = 0; - while(assetIndex < assets.length) + while (assetIndex < assets.length) { const graphic = assets[assetIndex]; - if(graphic) this._extraItemAssets.push(graphic); + if (graphic) this._extraItemAssets.push(graphic); assetIndex++; } - if(this._extraItemAssets.length) + if (this._extraItemAssets.length) { - if(offsetPoints) + if (offsetPoints) { let pointIndex = 0; - while(pointIndex < offsetPoints.length) + while (pointIndex < offsetPoints.length) { const point = offsetPoints[pointIndex]; - if(point) this._extraItemOffsets.push(new Point(point.x, point.y)); + if (point) this._extraItemOffsets.push(new Point(point.x, point.y)); pointIndex++; } @@ -62,14 +62,14 @@ export class PlaneMaterialCell public dispose(): void { - if(this._texture) + if (this._texture) { this._texture.dispose(); this._texture = null; } - if(this._cachedSprite) + if (this._cachedSprite) { this._cachedSprite.destroy(); @@ -83,7 +83,7 @@ export class PlaneMaterialCell public clearCache(): void { - if(this._cachedSprite) + if (this._cachedSprite) { this._cachedSprite.destroy(); @@ -93,11 +93,11 @@ export class PlaneMaterialCell public getHeight(normal: IVector3D): number { - if(this._texture) + if (this._texture) { const texture = this._texture.getBitmap(normal); - if(texture) return texture.height; + if (texture) return texture.height; } return 0; @@ -105,43 +105,43 @@ export class PlaneMaterialCell public render(normal: IVector3D, textureOffsetX: number, textureOffsetY: number): NitroSprite { - if(!this._texture) return null; + if (!this._texture) return null; const texture = this._texture.getBitmap(normal); - if(!texture) return null; + if (!texture) return null; const bitmap = new NitroSprite(texture); - if((textureOffsetX !== 0) || (textureOffsetY !== 0)) + if ((textureOffsetX !== 0) || (textureOffsetY !== 0)) { - while(textureOffsetX < 0) textureOffsetX += texture.width; + while (textureOffsetX < 0) textureOffsetX += texture.width; - while(textureOffsetY < 0) textureOffsetY += texture.height; + while (textureOffsetY < 0) textureOffsetY += texture.height; bitmap.x = (textureOffsetX % texture.width); bitmap.y = (textureOffsetY % texture.height); - if(textureOffsetX) + if (textureOffsetX) { bitmap.anchor.x = 1; bitmap.scale.x = -1; } - if(textureOffsetY) + if (textureOffsetY) { bitmap.anchor.y = 1; bitmap.scale.y = -1; } } - if(bitmap) + if (bitmap) { - if(!this.isStatic) + if (!this.isStatic) { - if(this._cachedSprite) + if (this._cachedSprite) { - if((this._cachedSprite.width !== bitmap.width) || (this._cachedSprite.height !== bitmap.height)) + if ((this._cachedSprite.width !== bitmap.width) || (this._cachedSprite.height !== bitmap.height)) { this._cachedSprite.destroy(); @@ -149,7 +149,7 @@ export class PlaneMaterialCell } } - if(!this._cachedSprite) + if (!this._cachedSprite) { this._cachedSprite = new NitroSprite(texture); } @@ -160,16 +160,16 @@ export class PlaneMaterialCell let i = 0; - while(i < limitMin) + while (i < limitMin) { const offset = this._extraItemOffsets[offsetIndexes[i]]; const item = this._extraItemAssets[(i % this._extraItemAssets.length)]; - if(offset && item) + if (offset && item) { const assetTexture = item.texture; - if(assetTexture) + if (assetTexture) { const offsetFinal = new Point((offset.x + item.offsetX), (offset.y + item.offsetY)); const flipMatrix = new Matrix(); @@ -179,13 +179,13 @@ export class PlaneMaterialCell let translateX = 0; let translateY = 0; - if(item.flipH) + if (item.flipH) { x = -1; translateX = assetTexture.width; } - if(item.flipV) + if (item.flipV) { y = -1; translateY = assetTexture.height; @@ -220,7 +220,7 @@ export class PlaneMaterialCell return null; } - public getAssetName(normal:IVector3D): string + public getAssetName(normal: IVector3D): string { return (this._texture == null) ? null : this._texture.getAssetName(normal); } diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts index 7ca1fa3f..98023d15 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts @@ -1,8 +1,7 @@ import { Resource, Texture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; import { Point } from '@pixi/math'; -import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset'; -import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; +import { IGraphicAsset, IGraphicAssetCollection } from '../../../../../../../api'; import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry'; import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { Rasterizer } from '../../../../../../../room/utils/Rasterizer'; @@ -57,11 +56,11 @@ export class PlaneRasterizer implements IPlaneRasterizer public dispose(): void { - if(this._planes) + if (this._planes) { - for(const plane of this._planes.values()) + for (const plane of this._planes.values()) { - if(!plane) continue; + if (!plane) continue; plane.dispose(); } @@ -69,25 +68,25 @@ export class PlaneRasterizer implements IPlaneRasterizer this._planes = null; } - if(this._materials) + if (this._materials) { this.resetMaterials(); this._materials = null; } - if(this._textures) + if (this._textures) { this.resetTextures(); this._textures = null; } - if(this._geometries) + if (this._geometries) { - for(const geometry of this._geometries.values()) + for (const geometry of this._geometries.values()) { - if(!geometry) continue; + if (!geometry) continue; geometry.dispose(); } @@ -101,16 +100,16 @@ export class PlaneRasterizer implements IPlaneRasterizer public clearCache(): void { - for(const plane of this._planes.values()) + for (const plane of this._planes.values()) { - if(!plane) continue; + if (!plane) continue; plane.clearCache(); } - for(const material of this._materials.values()) + for (const material of this._materials.values()) { - if(!material) continue; + if (!material) continue; material.clearCache(); } @@ -130,9 +129,9 @@ export class PlaneRasterizer implements IPlaneRasterizer private resetMaterials(): void { - for(const material of this._materials.values()) + for (const material of this._materials.values()) { - if(!material) continue; + if (!material) continue; material.dispose(); } @@ -142,9 +141,9 @@ export class PlaneRasterizer implements IPlaneRasterizer private resetTextures(): void { - for(const texture of this._textures.values()) + for (const texture of this._textures.values()) { - if(!texture) continue; + if (!texture) continue; texture.dispose(); } @@ -169,11 +168,11 @@ export class PlaneRasterizer implements IPlaneRasterizer protected addPlane(id: string, plane: Plane): boolean { - if(!plane) return false; + if (!plane) return false; const existing = this._planes.get(id); - if(!existing) + if (!existing) { this._planes.set(id, plane); @@ -185,7 +184,7 @@ export class PlaneRasterizer implements IPlaneRasterizer public initializeAssetCollection(collection: IGraphicAssetCollection): void { - if(!this._data) return; + if (!this._data) return; this._assetCollection = collection; @@ -194,7 +193,7 @@ export class PlaneRasterizer implements IPlaneRasterizer private initializeAll(): void { - if(!this._data) return; + if (!this._data) return; this.initializeTexturesAndMaterials(); @@ -203,9 +202,9 @@ export class PlaneRasterizer implements IPlaneRasterizer private initializeTexturesAndMaterials(): void { - if(this._data.textures && this._data.textures.length) this.parseTextures(this._data.textures, this.assetCollection); + if (this._data.textures && this._data.textures.length) this.parseTextures(this._data.textures, this.assetCollection); - if(this._data.materials && this._data.materials.length) this.parsePlaneMaterials(this._data.materials); + if (this._data.materials && this._data.materials.length) this.parsePlaneMaterials(this._data.materials); } protected initializePlanes(): void @@ -214,25 +213,25 @@ export class PlaneRasterizer implements IPlaneRasterizer private parseTextures(textures: any, collection: IGraphicAssetCollection): void { - if(!textures || !collection) return; + if (!textures || !collection) return; - if(textures.length) + if (textures.length) { - for(const texture of textures) + for (const texture of textures) { - if(!texture) continue; + if (!texture) continue; const id = texture.id; - if(!this._textures.get(id)) + if (!this._textures.get(id)) { const plane = new PlaneTexture(); - if(texture.bitmaps && texture.bitmaps.length) + if (texture.bitmaps && texture.bitmaps.length) { - for(const bitmap of texture.bitmaps) + for (const bitmap of texture.bitmaps) { - if(!bitmap) continue; + if (!bitmap) continue; const assetName = bitmap.assetName; @@ -241,22 +240,22 @@ export class PlaneRasterizer implements IPlaneRasterizer let normalMinY = PlaneTexture.MIN_NORMAL_COORDINATE_VALUE; let normalMaxY = PlaneTexture.MAX_NORMAL_COORDINATE_VALUE; - if(bitmap.normalMinX !== undefined) normalMinX = bitmap.normalMinX; - if(bitmap.normalMaxX !== undefined) normalMaxX = bitmap.normalMaxX; - if(bitmap.normalMinY !== undefined) normalMinY = bitmap.normalMinY; - if(bitmap.normalMaxY !== undefined) normalMaxY = bitmap.normalMaxY; + if (bitmap.normalMinX !== undefined) normalMinX = bitmap.normalMinX; + if (bitmap.normalMaxX !== undefined) normalMaxX = bitmap.normalMaxX; + if (bitmap.normalMinY !== undefined) normalMinY = bitmap.normalMinY; + if (bitmap.normalMaxY !== undefined) normalMaxY = bitmap.normalMaxY; const asset = collection.getAsset(assetName); - if(asset) + if (asset) { const texture = asset.texture; - if(texture) + if (texture) { let newTexture: Texture = texture; - if(asset.flipH) + if (asset.flipH) { newTexture = Rasterizer.getFlipHBitmapData(texture); } @@ -275,20 +274,20 @@ export class PlaneRasterizer implements IPlaneRasterizer private parsePlaneMaterials(materials: any): void { - if(!materials || !materials.length) return; + if (!materials || !materials.length) return; - for(const material of materials) + for (const material of materials) { - if(!material) continue; + if (!material) continue; const id = material.id; const newMaterial = new PlaneMaterial(); - if(material.matrices && material.matrices.length) + if (material.matrices && material.matrices.length) { - for(const matrix of material.matrices) + for (const matrix of material.matrices) { - if(!matrix) continue; + if (!matrix) continue; let repeatMode = matrix.repeatMode; let align = matrix.align; @@ -297,7 +296,7 @@ export class PlaneRasterizer implements IPlaneRasterizer const normalMinY = PlaneMaterialCellMatrix.MIN_NORMAL_COORDINATE_VALUE; const normalMaxY = PlaneMaterialCellMatrix.MAX_NORMAL_COORDINATE_VALUE; - switch(repeatMode) + switch (repeatMode) { case 'borders': repeatMode = PlaneMaterialCellMatrix.REPEAT_MODE_BORDERS; @@ -319,7 +318,7 @@ export class PlaneRasterizer implements IPlaneRasterizer break; } - switch(align) + switch (align) { case 'top': align = PlaneMaterialCellMatrix.ALIGN_TOP; @@ -332,17 +331,17 @@ export class PlaneRasterizer implements IPlaneRasterizer break; } - if(matrix.columns && matrix.columns.length) + if (matrix.columns && matrix.columns.length) { const cellMatrix = newMaterial.addMaterialCellMatrix(matrix.columns.length, repeatMode, align, normalMinX, normalMaxX, normalMinY, normalMaxY); let index = 0; - while(index < matrix.columns.length) + while (index < matrix.columns.length) { const column = matrix.columns[index]; - if(column) this.parsePlaneMaterialCellColumn(column, cellMatrix, index); + if (column) this.parsePlaneMaterialCellColumn(column, cellMatrix, index); index++; } @@ -356,7 +355,7 @@ export class PlaneRasterizer implements IPlaneRasterizer private parsePlaneMaterialCellColumn(column: { repeatMode: string, width: number }, cellMatrix: PlaneMaterialCellMatrix, index: number): void { - if(!column || !cellMatrix) return; + if (!column || !cellMatrix) return; let repeatMode = PlaneMaterialCellColumn.REPEAT_MODE_ALL; @@ -364,7 +363,7 @@ export class PlaneRasterizer implements IPlaneRasterizer const cells = this.parsePlaneMaterialCells(column); - switch(column.repeatMode) + switch (column.repeatMode) { case 'borders': repeatMode = PlaneMaterialCellColumn.REPEAT_MODE_BORDERS; @@ -391,17 +390,17 @@ export class PlaneRasterizer implements IPlaneRasterizer private parsePlaneMaterialCells(column: any): PlaneMaterialCell[] { - if(!column || !column.cells || !column.cells.length) return null; + if (!column || !column.cells || !column.cells.length) return null; const cells: PlaneMaterialCell[] = []; let index = 0; - while(index < column.cells.length) + while (index < column.cells.length) { const cell = column.cells[index]; - if(cell) + if (cell) { const textureId = cell.textureId; @@ -410,15 +409,15 @@ export class PlaneRasterizer implements IPlaneRasterizer let graphics: IGraphicAsset[] = null; let limit = 0; - if(cell.extras && cell.extras.length) + if (cell.extras && cell.extras.length) { const extra = cell.extras[0]; const types = extra.types; const offsets = extra.offsets; - if(types && offsets) + if (types && offsets) { - if(types.length && offsets.length) + if (types.length && offsets.length) { const type = types[0]; const offset = offsets[0]; @@ -427,22 +426,22 @@ export class PlaneRasterizer implements IPlaneRasterizer offsetPoints = this.parseExtraItemOffsets(offset); limit = offsetPoints.length; - if(extra.limitMax) limit = extra.limitMax; + if (extra.limitMax) limit = extra.limitMax; } } } - if(assetNames && assetNames.length) + if (assetNames && assetNames.length) { graphics = []; - for(const assetName of assetNames) + for (const assetName of assetNames) { - if(!assetName) continue; + if (!assetName) continue; const asset = this._assetCollection.getAsset(assetName); - if(!asset) continue; + if (!asset) continue; graphics.push(asset); } @@ -457,7 +456,7 @@ export class PlaneRasterizer implements IPlaneRasterizer index++; } - if(!cells || !cells.length) return null; + if (!cells || !cells.length) return null; return cells; } @@ -466,17 +465,17 @@ export class PlaneRasterizer implements IPlaneRasterizer { const assetNames: string[] = []; - if(k && k.types && k.types.length) + if (k && k.types && k.types.length) { let index = 0; - while(index < k.types.length) + while (index < k.types.length) { const type = k.types[index]; const assetName = type.assetName; - if(assetName) assetNames.push(assetName); + if (assetName) assetNames.push(assetName); index++; } @@ -489,11 +488,11 @@ export class PlaneRasterizer implements IPlaneRasterizer { const offsets: Point[] = []; - if(k && k.offsets && k.offsets.length) + if (k && k.offsets && k.offsets.length) { let index = 0; - while(index < k.offsets.length) + while (index < k.offsets.length) { const offset = k.offsets[index]; @@ -512,16 +511,16 @@ export class PlaneRasterizer implements IPlaneRasterizer protected getGeometry(size: number, horizontalAngle: number, verticalAngle: number): IRoomGeometry { horizontalAngle = Math.abs(horizontalAngle); - if(horizontalAngle > 90) horizontalAngle = 90; + if (horizontalAngle > 90) horizontalAngle = 90; verticalAngle = Math.abs(verticalAngle); - if(verticalAngle > 90) verticalAngle = 90; + if (verticalAngle > 90) verticalAngle = 90; - const identifier = `${ size }_${ Math.round(horizontalAngle) }_${ Math.round(verticalAngle) }`; + const identifier = `${size}_${Math.round(horizontalAngle)}_${Math.round(verticalAngle)}`; let geometry = this._geometries.get(identifier); - if(geometry) return geometry; + if (geometry) return geometry; geometry = new RoomGeometry(size, new Vector3d(horizontalAngle, verticalAngle), new Vector3d(-10, 0, 0)); @@ -532,52 +531,52 @@ export class PlaneRasterizer implements IPlaneRasterizer protected parseVisualizations(plane: Plane, visualizations: any): void { - if(!plane || !visualizations) return; + if (!plane || !visualizations) return; - if(visualizations && visualizations.length) + if (visualizations && visualizations.length) { - for(const visualization of visualizations) + for (const visualization of visualizations) { - if(!visualization) continue; + if (!visualization) continue; const size = visualization.size; let horizontalAngle = FloorPlane.HORIZONTAL_ANGLE_DEFAULT; let verticalAngle = FloorPlane.VERTICAL_ANGLE_DEFAULT; - if(visualization.horizontalAngle) horizontalAngle = visualization.horizontalAngle; - if(visualization.verticalAngle) verticalAngle = visualization.verticalAngle; + if (visualization.horizontalAngle) horizontalAngle = visualization.horizontalAngle; + if (visualization.verticalAngle) verticalAngle = visualization.verticalAngle; const layers = visualization.layers; const planeVisualization = plane.createPlaneVisualization(size, ((layers && layers.length) || 0), this.getGeometry(size, horizontalAngle, verticalAngle)); - if(planeVisualization && (layers && layers.length)) + if (planeVisualization && (layers && layers.length)) { let layerId = 0; - while(layerId < layers.length) + while (layerId < layers.length) { const layer = layers[layerId]; - if(layer) + if (layer) { let material: PlaneMaterial = null; let align: number = PlaneVisualizationLayer.ALIGN_DEFAULT; let color: number = FloorPlane.DEFAULT_COLOR; let offset: number = PlaneVisualizationLayer.DEFAULT_OFFSET; - if(layer.materialId) material = this.getMaterial(layer.materialId); + if (layer.materialId) material = this.getMaterial(layer.materialId); - if(layer.color) color = layer.color; + if (layer.color) color = layer.color; - if(layer.offset) offset = layer.offset; + if (layer.offset) offset = layer.offset; - if(layer.align) + if (layer.align) { - if(layer.align === 'bottom') align = PlaneVisualizationLayer.ALIGN_BOTTOM; + if (layer.align === 'bottom') align = PlaneVisualizationLayer.ALIGN_BOTTOM; - else if(layer.align == 'top') align = PlaneVisualizationLayer.ALIGN_TOP; + else if (layer.align == 'top') align = PlaneVisualizationLayer.ALIGN_TOP; } planeVisualization.setLayer(layerId, material, color, align, offset); @@ -604,7 +603,7 @@ export class PlaneRasterizer implements IPlaneRasterizer { let planes = this.getPlane(id); - if(!planes) planes = this.getPlane(PlaneRasterizer.DEFAULT); + if (!planes) planes = this.getPlane(PlaneRasterizer.DEFAULT); return planes.getLayers(); } diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts index f586e475..cd56f61f 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts @@ -1,6 +1,6 @@ import { Graphics } from '@pixi/graphics'; +import { IGraphicAssetCollection } from '../../../../../../../api'; import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable'; -import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry'; import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { Vector3d } from '../../../../../../../room/utils/Vector3d'; @@ -26,11 +26,11 @@ export class PlaneVisualization this._isCached = false; this._hasAnimationLayers = false; - if(totalLayers < 0) totalLayers = 0; + if (totalLayers < 0) totalLayers = 0; let index = 0; - while(index < totalLayers) + while (index < totalLayers) { this._layers.push(null); @@ -50,11 +50,11 @@ export class PlaneVisualization public dispose(): void { - if(this._layers && this._layers.length) + if (this._layers && this._layers.length) { - for(const layer of this._layers) + for (const layer of this._layers) { - if(!layer) continue; + if (!layer) continue; layer.dispose(); } @@ -64,37 +64,37 @@ export class PlaneVisualization this._geometry = null; - if(this._cachedBitmapData) + if (this._cachedBitmapData) { this._cachedBitmapData.destroy(); this._cachedBitmapData = null; } - if(this._cachedBitmapNormal) this._cachedBitmapNormal = null; + if (this._cachedBitmapNormal) this._cachedBitmapNormal = null; } public clearCache(): void { - if(!this._isCached) return; + if (!this._isCached) return; - if(this._cachedBitmapData) + if (this._cachedBitmapData) { this._cachedBitmapData.destroy(); this._cachedBitmapData = null; } - if(this._cachedBitmapNormal) + if (this._cachedBitmapNormal) { this._cachedBitmapNormal.assign(new Vector3d()); } - if(this._layers && this._layers.length) + if (this._layers && this._layers.length) { - for(const layer of this._layers) + for (const layer of this._layers) { - if(!layer) continue; + if (!layer) continue; const planeLayer = layer as PlaneVisualizationLayer; @@ -107,11 +107,11 @@ export class PlaneVisualization public setLayer(layerId: number, material: PlaneMaterial, color: number, align: number, offset: number = 0): boolean { - if((layerId < 0) || (layerId > this._layers.length)) return false; + if ((layerId < 0) || (layerId > this._layers.length)) return false; let layer = this._layers[layerId]; - if(layer) layer.dispose(); + if (layer) layer.dispose(); layer = new PlaneVisualizationLayer(material, color, align, offset); @@ -122,11 +122,11 @@ export class PlaneVisualization public setAnimationLayer(layerId: number, animationItems: any, collection: IGraphicAssetCollection): boolean { - if((layerId < 0) || (layerId > this._layers.length)) return false; + if ((layerId < 0) || (layerId > this._layers.length)) return false; let layer = this._layers[layerId] as IDisposable; - if(layer) layer.dispose(); + if (layer) layer.dispose(); layer = new PlaneVisualizationAnimationLayer(animationItems, collection); @@ -143,19 +143,19 @@ export class PlaneVisualization public render(canvas: Graphics, width: number, height: number, normal: IVector3D, useTexture: boolean, offsetX: number = 0, offsetY: number = 0, maxX: number = 0, maxY: number = 0, dimensionX: number = 0, dimensionY: number = 0, timeSinceStartMs: number = 0): Graphics { - if(width < 1) width = 1; + if (width < 1) width = 1; - if(height < 1) height = 1; + if (height < 1) height = 1; - if((!canvas || (canvas.width !== width)) || (canvas.height !== height)) canvas = null; + if ((!canvas || (canvas.width !== width)) || (canvas.height !== height)) canvas = null; - if(this._cachedBitmapData) + if (this._cachedBitmapData) { - if(((this._cachedBitmapData.width === width) && (this._cachedBitmapData.height === height)) && (Vector3d.isEqual(this._cachedBitmapNormal, normal))) + if (((this._cachedBitmapData.width === width) && (this._cachedBitmapData.height === height)) && (Vector3d.isEqual(this._cachedBitmapNormal, normal))) { - if(!this.hasAnimationLayers) + if (!this.hasAnimationLayers) { - if(canvas) + if (canvas) { canvas.addChild(this._cachedBitmapData); @@ -186,7 +186,7 @@ export class PlaneVisualization this._isCached = true; - if(!this._cachedBitmapData) + if (!this._cachedBitmapData) { this._cachedBitmapData = new Graphics() .beginFill(0xFFFFFF) @@ -201,29 +201,29 @@ export class PlaneVisualization .endFill(); } - if(!canvas) canvas = this._cachedBitmapData; + if (!canvas) canvas = this._cachedBitmapData; this._cachedBitmapNormal.assign(normal); - if(this._layers && this._layers.length) + if (this._layers && this._layers.length) { - for(const layer of this._layers) + for (const layer of this._layers) { - if(!layer) continue; + if (!layer) continue; - if(layer instanceof PlaneVisualizationLayer) + if (layer instanceof PlaneVisualizationLayer) { layer.render(canvas, width, height, normal, useTexture, offsetX, offsetY); } - else if(layer instanceof PlaneVisualizationAnimationLayer) + else if (layer instanceof PlaneVisualizationAnimationLayer) { layer.render(canvas, width, height, normal, offsetX, offsetY, maxX, maxY, dimensionX, dimensionY, timeSinceStartMs); } } } - if(canvas && (canvas !== this._cachedBitmapData)) + if (canvas && (canvas !== this._cachedBitmapData)) { this._cachedBitmapData.addChild(canvas.clone()); // const texture = TextureUtils.generateTexture(canvas, new Rectangle(0, 0, canvas.width, canvas.height)); diff --git a/src/nitro/session/badge/BadgeImageManager.ts b/src/nitro/session/badge/BadgeImageManager.ts index a2863215..7f142e29 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -1,7 +1,7 @@ import { Resource, Texture } from '@pixi/core'; -import { NitroContainer, NitroTexture } from '../../..'; -import { IAssetManager } from '../../../core/asset/IAssetManager'; +import { IAssetManager } from '../../../api'; import { IMessageEvent } from '../../../core/communication/messages/IMessageEvent'; +import { NitroContainer, NitroTexture } from '../../../core/utils'; import { NitroSprite } from '../../../core/utils/proxy/NitroSprite'; import { GroupBadgePartsEvent } from '../../communication/messages/incoming/group/GroupBadgePartsEvent'; import { Nitro } from '../../Nitro'; @@ -48,21 +48,21 @@ export class BadgeImageManager implements IDisposable public init(): void { - if(this._sessionDataManager && this._sessionDataManager.communication) + if (this._sessionDataManager && this._sessionDataManager.communication) { this._messages = [ new GroupBadgePartsEvent(this.onGroupBadgePartsEvent.bind(this)) ]; - for(const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); + for (const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); } } public dispose(): void { - if(this._messages && this._messages.length) + if (this._messages && this._messages.length) { - for(const message of this._messages) this._sessionDataManager.communication.removeMessageEvent(message); + for (const message of this._messages) this._sessionDataManager.communication.removeMessageEvent(message); this._messages = null; } @@ -74,7 +74,7 @@ export class BadgeImageManager implements IDisposable { let badge = this.getBadgeTexture(badgeName, type); - if(!badge && load) badge = this.getBadgePlaceholder(); + if (!badge && load) badge = this.getBadgePlaceholder(); return badge; } @@ -88,7 +88,7 @@ export class BadgeImageManager implements IDisposable public loadBadgeImage(badgeName: string, type: string = BadgeImageManager.NORMAL_BADGE): string { - if(this._assets.getTexture(this.getBadgeUrl(badgeName, type))) return badgeName; + if (this._assets.getTexture(this.getBadgeUrl(badgeName, type))) return badgeName; this.getBadgeTexture(badgeName, type); @@ -99,38 +99,38 @@ export class BadgeImageManager implements IDisposable { const url = this.getBadgeUrl(badgeName, type); - if(!url || !url.length) return null; + if (!url || !url.length) return null; const existing = this._assets.getTexture(url); - if(existing) return existing.clone(); + if (existing) return existing.clone(); - if(type === BadgeImageManager.NORMAL_BADGE) + if (type === BadgeImageManager.NORMAL_BADGE) { - if(this._requestedBadges.get(badgeName)) return null; + if (this._requestedBadges.get(badgeName)) return null; this._requestedBadges.set(badgeName, true); this._assets.downloadAsset(url, (flag: boolean) => { - if(flag) + if (flag) { this._requestedBadges.delete(badgeName); const texture = this._assets.getTexture(url); - if(texture && this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(badgeName, texture.clone())); + if (texture && this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(badgeName, texture.clone())); } }); } - else if(type === BadgeImageManager.GROUP_BADGE) + else if (type === BadgeImageManager.GROUP_BADGE) { - if(this._groupBadgesQueue.get(badgeName)) return; + if (this._groupBadgesQueue.get(badgeName)) return; this._groupBadgesQueue.set(badgeName, true); - if(this._readyToGenerateGroupBadges) this.loadGroupBadge(badgeName); + if (this._readyToGenerateGroupBadges) this.loadGroupBadge(badgeName); } return null; @@ -141,7 +141,7 @@ export class BadgeImageManager implements IDisposable const url = (Nitro.instance.getConfiguration('images.url') + '/loading_icon.png'); const existing = this._assets.getTexture(url); - if(!existing) return null; + if (!existing) return null; return existing.clone(); } @@ -150,7 +150,7 @@ export class BadgeImageManager implements IDisposable { let url = null; - switch(type) + switch (type) { case BadgeImageManager.NORMAL_BADGE: url = (Nitro.instance.getConfiguration('badge.asset.url')).replace('%badgename%', badge); @@ -168,7 +168,7 @@ export class BadgeImageManager implements IDisposable const groupBadge = new GroupBadge(badgeCode); const partMatches = [...badgeCode.matchAll(/[b|s][0-9]{4,6}/g)]; - for(const partMatch of partMatches) + for (const partMatch of partMatches) { const partCode = partMatch[0]; const shortMethod = (partCode.length === 6); @@ -194,28 +194,28 @@ export class BadgeImageManager implements IDisposable container.addChild(tempSprite); - for(const part of groupBadge.parts) + for (const part of groupBadge.parts) { let isFirst = true; const partNames = ((part.type === 'b') ? this._groupBases.get(part.key) : this._groupSymbols.get(part.key)); - if(partNames) + if (partNames) { - for(const partName of partNames) + for (const partName of partNames) { - if(!partName || !partName.length) continue; + if (!partName || !partName.length) continue; const texture = this._assets.getTexture(`badgepart_${partName}`); - if(!texture) continue; + if (!texture) continue; const { x, y } = part.calculatePosition(texture); const sprite = new NitroSprite(texture); sprite.position.set(x, y); - if(isFirst) sprite.tint = parseInt(this._groupPartColors.get(part.color), 16); + if (isFirst) sprite.tint = parseInt(this._groupPartColors.get(part.color), 16); isFirst = false; @@ -230,16 +230,16 @@ export class BadgeImageManager implements IDisposable const texture = TextureUtils.generateTexture(container); this._assets.setTexture(groupBadge.code, texture); - if(this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(groupBadge.code, texture)); + if (this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(groupBadge.code, texture)); } private onGroupBadgePartsEvent(event: GroupBadgePartsEvent): void { - if(!event) return; + if (!event) return; const data = event.getParser(); - if(!data) return; + if (!data) return; data.bases.forEach((names, id) => this._groupBases.set(id, names.map(val => val.replace('.png', '').replace('.gif', '')))); @@ -248,7 +248,7 @@ export class BadgeImageManager implements IDisposable this._groupPartColors = data.partColors; this._readyToGenerateGroupBadges = true; - for(const badgeCode of this._groupBadgesQueue.keys()) this.loadGroupBadge(badgeCode); + for (const badgeCode of this._groupBadgesQueue.keys()) this.loadGroupBadge(badgeCode); } public get disposed(): boolean diff --git a/src/room/RoomManager.ts b/src/room/RoomManager.ts index bf6085b4..614f0fd8 100644 --- a/src/room/RoomManager.ts +++ b/src/room/RoomManager.ts @@ -1,3 +1,4 @@ +import { IGraphicAssetCollection } from '../api'; import { NitroManager } from '../core/common/NitroManager'; import { RoomContentLoader } from '../nitro/room/RoomContentLoader'; import { RoomContentLoadedEvent } from './events/RoomContentLoadedEvent'; @@ -10,7 +11,6 @@ import { IRoomObject } from './object/IRoomObject'; import { IRoomObjectController } from './object/IRoomObjectController'; import { IRoomObjectLogicFactory } from './object/logic/IRoomObjectLogicFactory'; import { IRoomObjectVisualizationFactory } from './object/visualization/IRoomObjectVisualizationFactory'; -import { IGraphicAssetCollection } from './object/visualization/utils/IGraphicAssetCollection'; import { RoomInstance } from './RoomInstance'; import { RoomObjectManager } from './RoomObjectManager'; @@ -66,15 +66,15 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst public onInit(): void { - if(this._state >= RoomManager.ROOM_MANAGER_INITIALIZING || !this._contentLoader) return; + if (this._state >= RoomManager.ROOM_MANAGER_INITIALIZING || !this._contentLoader) return; const mandatoryLibraries = RoomContentLoader.MANDATORY_LIBRARIES; - for(const library of mandatoryLibraries) + for (const library of mandatoryLibraries) { - if(!library) continue; + if (!library) continue; - if(this._initialLoadList.indexOf(library) === -1) + if (this._initialLoadList.indexOf(library) === -1) { this._contentLoader.downloadAsset(library, this.events); @@ -89,22 +89,22 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const existing = this._rooms.get(roomId); - if(!existing) return null; + if (!existing) return null; return existing; } public createRoomInstance(roomId: string): IRoomInstance { - if(this._rooms.get(roomId)) return null; + if (this._rooms.get(roomId)) return null; const instance = new RoomInstance(roomId, this); this._rooms.set(instance.id, instance); - if(this._updateCategories.length) + if (this._updateCategories.length) { - for(const category of this._updateCategories) + for (const category of this._updateCategories) { instance.addUpdateCategory(category); } @@ -117,7 +117,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const existing = this._rooms.get(roomId); - if(!existing) return false; + if (!existing) return false; this._rooms.delete(roomId); @@ -130,7 +130,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const instance = this.getRoomInstance(roomId); - if(!instance) return null; + if (!instance) return null; let visualization = type; let logic = type; @@ -138,11 +138,11 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst let asset: IGraphicAssetCollection = null; let isLoading = false; - if(this._contentLoader.isLoaderType(type)) + if (this._contentLoader.isLoaderType(type)) { asset = this._contentLoader.getCollection(type); - if(!asset) + if (!asset) { isLoading = true; @@ -151,7 +151,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst assetName = this._contentLoader.getPlaceholderName(type); asset = this._contentLoader.getCollection(assetName); - if(!asset) return null; + if (!asset) return null; } visualization = asset.data.visualizationType; @@ -160,13 +160,13 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst const object = (instance.createRoomObject(objectId, 1, type, category) as IRoomObjectController); - if(!object) return null; + if (!object) return null; - if(this._visualizationFactory) + if (this._visualizationFactory) { const visualizationInstance = this._visualizationFactory.getVisualization(visualization); - if(!visualizationInstance) + if (!visualizationInstance) { instance.removeRoomObject(objectId, category); @@ -177,7 +177,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst const visualizationData = this._visualizationFactory.getVisualizationData(assetName, visualization, ((asset && asset.data) || null)); - if(!visualizationData || !visualizationInstance.initialize(visualizationData)) + if (!visualizationData || !visualizationInstance.initialize(visualizationData)) { instance.removeRoomObject(objectId, category); @@ -187,19 +187,19 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst object.setVisualization(visualizationInstance); } - if(this._logicFactory) + if (this._logicFactory) { const logicInstance = this._logicFactory.getLogic(logic); object.setLogic(logicInstance); - if(logicInstance) + if (logicInstance) { logicInstance.initialize((asset && asset.data) || null); } } - if(!isLoading) object.isReady = true; + if (!isLoading) object.isReady = true; this._contentLoader.setRoomObjectRoomId(object, roomId); @@ -208,35 +208,35 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst private reinitializeRoomObjectsByType(type: string): void { - if(!type || !this._contentLoader || !this._visualizationFactory || !this._logicFactory) return; + if (!type || !this._contentLoader || !this._visualizationFactory || !this._logicFactory) return; const asset = this._contentLoader.getCollection(type); - if(!asset) return; + if (!asset) return; const visualization = asset.data.visualizationType; const logic = asset.data.logicType; const visualizationData = this._visualizationFactory.getVisualizationData(type, visualization, asset.data); - for(const room of this._rooms.values()) + for (const room of this._rooms.values()) { - if(!room) continue; + if (!room) continue; - for(const [ category, manager ] of room.managers.entries()) + for (const [category, manager] of room.managers.entries()) { - if(!manager) continue; + if (!manager) continue; - for(const object of manager.objects.getValues()) + for (const object of manager.objects.getValues()) { - if(!object || object.type !== type) continue; + if (!object || object.type !== type) continue; const visualizationInstance = this._visualizationFactory.getVisualization(visualization); - if(visualizationInstance) + if (visualizationInstance) { visualizationInstance.asset = asset; - if(!visualizationData || !visualizationInstance.initialize(visualizationData)) + if (!visualizationData || !visualizationInstance.initialize(visualizationData)) { manager.removeObject(object.id); } @@ -248,14 +248,14 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst object.setLogic(logicInstance); - if(logicInstance) + if (logicInstance) { logicInstance.initialize(asset.data); } object.isReady = true; - if(this._listener) this._listener.objectInitialized(room.id, object.id, category); + if (this._listener) this._listener.objectInitialized(room.id, object.id, category); } } else @@ -271,15 +271,15 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const index = this._updateCategories.indexOf(category); - if(index >= 0) return; + if (index >= 0) return; this._updateCategories.push(category); - if(!this._rooms.size) return; + if (!this._rooms.size) return; - for(const room of this._rooms.values()) + for (const room of this._rooms.values()) { - if(!room) continue; + if (!room) continue; room.addUpdateCategory(category); } @@ -289,15 +289,15 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const index = this._updateCategories.indexOf(category); - if(index === -1) return; + if (index === -1) return; this._updateCategories.splice(index, 1); - if(!this._rooms.size) return; + if (!this._rooms.size) return; - for(const room of this._rooms.values()) + for (const room of this._rooms.values()) { - if(!room) continue; + if (!room) continue; room.removeUpdateCategory(category); } @@ -305,63 +305,63 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst public setContentLoader(loader: RoomContentLoader): void { - if(this._contentLoader) this._contentLoader.dispose(); + if (this._contentLoader) this._contentLoader.dispose(); this._contentLoader = loader; } private processPendingContentTypes(time: number): void { - if(this._skipContentProcessing) + if (this._skipContentProcessing) { this._skipContentProcessing = false; return; } - while(this._pendingContentTypes.length) + while (this._pendingContentTypes.length) { const type = this._pendingContentTypes.shift(); const collection = this._contentLoader.getCollection(type); - if(!collection) + if (!collection) { - if(this._listener) + if (this._listener) { this._listener.initalizeTemporaryObjectsByType(type, false); } - this.logger.log(`Invalid Collection: ${ type }`); + this.logger.log(`Invalid Collection: ${type}`); continue; } this.reinitializeRoomObjectsByType(type); - if(this._listener) this._listener.initalizeTemporaryObjectsByType(type, true); + if (this._listener) this._listener.initalizeTemporaryObjectsByType(type, true); - if(this._initialLoadList.length > 0) this.removeFromInitialLoad(type); + if (this._initialLoadList.length > 0) this.removeFromInitialLoad(type); } } private removeFromInitialLoad(type: string): void { - if(!type || this._state === RoomManager.ROOM_MANAGER_ERROR) return; + if (!type || this._state === RoomManager.ROOM_MANAGER_ERROR) return; - if(!this._contentLoader) this._state = RoomManager.ROOM_MANAGER_ERROR; + if (!this._contentLoader) this._state = RoomManager.ROOM_MANAGER_ERROR; - if(this._contentLoader.getCollection(type)) + if (this._contentLoader.getCollection(type)) { const i = this._initialLoadList.indexOf(type); - if(i >= 0) this._initialLoadList.splice(i, 1); + if (i >= 0) this._initialLoadList.splice(i, 1); - if(!this._initialLoadList.length) + if (!this._initialLoadList.length) { this._state = RoomManager.ROOM_MANAGER_INITIALIZED; - if(this._listener) + if (this._listener) { this._listener.onRoomEngineInitalized(true); } @@ -371,17 +371,17 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { this._state = RoomManager.ROOM_MANAGER_ERROR; - if(this._listener) this._listener.onRoomEngineInitalized(false); + if (this._listener) this._listener.onRoomEngineInitalized(false); } } private onRoomContentLoadedEvent(event: RoomContentLoadedEvent): void { - if(!this._contentLoader) return; + if (!this._contentLoader) return; const contentType = event.contentType; - if(this._pendingContentTypes.indexOf(contentType) >= 0) return; + if (this._pendingContentTypes.indexOf(contentType) >= 0) return; this._pendingContentTypes.push(contentType); } @@ -390,9 +390,9 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { this.processPendingContentTypes(time); - if(!this._rooms.size) return; + if (!this._rooms.size) return; - for(const room of this._rooms.values()) room && room.update(time, update); + for (const room of this._rooms.values()) room && room.update(time, update); } public createRoomObjectManager(category: number): IRoomObjectManager diff --git a/src/room/object/visualization/IRoomObjectGraphicVisualization.ts b/src/room/object/visualization/IRoomObjectGraphicVisualization.ts index ffef37c6..58a37fc0 100644 --- a/src/room/object/visualization/IRoomObjectGraphicVisualization.ts +++ b/src/room/object/visualization/IRoomObjectGraphicVisualization.ts @@ -1,7 +1,7 @@ +import { IGraphicAssetCollection } from '../../../api'; import { IRoomObjectVisualization } from './IRoomObjectVisualization'; -import { IGraphicAssetCollection } from './utils/IGraphicAssetCollection'; export interface IRoomObjectGraphicVisualization extends IRoomObjectVisualization { asset: IGraphicAssetCollection; -} \ No newline at end of file +} diff --git a/src/room/object/visualization/IRoomObjectVisualizationData.ts b/src/room/object/visualization/IRoomObjectVisualizationData.ts index 06704411..d442843b 100644 --- a/src/room/object/visualization/IRoomObjectVisualizationData.ts +++ b/src/room/object/visualization/IRoomObjectVisualizationData.ts @@ -1,7 +1,7 @@ -import { IAssetData } from '../../../core/asset/interfaces'; +import { IAssetData } from '../../../api'; export interface IObjectVisualizationData { initialize(asset: IAssetData): boolean; dispose(): void; -} \ No newline at end of file +} diff --git a/src/room/object/visualization/IRoomObjectVisualizationFactory.ts b/src/room/object/visualization/IRoomObjectVisualizationFactory.ts index 6c988221..a088e65a 100644 --- a/src/room/object/visualization/IRoomObjectVisualizationFactory.ts +++ b/src/room/object/visualization/IRoomObjectVisualizationFactory.ts @@ -1,4 +1,4 @@ -import { IAssetData } from '../../../core/asset/interfaces'; +import { IAssetData } from '../../../api'; import { IRoomObjectGraphicVisualization } from './IRoomObjectGraphicVisualization'; import { IObjectVisualizationData } from './IRoomObjectVisualizationData'; @@ -6,4 +6,4 @@ export interface IRoomObjectVisualizationFactory { getVisualization(type: string): IRoomObjectGraphicVisualization; getVisualizationData(type: string, visualization: string, asset: IAssetData): IObjectVisualizationData; -} \ No newline at end of file +} diff --git a/src/room/object/visualization/RoomObjectSpriteVisualization.ts b/src/room/object/visualization/RoomObjectSpriteVisualization.ts index 4227f2d1..e01eacbd 100644 --- a/src/room/object/visualization/RoomObjectSpriteVisualization.ts +++ b/src/room/object/visualization/RoomObjectSpriteVisualization.ts @@ -1,5 +1,6 @@ import { RenderTexture } from '@pixi/core'; import { Point, Rectangle } from '@pixi/math'; +import { IGraphicAssetCollection } from '../../../api'; import { NitroContainer, NitroSprite } from '../../../core'; import { RoomObjectSpriteData } from '../../data/RoomObjectSpriteData'; import { IRoomGeometry } from '../../utils/IRoomGeometry'; @@ -9,7 +10,6 @@ import { IRoomObjectSprite } from './IRoomObjectSprite'; import { IRoomObjectSpriteVisualization } from './IRoomObjectSpriteVisualization'; import { IObjectVisualizationData } from './IRoomObjectVisualizationData'; import { RoomObjectSprite } from './RoomObjectSprite'; -import { IGraphicAssetCollection } from './utils/IGraphicAssetCollection'; export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualization { @@ -57,13 +57,13 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza public dispose(): void { - if(this._sprites) + if (this._sprites) { - while(this._sprites.length) + while (this._sprites.length) { const sprite = (this._sprites[0] as RoomObjectSprite); - if(sprite) sprite.dispose(); + if (sprite) sprite.dispose(); this._sprites.pop(); } @@ -77,7 +77,7 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza public getSprite(index: number): IRoomObjectSprite { - if((index >= 0) && (index < this._sprites.length)) return this._sprites[index]; + if ((index >= 0) && (index < this._sprites.length)) return this._sprites[index]; return null; } @@ -96,7 +96,7 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza { const sprite = new RoomObjectSprite(); - if(index >= this._sprites.length) + if (index >= this._sprites.length) { this._sprites.push(sprite); } @@ -110,16 +110,16 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza protected createSprites(count: number): void { - while(this._sprites.length > count) + while (this._sprites.length > count) { const sprite = this._sprites[(this._sprites.length - 1)] as RoomObjectSprite; - if(sprite) sprite.dispose(); + if (sprite) sprite.dispose(); this._sprites.pop(); } - while(this._sprites.length < count) + while (this._sprites.length < count) { this._sprites.push(new RoomObjectSprite()); } @@ -134,18 +134,18 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza { const boundingRectangle = this.getBoundingRectangle(); - if((boundingRectangle.width * boundingRectangle.height) === 0) return null; + if ((boundingRectangle.width * boundingRectangle.height) === 0) return null; const spriteCount = this.totalSprites; const spriteList: IRoomObjectSprite[] = []; let index = 0; - while(index < spriteCount) + while (index < spriteCount) { const objectSprite = this.getSprite(index); - if(objectSprite && objectSprite.visible && objectSprite.texture) spriteList.push(objectSprite); + if (objectSprite && objectSprite.visible && objectSprite.texture) spriteList.push(objectSprite); index++; } @@ -159,12 +159,12 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza index = 0; - while(index < spriteList.length) + while (index < spriteList.length) { const objectSprite = spriteList[index]; const texture = objectSprite.texture; - if(texture) + if (texture) { const sprite = new NitroSprite(texture); @@ -175,9 +175,9 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza sprite.blendMode = objectSprite.blendMode; sprite.filters = objectSprite.filters; - if(objectSprite.flipH) sprite.scale.x = -1; + if (objectSprite.flipH) sprite.scale.x = -1; - if(objectSprite.flipV) sprite.scale.y = -1; + if (objectSprite.flipV) sprite.scale.y = -1; container.addChild(sprite); } @@ -187,7 +187,7 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza const texture = TextureUtils.generateTexture(container); - if(!texture) return null; + if (!texture) return null; return texture; } @@ -199,18 +199,18 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza let iterator = 0; - while(iterator < totalSprites) + while (iterator < totalSprites) { const sprite = this.getSprite(iterator); - if(sprite && sprite.texture && sprite.visible) + if (sprite && sprite.texture && sprite.visible) { const offsetX = ((sprite.flipH) ? (-(sprite.width) + sprite.offsetX) : sprite.offsetX); const offsetY = ((sprite.flipV) ? (-(sprite.height) + sprite.offsetY) : sprite.offsetY); const point = new Point(offsetX, offsetY); - if(iterator === 0) + if (iterator === 0) { rectangle.x = point.x; rectangle.y = point.y; @@ -219,13 +219,13 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza } else { - if(point.x < rectangle.x) rectangle.x = point.x; + if (point.x < rectangle.x) rectangle.x = point.x; - if(point.y < rectangle.y) rectangle.y = point.y; + if (point.y < rectangle.y) rectangle.y = point.y; - if((point.x + sprite.width) > rectangle.right) rectangle.width = ((point.x + sprite.width) - rectangle.x); + if ((point.x + sprite.width) > rectangle.right) rectangle.width = ((point.x + sprite.width) - rectangle.x); - if((point.y + sprite.height) > rectangle.bottom) rectangle.height = ((point.y + sprite.height) - rectangle.y); + if ((point.y + sprite.height) > rectangle.bottom) rectangle.height = ((point.y + sprite.height) - rectangle.y); } } @@ -257,11 +257,11 @@ export class RoomObjectSpriteVisualization implements IRoomObjectSpriteVisualiza public set asset(asset: IGraphicAssetCollection) { - if(this._asset) this._asset.removeReference(); + if (this._asset) this._asset.removeReference(); this._asset = asset; - if(this._asset) this._asset.addReference(); + if (this._asset) this._asset.addReference(); } public get sprites(): IRoomObjectSprite[] diff --git a/src/room/object/visualization/utils/GraphicAsset.ts b/src/room/object/visualization/utils/GraphicAsset.ts index 7b717978..f4251a06 100644 --- a/src/room/object/visualization/utils/GraphicAsset.ts +++ b/src/room/object/visualization/utils/GraphicAsset.ts @@ -1,6 +1,6 @@ import { Resource, Texture } from '@pixi/core'; import { Rectangle } from '@pixi/math'; -import { IGraphicAsset } from './IGraphicAsset'; +import { IGraphicAsset } from '../../../../api'; export class GraphicAsset implements IGraphicAsset { @@ -26,7 +26,7 @@ export class GraphicAsset implements IGraphicAsset graphicAsset._name = name; graphicAsset._source = source || null; - if(texture) + if (texture) { graphicAsset._texture = texture; graphicAsset._initialized = false; @@ -56,7 +56,7 @@ export class GraphicAsset implements IGraphicAsset private initialize(): void { - if(this._initialized || !this._texture) return; + if (this._initialized || !this._texture) return; this._width = this._texture.width; this._height = this._texture.height; @@ -110,14 +110,14 @@ export class GraphicAsset implements IGraphicAsset public get offsetX(): number { - if(!this._flipH) return this._x; + if (!this._flipH) return this._x; return (-(this._x)); } public get offsetY(): number { - if(!this._flipV) return this._y; + if (!this._flipV) return this._y; return (-(this._y)); } @@ -134,7 +134,7 @@ export class GraphicAsset implements IGraphicAsset public get rectangle(): Rectangle { - if(!this._rectangle) this._rectangle = new Rectangle(0, 0, this.width, this.height); + if (!this._rectangle) this._rectangle = new Rectangle(0, 0, this.width, this.height); return this._rectangle; } diff --git a/src/room/object/visualization/utils/GraphicAssetCollection.ts b/src/room/object/visualization/utils/GraphicAssetCollection.ts index bdea02f0..e36c220c 100644 --- a/src/room/object/visualization/utils/GraphicAssetCollection.ts +++ b/src/room/object/visualization/utils/GraphicAssetCollection.ts @@ -1,13 +1,11 @@ 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 { AssetManager } from '../../../../core/asset/AssetManager'; -import { IAsset, IAssetData, IAssetPalette } from '../../../../core/asset/interfaces'; import { Nitro } from '../../../../nitro/Nitro'; import { GraphicAsset } from './GraphicAsset'; import { GraphicAssetPalette } from './GraphicAssetPalette'; -import { IGraphicAsset } from './IGraphicAsset'; -import { IGraphicAssetCollection } from './IGraphicAssetCollection'; export class GraphicAssetCollection implements IGraphicAssetCollection { @@ -26,7 +24,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); @@ -36,30 +34,30 @@ 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); } 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(); } @@ -75,7 +73,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { this._referenceCount--; - if(this._referenceCount <= 0) + if (this._referenceCount <= 0) { this._referenceCount = 0; this._referenceTimestamp = Nitro.instance.time; @@ -89,20 +87,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); @@ -111,23 +109,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); } @@ -137,28 +135,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)); } @@ -166,7 +164,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); @@ -179,7 +177,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const existing = this._assets.get(name); - if(existing) + if (existing) { this._assets.delete(name); @@ -191,11 +189,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; } @@ -206,19 +204,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); @@ -246,36 +244,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; @@ -293,13 +291,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); @@ -311,26 +309,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(AssetManager.removeFileExtension(name), texture); } @@ -338,11 +336,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/room/object/visualization/utils/index.ts b/src/room/object/visualization/utils/index.ts index 835203ad..fe1e704f 100644 --- a/src/room/object/visualization/utils/index.ts +++ b/src/room/object/visualization/utils/index.ts @@ -1,6 +1,4 @@ export * from './GraphicAsset'; +/* export * from './GraphicAssetCollection'; */ export * from './GraphicAssetGifCollection'; -//export * from './GraphicAssetCollection'; export * from './GraphicAssetPalette'; -export * from './IGraphicAsset'; -export * from './IGraphicAssetCollection';