duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-19 23:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

🆙 Catalog & Inventory preview now to original

Browse Source
This commit is contained in:
DuckieTM
2026-06-06 08:10:40 +02:00
parent e91aa0c202
commit bf37aef9af
8 changed files with 186 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx
+21 -3
View File
@@ -1,4 +1,4 @@
import { GetAvatarRenderManager, GetSessionDataManager, Vector3d } from '@nitrots/nitro-renderer';
import { GetAvatarRenderManager, GetRoomEngine, GetSessionDataManager, RoomObjectVariable, Vector3d } from '@nitrots/nitro-renderer';
import { FC, useEffect } from 'react';
import { BuildPurchasableClothingFigure, FurniCategory, Offer, ProductTypeEnum } from '../../../../../api';
import { AutoGrid, Column, LayoutGridItem, LayoutRoomPreviewerView } from '../../../../../common';
@@ -19,7 +19,25 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
if(!product) return;
roomPreviewer.reset(false);
roomPreviewer.updateObjectRoom('default', 'default', 'default');
// Mirror the user's current room so the catalog preview shows
// the item against the wallpaper / floor / landscape they
// actually have decorated. Same approach as
// InventoryFurnitureView - read the active room's pattern ids
// off the room engine, fall back to '101' / '101' / '1.1' if
// the user isn't in a room yet (those are real Habbo pattern
// ids, the literal 'default' we used before is not and made
// the previewer fall back to blank white surfaces).
const roomEngine = GetRoomEngine();
let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
let wallType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_WALL_TYPE);
let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
floorType = (floorType && floorType.length) ? floorType : '3002';
wallType = (wallType && wallType.length) ? wallType : '3001';
landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
roomPreviewer.updateObjectRoom(floorType, wallType, landscapeType);
roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
const populate = () =>
@@ -91,7 +109,7 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
return;
}
default:
roomPreviewer.updateObjectRoom('default', 'default', 'default');
roomPreviewer.updateObjectRoom('101', '101', '1.1');
roomPreviewer.addWallItemIntoRoom(product.productClassId, new Vector3d(90), product.extraParam);
return;
}
src/components/inventory/views/bot/InventoryBotView.tsx
+2 -2
View File
@@ -29,8 +29,8 @@ export const InventoryBotView: FC<{
let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
wallType = (wallType && wallType.length) ? wallType : '101';
floorType = (floorType && floorType.length) ? floorType : '101';
wallType = (wallType && wallType.length) ? wallType : '3001';
floorType = (floorType && floorType.length) ? floorType : '3002';
landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
roomPreviewer.reset(false);
src/components/inventory/views/furniture/InventoryFurnitureView.tsx
+20 -3
View File
@@ -61,8 +61,8 @@ export const InventoryFurnitureView: FC<{
let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
wallType = (wallType && wallType.length) ? wallType : '101';
floorType = (floorType && floorType.length) ? floorType : '101';
wallType = (wallType && wallType.length) ? wallType : '3001';
floorType = (floorType && floorType.length) ? floorType : '3002';
landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
@@ -83,7 +83,24 @@ export const InventoryFurnitureView: FC<{
return;
}
roomPreviewer.updateObjectRoom('default', 'default', 'default');
// Mirror the active room's pattern ids so the furniture
// preview lands on the same wallpaper / floor / landscape the
// user is decorated with. Same fallback as the
// isRoomDecoration branch above; 'default' isn't a real
// pattern id, so passing it made the previewer fall back to
// blank white surfaces.
{
const roomEngine = GetRoomEngine();
let wallType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_WALL_TYPE);
let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
wallType = (wallType && wallType.length) ? wallType : '3001';
floorType = (floorType && floorType.length) ? floorType : '3002';
landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
roomPreviewer.updateObjectRoom(floorType, wallType, landscapeType);
}
roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
if(selectedItem.isWallItem)
src/components/inventory/views/pet/InventoryPetView.tsx
+2 -2
View File
@@ -44,8 +44,8 @@ export const InventoryPetView: FC<{
let floorType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_FLOOR_TYPE);
let landscapeType = roomEngine.getRoomInstanceVariable<string>(roomEngine.activeRoomId, RoomObjectVariable.ROOM_LANDSCAPE_TYPE);
wallType = (wallType && wallType.length) ? wallType : '101';
floorType = (floorType && floorType.length) ? floorType : '101';
wallType = (wallType && wallType.length) ? wallType : '3001';
floorType = (floorType && floorType.length) ? floorType : '3002';
landscapeType = (landscapeType && landscapeType.length) ? landscapeType : '1.1';
roomPreviewer.reset(false);