nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-23 14:40:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update PetImageView

Browse Source
This commit is contained in:
Bill 2021-08-16 02:39:56 -04:00
parent bf780ec546
commit ca18bf2f30
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/shared/avatar-image/AvatarImageView.tsx
View File

@ -14,7 +14,7 @@ export const AvatarImageView: FC<AvatarImageViewProps> = props =>
{ {
const avatarImage = GetAvatarRenderManager().createAvatarImage(figure, AvatarScaleType.LARGE, gender, { const avatarImage = GetAvatarRenderManager().createAvatarImage(figure, AvatarScaleType.LARGE, gender, {
resetFigure: figure => resetFigure: figure =>
{ {
if(isDisposed.current) return; if(isDisposed.current) return;
setRandomValue(Math.random()); setRandomValue(Math.random());

23
src/views/shared/pet-image/PetImageView.tsx
View File

@ -1,15 +1,15 @@
import { PetFigureData, TextureUtils, Vector3d } from '@nitrots/nitro-renderer'; import { PetFigureData, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
import { FC, useCallback, useEffect, useState } from 'react'; import { FC, useEffect, useRef, useState } from 'react';
import { GetRoomEngine } from '../../../api'; import { GetRoomEngine } from '../../../api';
import { PetImageViewProps } from './PetImageView.types'; import { PetImageViewProps } from './PetImageView.types';
export const PetImageView: FC<PetImageViewProps> = props => export const PetImageView: FC<PetImageViewProps> = props =>
{ {
const { figure = '', typeId = -1, paletteId = -1, color = 0xFFFFFF, customParts = [], posture = 'std', headOnly = false, direction = 0, scale = 1 } = props; const { figure = '', typeId = -1, paletteId = -1, color = 0xFFFFFF, customParts = [], posture = 'std', headOnly = false, direction = 0, scale = 1 } = props;
const [ petUrl, setPetUrl ] = useState<string>(null); const [ petUrl, setPetUrl ] = useState<string>(null);
const isDisposed = useRef(false);
const getPetImageUrl = useCallback(() => useEffect(() =>
{ {
let url = null; let url = null;
@ -31,6 +31,8 @@ export const PetImageView: FC<PetImageViewProps> = props =>
const imageResult = GetRoomEngine().getRoomObjectPetImage(petTypeId, petPaletteId, petColor, new Vector3d((direction * 45)), 64, { const imageResult = GetRoomEngine().getRoomObjectPetImage(petTypeId, petPaletteId, petColor, new Vector3d((direction * 45)), 64, {
imageReady: (id, texture, image) => imageReady: (id, texture, image) =>
{ {
if(isDisposed.current) return;
if(image) setPetUrl(image.src); if(image) setPetUrl(image.src);
else if(texture) setPetUrl(TextureUtils.generateImageUrl(texture)); else if(texture) setPetUrl(TextureUtils.generateImageUrl(texture));
}, },
@ -44,16 +46,21 @@ export const PetImageView: FC<PetImageViewProps> = props =>
{ {
const image = imageResult.getImage(); const image = imageResult.getImage();
if(image) url = image.src; if(image) setPetUrl(image.src);
}
return url;
}
}, [ figure, typeId, paletteId, color, customParts, posture, headOnly, direction ]); }, [ figure, typeId, paletteId, color, customParts, posture, headOnly, direction ]);
useEffect(() => useEffect(() =>
{ {
setPetUrl(getPetImageUrl()); isDisposed.current = false;
}, [ getPetImageUrl ]);
return () =>
{
isDisposed.current = true;
}
}, []);
const url = `url('${ petUrl }')`; const url = `url('${ petUrl }')`;