duckietm/Nitro-Cool-UI
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-Cool-UI.git synced 2025-06-21 22:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Avatarimage

Browse Source
This commit is contained in:
DuckieTM 2024-03-16 19:24:01 +01:00
parent ce32a12d19
commit d17fea128d
3 changed files with 16 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetAvatarView.tsx
View File

@ -203,9 +203,7 @@ export const AvatarInfoWidgetAvatarView: FC<AvatarInfoWidgetAvatarViewProps> = p
return ( return (
<ContextMenuView objectId={ avatarInfo.roomIndex } category={ RoomObjectCategory.UNIT } userType={ avatarInfo.userType } onClose={ onClose } collapsable={ true }> <ContextMenuView objectId={ avatarInfo.roomIndex } category={ RoomObjectCategory.UNIT } userType={ avatarInfo.userType } onClose={ onClose } collapsable={ true }>
<ContextMenuHeaderView className="cursor-pointer" onClick={ event => GetUserProfile(avatarInfo.webID) }> <ContextMenuHeaderView className="cursor-pointer" onClick={ event => GetUserProfile(avatarInfo.webID) } dangerouslySetInnerHTML={ { __html: `${ avatarInfo.name }` } }></ContextMenuHeaderView>
{ avatarInfo.name }
</ContextMenuHeaderView>
{ (mode === MODE_NORMAL) && { (mode === MODE_NORMAL) &&
<> <>
{ canRequestFriend(avatarInfo.webID) && { canRequestFriend(avatarInfo.webID) &&

4
src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetNameView.tsx
View File

@ -23,9 +23,7 @@ export const AvatarInfoWidgetNameView: FC<AvatarInfoWidgetNameViewProps> = props
return ( return (
<ContextMenuView objectId={ nameInfo.roomIndex } category={ nameInfo.category } userType={ nameInfo.userType } fades={ (nameInfo.id !== GetSessionDataManager().userId) } classNames={ getClassNames } onClose={ onClose }> <ContextMenuView objectId={ nameInfo.roomIndex } category={ nameInfo.category } userType={ nameInfo.userType } fades={ (nameInfo.id !== GetSessionDataManager().userId) } classNames={ getClassNames } onClose={ onClose }>
<div className="text-shadow"> <div className="text-shadow" dangerouslySetInnerHTML={ { __html: `${ nameInfo.name }` } }></div>
{ nameInfo.name }
</div>
</ContextMenuView> </ContextMenuView>
); );
} }

67
submodules/renderer/src/nitro/avatar/AvatarImage.ts
View File

@ -5,12 +5,12 @@ import { Rectangle } from '@pixi/math';
import { Sprite } from '@pixi/sprite'; import { Sprite } from '@pixi/sprite';
import { AdvancedMap, AvatarAction, AvatarDirectionAngle, AvatarScaleType, AvatarSetType, IActionDefinition, IActiveActionData, IAdvancedMap, IAnimationLayerData, IAvatarDataContainer, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IGraphicAsset, IPartColor, ISpriteDataContainer } from '../../api'; import { AdvancedMap, AvatarAction, AvatarDirectionAngle, AvatarScaleType, AvatarSetType, IActionDefinition, IActiveActionData, IAdvancedMap, IAnimationLayerData, IAvatarDataContainer, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IGraphicAsset, IPartColor, ISpriteDataContainer } from '../../api';
import { GetTickerTime, NitroContainer, NitroSprite, PaletteMapFilter, PixiApplicationProxy, TextureUtils } from '../../pixi-proxy'; import { GetTickerTime, NitroContainer, NitroSprite, PaletteMapFilter, PixiApplicationProxy, TextureUtils } from '../../pixi-proxy';
import { ActiveActionData } from './actions';
import { AssetAliasCollection } from './alias';
import { AvatarFigureContainer } from './AvatarFigureContainer'; import { AvatarFigureContainer } from './AvatarFigureContainer';
import { AvatarStructure } from './AvatarStructure'; import { AvatarStructure } from './AvatarStructure';
import { AvatarImageCache } from './cache';
import { EffectAssetDownloadManager } from './EffectAssetDownloadManager'; import { EffectAssetDownloadManager } from './EffectAssetDownloadManager';
import { ActiveActionData } from './actions';
import { AssetAliasCollection } from './alias';
import { AvatarImageCache } from './cache';
export class AvatarImage implements IAvatarImage, IAvatarEffectListener export class AvatarImage implements IAvatarImage, IAvatarEffectListener
{ {
@ -222,45 +222,6 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
this._changes = true; this._changes = true;
} }
private getFullImageCacheKey(): string
{
if(!this._useFullImageCache) return null;
if(((this._sortedActions.length == 1) && (this._mainDirection == this._headDirection)))
{
return (this._mainDirection + this._currentActionsString) + (this._frameCounter % 4);
}
if(this._sortedActions.length == 2)
{
for(const k of this._sortedActions)
{
if(((k.actionType == 'fx') && ((((k.actionParameter == '33') || (k.actionParameter == '34')) || (k.actionParameter == '35')) || (k.actionParameter == '36'))))
{
return (this._mainDirection + this._currentActionsString) + 0;
}
if(((k.actionType == 'fx') && ((k.actionParameter == '38') || (k.actionParameter == '39'))))
{
return (((this._mainDirection + '_') + this._headDirection) + this._currentActionsString) + (this._frameCounter % 11);
}
if((k.actionType === 'dance') && ((k.actionParameter === '1') || (k.actionParameter === '2') || (k.actionParameter === '3') || (k.actionParameter === '4')))
{
let frame = (this._frameCounter % 8);
if((k.actionParameter === '3')) frame = (this._frameCounter % 10);
if((k.actionParameter === '4')) frame = (this._frameCounter % 16);
return (((this._mainDirection + k.actionType) + k.actionParameter) + frame);
}
}
}
return null;
}
private getBodyParts(k: string, _arg_2: string, _arg_3: number): string[] private getBodyParts(k: string, _arg_2: string, _arg_3: number): string[]
{ {
if((((!(_arg_3 == this._cachedBodyPartsDirection)) || (!(_arg_2 == this._cachedBodyPartsGeometryType))) || (!(k == this._cachedBodyPartsAvatarSet)))) if((((!(_arg_3 == this._cachedBodyPartsDirection)) || (!(_arg_2 == this._cachedBodyPartsGeometryType))) || (!(k == this._cachedBodyPartsAvatarSet))))
@ -273,25 +234,25 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
return this._cachedBodyParts; return this._cachedBodyParts;
} }
public getAvatarPartsForCamera(k: string): void public getAvatarPartsForCamera(partsAvatarSet: string): void
{ {
let _local_4: string; if(this._mainAction === null)
if(this._mainAction == null)
{ {
return; return;
} }
const _local_2 = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType);
if(_local_2 == null) const canvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType);
if(canvas === null)
{ {
return; return;
} }
const _local_3 = this.getBodyParts(k, this._mainAction.definition.geometryType, this._mainDirection);
let _local_6 = (_local_3.length - 1); const bodyParts = this.getBodyParts(partsAvatarSet, this._mainAction.definition.geometryType, this._mainDirection);
while(_local_6 >= 0)
for(let i = bodyParts.length - 1; i >= 0; i--)
{ {
_local_4 = _local_3[_local_6]; const bodyPart = bodyParts[i];
const _local_5 = this._cache.getImageContainer(_local_4, this._frameCounter, true); const imageContainer = this._cache.getImageContainer(bodyPart, this._frameCounter, true);
_local_6--;
} }
} }