From 9f49c58dca97856209e39009ee90031973ab9f79 Mon Sep 17 00:00:00 2001 From: Dank074 Date: Mon, 7 Jun 2021 03:09:59 -0500 Subject: [PATCH] cleaned PlaneDrawingData --- .../visualization/room/PlaneDrawingData.ts | 16 ++++++++-------- .../room/object/visualization/room/RoomPlane.ts | 8 ++++---- .../rasterizer/basic/PlaneMaterialCellMatrix.ts | 2 +- .../object/visualization/IPlaneDrawingData.ts | 14 +++++++------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/nitro/room/object/visualization/room/PlaneDrawingData.ts b/src/nitro/room/object/visualization/room/PlaneDrawingData.ts index a5c48b29..244e7005 100644 --- a/src/nitro/room/object/visualization/room/PlaneDrawingData.ts +++ b/src/nitro/room/object/visualization/room/PlaneDrawingData.ts @@ -41,7 +41,7 @@ export class PlaneDrawingData implements IPlaneDrawingData this._maskAssetFlipVs.push(_arg_4); } - public _Str_22862(k: string[]): void + public addAssetColumn(k: string[]): void { this._assetNames.push(k); } @@ -71,33 +71,33 @@ export class PlaneDrawingData implements IPlaneDrawingData return this._color; } - public get _Str_21807(): string[] + public get maskAssetNames(): string[] { return this._maskAssetNames; } - public get _Str_20731(): Point[] + public get maskAssetLocations(): Point[] { return this._maskAssetLocations; } - public get _Str_21810(): boolean[] + public get maskAssetFlipHs(): boolean[] { return this._maskAssetFlipHs; } - public get _Str_19044(): boolean[] + public get maskAssetFlipVs(): boolean[] { return this._maskAssetFlipVs; } - public _Str_14945(): boolean + public isBottomAligned(): boolean { return this._alignBottom; } - public get _Str_17636(): string[][] + public get assetNameColumns(): string[][] { return this._assetNames; } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/room/RoomPlane.ts b/src/nitro/room/object/visualization/room/RoomPlane.ts index 47515c9c..5f1d324a 100644 --- a/src/nitro/room/object/visualization/room/RoomPlane.ts +++ b/src/nitro/room/object/visualization/room/RoomPlane.ts @@ -509,8 +509,8 @@ export class RoomPlane implements IRoomPlane { const normal = geometry.getCoordinatePosition(this._normal); const cm = layer.getMaterial()._Str_21968(normal); - //const data = new PlaneDrawingData(maskData, blend(this._color, layer.getColor()), cm._Str_14945()); - const data = new PlaneDrawingData(maskData, this._color, cm._Str_14945()); + //const data = new PlaneDrawingData(maskData, blend(this._color, layer.getColor()), cm.isBottomAligned()); + const data = new PlaneDrawingData(maskData, this._color, cm.isBottomAligned()); Randomizer.setSeed(this._randomSeed); @@ -529,11 +529,11 @@ export class RoomPlane implements IRoomPlane { if(!column._Str_24523()) assetNames.push(''); - data._Str_22862(assetNames); + data.addAssetColumn(assetNames); } } - if(data._Str_17636.length > 0) drawingDatas.push(data); + if(data.assetNameColumns.length > 0) drawingDatas.push(data); } else { diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts index 0ea62351..06dd7ed6 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts @@ -85,7 +85,7 @@ export class PlaneMaterialCellMatrix return this._normalMaxY; } - public _Str_14945(): boolean + public isBottomAligned(): boolean { return this._align === PlaneMaterialCellMatrix._Str_3606; } diff --git a/src/room/object/visualization/IPlaneDrawingData.ts b/src/room/object/visualization/IPlaneDrawingData.ts index c043e177..8a67219e 100644 --- a/src/room/object/visualization/IPlaneDrawingData.ts +++ b/src/room/object/visualization/IPlaneDrawingData.ts @@ -2,13 +2,13 @@ export interface IPlaneDrawingData { - _Str_14945(): boolean; + isBottomAligned(): boolean; z: number; cornerPoints: Point[]; color: number; - _Str_21807: string[]; - _Str_20731: Point[]; - _Str_21810: boolean[]; - _Str_19044: boolean[]; - _Str_17636: string[][]; -} \ No newline at end of file + maskAssetNames: string[]; + maskAssetLocations: Point[]; + maskAssetFlipHs: boolean[]; + maskAssetFlipVs: boolean[]; + assetNameColumns: string[][]; +}