nitro/nitro-renderer
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-renderer.git synced 2024-11-27 01:40:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaned RoomInstanceData

Browse Source
This commit is contained in:
Dank074 2021-06-12 17:07:07 -05:00
parent aaf9e858ba
commit 33b7c61841
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -902,7 +902,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
this._roomManager.update(time, update); this._roomManager.update(time, update);
this._Str_22919(time); this.updateRoomCameras(time);
if(this._mouseCursorUpdate) this.setPointer(); if(this._mouseCursorUpdate) this.setPointer();
@ -915,7 +915,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
const instanceData = this.getRoomInstanceData(this._activeRoomId); const instanceData = this.getRoomInstanceData(this._activeRoomId);
if(instanceData && instanceData._Str_22598()) if(instanceData && instanceData.hasButtonMouseCursorOwners())
{ {
document.body.style.cursor = 'pointer'; document.body.style.cursor = 'pointer';
} }
@ -1143,17 +1143,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
camera.targetId = objectId; camera.targetId = objectId;
camera.targetCategory = RoomObjectCategory.UNIT; camera.targetCategory = RoomObjectCategory.UNIT;
camera.activateFollowing(this._Str_19549); camera.activateFollowing(this.cameraFollowDuration);
} }
} }
private get _Str_19549(): number private get cameraFollowDuration(): number
{ {
return 1000; return 1000;
//return (getBoolean("room.camera.follow_user")) ? 1000 : 0; //return (getBoolean("room.camera.follow_user")) ? 1000 : 0;
} }
private _Str_22919(time: number): void private updateRoomCameras(time: number): void
{ {
for(const instanceData of this._roomInstanceDatas.values()) for(const instanceData of this._roomInstanceDatas.values())
{ {
@ -1169,7 +1169,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if((instanceData.roomId !== this._activeRoomId) || !this._activeRoomIsDragged) if((instanceData.roomId !== this._activeRoomId) || !this._activeRoomIsDragged)
{ {
this._Str_25242(instanceData.roomId, 1, object.getLocation(), time); this.updateRoomCamera(instanceData.roomId, 1, object.getLocation(), time);
} }
} }
@ -1188,7 +1188,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
} }
} }
private _Str_25242(roomId: number, canvasId: number, objectLocation: IVector3D, time: number): void private updateRoomCamera(roomId: number, canvasId: number, objectLocation: IVector3D, time: number): void
{ {
const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId);
const instanceData = this.getRoomInstanceData(roomId); const instanceData = this.getRoomInstanceData(roomId);
@ -1201,7 +1201,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(!roomGeometry || !roomCamera || !roomInstance) return; if(!roomGeometry || !roomCamera || !roomInstance) return;
const canvasRectangle = this._Str_25261(roomId, canvasId); const canvasRectangle = this.getRoomCanvasRectangle(roomId, canvasId);
if(!canvasRectangle) return; if(!canvasRectangle) return;
@ -1475,7 +1475,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
} }
} }
private _Str_25261(roomId: number, canvasId: number): Rectangle private getRoomCanvasRectangle(roomId: number, canvasId: number): Rectangle
{ {
const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId);
@ -2615,7 +2615,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(instanceData) if(instanceData)
{ {
if(instanceData._Str_16810((category + '_' + objectId))) this._mouseCursorUpdate = true; if(instanceData.addButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true;
} }
} }
} }
@ -2628,7 +2628,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
if(instanceData) if(instanceData)
{ {
if(instanceData._Str_11959((category + '_' + objectId))) this._mouseCursorUpdate = true; if(instanceData.removeButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true;
} }
} }

4
src/nitro/room/object/visualization/furniture/FurnitureExternalImageVisualization.ts
View File

@ -32,14 +32,14 @@ export class FurnitureExternalImageVisualization extends FurnitureDynamicThumbna
let url = (json.w || ''); let url = (json.w || '');
url = this._Str_18056(url); url = this.buildThumbnailUrl(url);
this._url = url; this._url = url;
return this._url; return this._url;
} }
private _Str_18056(url: string): string private buildThumbnailUrl(url: string): string
{ {
url = url.replace('.png', '_small.png'); url = url.replace('.png', '_small.png');

6
src/nitro/room/utils/RoomInstanceData.ts
View File

@ -160,7 +160,7 @@ export class RoomInstanceData
return this.getPendingFurnitureWall(keys.next().value as number); return this.getPendingFurnitureWall(keys.next().value as number);
} }
public _Str_16810(k: string): boolean public addButtonMouseCursorOwner(k: string): boolean
{ {
const _local_2 = this._mouseButtonCursorOwners.indexOf(k); const _local_2 = this._mouseButtonCursorOwners.indexOf(k);
@ -174,7 +174,7 @@ export class RoomInstanceData
return false; return false;
} }
public _Str_11959(k: string): boolean public removeButtonMouseCursorOwner(k: string): boolean
{ {
const _local_2 = this._mouseButtonCursorOwners.indexOf(k); const _local_2 = this._mouseButtonCursorOwners.indexOf(k);
@ -188,7 +188,7 @@ export class RoomInstanceData
return false; return false;
} }
public _Str_22598(): boolean public hasButtonMouseCursorOwners(): boolean
{ {
return this._mouseButtonCursorOwners.length > 0; return this._mouseButtonCursorOwners.length > 0;
} }