nitro/nitro-renderer
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-renderer.git synced 2025-01-31 11:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaned AvatarModelGeometry

Browse Source
This commit is contained in:
Dank074 2021-06-07 03:04:24 -05:00
parent 8ef477ea80
commit 7945a1550f
14 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nitro/avatar/AvatarStructure.ts
View File

@ -282,12 +282,12 @@ export class AvatarStructure extends EventDispatcher
for(const _local_13 of _local_8.addData)
{
const _local_6 = this._geometry._Str_1919(_local_5, _local_13.align);
const _local_6 = this._geometry.getBodyPart(_local_5, _local_13.align);
if(_local_6)
{
_local_11.id = _local_13.id;
_local_6._Str_2020(_local_11, _arg_2);
_local_6.addPart(_local_11, _arg_2);
_local_12.setType = _local_13.id;
@ -304,7 +304,7 @@ export class AvatarStructure extends EventDispatcher
for(const _local_9 of _local_3)
{
const _local_6 = this._geometry._Str_1919(_local_5, _local_9);
const _local_6 = this._geometry.getBodyPart(_local_5, _local_9);
if(_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id);
}
@ -315,7 +315,7 @@ export class AvatarStructure extends EventDispatcher
for(const _local_14 of _local_3)
{
const _local_6 = this._geometry._Str_1701(_local_5, _local_14, _arg_2);
const _local_6 = this._geometry.getBodyPartOfItem(_local_5, _local_14, _arg_2);
if(_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id);
}
@ -326,14 +326,14 @@ export class AvatarStructure extends EventDispatcher
public getBodyPartsUnordered(k: string): string[]
{
return this._geometry._Str_1307(k);
return this._geometry.getBodyPartIdsInAvatarSet(k);
}
public getBodyParts(k: string, _arg_2: string, _arg_3: number): string[]
{
const _local_4 = AvatarDirectionAngle.DIRECTION_TO_ANGLE[_arg_3];
return this._geometry._Str_2250(k, _local_4, _arg_2);
return this._geometry.getBodyPartsAtAngle(k, _local_4, _arg_2);
}
public getFrameBodyPartOffset(k:IActiveActionData, _arg_2: number, _arg_3: number, _arg_4: string): Point
@ -373,11 +373,11 @@ export class AvatarStructure extends EventDispatcher
{
if(_local_25 === k)
{
const _local_26 = this._geometry._Str_1919(_arg_4, _local_25);
const _local_26 = this._geometry.getBodyPart(_arg_4, _local_25);
if(_local_26)
{
for(const _local_27 of _local_26._Str_1883(_arg_7))
for(const _local_27 of _local_26.getDynamicParts(_arg_7))
{
_local_9.push(_local_27.id);
}
@ -530,7 +530,7 @@ export class AvatarStructure extends EventDispatcher
{
if(_local_9.indexOf(_local_12) > -1)
{
const _local_44 = this._geometry._Str_1701(_arg_4, _local_12, _arg_7);
const _local_44 = this._geometry.getBodyPartOfItem(_arg_4, _local_12, _arg_7);
if(k !== _local_44.id)
{

2
src/nitro/avatar/figuredata/FigureData.ts
View File

@ -33,7 +33,7 @@ export class FigureData implements IAvatarImageListener
constructor()
{
this._direction = FigureDataView._Str_9887;
this._direction = FigureDataView.PREVIEW_AVATAR_DIRECTION;
this._view = new FigureDataView(this);
}

4
src/nitro/avatar/figuredata/FigureDataView.ts
View File

@ -3,7 +3,7 @@ import { FigureData } from './FigureData';
export class FigureDataView implements IAvatarImageListener
{
public static _Str_9887: number = 4;
public static PREVIEW_AVATAR_DIRECTION: number = 4;
private _model: FigureData;
private _figureString: string;
@ -40,4 +40,4 @@ export class FigureDataView implements IAvatarImageListener
{
return this._figureString;
}
}
}

46
src/nitro/avatar/geometry/AvatarModelGeometry.ts
View File

@ -76,7 +76,7 @@ export class AvatarModelGeometry
bodyParts.set(geometryBodyPart.id, geometryBodyPart);
for(const part of geometryBodyPart._Str_1456(null))
for(const part of geometryBodyPart.getPartIds(null))
{
itemIds.set(part, geometryBodyPart);
}
@ -99,12 +99,12 @@ export class AvatarModelGeometry
{
if(!part) continue;
part._Str_2004(k);
part.removeDynamicParts(k);
}
}
}
public _Str_1307(k: string): string[]
public getBodyPartIdsInAvatarSet(k: string): string[]
{
const avatarSet = this._avatarSet._Str_1498(k);
@ -131,7 +131,7 @@ export class AvatarModelGeometry
return (canvas.get(_arg_2) || null);
}
private _Str_1342(k: string): boolean
private typeExists(k: string): boolean
{
const existing = this._geometryTypes.get(k);
@ -140,9 +140,9 @@ export class AvatarModelGeometry
return false;
}
private _Str_1332(k: string, _arg_2: string): boolean
private hasBodyPart(k: string, _arg_2: string): boolean
{
if(this._Str_1342(k))
if(this.typeExists(k))
{
const existing = this._geometryTypes.get(k);
@ -152,9 +152,9 @@ export class AvatarModelGeometry
return false;
}
private _Str_2072(k: string): string[]
private getBodyPartIDs(k: string): string[]
{
const parts = this._Str_1280(k);
const parts = this.getBodyPartsOfType(k);
const types = [];
@ -171,19 +171,19 @@ export class AvatarModelGeometry
return types;
}
private _Str_1280(k: string): Map<string, GeometryBodyPart>
private getBodyPartsOfType(k: string): Map<string, GeometryBodyPart>
{
if(this._Str_1342(k)) return this._geometryTypes.get(k);
if(this.typeExists(k)) return this._geometryTypes.get(k);
return new Map();
}
public _Str_1919(k: string, _arg_2: string): GeometryBodyPart
public getBodyPart(k: string, _arg_2: string): GeometryBodyPart
{
return (this._Str_1280(k).get(_arg_2) || null);
return (this.getBodyPartsOfType(k).get(_arg_2) || null);
}
public _Str_1701(k: string, _arg_2: string, _arg_3:IAvatarImage): GeometryBodyPart
public getBodyPartOfItem(k: string, _arg_2: string, _arg_3:IAvatarImage): GeometryBodyPart
{
const itemIds = this._itemIdToBodyPartMap.get(k);
@ -193,7 +193,7 @@ export class AvatarModelGeometry
if(part) return part;
const parts = this._Str_1280(k);
const parts = this.getBodyPartsOfType(k);
if(parts)
{
@ -201,7 +201,7 @@ export class AvatarModelGeometry
{
if(!part) continue;
if(part._Str_2030(_arg_2, _arg_3)) return part;
if(part.hasPart(_arg_2, _arg_3)) return part;
}
}
}
@ -209,9 +209,9 @@ export class AvatarModelGeometry
return null;
}
private _Str_1787(k: Map<string, GeometryBodyPart>, _arg_2: string): GeometryBodyPart[]
private getBodyPartsInAvatarSet(k: Map<string, GeometryBodyPart>, _arg_2: string): GeometryBodyPart[]
{
const parts = this._Str_1307(_arg_2);
const parts = this.getBodyPartIdsInAvatarSet(_arg_2);
const geometryParts = [];
for(const part of parts)
@ -229,12 +229,12 @@ export class AvatarModelGeometry
return geometryParts;
}
public _Str_2250(k: string, _arg_2: number, _arg_3: string): string[]
public getBodyPartsAtAngle(k: string, _arg_2: number, _arg_3: string): string[]
{
if(!_arg_3) return [];
const geometryParts = this._Str_1280(_arg_3);
const parts = this._Str_1787(geometryParts, k);
const geometryParts = this.getBodyPartsOfType(_arg_3);
const parts = this.getBodyPartsInAvatarSet(geometryParts, k);
const sets: [ number, GeometryBodyPart ][] = [];
const ids: string[] = [];
@ -246,7 +246,7 @@ export class AvatarModelGeometry
part.applyTransform(this._transformation);
sets.push([ part._Str_1522(this._camera), part ]);
sets.push([ part.getDistance(this._camera), part ]);
}
sets.sort((a, b) =>
@ -273,9 +273,9 @@ export class AvatarModelGeometry
public getParts(k: string, _arg_2: string, _arg_3: number, _arg_4: any[], _arg_5:IAvatarImage): string[]
{
if(this._Str_1332(k, _arg_2))
if(this.hasBodyPart(k, _arg_2))
{
const part = this._Str_1280(k).get(_arg_2);
const part = this.getBodyPartsOfType(k).get(_arg_2);
this._transformation = Matrix4x4.getYRotationMatrix(_arg_3);

18
src/nitro/avatar/geometry/GeometryBodyPart.ts
View File

@ -33,7 +33,7 @@ export class GeometryBodyPart extends Node3D
}
}
public _Str_1883(k: IAvatarImage): GeometryItem[]
public getDynamicParts(k: IAvatarImage): GeometryItem[]
{
const existing = this._dynamicParts.get(k);
const parts: GeometryItem[] = [];
@ -53,7 +53,7 @@ export class GeometryBodyPart extends Node3D
return parts;
}
public _Str_1456(k: IAvatarImage): string[]
public getPartIds(k: IAvatarImage): string[]
{
const ids: string[] = [];
@ -84,16 +84,16 @@ export class GeometryBodyPart extends Node3D
return ids;
}
public _Str_2004(k: IAvatarImage): boolean
public removeDynamicParts(k: IAvatarImage): boolean
{
this._dynamicParts.delete(k);
return true;
}
public _Str_2020(k: any, _arg_2: IAvatarImage): boolean
public addPart(k: any, _arg_2: IAvatarImage): boolean
{
if(this._Str_2030(k.id, _arg_2)) return false;
if(this.hasPart(k.id, _arg_2)) return false;
let existing = this._dynamicParts.get(_arg_2);
@ -109,7 +109,7 @@ export class GeometryBodyPart extends Node3D
return true;
}
public _Str_2030(k: string, _arg_2: IAvatarImage): boolean
public hasPart(k: string, _arg_2: IAvatarImage): boolean
{
let existingPart = (this._parts.get(k) || null);
@ -131,7 +131,7 @@ export class GeometryBodyPart extends Node3D
part.applyTransform(k);
parts.push([ part._Str_1522(_arg_2), part ]);
parts.push([ part.getDistance(_arg_2), part ]);
}
const existingDynamic = this._dynamicParts.get(_arg_4);
@ -146,7 +146,7 @@ export class GeometryBodyPart extends Node3D
part.applyTransform(k);
parts.push([ part._Str_1522(_arg_2), part ]);
parts.push([ part.getDistance(_arg_2), part ]);
}
}
@ -174,7 +174,7 @@ export class GeometryBodyPart extends Node3D
return partIds;
}
public _Str_1522(k: Vector3D): number
public getDistance(k: Vector3D): number
{
const _local_2 = Math.abs(((k.z - this.transformedLocation.z) - this._radius));
const _local_3 = Math.abs(((k.z - this.transformedLocation.z) + this._radius));

2
src/nitro/avatar/geometry/GeometryItem.ts
View File

@ -20,7 +20,7 @@ export class GeometryItem extends Node3D
this._isDynamic = _arg_2;
}
public _Str_1522(k: Vector3D): number
public getDistance(k: Vector3D): number
{
const _local_2 = Math.abs(((k.z - this.transformedLocation.z) - this._radius));
const _local_3 = Math.abs(((k.z - this.transformedLocation.z) + this._radius));

10
src/nitro/room/enums/FriendFurniEngravingWidgetType.ts
View File

@ -1,8 +1,8 @@
export class FriendFurniEngravingWidgetType
{
public static readonly _Str_13451:number = 0;
public static readonly _Str_17498:number = 1;
public static readonly _Str_18746:number = 2;
public static readonly _Str_15230:number = 3;
public static readonly _Str_15778:number = 4;
public static readonly LOVE_LOCK:number = 0;
public static readonly CARVE_A_TREE:number = 1;
public static readonly FRIENDS_PORTRAIT:number = 2;
public static readonly WILD_WEST_WANTED:number = 3;
public static readonly HABBOWEEN:number = 4;
}

8
src/nitro/room/object/RoomPlaneData.ts
View File

@ -165,7 +165,7 @@ export class RoomPlaneData
const _local_2:RoomPlaneMaskData = this._Str_8361(k);
if(_local_2 != null)
{
return _local_2._Str_5120;
return _local_2.leftSideLoc;
}
return -1;
}
@ -175,7 +175,7 @@ export class RoomPlaneData
const _local_2:RoomPlaneMaskData = this._Str_8361(k);
if(_local_2 != null)
{
return _local_2._Str_4659;
return _local_2.rightSideLoc;
}
return -1;
}
@ -185,7 +185,7 @@ export class RoomPlaneData
const _local_2:RoomPlaneMaskData = this._Str_8361(k);
if(_local_2 != null)
{
return _local_2._Str_9124;
return _local_2.leftSideLength;
}
return -1;
}
@ -195,7 +195,7 @@ export class RoomPlaneData
const _local_2:RoomPlaneMaskData = this._Str_8361(k);
if(_local_2 != null)
{
return _local_2._Str_12156;
return _local_2.rightSideLength;
}
return -1;
}

