nitro/nitro-renderer
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-renderer.git synced 2025-02-17 02:22:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaned RoomEngine

Browse Source
This commit is contained in:
Dank074 2021-06-12 18:02:59 -05:00
parent 33b7c61841
commit 325482fe7e
7 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nitro/room/IRoomCreator.ts
View File

@ -51,7 +51,7 @@ export interface IRoomCreator
updateRoomObjectUserPosture(roomId: number, objectId: number, type: string, parameter?: string): boolean;
updateRoomObjectUserOwn(roomId: number, objectId: number): void;
getPetTypeId(figure: string): number;
_Str_17722(k: number, _arg_2: string): void;
refreshTileObjectMap(k: number, _arg_2: string): void;
setRoomEngineGameMode(roomId: number, isPlaying: boolean): void;
sessionDataManager: ISessionDataManager;
roomSessionManager: IRoomSessionManager;

40
src/nitro/room/RoomEngine.ts
View File

@ -1068,7 +1068,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
this.selectRoomObject(roomId, id, RoomObjectCategory.FLOOR);
}
if(object.isReady && data.synchronized) this._Str_21543(roomId, object);
if(object.isReady && data.synchronized) this.addObjectToTileMap(roomId, object);
return true;
}
@ -1398,7 +1398,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!roomCamera.location)
{
roomGeometry.location = _local_15;
if(this._Str_11555)
if(this.useOffsetScrolling)
{
roomCamera.initializeLocation(new Vector3d(0, 0, 0));
}
@ -1418,7 +1418,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
{
roomCamera.limitedLocationX = _local_34;
roomCamera.limitedLocationY = _local_35;
if(this._Str_11555)
if(this.useOffsetScrolling)
{
roomCamera.target = _local_46;
}
@ -1446,7 +1446,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!this._sessionDataManager.isCameraFollowDisabled)
{
if(this._Str_11555)
if(this.useOffsetScrolling)
{
roomCamera.update(time, 8);
}
@ -1456,7 +1456,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
}
}
if(this._Str_11555)
if(this.useOffsetScrolling)
{
renderingCanvas.screenOffsetX = -(roomCamera.location.x);
renderingCanvas.screenOffsetY = -(roomCamera.location.y);
@ -1845,7 +1845,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
this.removeRoomObject(roomId, objectId, RoomObjectCategory.FLOOR);
this.setMouseDefault(roomId, RoomObjectCategory.FLOOR, objectId);
if(_arg_4) this._Str_17722(roomId, 'RoomEngine.disposeObjectFurniture()');
if(_arg_4) this.refreshTileObjectMap(roomId, 'RoomEngine.disposeObjectFurniture()');
}
public getRoomObjectWall(roomId: number, objectId: number): IRoomObjectController
@ -2142,7 +2142,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if((Math.abs((_local_5 - _local_6)) < 0.1) && (Math.abs((_local_6 - _local_7)) < 0.1))
{
_local_5 = wallGeometry._Str_24141(location.x, location.y);
_local_5 = wallGeometry.getFloorAltitude(location.x, location.y);
}
return new Vector3d(location.x, location.y, _local_5);
@ -2327,7 +2327,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.CONTENT_UPDATED, id, objectId, category));
}
if(roomId !== RoomEngine.TEMPORARY_ROOM) this._Str_21543(id, object);
if(roomId !== RoomEngine.TEMPORARY_ROOM) this.addObjectToTileMap(id, object);
}
public changeObjectModelData(roomId: number, objectId: number, category: number, numberKey: string, numberValue: number): boolean
@ -2445,7 +2445,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!canvas) return;
const overlay = this.getRenderingCanvasOverlay(canvas);
const sprite = this._Str_16498(overlay, RoomEngine.OBJECT_ICON_SPRITE);
const sprite = this.getOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE);
if(sprite)
{
@ -2525,7 +2525,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(camera)
{
if(this._Str_11555)
if(this.useOffsetScrolling)
{
if(!camera.isMoving)
{
@ -2714,7 +2714,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
{
if(!this._roomObjectEventHandler) return;
this._roomObjectEventHandler._Str_17481(roomId, objectId, objectCategory);
this._roomObjectEventHandler.setSelectedObject(roomId, objectId, objectCategory);
}
public cancelRoomObjectInsert(): void
@ -2728,7 +2728,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
{
if(!k || !_arg_3) return;
let sprite = this._Str_16498(k, _arg_2);
let sprite = this.getOverlayIconSprite(k, _arg_2);
if(sprite) return null;
@ -3273,7 +3273,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!canvas) return;
const overlay = this.getRenderingCanvasOverlay(canvas);
const sprite = this._Str_16498(overlay, RoomEngine.OBJECT_ICON_SPRITE);
const sprite = this.getOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE);
if(sprite)
{
@ -3342,7 +3342,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
return false;
}
private _Str_16498(k: Sprite, _arg_2: string): Sprite
private getOverlayIconSprite(k: Sprite, _arg_2: string): Sprite
{
if(!k) return null;
@ -3363,7 +3363,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
return null;
}
public _Str_21072(k: number, _arg_2: number): IRoomObject[]
public getRoomObjects(k: number, _arg_2: number): IRoomObject[]
{
if(this._ready)
{
@ -3377,18 +3377,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
return [];
}
protected _Str_21543(k: number, _arg_2: IRoomObject): void
protected addObjectToTileMap(k: number, _arg_2: IRoomObject): void
{
const tileObjectMap = this.getRoomInstanceData(k).tileObjectMap;
if(tileObjectMap) tileObjectMap._Str_21192(_arg_2);
if(tileObjectMap) tileObjectMap.addRoomObject(_arg_2);
}
public _Str_17722(k: number, _arg_2: string): void
public refreshTileObjectMap(k: number, _arg_2: string): void
{
const tileObjectMap = this.getRoomInstanceData(k).tileObjectMap;
if(tileObjectMap) tileObjectMap.populate(this._Str_21072(k, RoomObjectCategory.FLOOR));
if(tileObjectMap) tileObjectMap.populate(this.getRoomObjects(k, RoomObjectCategory.FLOOR));
}
public getRenderRoomMessage(k: Rectangle, _arg_2: number, _arg_3: boolean = false, _arg_4: boolean = true, _arg_5: boolean = false, canvasId: number = -1): IMessageComposer<unknown[]>
@ -3624,7 +3624,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
return (session && session.isDecorating) || false;
}
private get _Str_11555(): boolean
private get useOffsetScrolling(): boolean
{
return true;
}

4
src/nitro/room/RoomMessageHandler.ts
View File

@ -383,7 +383,7 @@ export class RoomMessageHandler extends Disposable
heightMap.setIsRoomTile(parser.x, parser.y, parser.isRoomTile());
}
this._roomCreator._Str_17722(this._currentRoomId, 'RoomMessageHandler.onRoomHeightMapUpdateEvent()');
this._roomCreator.refreshTileObjectMap(this._currentRoomId, 'RoomMessageHandler.onRoomHeightMapUpdateEvent()');
}
private onRoomThicknessEvent(event: RoomThicknessEvent): void
@ -903,7 +903,7 @@ export class RoomMessageHandler extends Disposable
}
else
{
//location = wallGeometry._Str_24084(data.y, data.z, data.direction);
//location = wallGeometry.getLocationOldFormat(data.y, data.z, data.direction);
}
const direction = new Vector3d(wallGeometry.getDirection(data.direction));

