🆙 added latest changes

This commit is contained in:
duckietm
2024-07-04 15:03:26 +02:00
parent d5a3a05c40
commit bd09ea8b25
116 changed files with 2246 additions and 1794 deletions
+2 -2
View File
@@ -141,7 +141,7 @@ export class AvatarStructure
public getAnimation(k: string): Animation
{
return this._animationManager.getAnimation(k) as Animation;
return this._animationManager.getAnimation(k);
}
public getActionDefinition(k: string): ActionDefinition
@@ -319,7 +319,7 @@ export class AvatarStructure
let _local_20: AvatarAnimationFrame[] = [];
let _local_36: IPartColor = null;
if(!_arg_3 == null) return [];
if(!_arg_3) return [];
const _local_9 = this._partSetsData.getActiveParts(_arg_3.definition);
const _local_11: AvatarImagePartContainer[] = [];
@@ -135,7 +135,19 @@ export class AvatarActionManager
validatedActions.push(action);
}
validatedActions.sort(this.sortByPrecedence);
validatedActions.sort((actionOne: IActiveActionData, actionTwo: IActiveActionData) =>
{
if(!actionOne || !actionTwo) return 0;
const precedenceOne = actionOne.definition.precedence;
const precedenceTwo = actionTwo.definition.precedence;
if(precedenceOne < precedenceTwo) return 1;
if(precedenceOne > precedenceTwo) return -1;
return 0;
});
return validatedActions;
}
@@ -169,18 +181,4 @@ export class AvatarActionManager
return activeActions;
}
private sortByPrecedence(actionOne: IActiveActionData, actionTwo: IActiveActionData): number
{
if(!actionOne || !actionTwo) return 0;
const precedenceOne = actionOne.definition.precedence;
const precedenceTwo = actionTwo.definition.precedence;
if(precedenceOne < precedenceTwo) return 1;
if(precedenceOne > precedenceTwo) return -1;
return 0;
}
}
+1 -1
View File
@@ -44,7 +44,7 @@ export class GeometryItem extends Node3D
public toString(): string
{
return ((((this._id + ': ') + this.location) + ' - ') + this.transformedLocation);
return `${this._id}: ${this.location.toString()} - ${this.transformedLocation.toString()}`;
}
public get isDynamic(): boolean