10
src/nitro/room/object/RoomPlaneMaskData.ts
View File

@ -13,23 +13,23 @@
this._rightSideLength = _arg_4;
}
public get _Str_5120(): number
public get leftSideLoc(): number
{
return this._leftSideLoc;
}
public get _Str_4659(): number
public get rightSideLoc(): number
{
return this._rightSideLoc;
}
public get _Str_9124(): number
public get leftSideLength(): number
{
return this._leftSideLength;
}
public get _Str_12156(): number
public get rightSideLength(): number
{
return this._rightSideLength;
}
}
}

4
src/nitro/room/object/visualization/data/DirectionData.ts
View File

@ -2,7 +2,7 @@ import { LayerData } from './LayerData';
export class DirectionData
{
public static _Str_9471: number = -1;
public static USE_DEFAULT_DIRECTION: number = -1;
private _layers: LayerData[];
@ -193,4 +193,4 @@ export class DirectionData
{
return this._layers.length;
}
}
}

10
src/nitro/room/object/visualization/pet/PetVisualization.ts
View File

@ -436,8 +436,8 @@ export class PetVisualization extends FurnitureAnimatedVisualization
{
if(this._headSprites[layerId] === undefined)
{
const isHead = (this._data.getLayerTag(this._scale, DirectionData._Str_9471, layerId) === PetVisualization.HEAD);
const isHair = (this._data.getLayerTag(this._scale, DirectionData._Str_9471, layerId) === PetVisualization.HAIR);
const isHead = (this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.HEAD);
const isHair = (this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.HAIR);
if(isHead || isHair) this._headSprites[layerId] = true;
else this._headSprites[layerId] = false;
@ -452,7 +452,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization
{
if(layerId < (this.totalSprites - (1 + PetVisualization._Str_7490)))
{
const tag = this._data.getLayerTag(this._scale, DirectionData._Str_9471, layerId);
const tag = this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId);
if(((tag && (tag.length > 0)) && (tag !== PetVisualization.HEAD)) && (tag !== PetVisualization.HAIR))
{
@ -476,7 +476,7 @@ export class PetVisualization extends FurnitureAnimatedVisualization
{
if(this._saddleSprites[layerId] === undefined)
{
if(this._data.getLayerTag(this._scale, DirectionData._Str_9471, layerId) === PetVisualization.SADDLE)
if(this._data.getLayerTag(this._scale, DirectionData.USE_DEFAULT_DIRECTION, layerId) === PetVisualization.SADDLE)
{
this._saddleSprites[layerId] = true;
}
@ -558,4 +558,4 @@ export class PetVisualization extends FurnitureAnimatedVisualization
return posture;
}
}
}

26
src/nitro/room/object/visualization/room/RoomPlane.ts
View File

@ -466,8 +466,8 @@ export class RoomPlane implements IRoomPlane
if(asset)
{
const _local_3 = (this._maskBitmapData.width * (1 - (mask._Str_5120 / this._leftSide.length)));
const _local_4 = (this._maskBitmapData.height * (1 - (mask._Str_4659 / this._rightSide.length)));
const _local_3 = (this._maskBitmapData.width * (1 - (mask.leftSideLoc / this._leftSide.length)));
const _local_4 = (this._maskBitmapData.height * (1 - (mask.rightSideLoc / this._rightSide.length)));
const _local_11 = new Point((_local_3 + asset.offsetX), (_local_4 + asset.offsetY));
_local_5.addMask(assetName, _local_11, asset.flipH, asset.flipV);
@ -794,7 +794,7 @@ export class RoomPlane implements IRoomPlane
if(mask)
{
if((((mask.type === k) && (mask._Str_5120 === _arg_2)) && (mask._Str_4659 === _arg_3))) return false;
if((((mask.type === k) && (mask.leftSideLoc === _arg_2)) && (mask.rightSideLoc === _arg_3))) return false;
}
_local_5++;
@ -824,7 +824,7 @@ export class RoomPlane implements IRoomPlane
{
if(!mask) continue;
if((((mask._Str_5120 === k) && (mask._Str_4659 === _arg_2)) && (mask._Str_9124 === _arg_3)) && (mask._Str_12156 === _arg_4)) return false;
if((((mask.leftSideLoc === k) && (mask.rightSideLoc === _arg_2)) && (mask.leftSideLength === _arg_3)) && (mask.rightSideLength === _arg_4)) return false;
}
const _local_5 = new RoomPlaneRectangleMask(k, _arg_2, _arg_3, _arg_4);
@ -857,7 +857,7 @@ export class RoomPlane implements IRoomPlane
{
if(!plane) continue;
if(((plane.type === mask.type) && (plane._Str_5120 === mask._Str_5120)) && (plane._Str_4659 === mask._Str_4659))
if(((plane.type === mask.type) && (plane.leftSideLoc === mask.leftSideLoc)) && (plane.rightSideLoc === mask.rightSideLoc))
{
_local_6 = true;
@ -942,11 +942,11 @@ export class RoomPlane implements IRoomPlane
if(mask)
{
type = mask.type;
posX = (this._maskBitmapData.width - ((this._maskBitmapData.width * mask._Str_5120) / this._leftSide.length));
posY = (this._maskBitmapData.height - ((this._maskBitmapData.height * mask._Str_4659) / this._rightSide.length));
posX = (this._maskBitmapData.width - ((this._maskBitmapData.width * mask.leftSideLoc) / this._leftSide.length));
posY = (this._maskBitmapData.height - ((this._maskBitmapData.height * mask.rightSideLoc) / this._rightSide.length));
this._maskManager.updateMask(this._maskBitmapData, type, geometry.scale, normal, posX, posY);
this._bitmapMasksOld.push(new RoomPlaneBitmapMask(type, mask._Str_5120, mask._Str_4659));
this._bitmapMasksOld.push(new RoomPlaneBitmapMask(type, mask.leftSideLoc, mask.rightSideLoc));
}
i++;
@ -960,18 +960,18 @@ export class RoomPlane implements IRoomPlane
if(rectMask)
{
posX = (this._maskBitmapData.width - ((this._maskBitmapData.width * rectMask._Str_5120) / this._leftSide.length));
posY = (this._maskBitmapData.height - ((this._maskBitmapData.height * rectMask._Str_4659) / this._rightSide.length));
posX = (this._maskBitmapData.width - ((this._maskBitmapData.width * rectMask.leftSideLoc) / this._leftSide.length));
posY = (this._maskBitmapData.height - ((this._maskBitmapData.height * rectMask.rightSideLoc) / this._rightSide.length));
const wd = ((this._maskBitmapData.width * rectMask._Str_9124) / this._leftSide.length);
const ht = ((this._maskBitmapData.height * rectMask._Str_12156) / this._rightSide.length);
const wd = ((this._maskBitmapData.width * rectMask.leftSideLength) / this._leftSide.length);
const ht = ((this._maskBitmapData.height * rectMask.rightSideLength) / this._rightSide.length);
this._maskBitmapData
.beginFill(0xFF0000)
.drawRect((posX - wd), (posY - ht), wd, ht)
.endFill();
this._rectangleMasksOld.push(new RoomPlaneRectangleMask(rectMask._Str_9124, rectMask._Str_4659, rectMask._Str_9124, rectMask._Str_12156));
this._rectangleMasksOld.push(new RoomPlaneRectangleMask(rectMask.leftSideLength, rectMask.rightSideLoc, rectMask.leftSideLength, rectMask.rightSideLength));
}
i++;

6
src/nitro/room/object/visualization/room/RoomPlaneBitmapMask.ts
View File

@ -16,13 +16,13 @@
return this._type;
}
public get _Str_5120(): number
public get leftSideLoc(): number
{
return this._leftSideLoc;
}
public get _Str_4659(): number
public get rightSideLoc(): number
{
return this._rightSideLoc;
}
}
}

10
src/nitro/room/object/visualization/room/RoomPlaneRectangleMask.ts
View File

@ -13,23 +13,23 @@
this._rightSideLength = _arg_4;
}
public get _Str_5120(): number
public get leftSideLoc(): number
{
return this._leftSideLoc;
}
public get _Str_4659(): number
public get rightSideLoc(): number
{
return this._rightSideLoc;
}
public get _Str_9124(): number
public get leftSideLength(): number
{
return this._leftSideLength;
}
public get _Str_12156(): number
public get rightSideLength(): number
{
return this._rightSideLength;
}
}
}