From df3bd5bf52fdb04d7cb90cedf4679c368ca3d83c Mon Sep 17 00:00:00 2001 From: billsonnn Date: Wed, 20 Mar 2024 22:37:27 -0400 Subject: [PATCH] Continue refactor --- .../src/room/renderer/IRoomRenderingCanvas.ts | 4 +- packages/assets/src/GraphicAssetPalette.ts | 25 +++++---- .../camera/src/GetRoomCameraWidgetManager.ts | 5 ++ packages/camera/src/index.ts | 1 + .../configuration/src/ConfigurationManager.ts | 7 +-- packages/room/src/RoomEngine.ts | 52 +++++++++---------- packages/room/src/RoomManager.ts | 5 ++ packages/room/src/RoomObjectEventHandler.ts | 6 +-- packages/room/src/RoomPreviewer.ts | 4 +- packages/room/src/index.ts | 3 ++ .../avatar/AvatarVisualizationData.ts | 16 ++---- .../object/visualization/data/LayerData.ts | 2 + .../src/object/visualization/data/SizeData.ts | 2 +- .../FurnitureDynamicThumbnailVisualization.ts | 4 +- .../animated/LandscapeRasterizer.ts | 4 +- .../basic/PlaneMaterialCellMatrix.ts | 2 +- .../room/src/renderer/RoomSpriteCanvas.ts | 25 ++++----- .../room/src/renderer/utils/ExtendedSprite.ts | 6 +-- packages/session/src/SessionDataManager.ts | 1 + packages/sound/src/music/MusicController.ts | 7 +-- src/pixi-proxy/NitroAdjustmentFilter.ts | 4 ++ src/pixi-proxy/NitroTicker.ts | 3 ++ src/pixi-proxy/index.ts | 2 + 23 files changed, 101 insertions(+), 89 deletions(-) create mode 100644 packages/camera/src/GetRoomCameraWidgetManager.ts create mode 100644 src/pixi-proxy/NitroAdjustmentFilter.ts create mode 100644 src/pixi-proxy/NitroTicker.ts diff --git a/packages/api/src/room/renderer/IRoomRenderingCanvas.ts b/packages/api/src/room/renderer/IRoomRenderingCanvas.ts index 05f1864c..65a24b6d 100644 --- a/packages/api/src/room/renderer/IRoomRenderingCanvas.ts +++ b/packages/api/src/room/renderer/IRoomRenderingCanvas.ts @@ -1,4 +1,4 @@ -import { Container, Point, Sprite, Texture } from 'pixi.js'; +import { Container, Point, Texture } from 'pixi.js'; import { IRoomGeometry } from '../IRoomGeometry'; import { RoomObjectSpriteData } from '../RoomObjectSpriteData'; import { ISortableSprite } from '../object'; @@ -25,7 +25,7 @@ export interface IRoomRenderingCanvas moveDown(): void; id: number; geometry: IRoomGeometry; - master: Sprite; + master: Container; display: Container; screenOffsetX: number; screenOffsetY: number; diff --git a/packages/assets/src/GraphicAssetPalette.ts b/packages/assets/src/GraphicAssetPalette.ts index 3eefb90b..a0e84048 100644 --- a/packages/assets/src/GraphicAssetPalette.ts +++ b/packages/assets/src/GraphicAssetPalette.ts @@ -23,21 +23,26 @@ export class GraphicAssetPalette implements IGraphicAssetPalette const pixelOutput = TextureUtils.getPixels(texture); const pixels = pixelOutput?.pixels; - if(pixels) + if(!pixels) return texture; + + const canvas = document.createElement('canvas'); + const ctx = canvas.getContext('2d'); + const imageData = ctx.createImageData(texture.width, texture.height); + + for(let i = 0; i < pixels.length; i += 4) { - for(let i = 0; i < pixels.length; i += 4) - { - let paletteColor = this._palette[pixels[i + 1]]; + let paletteColor = this._palette[pixels[i + 1]]; - if(paletteColor === undefined) paletteColor = [0, 0, 0]; + if(paletteColor === undefined) paletteColor = [0, 0, 0]; - pixels[i] = paletteColor[0]; - pixels[i + 1] = paletteColor[1]; - pixels[i + 2] = paletteColor[2]; - } + imageData.data[i] = paletteColor[0]; + imageData.data[i + 1] = paletteColor[1]; + imageData.data[i + 2] = paletteColor[2]; } - return Texture.from(pixelOutput); + ctx.putImageData(imageData, 0, 0); + + return Texture.from(canvas); } public get primaryColor(): number diff --git a/packages/camera/src/GetRoomCameraWidgetManager.ts b/packages/camera/src/GetRoomCameraWidgetManager.ts new file mode 100644 index 00000000..0f6f44f0 --- /dev/null +++ b/packages/camera/src/GetRoomCameraWidgetManager.ts @@ -0,0 +1,5 @@ +import { RoomCameraWidgetManager } from './RoomCameraWidgetManager'; + +const roomCameraWidgetManager = new RoomCameraWidgetManager(); + +export const GetRoomCameraWidgetManager = () => roomCameraWidgetManager; diff --git a/packages/camera/src/index.ts b/packages/camera/src/index.ts index c79058c0..a2f30698 100644 --- a/packages/camera/src/index.ts +++ b/packages/camera/src/index.ts @@ -1,3 +1,4 @@ +export * from './GetRoomCameraWidgetManager'; export * from './RoomCameraWidgetEffect'; export * from './RoomCameraWidgetManager'; export * from './RoomCameraWidgetSelectedEffect'; diff --git a/packages/configuration/src/ConfigurationManager.ts b/packages/configuration/src/ConfigurationManager.ts index 575a1997..560ff9a1 100644 --- a/packages/configuration/src/ConfigurationManager.ts +++ b/packages/configuration/src/ConfigurationManager.ts @@ -1,4 +1,5 @@ -import { IConfigurationManager } from './IConfigurationManager'; +import { NitroLogger } from '@nitrots/utils'; +import { IConfigurationManager } from './IConfigurationManager'; export class ConfigurationManager implements IConfigurationManager { @@ -76,7 +77,7 @@ export class ConfigurationManager implements IConfigurationManager catch (e) { - console.error(e.stack); + NitroLogger.error(e.stack); return false; } @@ -116,7 +117,7 @@ export class ConfigurationManager implements IConfigurationManager this._missingKeys.push(key); - console.warn(`Missing configuration key: ${key}`); + NitroLogger.warn(`Missing configuration key: ${key}`); existing = value; } diff --git a/packages/room/src/RoomEngine.ts b/packages/room/src/RoomEngine.ts index 3a57027b..e560673f 100644 --- a/packages/room/src/RoomEngine.ts +++ b/packages/room/src/RoomEngine.ts @@ -40,7 +40,7 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService private _sessionDataManager: ISessionDataManager = GetSessionDataManager(); private _roomManager: IRoomManager = GetRoomManager(); - private _roomObjectEventHandler: RoomObjectEventHandler = new RoomObjectEventHandler(); + private _roomObjectEventHandler: RoomObjectEventHandler = new RoomObjectEventHandler(this); private _imageObjectIdBank: NumberBank = new NumberBank(1000); private _imageCallbacks: Map = new Map(); private _thumbnailObjectIdBank: NumberBank = new NumberBank(1000); @@ -345,11 +345,11 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService canvas.geometry.setDisplacement(vector, direction); - const displayObject = (canvas.master as Container); + const displayObject = canvas.master; if(displayObject) { - const overlay = new Sprite(Texture.EMPTY); + const overlay = new Container(); overlay.label = RoomEngine.OVERLAY; @@ -2474,21 +2474,21 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService this._roomObjectEventHandler.cancelRoomObjectInsert(this._activeRoomId); } - private addOverlayIconSprite(k: Sprite, _arg_2: string, _arg_3: Texture, scale: number = 1): Sprite + private addOverlayIconSprite(container: Container, label: string, texture: Texture, scale: number = 1): Sprite { - if(!k || !_arg_3) return; + if(!container || !texture) return; - let sprite = this.getOverlayIconSprite(k, _arg_2); + let sprite = this.getOverlayIconSprite(container, label); if(sprite) return null; - sprite = new Sprite(_arg_3); + sprite = new Sprite(texture); - sprite.label = _arg_2; + sprite.label = label; sprite.scale.set(scale); - k.addChild(sprite); + container.addChild(sprite); return sprite; } @@ -3006,37 +3006,37 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService if(!canvas) return; - const sprite = this.getRenderingCanvasOverlay(canvas); + const overlayContainer = this.getRenderingCanvasOverlay(canvas); - this.removeOverlayIconSprite(sprite, RoomEngine.OBJECT_ICON_SPRITE); + this.removeOverlayIconSprite(overlayContainer, RoomEngine.OBJECT_ICON_SPRITE); } - private getRenderingCanvasOverlay(k: IRoomRenderingCanvas): Sprite + private getRenderingCanvasOverlay(canvas: IRoomRenderingCanvas): Container { - if(!k) return null; + if(!canvas) return null; - const displayObject = (k.master as Container); + const displayObject = canvas.master; if(!displayObject) return null; - return ((displayObject.getChildByName(RoomEngine.OVERLAY) as Sprite) || null); + return displayObject.getChildByName(RoomEngine.OVERLAY) ?? null; } - private removeOverlayIconSprite(k: Sprite, _arg_2: string): boolean + private removeOverlayIconSprite(container: Container, label: string): boolean { - if(!k) return false; + if(!container) return false; - let index = (k.children.length - 1); + let index = (container.children.length - 1); while(index >= 0) { - const child = (k.getChildAt(index) as Sprite); + const child = (container.getChildAt(index) as Sprite); if(child) { - if(child.label === _arg_2) + if(child.label === label) { - k.removeChildAt(index); + container.removeChildAt(index); if(child.children.length) { @@ -3057,19 +3057,19 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService return false; } - private getOverlayIconSprite(k: Sprite, _arg_2: string): Sprite + private getOverlayIconSprite(container: Container, label: string): Sprite { - if(!k) return null; + if(!container) return null; - let index = (k.children.length - 1); + let index = (container.children.length - 1); while(index >= 0) { - const child = (k.getChildAt(index) as Sprite); + const child = (container.getChildAt(index) as Sprite); if(child) { - if(child.label === _arg_2) return child; + if(child.label === label) return child; } index--; diff --git a/packages/room/src/RoomManager.ts b/packages/room/src/RoomManager.ts index af6a8292..12435988 100644 --- a/packages/room/src/RoomManager.ts +++ b/packages/room/src/RoomManager.ts @@ -18,6 +18,11 @@ export class RoomManager implements IRoomManager, IRoomInstanceContainer private _pendingContentTypes: string[] = []; private _skipContentProcessing: boolean = false; + constructor() + { + this.onRoomContentLoadedEvent = this.onRoomContentLoadedEvent.bind(this); + } + public async init(listener: IRoomManagerListener): Promise { this._listener = listener; diff --git a/packages/room/src/RoomObjectEventHandler.ts b/packages/room/src/RoomObjectEventHandler.ts index d90e8df3..3a4c08b9 100644 --- a/packages/room/src/RoomObjectEventHandler.ts +++ b/packages/room/src/RoomObjectEventHandler.ts @@ -5,14 +5,11 @@ import { GetEventDispatcher, RoomEngineDimmerStateEvent, RoomEngineObjectEvent, import { GetRoomSessionManager, GetSessionDataManager } from '@nitrots/session'; import { CreateLinkEvent, NitroLogger, RoomId, Vector3d } from '@nitrots/utils'; import { RoomEnterEffect, RoomObjectUpdateMessage } from '../../room'; -import { GetRoomEngine } from './GetRoomEngine'; import { ObjectAvatarSelectedMessage, ObjectDataUpdateMessage, ObjectSelectedMessage, ObjectTileCursorUpdateMessage, ObjectVisibilityUpdateMessage } from './messages'; import { SelectedRoomObjectData } from './utils'; export class RoomObjectEventHandler implements IRoomCanvasMouseListener, IRoomObjectEventManager { - private _roomEngine: IRoomEngineServices = GetRoomEngine(); - private _eventIds: Map> = new Map(); private _selectedAvatarId: number = -1; @@ -21,7 +18,8 @@ export class RoomObjectEventHandler implements IRoomCanvasMouseListener, IRoomOb private _whereYouClickIsWhereYouGo: boolean = true; private _objectPlacementSource: string = null; - constructor() + constructor( + private readonly _roomEngine: IRoomEngineServices) { GetEventDispatcher().addEventListener(RoomEngineObjectEvent.ADDED, event => this.onRoomEngineObjectEvent(event)); } diff --git a/packages/room/src/RoomPreviewer.ts b/packages/room/src/RoomPreviewer.ts index 60677fed..95c4859c 100644 --- a/packages/room/src/RoomPreviewer.ts +++ b/packages/room/src/RoomPreviewer.ts @@ -491,8 +491,10 @@ export class RoomPreviewer return this._addViewOffset; } - public updatePreviewObjectBoundingRectangle(point: Point): void + public updatePreviewObjectBoundingRectangle(point: Point = null): void { + if(!point) point = new Point(0, 0); + const objectBounds = this._roomEngine.getRoomObjectBoundingRectangle(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory, RoomPreviewer.PREVIEW_CANVAS_ID); if(objectBounds && point) diff --git a/packages/room/src/index.ts b/packages/room/src/index.ts index 58285261..6bd68728 100644 --- a/packages/room/src/index.ts +++ b/packages/room/src/index.ts @@ -1,4 +1,7 @@ +export * from './GetRoomContentLoader'; export * from './GetRoomEngine'; +export * from './GetRoomManager'; +export * from './GetRoomMessageHandler'; export * from './GetRoomObjectLogicFactory'; export * from './GetRoomObjectVisualizationFactory'; export * from './ImageResult'; diff --git a/packages/room/src/object/visualization/avatar/AvatarVisualizationData.ts b/packages/room/src/object/visualization/avatar/AvatarVisualizationData.ts index 34048ea3..ec4b769b 100644 --- a/packages/room/src/object/visualization/avatar/AvatarVisualizationData.ts +++ b/packages/room/src/object/visualization/avatar/AvatarVisualizationData.ts @@ -1,37 +1,27 @@ -import { AvatarScaleType, IAssetData, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IObjectVisualizationData } from '@nitrots/api'; +import { AvatarScaleType, IAssetData, IAvatarEffectListener, IAvatarImage, IAvatarImageListener, IObjectVisualizationData } from '@nitrots/api'; import { GetAvatarRenderManager } from '@nitrots/avatar'; export class AvatarVisualizationData implements IObjectVisualizationData { - private _avatarRenderer: IAvatarRenderManager; - public initialize(asset: IAssetData): boolean { - this._avatarRenderer = GetAvatarRenderManager(); - return true; } public dispose(): void { - this._avatarRenderer = null; } public createAvatarImage(figure: string, size: number, gender: string = null, avatarListener: IAvatarImageListener = null, effectListener: IAvatarEffectListener = null): IAvatarImage { let avatarImage: IAvatarImage = null; - if(size > 48) avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.LARGE, gender, avatarListener, effectListener); - else avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.SMALL, gender, avatarListener, effectListener); + if(size > 48) avatarImage = GetAvatarRenderManager().createAvatarImage(figure, AvatarScaleType.LARGE, gender, avatarListener, effectListener); + else avatarImage = GetAvatarRenderManager().createAvatarImage(figure, AvatarScaleType.SMALL, gender, avatarListener, effectListener); return avatarImage; } - public get avatarManager(): IAvatarRenderManager - { - return this._avatarRenderer; - } - public get layerCount(): number { return 0; diff --git a/packages/room/src/object/visualization/data/LayerData.ts b/packages/room/src/object/visualization/data/LayerData.ts index a38dda0e..100591ed 100644 --- a/packages/room/src/object/visualization/data/LayerData.ts +++ b/packages/room/src/object/visualization/data/LayerData.ts @@ -24,6 +24,8 @@ export class LayerData { if(!layer) return; + console.log(layer.ink); + this._tag = layer.tag; this._ink = layer.ink; this._alpha = layer.alpha; diff --git a/packages/room/src/object/visualization/data/SizeData.ts b/packages/room/src/object/visualization/data/SizeData.ts index a5f2fd6b..cee85ef6 100644 --- a/packages/room/src/object/visualization/data/SizeData.ts +++ b/packages/room/src/object/visualization/data/SizeData.ts @@ -145,7 +145,7 @@ export class SizeData if(layerId < 0 || (layerId >= this._layerCount)) return false; // TODO: check the .nitro files for inks - if(layer.ink !== undefined) directionData.setLayerInk(layerId, (layer.ink as BLEND_MODES)); + if(layer.ink !== undefined) directionData.setLayerInk(layerId, (layer.ink?.toLowerCase() as BLEND_MODES)); if(layer.tag !== undefined) directionData.setLayerTag(layerId, layer.tag); diff --git a/packages/room/src/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts b/packages/room/src/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts index b724d66a..b6f45660 100644 --- a/packages/room/src/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts +++ b/packages/room/src/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts @@ -1,4 +1,4 @@ -import { SCALE_MODES, Texture } from 'pixi.js'; +import { Texture } from 'pixi.js'; import { IsometricImageFurniVisualization } from './IsometricImageFurniVisualization'; export class FurnitureDynamicThumbnailVisualization extends IsometricImageFurniVisualization @@ -34,7 +34,7 @@ export class FurnitureDynamicThumbnailVisualization extends IsometricImageFurniV { const texture = Texture.from(image); - texture.baseTexture.scaleMode = SCALE_MODES.LINEAR; + texture.source.scaleMode = 'linear'; this.setThumbnailImages(texture); }; diff --git a/packages/room/src/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts b/packages/room/src/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts index 5d82a38c..97610d54 100644 --- a/packages/room/src/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts +++ b/packages/room/src/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts @@ -1,7 +1,7 @@ import { IAssetPlane, IAssetPlaneVisualizationAnimatedLayer, IAssetPlaneVisualizationLayer, IVector3D } from '@nitrots/api'; import { GetConfiguration } from '@nitrots/configuration'; import { TextureUtils } from '@nitrots/utils'; -import { RenderTexture } from 'pixi.js'; +import { RenderTexture, Sprite } from 'pixi.js'; import { PlaneBitmapData, Randomizer } from '../../utils'; import { PlaneMaterial, PlaneRasterizer, PlaneVisualizationLayer } from '../basic'; import { LandscapePlane } from './LandscapePlane'; @@ -206,7 +206,7 @@ export class LandscapeRasterizer extends PlaneRasterizer if(graphic && (graphic !== canvas)) { - graphic = new RenderTexture(graphic.baseTexture); + graphic = TextureUtils.generateTexture(new Sprite(graphic.source)); if(!graphic) return null; } diff --git a/packages/room/src/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts b/packages/room/src/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts index 0b93d9b4..51c55af4 100644 --- a/packages/room/src/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts +++ b/packages/room/src/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts @@ -152,7 +152,7 @@ export class PlaneMaterialCellMatrix { if(this._cachedBitmapData) { - if(this._cachedBitmapData.baseTexture && (this._cachedBitmapData.width === width) && (this._cachedBitmapData.height === height) && Vector3d.isEqual(this._cachedBitmapNormal, normal)) + if(this._cachedBitmapData.source && (this._cachedBitmapData.width === width) && (this._cachedBitmapData.height === height) && Vector3d.isEqual(this._cachedBitmapNormal, normal)) { if(canvas) { diff --git a/packages/room/src/renderer/RoomSpriteCanvas.ts b/packages/room/src/renderer/RoomSpriteCanvas.ts index 2c75c2eb..8ead2a1b 100644 --- a/packages/room/src/renderer/RoomSpriteCanvas.ts +++ b/packages/room/src/renderer/RoomSpriteCanvas.ts @@ -2,7 +2,7 @@ import { IRoomCanvasMouseListener, IRoomGeometry, IRoomObject, IRoomObjectSprite import { GetConfiguration } from '@nitrots/configuration'; import { RoomSpriteMouseEvent } from '@nitrots/events'; import { GetTicker, TextureUtils, Vector3d } from '@nitrots/utils'; -import { Container, Graphics, Matrix, Point, Rectangle, Sprite, Texture } from 'pixi.js'; +import { Container, Graphics, Matrix, Point, Rectangle, Texture } from 'pixi.js'; import { RoomEnterEffect, RoomGeometry, RoomRotatingEffect, RoomShakingEffect } from '../utils'; import { RoomObjectCache, RoomObjectCacheItem } from './cache'; import { ExtendedSprite, ObjectMouseData, SortableSprite } from './utils'; @@ -18,7 +18,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private _totalTimeRunning: number; private _lastFrame: number; - private _master: Sprite; + private _master: Container; private _display: Container; private _mask: Graphics; @@ -115,10 +115,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private setupCanvas(): void { - if(!this._master) - { - this._master = new Sprite(); - } + if(!this._master) this._master = new Container(); if(!this._display) { @@ -206,9 +203,8 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas if(!this._mask) { this._mask = new Graphics() - .beginFill(0xFF0000) - .drawRect(0, 0, width, height) - .endFill(); + .rect(0, 0, width, height) + .fill(0xFF0000); if(this._master) { @@ -221,9 +217,8 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { this._mask .clear() - .beginFill(0xFF0000) - .drawRect(0, 0, width, height) - .endFill(); + .rect(0, 0, width, height) + .fill(0xFF0000); } } @@ -461,7 +456,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas if(!sprite || !sprite.visible) continue; const texture = sprite.texture; - const baseTexture = texture && texture.baseTexture; + const baseTexture = texture && texture.source; if(!texture || !baseTexture) continue; @@ -631,7 +626,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas if(this._spritePool.length > 0) extendedSprite = this._spritePool.pop(); - if(!extendedSprite) extendedSprite = new ExtendedSprite(); + if(!extendedSprite) extendedSprite = new ExtendedSprite({}); if(extendedSprite.children.length) extendedSprite.removeChildren(); @@ -1164,7 +1159,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas return this._geometry; } - public get master(): Sprite + public get master(): Container { return this._master; } diff --git a/packages/room/src/renderer/utils/ExtendedSprite.ts b/packages/room/src/renderer/utils/ExtendedSprite.ts index fc8d3fdb..9d09958d 100644 --- a/packages/room/src/renderer/utils/ExtendedSprite.ts +++ b/packages/room/src/renderer/utils/ExtendedSprite.ts @@ -1,6 +1,6 @@ import { AlphaTolerance } from '@nitrots/api'; import { TextureUtils } from '@nitrots/utils'; -import { Point, Sprite, Texture, TextureSource } from 'pixi.js'; +import { Point, Sprite, SpriteOptions, Texture, TextureSource } from 'pixi.js'; export class ExtendedSprite extends Sprite { @@ -14,9 +14,9 @@ export class ExtendedSprite extends Sprite private _updateId1: number = -1; private _updateId2: number = -1; - constructor(texture: Texture = null) + constructor(options?: SpriteOptions | Texture) { - super(texture); + super(options); this._offsetX = 0; this._offsetY = 0; diff --git a/packages/session/src/SessionDataManager.ts b/packages/session/src/SessionDataManager.ts index 81bca30e..ceba934c 100644 --- a/packages/session/src/SessionDataManager.ts +++ b/packages/session/src/SessionDataManager.ts @@ -56,6 +56,7 @@ export class SessionDataManager implements ISessionDataManager public async init(): Promise { + console.log('do this') await this._furnitureData.init(); await this._productData.init(); diff --git a/packages/sound/src/music/MusicController.ts b/packages/sound/src/music/MusicController.ts index ba8e8f35..8eedb4b7 100644 --- a/packages/sound/src/music/MusicController.ts +++ b/packages/sound/src/music/MusicController.ts @@ -1,4 +1,4 @@ -import { IAdvancedMap, IMessageEvent, IMusicController, IPlaylistController, ISongInfo } from '@nitrots/api'; +import { IAdvancedMap, IMusicController, IPlaylistController, ISongInfo } from '@nitrots/api'; import { GetCommunication, GetNowPlayingMessageComposer, GetSongInfoMessageComposer, GetUserSongDisksMessageComposer, TraxSongInfoMessageEvent, UserSongDisksInventoryMessageEvent } from '@nitrots/communication'; import { GetConfiguration } from '@nitrots/configuration'; import { GetEventDispatcher, NotifyPlayedSongEvent, NowPlayingEvent, RoomObjectSoundMachineEvent, SongDiskInventoryReceivedEvent, SongInfoReceivedEvent, SoundManagerEvent } from '@nitrots/events'; @@ -25,7 +25,6 @@ export class MusicController implements IMusicController private _songDiskInventory: IAdvancedMap = new AdvancedMap(); private _priorityPlaying: number = -1; private _requestNumberPlaying: number = -1; - private _messageEvents: IMessageEvent[]; private _roomItemPlaylist: IPlaylistController; private _musicPlayer: MusicPlayer; @@ -51,8 +50,6 @@ export class MusicController implements IMusicController this._timerInstance = window.setInterval(this.onTick.bind(this), 1000); this._musicPlayer = new MusicPlayer(GetConfiguration().getValue('external.samples.url')); - this._messageEvents.forEach(event => GetCommunication().registerMessageEvent(event)); - GetEventDispatcher().addEventListener(RoomObjectSoundMachineEvent.JUKEBOX_INIT, this.onJukeboxInit); GetEventDispatcher().addEventListener(RoomObjectSoundMachineEvent.JUKEBOX_DISPOSE, this.onJukeboxDispose); GetEventDispatcher().addEventListener(RoomObjectSoundMachineEvent.SOUND_MACHINE_INIT, this.onSoundMachineInit); @@ -159,8 +156,6 @@ export class MusicController implements IMusicController this._timerInstance = undefined; } - this._messageEvents.forEach(event => GetCommunication().removeMessageEvent(event)); - GetEventDispatcher().removeEventListener(RoomObjectSoundMachineEvent.JUKEBOX_INIT, this.onJukeboxInit); GetEventDispatcher().removeEventListener(RoomObjectSoundMachineEvent.JUKEBOX_DISPOSE, this.onJukeboxDispose); GetEventDispatcher().removeEventListener(RoomObjectSoundMachineEvent.SOUND_MACHINE_INIT, this.onSoundMachineInit); diff --git a/src/pixi-proxy/NitroAdjustmentFilter.ts b/src/pixi-proxy/NitroAdjustmentFilter.ts new file mode 100644 index 00000000..7818fa47 --- /dev/null +++ b/src/pixi-proxy/NitroAdjustmentFilter.ts @@ -0,0 +1,4 @@ +import { AdjustmentFilter } from 'pixi-filters'; + +export class NitroAdjustmentFilter extends AdjustmentFilter +{} diff --git a/src/pixi-proxy/NitroTicker.ts b/src/pixi-proxy/NitroTicker.ts new file mode 100644 index 00000000..0b35d6cf --- /dev/null +++ b/src/pixi-proxy/NitroTicker.ts @@ -0,0 +1,3 @@ +import { Ticker } from 'pixi.js'; + +export type NitroTicker = Ticker; diff --git a/src/pixi-proxy/index.ts b/src/pixi-proxy/index.ts index 7e99df75..1ff5b326 100644 --- a/src/pixi-proxy/index.ts +++ b/src/pixi-proxy/index.ts @@ -1,3 +1,4 @@ +export * from './NitroAdjustmentFilter'; export * from './NitroAlphaFilter'; export * from './NitroContainer'; export * from './NitroFilter'; @@ -5,3 +6,4 @@ export * from './NitroRectangle'; export * from './NitroRenderTexture'; export * from './NitroSprite'; export * from './NitroTexture'; +export * from './NitroTicker';