diff --git a/packages/room/src/utils/SpriteDataCollector.ts b/packages/room/src/utils/SpriteDataCollector.ts index af8dbe6e..d29996fe 100644 --- a/packages/room/src/utils/SpriteDataCollector.ts +++ b/packages/room/src/utils/SpriteDataCollector.ts @@ -1,5 +1,5 @@ import { IPlaneDrawingData, IPlaneVisualization, IRoomObjectSpriteVisualization, IRoomPlane, IRoomRenderingCanvas, RoomObjectCategory, RoomObjectSpriteData } from '@nitrots/api'; -import { GetPixi, Vector3d } from '@nitrots/utils'; +import { GetStage, Vector3d } from '@nitrots/utils'; import { Point, Rectangle } from 'pixi.js'; import { RoomEngine } from '../RoomEngine'; import { PlaneDrawingData } from '../object'; @@ -389,7 +389,7 @@ export class SpriteDataCollector { const _local_8 = _arg_2.geometry; const _local_9 = this.sortRoomPlanes(visualization.planes, _arg_2, _arg_3); - const _local_10 = GetPixi().stage; + const _local_10 = GetStage(); for(const _local_11 of _local_9) { @@ -435,13 +435,13 @@ export class SpriteDataCollector { const _local_22 = SpriteDataCollector.sortQuadPoints(_local_15, _local_16, _local_17, _local_18); - for(const _local_23 of _local_12.getDrawingDatas(_local_8)) + /* for(const _local_23 of _local_12.getDrawingDatas(_local_8)) { _local_23.cornerPoints = _local_22; _local_23.z = _local_11.z; _local_5.push(_local_23); - } + } */ } } diff --git a/packages/utils/src/GetRenderer.ts b/packages/utils/src/GetRenderer.ts new file mode 100644 index 00000000..2b32287f --- /dev/null +++ b/packages/utils/src/GetRenderer.ts @@ -0,0 +1,12 @@ +import { AutoDetectOptions, Renderer, autoDetectRenderer } from 'pixi.js'; + +let renderer: Renderer = null; + +export const PrepareRenderer = async (options: Partial): Promise => +{ + renderer = await autoDetectRenderer(options); + + return renderer; +} + +export const GetRenderer = () => renderer; diff --git a/packages/utils/src/GetStage.ts b/packages/utils/src/GetStage.ts new file mode 100644 index 00000000..164f1a4f --- /dev/null +++ b/packages/utils/src/GetStage.ts @@ -0,0 +1,5 @@ +import { Container } from 'pixi.js'; + +const stage = new Container(); + +export const GetStage = () => stage; diff --git a/packages/utils/src/GetTicker.ts b/packages/utils/src/GetTicker.ts index 605dc00e..b2c9c780 100644 --- a/packages/utils/src/GetTicker.ts +++ b/packages/utils/src/GetTicker.ts @@ -1,3 +1,3 @@ -import { GetPixi } from './GetPixi'; +import { Ticker } from 'pixi.js'; -export const GetTicker = () => GetPixi().ticker; +export const GetTicker = () => Ticker.shared; diff --git a/packages/utils/src/TextureUtils.ts b/packages/utils/src/TextureUtils.ts index 4706e295..c58f6218 100644 --- a/packages/utils/src/TextureUtils.ts +++ b/packages/utils/src/TextureUtils.ts @@ -1,5 +1,5 @@ import { Container, ExtractImageOptions, ExtractOptions, ExtractSystem, GenerateTextureOptions, GetPixelsOutput, ICanvas, Matrix, RenderTexture, Renderer, Sprite, Texture } from 'pixi.js'; -import { GetPixi } from './GetPixi'; +import { GetRenderer } from './GetRenderer'; export class TextureUtils { @@ -125,7 +125,7 @@ export class TextureUtils public static getRenderer(): Renderer { - return GetPixi().renderer; + return GetRenderer(); } public static getExtractor(): ExtractSystem diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 96cd258c..b9854ee2 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -5,6 +5,8 @@ export * from './BinaryWriter'; export * from './ColorConverter'; export * from './FurniId'; export * from './GetPixi'; +export * from './GetRenderer'; +export * from './GetStage'; export * from './GetTicker'; export * from './GetTickerFPS'; export * from './GetTickerTime';