nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-10-23 03:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix floorplan to use bundled asset

Browse Source
This commit is contained in:
Bill 2022-03-15 04:15:17 -04:00
parent 77e0de6128
commit 60bd3f6794
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/ui-config.json.example
View File

@ -4,7 +4,6 @@
"camera.url": "https://camera.com", "camera.url": "https://camera.com",
"thumbnails.url": "https://camera.com/thumbnail/%thumbnail%.png", "thumbnails.url": "https://camera.com/thumbnail/%thumbnail%.png",
"url.prefix": "https://website.com", "url.prefix": "https://website.com",
"floorplan.tile.url": "${asset.url}/floorplan-editor/tiles.json",
"habbopages.url": "${url.prefix}/", "habbopages.url": "${url.prefix}/",
"group.homepage.url": "${url.prefix}/groups/%groupid%/id", "group.homepage.url": "${url.prefix}/groups/%groupid%/id",
"guide.help.alpha.groupid": 0, "guide.help.alpha.groupid": 0,

51
src/components/floorplan-editor/common/FloorplanEditor.ts
View File

@ -1,5 +1,5 @@
import { NitroPoint, NitroTilemap, PixiApplicationProxy, PixiInteractionEventProxy, POINT_STRUCT_SIZE } from '@nitrots/nitro-renderer'; import { IGraphicAssetCollection, NitroPoint, NitroTilemap, PixiApplicationProxy, PixiInteractionEventProxy, POINT_STRUCT_SIZE } from '@nitrots/nitro-renderer';
import { GetConfiguration } from '../../../api'; import { GetNitroCore } from '../../../api';
import { ActionSettings } from './ActionSettings'; import { ActionSettings } from './ActionSettings';
import { FloorAction, HEIGHT_SCHEME, MAX_NUM_TILE_PER_AXIS, TILE_SIZE } from './Constants'; import { FloorAction, HEIGHT_SCHEME, MAX_NUM_TILE_PER_AXIS, TILE_SIZE } from './Constants';
import { Tile } from './Tile'; import { Tile } from './Tile';
@ -7,7 +7,7 @@ import { getScreenPositionForTile, getTileFromScreenPosition } from './Utils';
export class FloorplanEditor extends PixiApplicationProxy export class FloorplanEditor extends PixiApplicationProxy
{ {
private static _instance: FloorplanEditor = new FloorplanEditor(); private static _INSTANCE: FloorplanEditor = null;
private static readonly TILE_BLOCKED = 'r_blocked'; private static readonly TILE_BLOCKED = 'r_blocked';
private static readonly TILE_DOOR = 'r_door'; private static readonly TILE_DOOR = 'r_door';
@ -22,7 +22,9 @@ export class FloorplanEditor extends PixiApplicationProxy
private _actionSettings: ActionSettings; private _actionSettings: ActionSettings;
private _isInitialized: boolean; private _isInitialized: boolean;
private constructor() private _assetCollection: IGraphicAssetCollection;
constructor()
{ {
const width = TILE_SIZE * MAX_NUM_TILE_PER_AXIS + 20; const width = TILE_SIZE * MAX_NUM_TILE_PER_AXIS + 20;
const height = (TILE_SIZE * MAX_NUM_TILE_PER_AXIS) / 2 + 100; const height = (TILE_SIZE * MAX_NUM_TILE_PER_AXIS) / 2 + 100;
@ -49,18 +51,20 @@ export class FloorplanEditor extends PixiApplicationProxy
public initialize(): void public initialize(): void
{ {
if(!this._isInitialized) if(this._isInitialized) return;
{
this.loader.add('tiles', GetConfiguration<string>('floorplan.tile.url'));
this.loader.load((_, resources) => const collection = GetNitroCore().asset.getCollection('floor_editor');
{
this._tilemapRenderer = new NitroTilemap(resources['tiles'].spritesheet.baseTexture); if(!collection) return;
this.registerEventListeners();
this.stage.addChild(this._tilemapRenderer); this._assetCollection = collection;
}); this._tilemapRenderer = new NitroTilemap(collection.baseTexture);
this._isInitialized = true;
} this.registerEventListeners();
this.stage.addChild(this._tilemapRenderer);
this._isInitialized = true;
} }
private registerEventListeners(): void private registerEventListeners(): void
@ -72,7 +76,7 @@ export class FloorplanEditor extends PixiApplicationProxy
this._tilemapRenderer.containsPoint = (position) => this._tilemapRenderer.containsPoint = (position) =>
{ {
this._tilemapRenderer.worldTransform.applyInverse(position, tempPoint); this._tilemapRenderer.worldTransform.applyInverse(position, tempPoint);
return this.tileHitDettection(tempPoint, false); return this.tileHitDetection(tempPoint, false);
}; };
this._tilemapRenderer.on('pointerup', () => this._tilemapRenderer.on('pointerup', () =>
@ -94,7 +98,7 @@ export class FloorplanEditor extends PixiApplicationProxy
const location = event.data.global; const location = event.data.global;
this.tileHitDettection(location, true); this.tileHitDetection(location, true);
}); });
this._tilemapRenderer.on('click', (event: PixiInteractionEventProxy) => this._tilemapRenderer.on('click', (event: PixiInteractionEventProxy) =>
@ -105,11 +109,11 @@ export class FloorplanEditor extends PixiApplicationProxy
if(pointerEvent.button === 2) return; if(pointerEvent.button === 2) return;
const location = event.data.global; const location = event.data.global;
this.tileHitDettection(location, true, true); this.tileHitDetection(location, true, true);
}); });
} }
private tileHitDettection(tempPoint: NitroPoint, setHolding: boolean, isClick: boolean = false): boolean private tileHitDetection(tempPoint: NitroPoint, setHolding: boolean, isClick: boolean = false): boolean
{ {
// @ts-ignore // @ts-ignore
const buffer = this._tilemapRenderer.pointsBuf; const buffer = this._tilemapRenderer.pointsBuf;
@ -241,7 +245,8 @@ export class FloorplanEditor extends PixiApplicationProxy
//if((tile.height === 'x') || tile.height === 'X') continue; //if((tile.height === 'x') || tile.height === 'X') continue;
const [positionX, positionY] = getScreenPositionForTile(x, y); const [positionX, positionY] = getScreenPositionForTile(x, y);
this._tilemapRenderer.tile(`${assetName}.png`, positionX, positionY);
this._tilemapRenderer.tile(this._assetCollection.getTexture(`floor_editor_${ assetName }`), positionX, positionY);
} }
} }
} }
@ -404,11 +409,11 @@ export class FloorplanEditor extends PixiApplicationProxy
public static get instance(): FloorplanEditor public static get instance(): FloorplanEditor
{ {
if(!FloorplanEditor._instance) if(!FloorplanEditor._INSTANCE)
{ {
FloorplanEditor._instance = new FloorplanEditor(); FloorplanEditor._INSTANCE = new FloorplanEditor();
} }
return FloorplanEditor._instance; return FloorplanEditor._INSTANCE;
} }
} }