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

cleaned RoomWallData

Browse Source
This commit is contained in:
Dank074 2021-05-15 05:17:36 -05:00
parent 1a717cc1aa
commit a4121cd78b
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/nitro/room/object/RoomPlaneParser.ts
View File

@ -686,7 +686,7 @@ export class RoomPlaneParser
_local_5 = ((_local_5 + 1) % _local_4.length);
_local_12--;
}
_local_3._Str_17862(_local_6, _local_10, _local_12, _local_8, _local_9);
_local_3.addWall(_local_6, _local_10, _local_12, _local_8, _local_9);
if((((_local_11.x == k.x) && (_local_11.y == k.y)) && ((!(_local_11.x == _local_6.x)) || (!(_local_11.y == _local_6.y)))))
{
break;
@ -715,9 +715,9 @@ export class RoomPlaneParser
_local_5 = _local_2;
_local_6 = 0;
_local_7 = false;
while(((!(k._Str_25208(_local_2))) && (_local_2 < _local_3)))
while(((!(k.getBorder(_local_2))) && (_local_2 < _local_3)))
{
if(k._Str_17084(_local_2))
if(k.getLeftTurn(_local_2))
{
_local_6++;
}
@ -740,7 +740,7 @@ export class RoomPlaneParser
_local_8 = _local_4;
while(_local_8 <= _local_5)
{
k._Str_15901(_local_8, true);
k.setHideWall(_local_8, true);
_local_8++;
}
}
@ -761,11 +761,11 @@ export class RoomPlaneParser
let _local_3 = 0;
while(_local_3 < _local_2)
{
if(!k._Str_10019(_local_3))
if(!k.getHideWall(_local_3))
{
_local_4 = k._Str_10778(_local_3);
_local_4 = k.getCorner(_local_3);
_local_5 = k.getDirection(_local_3);
_local_6 = k._Str_13743(_local_3);
_local_6 = k.getLength(_local_3);
_local_7 = RoomWallData.WALL_DIRECTION_VECTORS[_local_5];
_local_8 = RoomWallData.WALL_NORMAL_VECTORS[_local_5];
_local_9 = 0;
@ -776,7 +776,7 @@ export class RoomPlaneParser
{
if(((_local_10 > 0) && (_local_9 == 0)))
{
k._Str_24531(_local_3, _local_10);
k.setLength(_local_3, _local_10);
break;
}
_local_9++;
@ -785,7 +785,7 @@ export class RoomPlaneParser
{
if(_local_9 > 0)
{
k._Str_23976(_local_3, _local_9);
k.moveCorner(_local_3, _local_9);
break;
}
}
@ -793,7 +793,7 @@ export class RoomPlaneParser
}
if(_local_9 == _local_6)
{
k._Str_15901(_local_3, true);
k.setHideWall(_local_3, true);
}
}
_local_3++;
@ -816,8 +816,8 @@ export class RoomPlaneParser
let _local_9 = 0;
while(_local_9 < _local_8)
{
_local_10 = _arg_3._Str_10778(_local_9);
_local_11 = _arg_3._Str_19138(_local_9);
_local_10 = _arg_3.getCorner(_local_9);
_local_11 = _arg_3.getEndPoint(_local_9);
if(k.x == _arg_2.x)
{
if(((_local_10.x == k.x) && (_local_11.x == k.x)))
@ -861,25 +861,25 @@ export class RoomPlaneParser
let _local_4 = 0;
while(_local_4 < _local_3)
{
if(!k._Str_10019(_local_4))
if(!k.getHideWall(_local_4))
{
_local_5 = k._Str_10778(_local_4);
_local_5 = k.getCorner(_local_4);
_local_6 = new Point(_local_5.x, _local_5.y);
_local_7 = RoomWallData.WALL_DIRECTION_VECTORS[k.getDirection(_local_4)];
_local_8 = k._Str_13743(_local_4);
_local_8 = k.getLength(_local_4);
_local_6.x = (_local_6.x + (_local_7.x * _local_8));
_local_6.y = (_local_6.y + (_local_7.y * _local_8));
_local_9 = this.resolveOriginalWallIndex(_local_5, _local_6, _arg_2);
if(_local_9 >= 0)
{
if(_arg_2._Str_10019(_local_9))
if(_arg_2.getHideWall(_local_9))
{
k._Str_15901(_local_4, true);
k.setHideWall(_local_4, true);
}
}
else
{
k._Str_15901(_local_4, true);
k.setHideWall(_local_4, true);
}
}
_local_4++;
@ -901,11 +901,11 @@ export class RoomPlaneParser
while(_local_7 < _local_3)
{
if(!k._Str_10019(_local_7))
if(!k.getHideWall(_local_7))
{
const _local_8 = k._Str_10778(_local_7);
const _local_8 = k.getCorner(_local_7);
const _local_9 = k.getDirection(_local_7);
const _local_10 = k._Str_13743(_local_7);
const _local_10 = k.getLength(_local_7);
const _local_11 = RoomWallData.WALL_DIRECTION_VECTORS[_local_9];
const _local_12 = RoomWallData.WALL_NORMAL_VECTORS[_local_9];
let _local_13 = -1;
@ -935,7 +935,7 @@ export class RoomPlaneParser
_local_16 = Vector3d.dif(_local_16, _local_18);
const _local_20 = this.resolveOriginalWallIndex(_local_8, k._Str_19138(_local_7), _arg_2);
const _local_20 = this.resolveOriginalWallIndex(_local_8, k.getEndPoint(_local_7), _arg_2);
let _local_5 = 0;
let _local_6 = 0;
@ -965,11 +965,11 @@ export class RoomPlaneParser
}
}
const _local_22 = k._Str_17084(_local_7);
const _local_23 = k._Str_17084((((_local_7 - 1) + _local_3) % _local_3));
const _local_24 = k._Str_10019(((_local_7 + 1) % _local_3));
const _local_25 = k._Str_25455(_local_7);
const _local_26 = k._Str_24163(_local_7);
const _local_22 = k.getLeftTurn(_local_7);
const _local_23 = k.getLeftTurn((((_local_7 - 1) + _local_3) % _local_3));
const _local_24 = k.getHideWall(((_local_7 + 1) % _local_3));
const _local_25 = k.getManuallyLeftCut(_local_7);
const _local_26 = k.getManuallyRightCut(_local_7);
this.addWall(_local_16, _local_18, _local_19, _local_21, ((!(_local_23)) || (_local_25)), ((!(_local_22)) || (_local_26)), (!(_local_24)));
}

36
src/nitro/room/object/RoomWallData.ts
View File

@ -45,9 +45,9 @@ export class RoomWallData
this._count = 0;
}
public _Str_17862(k: Point, _arg_2: number, _arg_3: number, _arg_4: boolean, _arg_5: boolean): void
public addWall(k: Point, _arg_2: number, _arg_3: number, _arg_4: boolean, _arg_5: boolean): void
{
if(((this._addDuplicates) || (this._Str_22484(k, _arg_2, _arg_3, _arg_4, _arg_5))))
if(((this._addDuplicates) || (this.checkIsNotDuplicate(k, _arg_2, _arg_3, _arg_4, _arg_5))))
{
this._corners.push(k);
this._directions.push(_arg_2);
@ -61,7 +61,7 @@ export class RoomWallData
}
}
private _Str_22484(k: Point, _arg_2: number, _arg_3: number, _arg_4: boolean, _arg_5: boolean): boolean
private checkIsNotDuplicate(k: Point, _arg_2: number, _arg_3: number, _arg_4: boolean, _arg_5: boolean): boolean
{
let _local_6 = 0;
@ -81,18 +81,18 @@ export class RoomWallData
return this._count;
}
public _Str_10778(k: number): Point
public getCorner(k: number): Point
{
return this._corners[k];
}
public _Str_19138(k: number): Point
public getEndPoint(k: number): Point
{
this._Str_23674();
this.calculateWallEndPoints();
return this._endPoints[k];
}
public _Str_13743(k: number): number
public getLength(k: number): number
{
return this._lengths[k];
}
@ -102,37 +102,37 @@ export class RoomWallData
return this._directions[k];
}
public _Str_25208(k: number): boolean
public getBorder(k: number): boolean
{
return this._borders[k];
}
public _Str_10019(k: number): boolean
public getHideWall(k: number): boolean
{
return this._hideWalls[k];
}
public _Str_17084(k: number): boolean
public getLeftTurn(k: number): boolean
{
return this._leftTurns[k];
}
public _Str_25455(k: number): boolean
public getManuallyLeftCut(k: number): boolean
{
return this._manuallyLeftCut[k];
}
public _Str_24163(k: number): boolean
public getManuallyRightCut(k: number): boolean
{
return this._manuallyRightCut[k];
}
public _Str_15901(k: number, _arg_2: boolean): void
public setHideWall(k: number, _arg_2: boolean): void
{
this._hideWalls[k] = _arg_2;
}
public _Str_24531(k: number, _arg_2: number): void
public setLength(k: number, _arg_2: number): void
{
if(_arg_2 < this._lengths[k])
{
@ -141,7 +141,7 @@ export class RoomWallData
}
}
public _Str_23976(k: number, _arg_2: number): void
public moveCorner(k: number, _arg_2: number): void
{
let _local_3: IVector3D;
if(((_arg_2 > 0) && (_arg_2 < this._lengths[k])))
@ -155,7 +155,7 @@ export class RoomWallData
}
}
private _Str_23674(): void
private calculateWallEndPoints(): void
{
let k: number;
let _local_2: Point;
@ -168,10 +168,10 @@ export class RoomWallData
k = 0;
while(k < this.count)
{
_local_2 = this._Str_10778(k);
_local_2 = this.getCorner(k);
_local_3 = new Point(_local_2.x, _local_2.y);
_local_4 = RoomWallData.WALL_DIRECTION_VECTORS[this.getDirection(k)];
_local_5 = this._Str_13743(k);
_local_5 = this.getLength(k);
_local_3.x = (_local_3.x + (_local_4.x * _local_5));
_local_3.y = (_local_3.y + (_local_4.y * _local_5));
this._endPoints.push(_local_3);