32
src/nitro/room/RoomObjectEventHandler.ts
View File

@ -398,7 +398,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
didMove = true;
if(event.objectId !== -1) this._Str_17481(roomId, event.objectId, category);
if(event.objectId !== -1) this.setSelectedObject(roomId, event.objectId, category);
break;
case RoomObjectOperationType.OBJECT_PLACE:
@ -433,7 +433,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
}
else
{
this._Str_17481(roomId, event.objectId, category);
this.setSelectedObject(roomId, event.objectId, category);
didMove = false;
@ -518,11 +518,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
if((_local_15 !== event.eventId) && (_local_16 !== event.eventId) && !didMove)
{
this._Str_16209(roomId);
this.deselectObject(roomId);
if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, roomId, -1, RoomObjectCategory.MINIMUM));
this._Str_12227(roomId, 0, false);
this.setSelectedAvatar(roomId, 0, false);
}
}
}
@ -719,7 +719,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
return;
}
case RoomObjectMoveEvent.OBJECT_REMOVED:
this._Str_12227(roomId, 0, false);
this.setSelectedAvatar(roomId, 0, false);
return;
}
}
@ -1447,7 +1447,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
if(_local_8)
{
const _local_9 = _local_8._Str_19056(_local_4, _local_5);
const _local_9 = _local_8.getObjectIntTile(_local_4, _local_5);
const _local_10 = this._roomEngine.getFurnitureStackingHeightMap(roomId);
if(_local_10)
@ -1510,7 +1510,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
const wallGeometry = this._roomEngine.getLegacyWallGeometry(roomId);
if(wallGeometry) wallLocation = wallGeometry._Str_21860(location, direction);
if(wallGeometry) wallLocation = wallGeometry.getOldLocationString(location, direction);
}
direction = ((((direction / 45) % 8) + 8) % 8);
@ -1704,7 +1704,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
if(wallGeometry)
{
const location = wallGeometry._Str_21860(roomObject.getLocation(), angle);
const location = wallGeometry.getOldLocationString(roomObject.getLocation(), angle);
if(location) this._roomEngine.connection.send(new FurnitureWallUpdateComposer(objectId, location));
}
@ -1838,7 +1838,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
this._roomEngine.events.dispatchEvent(new RoomEngineObjectPlacedOnUserEvent(RoomEngineObjectEvent.PLACED_ON_USER, roomId, objectId, category, _local_4.id, _local_4.category));
}
public _Str_17481(roomId: number, objectId: number, category: number): void
public setSelectedObject(roomId: number, objectId: number, category: number): void
{
if(!this._roomEngine) return;
@ -1853,16 +1853,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
case RoomObjectCategory.WALL:
if(category === RoomObjectCategory.UNIT)
{
this._Str_16209(roomId);
this._Str_12227(roomId, objectId, true);
this.deselectObject(roomId);
this.setSelectedAvatar(roomId, objectId, true);
}
else
{
this._Str_12227(roomId, 0, false);
this.setSelectedAvatar(roomId, 0, false);
if(objectId !== this._selectedObjectId)
{
this._Str_16209(roomId);
this.deselectObject(roomId);
const _local_5 = this._roomEngine.getRoomObject(roomId, objectId, category);
@ -1882,7 +1882,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
}
}
private _Str_16209(k: number): void
private deselectObject(k: number): void
{
if(this._selectedObjectId === -1) return;
@ -1897,7 +1897,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
}
}
public _Str_12227(k: number, _arg_2: number, _arg_3: boolean): void
public setSelectedAvatar(k: number, _arg_2: number, _arg_3: boolean): void
{
if(!this._roomEngine) return;
@ -2041,7 +2041,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
private _Str_25586(roomObject: IRoomObjectController, x: number, y: number, wallGeometry: LegacyWallGeometry): boolean
{
if(!wallGeometry._Str_10375(x, y)) return false;
if(!wallGeometry.isRoomTile(x, y)) return false;
roomObject.setLocation(new Vector3d(x, y, wallGeometry.getHeight(x, y)));

14
src/nitro/room/utils/LegacyWallGeometry.ts
View File

@ -191,7 +191,7 @@ export class LegacyWallGeometry
return _local_11;
}
public _Str_24084(k: number, _arg_2: number, _arg_3: string):IVector3D
public getLocationOldFormat(k: number, _arg_2: number, _arg_3: string):IVector3D
{
let _local_4: number;
let _local_5: number;
@ -244,7 +244,7 @@ export class LegacyWallGeometry
return this.getLocation(_local_8, _local_9, _local_10, _local_11, _arg_3);
}
public _Str_22875(k:IVector3D, _arg_2: number): [ number, number, number, number, string ]
public getOldLocation(k:IVector3D, _arg_2: number): [ number, number, number, number, string ]
{
if(k == null)
{
@ -284,9 +284,9 @@ export class LegacyWallGeometry
return [_local_3, _local_4, _local_5, _local_6, _local_7];
}
public _Str_21860(k:IVector3D, _arg_2: number): string
public getOldLocationString(k:IVector3D, _arg_2: number): string
{
const _local_3 = this._Str_22875(k, _arg_2);
const _local_3 = this.getOldLocation(k, _arg_2);
if(_local_3 == null)
{
return null;
@ -309,7 +309,7 @@ export class LegacyWallGeometry
return 90;
}
public _Str_24141(k: number, _arg_2: number): number
public getFloorAltitude(k: number, _arg_2: number): number
{
const _local_3 = this.getHeight(k, _arg_2);
const _local_4 = (_local_3 + 1);
@ -317,8 +317,8 @@ export class LegacyWallGeometry
return _local_3 + (((((((((Math.trunc(this.getHeight((k - 1), (_arg_2 - 1))) == _local_4) || (Math.trunc(this.getHeight(k, (_arg_2 - 1))) == _local_4)) || (Math.trunc(this.getHeight((k + 1), (_arg_2 - 1))) == _local_4)) || (Math.trunc(this.getHeight((k - 1), _arg_2)) == _local_4)) || (Math.trunc(this.getHeight((k + 1), _arg_2)) == _local_4)) || (Math.trunc(this.getHeight((k - 1), (_arg_2 + 1))) == _local_4)) || (Math.trunc(this.getHeight(k, (_arg_2 + 1))) == _local_4)) || (Math.trunc(this.getHeight((k + 1), (_arg_2 + 1))) == _local_4)) ? 0.5 : 0);
}
public _Str_10375(k: number, _arg_2: number): boolean
public isRoomTile(k: number, _arg_2: number): boolean
{
return ((((k >= 0) && (k < this._width)) && (_arg_2 >= 0)) && (_arg_2 < this._height)) && (this._heightMap[_arg_2][k] >= 0);
}
}
}

2
src/nitro/room/utils/SpriteDataCollector.ts
View File

@ -138,7 +138,7 @@ export class SpriteDataCollector
const _local_5: Object[] = [];
let _local_6 = _arg_2.getSortableSpriteList();
const _local_7 = _arg_3._Str_21072(_arg_3.activeRoomId, RoomObjectCategory.UNIT);
const _local_7 = _arg_3.getRoomObjects(_arg_3.activeRoomId, RoomObjectCategory.UNIT);
for(const _local_8 of _local_7)
{

14
src/nitro/room/utils/TileObjectMap.ts
View File

@ -41,7 +41,7 @@ export class TileObjectMap
{
this.clear();
for(const _local_2 of k) this._Str_21192(_local_2);
for(const _local_2 of k) this.addRoomObject(_local_2);
}
public dispose(): void
@ -51,7 +51,7 @@ export class TileObjectMap
this._height = 0;
}
public _Str_19056(k: number, _arg_2: number): IRoomObject
public getObjectIntTile(k: number, _arg_2: number): IRoomObject
{
if((((k >= 0) && (k < this._width)) && (_arg_2 >= 0)) && (_arg_2 < this._height))
{
@ -63,7 +63,7 @@ export class TileObjectMap
return null;
}
public _Str_23932(k: number, _arg_2: number, _arg_3:IRoomObject): void
public setObjectInTile(k: number, _arg_2: number, _arg_3:IRoomObject): void
{
if(!_arg_3.isReady)
{
@ -80,7 +80,7 @@ export class TileObjectMap
}
}
public _Str_21192(k: IRoomObject): void
public addRoomObject(k: IRoomObject): void
{
if(!k || !k.model || !k.isReady) return;
@ -107,11 +107,11 @@ export class TileObjectMap
while(x < (location.x + sizeX))
{
const roomObject = this._Str_19056(x, y);
const roomObject = this.getObjectIntTile(x, y);
if((!(roomObject)) || ((!(roomObject === k)) && (roomObject.getLocation().z <= location.z)))
{
this._Str_23932(x, y, k);
this.setObjectInTile(x, y, k);
}
x++;
@ -120,4 +120,4 @@ export class TileObjectMap
y++;
}
}
}
}