diff --git a/public/UITexts.example b/public/UITexts.example
index c7480c7..34719b4 100644
--- a/public/UITexts.example
+++ b/public/UITexts.example
@@ -168,6 +168,7 @@
"nitro.login.error.missing_username": "Please choose a Habbo name.",
"nitro.login.error.username_length": "Habbo name must be 3–16 characters.",
"nitro.login.error.username_taken": "This Habbo name is already taken.",
- "nitro.login.error.missing_email": "Please enter your email address."
+ "nitro.login.error.missing_email": "Please enter your email address.",
+ "inventory.effects.activate": "Use selected effect"
}
}
diff --git a/src/api/avatar/AvatarEditorThumbnailsHelper.ts b/src/api/avatar/AvatarEditorThumbnailsHelper.ts
index c319d2a..9cb58b6 100644
--- a/src/api/avatar/AvatarEditorThumbnailsHelper.ts
+++ b/src/api/avatar/AvatarEditorThumbnailsHelper.ts
@@ -227,9 +227,11 @@ export class AvatarEditorThumbnailsHelper
if(isDisabled) sprite.filters = [ AvatarEditorThumbnailsHelper.ALPHA_FILTER ];
+ const frame = AvatarEditorThumbnailsHelper.findOpaqueBoundsFrame(sprite, texture.width, texture.height);
+
const imageUrl = await TextureUtils.generateImageUrl({
target: sprite,
- frame: new NitroRectangle(0, 0, texture.width, texture.height)
+ frame
});
sprite.destroy();
@@ -244,6 +246,50 @@ export class AvatarEditorThumbnailsHelper
});
}
+ private static findOpaqueBoundsFrame(sprite: NitroSprite, fallbackWidth: number, fallbackHeight: number): NitroRectangle
+ {
+ try
+ {
+ const data = TextureUtils.getPixels(sprite);
+ if(!data) return new NitroRectangle(0, 0, fallbackWidth, fallbackHeight);
+
+ const pixels = data.pixels as Uint8ClampedArray | Uint8Array;
+ const width = data.width;
+ const height = data.height;
+ if(!pixels || width <= 0 || height <= 0) return new NitroRectangle(0, 0, fallbackWidth, fallbackHeight);
+
+ const ALPHA_THRESHOLD = 8;
+
+ let minX = width;
+ let minY = height;
+ let maxX = -1;
+ let maxY = -1;
+
+ for(let y = 0; y < height; y++)
+ {
+ const rowStart = y * width * 4;
+ for(let x = 0; x < width; x++)
+ {
+ if(pixels[rowStart + (x * 4) + 3] > ALPHA_THRESHOLD)
+ {
+ if(x < minX) minX = x;
+ if(x > maxX) maxX = x;
+ if(y < minY) minY = y;
+ if(y > maxY) maxY = y;
+ }
+ }
+ }
+
+ if(maxX < minX || maxY < minY) return new NitroRectangle(0, 0, fallbackWidth, fallbackHeight);
+
+ return new NitroRectangle(minX, minY, (maxX - minX) + 1, (maxY - minY) + 1);
+ }
+ catch
+ {
+ return new NitroRectangle(0, 0, fallbackWidth, fallbackHeight);
+ }
+ }
+
private static sortByDrawOrder(a: IFigurePart, b: IFigurePart): number
{
const indexA = AvatarEditorThumbnailsHelper.DRAW_ORDER.indexOf(a.type);
diff --git a/src/components/MainView.tsx b/src/components/MainView.tsx
index 5309364..70f2fd3 100644
--- a/src/components/MainView.tsx
+++ b/src/components/MainView.tsx
@@ -4,6 +4,7 @@ import { FC, useEffect, useState } from 'react';
import { useNitroEvent } from '../hooks';
import { AchievementsView } from './achievements/AchievementsView';
import { AvatarEditorView } from './avatar-editor';
+import { AvatarEffectsView } from './avatar-effects';
import { CameraWidgetView } from './camera/CameraWidgetView';
import { CampaignView } from './campaign/CampaignView';
import { CatalogView } from './catalog/CatalogView';
@@ -105,6 +106,7 @@ export const MainView: FC<{}> = props =>
+
diff --git a/src/components/avatar-editor/AvatarEditorModelView.tsx b/src/components/avatar-editor/AvatarEditorModelView.tsx
index 612773d..1656996 100644
--- a/src/components/avatar-editor/AvatarEditorModelView.tsx
+++ b/src/components/avatar-editor/AvatarEditorModelView.tsx
@@ -89,13 +89,13 @@ export const AvatarEditorModelView: FC<{
{ advancedColorMode
?
- :
}
+ :
}
}
{ (maxPaletteCount === 2) &&
{ advancedColorMode
?
- :
}
+ :
}
}
diff --git a/src/components/avatar-editor/AvatarEditorView.tsx b/src/components/avatar-editor/AvatarEditorView.tsx
index a150bec..e3197b5 100644
--- a/src/components/avatar-editor/AvatarEditorView.tsx
+++ b/src/components/avatar-editor/AvatarEditorView.tsx
@@ -78,7 +78,8 @@ export const AvatarEditorView: FC<{}> = props =>
return (
setIsVisible(false) } />
diff --git a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx
index 31c88a6..08c7c67 100644
--- a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx
+++ b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx
@@ -77,7 +77,7 @@ export const AvatarEditorFigureSetItemView: FC<{
itemActive={ isSelected }
itemImage={ (!partItem.isClear && isHead) ? assetUrl : undefined }
className={ `avatar-parts mx-auto${ isSelected ? ' part-selected' : '' }${ !partItem.isClear && isSellableNotOwned ? ' pet-sellable-locked' : '' }` }
- style={ isHead ? { backgroundSize: '200%', backgroundPosition: 'center -32px' } : undefined }
+ style={ isHead ? { backgroundSize: 'auto 80%', backgroundPosition: 'center', imageRendering: 'pixelated' } : undefined }
{ ...rest }
>
{ !partItem.isClear && assetUrl && !isHead &&
diff --git a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx
index 179f894..3def2bc 100644
--- a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx
+++ b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx
@@ -30,12 +30,12 @@ export const AvatarEditorFigureSetView: FC<{
};
return (
- columnCount={ columnCount } estimateSize={ estimateSize } itemRender={ (item: IAvatarEditorCategoryPartItem) =>
+ columnCount={ columnCount } itemMinWidth={ 42 } rowGap={ 8 } estimateSize={ estimateSize } itemRender={ (item: IAvatarEditorCategoryPartItem) =>
{
if(!item) return null;
return (
- selectEditorPart(category.setType, item.partSet?.id ?? -1) } />
+ selectEditorPart(category.setType, item.partSet?.id ?? -1) } />
);
} } items={ category.partItems } overscan={ columnCount } />
);
diff --git a/src/components/avatar-effects/AvatarEffectPreviewView.tsx b/src/components/avatar-effects/AvatarEffectPreviewView.tsx
new file mode 100644
index 0000000..b68d7d0
--- /dev/null
+++ b/src/components/avatar-effects/AvatarEffectPreviewView.tsx
@@ -0,0 +1,76 @@
+import { GetRoomEngine, RoomPreviewer } from '@nitrots/nitro-renderer';
+import { CSSProperties, FC, useEffect, useState } from 'react';
+import { LayoutRoomPreviewerView } from '../../common';
+
+interface AvatarEffectPreviewViewProps
+{
+ figure: string;
+ gender: string;
+ direction: number;
+ effect: number;
+ height?: number;
+ zoom?: number;
+}
+
+export const AvatarEffectPreviewView: FC = props =>
+{
+ const { figure = '', gender = 'M', direction = 4, effect = 0, height = 280, zoom = 1 } = props;
+ const [ roomPreviewer, setRoomPreviewer ] = useState(null);
+
+ const renderHeight = Math.floor(height / zoom);
+
+ useEffect(() =>
+ {
+ const previewer = new RoomPreviewer(GetRoomEngine(), ++RoomPreviewer.PREVIEW_COUNTER);
+ setRoomPreviewer(previewer);
+
+ return () =>
+ {
+ previewer.dispose();
+ setRoomPreviewer(null);
+ };
+ }, []);
+
+ useEffect(() =>
+ {
+ if(!roomPreviewer || !figure) return;
+
+ roomPreviewer.addAvatarIntoRoom(figure, effect);
+ roomPreviewer.updateObjectUserFigure(figure, gender);
+ }, [ roomPreviewer, figure, gender, effect ]);
+
+ useEffect(() =>
+ {
+ if(!roomPreviewer) return;
+ roomPreviewer.updateAvatarDirection(direction, direction);
+ }, [ roomPreviewer, direction ]);
+
+ if(!roomPreviewer) return null;
+
+ if(zoom === 1)
+ {
+ return ;
+ }
+
+ const outerStyle: CSSProperties = {
+ position: 'absolute',
+ inset: 0,
+ overflow: 'hidden'
+ };
+
+ const innerStyle: CSSProperties = {
+ width: `${ 100 / zoom }%`,
+ height: `${ 100 / zoom }%`,
+ transform: `scale(${ zoom })`,
+ transformOrigin: 'top left',
+ imageRendering: 'pixelated'
+ };
+
+ return (
+
+ );
+};
diff --git a/src/components/avatar-effects/AvatarEffectsView.tsx b/src/components/avatar-effects/AvatarEffectsView.tsx
new file mode 100644
index 0000000..14d4b89
--- /dev/null
+++ b/src/components/avatar-effects/AvatarEffectsView.tsx
@@ -0,0 +1,271 @@
+import { AddLinkEventTracker, AvatarDirectionAngle, AvatarEffectActivatedComposer, GetConfiguration, GetSessionDataManager, ILinkEventTracker, RemoveLinkEventTracker } from '@nitrots/nitro-renderer';
+import { ChangeEvent, FC, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { FaChevronLeft, FaChevronRight, FaSearch } from 'react-icons/fa';
+import { LocalizeText, SendMessageComposer } from '../../api';
+import { Button, Column, NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../common';
+import { AvatarEffectPreviewView } from './AvatarEffectPreviewView';
+
+interface EffectMapEntry
+{
+ id: string;
+ lib: string;
+ type: string;
+ revision?: string | number;
+}
+
+const DEFAULT_DIRECTION = 4;
+const PAGE_SIZE = 50;
+
+export const AvatarEffectsView: FC<{}> = () =>
+{
+ const [ isVisible, setIsVisible ] = useState(false);
+ const [ effects, setEffects ] = useState([]);
+ const [ loadError, setLoadError ] = useState(null);
+ const [ selectedId, setSelectedId ] = useState(0);
+ const [ direction, setDirection ] = useState(DEFAULT_DIRECTION);
+ const [ query, setQuery ] = useState('');
+ const [ visibleCount, setVisibleCount ] = useState(PAGE_SIZE);
+
+ useEffect(() =>
+ {
+ const linkTracker: ILinkEventTracker = {
+ linkReceived: (url: string) =>
+ {
+ const parts = url.split('/');
+ if(parts.length < 2) return;
+
+ switch(parts[1])
+ {
+ case 'show': setIsVisible(true); return;
+ case 'hide': setIsVisible(false); return;
+ case 'toggle': setIsVisible(prev => !prev); return;
+ }
+ },
+ eventUrlPrefix: 'avatar-effects/'
+ };
+
+ AddLinkEventTracker(linkTracker);
+
+ return () => RemoveLinkEventTracker(linkTracker);
+ }, []);
+
+ useEffect(() =>
+ {
+ if(!isVisible || effects.length || loadError) return;
+
+ const url = GetConfiguration().getValue('avatar.effectmap.url');
+ if(!url)
+ {
+ setLoadError('Effect map URL is not configured.');
+ return;
+ }
+
+ let cancelled = false;
+ (async () =>
+ {
+ try
+ {
+ const response = await fetch(url);
+ if(!response.ok) throw new Error(`HTTP ${ response.status }`);
+ const json = await response.json();
+ if(cancelled) return;
+
+ const list: EffectMapEntry[] = Array.isArray(json?.effects)
+ ? json.effects.filter((e: EffectMapEntry) => e?.type === 'fx' && /^\d+$/.test(String(e.id)))
+ : [];
+
+ list.sort((a, b) => parseInt(a.id, 10) - parseInt(b.id, 10));
+ setEffects(list);
+ }
+ catch(error)
+ {
+ if(!cancelled) setLoadError(String((error as Error).message ?? error));
+ }
+ })();
+
+ return () => { cancelled = true; };
+ }, [ isVisible, effects.length, loadError ]);
+
+ const session = GetSessionDataManager();
+ const figure = session?.figure ?? '';
+ const gender = session?.gender ?? 'M';
+
+ const rotateFigure = useCallback((delta: number) =>
+ {
+ setDirection(prev =>
+ {
+ let next = prev + delta;
+ if(next < AvatarDirectionAngle.MIN_DIRECTION) next = AvatarDirectionAngle.MAX_DIRECTION;
+ if(next > AvatarDirectionAngle.MAX_DIRECTION) next = AvatarDirectionAngle.MIN_DIRECTION;
+ return next;
+ });
+ }, []);
+
+ const applySelectedEffect = useCallback(() =>
+ {
+ if(!selectedId) return;
+ SendMessageComposer(new AvatarEffectActivatedComposer(selectedId));
+ setIsVisible(false);
+ }, [ selectedId ]);
+
+ const onClose = useCallback(() => setIsVisible(false), []);
+
+ const filteredEffects = useMemo(() =>
+ {
+ const trimmed = query.trim().toLowerCase();
+ if(!trimmed) return effects;
+ return effects.filter(e =>
+ e.id.toLowerCase().includes(trimmed) ||
+ e.lib.toLowerCase().includes(trimmed));
+ }, [ effects, query ]);
+
+ const onQueryChange = useCallback((event: ChangeEvent) =>
+ {
+ setQuery(event.target.value);
+ setVisibleCount(PAGE_SIZE);
+ }, []);
+
+ const visibleEffects = filteredEffects.slice(0, visibleCount);
+ const hasMore = filteredEffects.length > visibleEffects.length;
+ const selectedEffect = selectedId ? effects.find(e => parseInt(e.id, 10) === selectedId) : null;
+
+ const selectedRowRef = useRef(null);
+
+ const jumpToSelected = useCallback(() =>
+ {
+ if(!selectedId) return;
+
+ const indexInFiltered = filteredEffects.findIndex(e => parseInt(e.id, 10) === selectedId);
+ const indexInAll = effects.findIndex(e => parseInt(e.id, 10) === selectedId);
+
+ if(indexInFiltered === -1)
+ {
+ setQuery('');
+ if(indexInAll >= 0 && indexInAll >= visibleCount)
+ {
+ setVisibleCount(Math.ceil((indexInAll + 1) / PAGE_SIZE) * PAGE_SIZE);
+ }
+ }
+ else if(indexInFiltered >= visibleCount)
+ {
+ setVisibleCount(Math.ceil((indexInFiltered + 1) / PAGE_SIZE) * PAGE_SIZE);
+ }
+
+ requestAnimationFrame(() =>
+ {
+ selectedRowRef.current?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+ });
+ }, [ selectedId, filteredEffects, effects, visibleCount ]);
+
+ if(!isVisible) return null;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+ { selectedEffect &&
+
+
#{ parseInt(selectedEffect.id, 10) }
+
{ selectedEffect.lib }
+
+ }
+
+
+
+
+
+
+
+
+
+ { filteredEffects.length === effects.length ? `${ effects.length } effects` : `${ filteredEffects.length } of ${ effects.length }` }
+ { selectedId > 0 &&
+ }
+
+
+ { loadError &&
{ loadError }
}
+ { !loadError && !effects.length &&
{ LocalizeText('generic.loading') || 'Loading…' }
}
+ { !!effects.length && !filteredEffects.length &&
+
{ LocalizeText('generic.search.noresults') || 'No effects match your search.' }
+ }
+ { !!visibleEffects.length &&
+
+ { visibleEffects.map((effect, index) =>
+ {
+ const id = parseInt(effect.id, 10);
+ const isSelected = (id === selectedId);
+ return (
+ -
+
+
+ );
+ }) }
+ { hasMore &&
+ -
+
+
+ }
+
+ }
+
+
+
+
+ );
+};
diff --git a/src/components/avatar-effects/index.ts b/src/components/avatar-effects/index.ts
new file mode 100644
index 0000000..17f1000
--- /dev/null
+++ b/src/components/avatar-effects/index.ts
@@ -0,0 +1,2 @@
+export * from './AvatarEffectPreviewView';
+export * from './AvatarEffectsView';
diff --git a/src/components/friends/views/friends-bar/FriendBarItemView.tsx b/src/components/friends/views/friends-bar/FriendBarItemView.tsx
index 239016b..61a6d42 100644
--- a/src/components/friends/views/friends-bar/FriendBarItemView.tsx
+++ b/src/components/friends/views/friends-bar/FriendBarItemView.tsx
@@ -33,7 +33,7 @@ export const FriendBarItemView: FC<{ friend: MessengerFriend }> = props => {
onClick={() => setVisible(prev => !prev)}
>
- {LocalizeText('friend.bar.find.title')}
+ {LocalizeText('friend.bar.find.title')}
@@ -45,10 +45,10 @@ export const FriendBarItemView: FC<{ friend: MessengerFriend }> = props => {
transition={{ type: "spring", stiffness: 400, damping: 25 }}
className="absolute bottom-[calc(100%+12px)] left-1/2 -translate-x-1/2 tbme-panel whitespace-nowrap z-[80] flex flex-col items-center gap-2 pointer-events-auto min-w-[170px]"
>
- {LocalizeText('friend.bar.find.title')}
+ {LocalizeText('friend.bar.find.title')}
{LocalizeText('friend.bar.find.text')}