From eec32854eab5fdd67d1b662a46ca57f48340ae97 Mon Sep 17 00:00:00 2001 From: Bill Date: Tue, 31 Aug 2021 22:39:15 -0400 Subject: [PATCH] Avatar updates --- .../AvatarEditorPaletteSetItem.tsx | 2 +- .../views/wardrobe/AvatarEditorWardrobeView.tsx | 14 ++++++++------ .../furniture/mannequin/FurnitureMannequinView.tsx | 12 ++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/views/avatar-editor/views/palette-set-item/AvatarEditorPaletteSetItem.tsx b/src/views/avatar-editor/views/palette-set-item/AvatarEditorPaletteSetItem.tsx index 8dde6b36..4b0bbdc1 100644 --- a/src/views/avatar-editor/views/palette-set-item/AvatarEditorPaletteSetItem.tsx +++ b/src/views/avatar-editor/views/palette-set-item/AvatarEditorPaletteSetItem.tsx @@ -21,7 +21,7 @@ export const AvatarEditorPaletteSetItem: FC = p { colorItem.notify = null; } - }) + }); return ( diff --git a/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx b/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx index 54cf3dfa..fd0e756b 100644 --- a/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx +++ b/src/views/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx @@ -1,7 +1,7 @@ import { SaveWardrobeOutfitMessageComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useMemo } from 'react'; import { Button } from 'react-bootstrap'; -import { GetAvatarRenderManager } from '../../../../api'; +import { GetAvatarRenderManager, GetSessionDataManager } from '../../../../api'; import { SendMessageHook } from '../../../../hooks'; import { NitroCardGridItemView } from '../../../../layout/card/grid/item/NitroCardGridItemView'; import { NitroCardGridView } from '../../../../layout/card/grid/NitroCardGridView'; @@ -40,21 +40,23 @@ export const AvatarEditorWardrobeView: FC = props const figures = useMemo(() => { - if(!savedFigures) return []; + if(!savedFigures || !savedFigures.length) return []; const items: JSX.Element[] = []; savedFigures.forEach(([ figureContainer, gender ], index) => { - const clubLevel = GetAvatarRenderManager().getFigureClubLevel(figureContainer, gender); + let clubLevel = 0; + + if(figureContainer) clubLevel = GetAvatarRenderManager().getFigureClubLevel(figureContainer, gender); items.push( - + { figureContainer && } - { clubLevel > 0 && } + { (clubLevel > 0) && }
- { figureContainer && } + { figureContainer && }
); diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx index 24565fdb..5e3a3972 100644 --- a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx +++ b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx @@ -1,6 +1,6 @@ import { AvatarFigurePartType, FurnitureMannequinSaveLookComposer, FurnitureMannequinSaveNameComposer, FurnitureMultiStateComposer, IAvatarFigureContainer, NitroEvent, RoomEngineTriggerWidgetEvent, RoomObjectVariable } from '@nitrots/nitro-renderer'; import { FC, KeyboardEvent, useCallback, useEffect, useState } from 'react'; -import { GetNitroInstance, GetRoomEngine, GetRoomSession, GetSessionDataManager, LocalizeText, RoomWidgetRoomObjectUpdateEvent } from '../../../../../api'; +import { GetAvatarRenderManager, GetNitroInstance, GetRoomEngine, GetRoomSession, GetSessionDataManager, LocalizeText, RoomWidgetRoomObjectUpdateEvent } from '../../../../../api'; import { CreateEventDispatcherHook } from '../../../../../hooks/events/event-dispatcher.base'; import { useRoomEngineEvent } from '../../../../../hooks/events/nitro/room/room-engine-event'; import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../../layout'; @@ -45,7 +45,7 @@ export const FurnitureMannequinView: FC<{}> = props => { if(mannequinData && !mannequinData.renderedFigure) { - const figureContainer = GetNitroInstance().avatar.createFigureContainer(mannequinData.figure); + const figureContainer = GetAvatarRenderManager().createFigureContainer(mannequinData.figure); loadMannequinFigure(figureContainer); } }, [loadMannequinFigure, mannequinData]); @@ -96,8 +96,8 @@ export const FurnitureMannequinView: FC<{}> = props => const gender = roomObject.model.getValue(RoomObjectVariable.FURNITURE_MANNEQUIN_GENDER); const name = roomObject.model.getValue(RoomObjectVariable.FURNITURE_MANNEQUIN_NAME); - const figureContainer = GetNitroInstance().avatar.createFigureContainer(figure); - const clubLevel = GetNitroInstance().avatar.getFigureClubLevel(figureContainer, gender, parts); + const figureContainer = GetAvatarRenderManager().createFigureContainer(figure); + const clubLevel = GetAvatarRenderManager().getFigureClubLevel(figureContainer, gender, parts); const mannequinData = new FurnitureMannequinData(widgetEvent.objectId, widgetEvent.category, name, figure, gender, clubLevel); @@ -133,11 +133,11 @@ export const FurnitureMannequinView: FC<{}> = props => setMannequinData(mannequinData => new FurnitureMannequinData(mannequinData.objectId, mannequinData.category, value, mannequinData.figure, mannequinData.gender, mannequinData.clubLevel, mannequinData.renderedFigure)); return; case 'load_figure': - loadMannequinFigure(GetNitroInstance().avatar.createFigureContainer(GetNitroInstance().sessionDataManager.figure)); + loadMannequinFigure(GetAvatarRenderManager().createFigureContainer(GetNitroInstance().sessionDataManager.figure)); setViewMode(MannequinViewMode.SAVE); return; case 'back': - loadMannequinFigure(GetNitroInstance().avatar.createFigureContainer(mannequinData.figure)); + loadMannequinFigure(GetAvatarRenderManager().createFigureContainer(mannequinData.figure)); setViewMode(MannequinViewMode.EDIT); return; case 'save_name':