You've already forked Nitro_Render_V3
mirror of
https://github.com/duckietm/Nitro_Render_V3.git
synced 2026-06-20 07:26:18 +00:00
🆙 Small Fixes
This commit is contained in:
duckietm
@@ -22,6 +22,7 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService
|
||||
{
|
||||
public static ROOM_OBJECT_ID: number = -1;
|
||||
public static ROOM_OBJECT_TYPE: string = 'room';
|
||||
private _areaHideHoleCounts = new Map<string, number>();
|
||||
|
||||
public static CURSOR_OBJECT_ID: number = -2;
|
||||
public static CURSOR_OBJECT_TYPE: string = 'tile_cursor';
|
||||
@@ -170,6 +171,11 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService
|
||||
existing.dispose();
|
||||
}
|
||||
|
||||
for(const key of Array.from(this._areaHideHoleCounts.keys()))
|
||||
{
|
||||
if(key.startsWith(roomId + ':')) this._areaHideHoleCounts.delete(key);
|
||||
}
|
||||
|
||||
GetEventDispatcher().dispatchEvent(new RoomEngineEvent(RoomEngineEvent.DISPOSED, roomId));
|
||||
}
|
||||
|
||||
@@ -585,14 +591,106 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService
|
||||
|
||||
GetEventDispatcher().dispatchEvent(new RoomEngineAreaHideStateEvent(roomId, furniId, RoomObjectCategory.FLOOR, on));
|
||||
|
||||
this.removeAreaHideFloorHoles(roomObject, roomId, furniId);
|
||||
|
||||
if(on)
|
||||
{
|
||||
roomObject.logic.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.ADD, furniId, rootX, rootY, width, length, invert));
|
||||
const rectangles = this.getAreaHideHoleRectangles(roomObject, rootX, rootY, width, length, invert);
|
||||
|
||||
for(let index = 0; index < rectangles.length; index++)
|
||||
{
|
||||
const rectangle = rectangles[index];
|
||||
|
||||
roomObject.logic.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.ADD, this.getAreaHideHoleId(furniId, index), rectangle.x, rectangle.y, rectangle.width, rectangle.length, false));
|
||||
}
|
||||
|
||||
this._areaHideHoleCounts.set(this.getAreaHideHoleKey(roomId, furniId), rectangles.length);
|
||||
}
|
||||
else
|
||||
{
|
||||
roomObject.logic.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.REMOVE, furniId));
|
||||
this._areaHideHoleCounts.delete(this.getAreaHideHoleKey(roomId, furniId));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private removeAreaHideFloorHoles(roomObject: IRoomObjectController, roomId: number, furniId: number): void
|
||||
{
|
||||
if(!roomObject?.logic) return;
|
||||
|
||||
roomObject.logic.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.REMOVE, furniId));
|
||||
|
||||
const count = this._areaHideHoleCounts.get(this.getAreaHideHoleKey(roomId, furniId)) ?? 0;
|
||||
|
||||
for(let index = 0; index < Math.max(count, 4); index++)
|
||||
{
|
||||
roomObject.logic.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.REMOVE, this.getAreaHideHoleId(furniId, index)));
|
||||
}
|
||||
}
|
||||
|
||||
private getAreaHideHoleKey(roomId: number, furniId: number): string
|
||||
{
|
||||
return roomId + ':' + furniId;
|
||||
}
|
||||
|
||||
private getAreaHideHoleId(furniId: number, index: number): number
|
||||
{
|
||||
return -((furniId * 10000) + index + 1);
|
||||
}
|
||||
|
||||
private getAreaHideHoleRectangles(roomObject: IRoomObjectController, rootX: number, rootY: number, width: number, length: number, invert: boolean): { x: number, y: number, width: number, length: number }[]
|
||||
{
|
||||
const rectangles: { x: number, y: number, width: number, length: number }[] = [];
|
||||
|
||||
if(width <= 0 || length <= 0) return rectangles;
|
||||
|
||||
const roomMap = roomObject?.model?.getValue<RoomMapData>(RoomObjectVariable.ROOM_MAP_DATA);
|
||||
const tileMap = roomMap?.tileMap;
|
||||
|
||||
if(!tileMap?.length) return rectangles;
|
||||
|
||||
const areaMinX = rootX;
|
||||
const areaMinY = rootY;
|
||||
const areaMaxX = (rootX + width);
|
||||
const areaMaxY = (rootY + length);
|
||||
const pushRectangle = (x: number, y: number, rectWidth: number) =>
|
||||
{
|
||||
if(rectWidth <= 0) return;
|
||||
|
||||
rectangles.push({ x, y, width: rectWidth, length: 1 });
|
||||
};
|
||||
|
||||
for(let y = 0; y < tileMap.length; y++)
|
||||
{
|
||||
const row = tileMap[y];
|
||||
|
||||
if(!row?.length) continue;
|
||||
|
||||
let segmentStart = -1;
|
||||
|
||||
for(let x = 0; x <= row.length; x++)
|
||||
{
|
||||
const tileHeight = (x < row.length) ? row[x]?.height : Number.NEGATIVE_INFINITY;
|
||||
const validTile = (tileHeight >= 0);
|
||||
const inSelection = (x >= areaMinX) && (x < areaMaxX) && (y >= areaMinY) && (y < areaMaxY);
|
||||
const shouldHide = validTile && (invert ? !inSelection : inSelection);
|
||||
|
||||
if(shouldHide)
|
||||
{
|
||||
if(segmentStart === -1) segmentStart = x;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if(segmentStart !== -1)
|
||||
{
|
||||
pushRectangle(segmentStart, y, (x - segmentStart));
|
||||
segmentStart = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return rectangles;
|
||||
}
|
||||
|
||||
public updateObjectRoomColor(roomId: number, color: number, light: number, backgroundOnly: boolean): boolean
|
||||
@@ -1733,6 +1831,12 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService
|
||||
object.processUpdateMessage(new RoomObjectUpdateMessage(location, direction));
|
||||
object.processUpdateMessage(new ObjectDataUpdateMessage(state, data, extra));
|
||||
|
||||
if(object.model && (extra === 2147483001))
|
||||
{
|
||||
object.model.setValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT, 1);
|
||||
object.model.setValue(RoomObjectVariable.FURNITURE_IS_WALK_HEIGHT_HELPER, 1);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { AvatarGuideStatus, IConnection, IMessageEvent, IRoomCreator, IRoomObjectController, IVector3D, LegacyDataType, ObjectRolling, PetType, RoomObjectType, RoomObjectUserType, RoomObjectVariable } from '@nitrots/api';
|
||||
import { AreaHideMessageEvent, DiceValueMessageEvent, FloorHeightMapEvent, FurnitureAliasesComposer, FurnitureAliasesEvent, FurnitureDataEvent, FurnitureFloorAddEvent, FurnitureFloorDataParser, FurnitureFloorEvent, FurnitureFloorRemoveEvent, FurnitureFloorUpdateEvent, FurnitureWallAddEvent, FurnitureWallDataParser, FurnitureWallEvent, FurnitureWallRemoveEvent, FurnitureWallUpdateEvent, GetCommunication, GetRoomEntryDataMessageComposer, GuideSessionEndedMessageEvent, GuideSessionErrorMessageEvent, GuideSessionStartedMessageEvent, IgnoreResultEvent, ItemDataUpdateMessageEvent, ObjectsDataUpdateEvent, ObjectsRollingEvent, OneWayDoorStatusMessageEvent, PetExperienceEvent, PetFigureUpdateEvent, RoomEntryTileMessageEvent, RoomEntryTileMessageParser, RoomHeightMapEvent, RoomHeightMapUpdateEvent, RoomPaintEvent, RoomReadyMessageEvent, RoomUnitChatEvent, RoomUnitChatShoutEvent, RoomUnitChatWhisperEvent, RoomUnitDanceEvent, RoomUnitEffectEvent, RoomUnitEvent, RoomUnitExpressionEvent, RoomUnitHandItemEvent, RoomUnitIdleEvent, RoomUnitInfoEvent, RoomUnitNumberEvent, RoomUnitRemoveEvent, RoomUnitStatusEvent, RoomUnitStatusMessage, RoomUnitTypingEvent, RoomVisualizationSettingsEvent, UserInfoEvent, WiredFurniMovementData, WiredMovementsEvent, WiredUserDirectionUpdateData, WiredUserMovementData, YouArePlayingGameEvent } from '@nitrots/communication';
|
||||
import { AvatarGuideStatus, IConnection, IMessageEvent, IRoomCreator, IRoomObjectController, IRoomObject, IVector3D, LegacyDataType, ObjectRolling, PetType, RoomObjectCategory, RoomObjectType, RoomObjectUserType, RoomObjectVariable } from '@nitrots/api';
|
||||
import { AreaHideMessageEvent, ConfInvisStateMessageEvent, DiceValueMessageEvent, FloorHeightMapEvent, FurnitureAliasesComposer, FurnitureAliasesEvent, FurnitureDataEvent, FurnitureFloorAddEvent, FurnitureFloorDataParser, FurnitureFloorEvent, FurnitureFloorRemoveEvent, FurnitureFloorUpdateEvent, FurnitureWallAddEvent, FurnitureWallDataParser, FurnitureWallEvent, FurnitureWallRemoveEvent, FurnitureWallUpdateEvent, GetCommunication, GetRoomEntryDataMessageComposer, GuideSessionEndedMessageEvent, GuideSessionErrorMessageEvent, GuideSessionStartedMessageEvent, IgnoreResultEvent, ItemDataUpdateMessageEvent, ObjectsDataUpdateEvent, ObjectsRollingEvent, OneWayDoorStatusMessageEvent, PetExperienceEvent, PetFigureUpdateEvent, RoomEntryTileMessageEvent, RoomEntryTileMessageParser, RoomHeightMapEvent, RoomHeightMapUpdateEvent, RoomPaintEvent, RoomReadyMessageEvent, RoomUnitChatEvent, RoomUnitChatShoutEvent, RoomUnitChatWhisperEvent, RoomUnitDanceEvent, RoomUnitEffectEvent, RoomUnitEvent, RoomUnitExpressionEvent, RoomUnitHandItemEvent, RoomUnitIdleEvent, RoomUnitInfoEvent, RoomUnitNumberEvent, RoomUnitRemoveEvent, RoomUnitStatusEvent, RoomUnitStatusMessage, RoomUnitTypingEvent, RoomVisualizationSettingsEvent, UserInfoEvent, WiredFurniMovementData, WiredMovementsEvent, WiredUserDirectionUpdateData, WiredUserMovementData, YouArePlayingGameEvent } from '@nitrots/communication';
|
||||
import { GetRoomSessionManager, GetSessionDataManager } from '@nitrots/session';
|
||||
import { Vector3d } from '@nitrots/utils';
|
||||
import { GetRoomEngine } from './GetRoomEngine';
|
||||
@@ -7,6 +7,16 @@ import { RoomVariableEnum } from './RoomVariableEnum';
|
||||
import { RoomPlaneParser } from './object/RoomPlaneParser';
|
||||
import { FurnitureStackingHeightMap, LegacyWallGeometry } from './utils';
|
||||
|
||||
type AreaHideControllerState = {
|
||||
rootX: number;
|
||||
rootY: number;
|
||||
width: number;
|
||||
length: number;
|
||||
invert: boolean;
|
||||
wallItems: boolean;
|
||||
invisibility: boolean;
|
||||
};
|
||||
|
||||
export class RoomMessageHandler
|
||||
{
|
||||
private static WIRED_FURNI_ANCHOR_NONE = 0;
|
||||
@@ -21,8 +31,13 @@ export class RoomMessageHandler
|
||||
private _planeParser = new RoomPlaneParser();
|
||||
private _latestEntryTileEvent: RoomEntryTileMessageEvent = null;
|
||||
private _messageEvents: IMessageEvent[] = [];
|
||||
private _activeWiredUserMovements = new Map<number, { expiresAt: number, targetX: number, targetY: number, targetZ: number }>();
|
||||
private _activeWiredUserMovements = new Map<number, { expiresAt: number, sourceX: number, sourceY: number, sourceZ: number, targetX: number, targetY: number, targetZ: number }>();
|
||||
private _activeRoomUserWalks = new Map<number, { startedAt: number, targetX: number, targetY: number, targetZ: number, duration: number }>();
|
||||
private _activeConfInvisHiddenItemIds = new Set<number>();
|
||||
private _confInvisReapplyTimeouts: ReturnType<typeof setTimeout>[] = [];
|
||||
private _activeAreaHideControllers = new Map<number, AreaHideControllerState>();
|
||||
private _areaHideReapplyTimeouts: ReturnType<typeof setTimeout>[] = [];
|
||||
private _isConfInvisControlActive = false;
|
||||
|
||||
private _currentRoomId: number = 0;
|
||||
private _ownUserId: number = 0;
|
||||
@@ -62,6 +77,7 @@ export class RoomMessageHandler
|
||||
new ItemDataUpdateMessageEvent(this.onItemDataUpdateMessageEvent.bind(this)),
|
||||
new OneWayDoorStatusMessageEvent(this.onOneWayDoorStatusMessageEvent.bind(this)),
|
||||
new AreaHideMessageEvent(this.onAreaHideMessageEvent.bind(this)),
|
||||
new ConfInvisStateMessageEvent(this.onConfInvisStateMessageEvent.bind(this)),
|
||||
new RoomUnitDanceEvent(this.onRoomUnitDanceEvent.bind(this)),
|
||||
new RoomUnitEffectEvent(this.onRoomUnitEffectEvent.bind(this)),
|
||||
new RoomUnitEvent(this.onRoomUnitEvent.bind(this)),
|
||||
@@ -110,12 +126,16 @@ export class RoomMessageHandler
|
||||
this._latestEntryTileEvent = null;
|
||||
this._activeWiredUserMovements.clear();
|
||||
this._activeRoomUserWalks.clear();
|
||||
|
||||
if(this._planeParser)
|
||||
{
|
||||
this._planeParser.dispose();
|
||||
this._planeParser = null;
|
||||
}
|
||||
this._activeConfInvisHiddenItemIds.clear();
|
||||
this.clearConfInvisReapplyTimeouts();
|
||||
this._activeAreaHideControllers.clear();
|
||||
this.clearAreaHideReapplyTimeouts();
|
||||
this._isConfInvisControlActive = false;
|
||||
}
|
||||
|
||||
public setRoomId(id: number): void
|
||||
@@ -129,6 +149,11 @@ export class RoomMessageHandler
|
||||
this._latestEntryTileEvent = null;
|
||||
this._activeWiredUserMovements.clear();
|
||||
this._activeRoomUserWalks.clear();
|
||||
this._activeConfInvisHiddenItemIds.clear();
|
||||
this.clearConfInvisReapplyTimeouts();
|
||||
this._activeAreaHideControllers.clear();
|
||||
this.clearAreaHideReapplyTimeouts();
|
||||
this._isConfInvisControlActive = false;
|
||||
}
|
||||
|
||||
public clearRoomId(): void
|
||||
@@ -137,6 +162,11 @@ export class RoomMessageHandler
|
||||
this._latestEntryTileEvent = null;
|
||||
this._activeWiredUserMovements.clear();
|
||||
this._activeRoomUserWalks.clear();
|
||||
this._activeConfInvisHiddenItemIds.clear();
|
||||
this.clearConfInvisReapplyTimeouts();
|
||||
this._activeAreaHideControllers.clear();
|
||||
this.clearAreaHideReapplyTimeouts();
|
||||
this._isConfInvisControlActive = false;
|
||||
}
|
||||
|
||||
private onUserInfoEvent(event: UserInfoEvent): void
|
||||
@@ -383,6 +413,8 @@ export class RoomMessageHandler
|
||||
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, parser.rollerId, null, null, 1, null);
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, parser.rollerId, null, null, 2, null);
|
||||
this.applyConfInvisStateToFloorObjects([ parser.rollerId ]);
|
||||
this.applyAreaHideStateToFloorObjects([ parser.rollerId ]);
|
||||
|
||||
const furnitureRolling = parser.itemsRolling;
|
||||
|
||||
@@ -394,6 +426,8 @@ export class RoomMessageHandler
|
||||
|
||||
this._roomEngine.rollRoomObjectFloor(this._currentRoomId, rollData.id, rollData.location, rollData.targetLocation);
|
||||
}
|
||||
|
||||
this.scheduleAreaHideReapply(this._currentRoomId);
|
||||
}
|
||||
|
||||
const unitRollData = parser.unitRolling;
|
||||
@@ -584,6 +618,9 @@ export class RoomMessageHandler
|
||||
{
|
||||
this._activeWiredUserMovements.set(movement.id, {
|
||||
expiresAt: Date.now() + Math.max(movement.duration, 1) + RoomMessageHandler.WIRED_MOVEMENT_STATUS_GRACE,
|
||||
sourceX: movement.location.x,
|
||||
sourceY: movement.location.y,
|
||||
sourceZ: movement.location.z,
|
||||
targetX: movement.targetLocation.x,
|
||||
targetY: movement.targetLocation.y,
|
||||
targetZ: movement.targetLocation.z
|
||||
@@ -603,7 +640,8 @@ export class RoomMessageHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
if(this.shouldReleaseWiredStatusLocation(status, activeMovement))
|
||||
if(this.shouldDiscardWiredStatusLocation(status, activeMovement)
|
||||
|| !!this.getMatchedWiredStatusTargetLocation(status, activeMovement))
|
||||
{
|
||||
this._activeWiredUserMovements.delete(status.id);
|
||||
|
||||
@@ -613,37 +651,82 @@ export class RoomMessageHandler
|
||||
return true;
|
||||
}
|
||||
|
||||
private shouldReleaseWiredStatusLocation(status: RoomUnitStatusMessage, activeMovement: { expiresAt: number, targetX: number, targetY: number, targetZ: number }): boolean
|
||||
private getReleasedWiredStatusLocation(status: RoomUnitStatusMessage): IVector3D
|
||||
{
|
||||
const activeMovement = this._activeWiredUserMovements.get(status.id);
|
||||
|
||||
if(!activeMovement) return null;
|
||||
|
||||
if(activeMovement.expiresAt <= Date.now()) return null;
|
||||
|
||||
if(this.shouldDiscardWiredStatusLocation(status, activeMovement)) return null;
|
||||
|
||||
return this.getMatchedWiredStatusTargetLocation(status, activeMovement);
|
||||
}
|
||||
|
||||
private getMatchedWiredStatusTargetLocation(status: RoomUnitStatusMessage, activeMovement: { expiresAt: number, sourceX: number, sourceY: number, sourceZ: number, targetX: number, targetY: number, targetZ: number }): IVector3D
|
||||
{
|
||||
if(this.matchesWiredMovementTarget(status.x, status.y, (status.z + status.height), activeMovement))
|
||||
{
|
||||
return new Vector3d(activeMovement.targetX, activeMovement.targetY, activeMovement.targetZ);
|
||||
}
|
||||
|
||||
if(status.didMove && this.matchesWiredMovementTarget(status.targetX, status.targetY, status.targetZ, activeMovement))
|
||||
{
|
||||
return new Vector3d(activeMovement.targetX, activeMovement.targetY, activeMovement.targetZ);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private shouldDiscardWiredStatusLocation(status: RoomUnitStatusMessage, activeMovement: { expiresAt: number, sourceX: number, sourceY: number, sourceZ: number, targetX: number, targetY: number, targetZ: number }): boolean
|
||||
{
|
||||
if(!status.didMove)
|
||||
{
|
||||
return this.matchesWiredMovementTarget(status.x, status.y, (status.z + status.height), activeMovement);
|
||||
return !this.matchesWiredMovementSource(status.x, status.y, (status.z + status.height), activeMovement)
|
||||
&& !this.matchesWiredMovementTarget(status.x, status.y, (status.z + status.height), activeMovement);
|
||||
}
|
||||
|
||||
return !this.matchesWiredMovementTarget(status.targetX, status.targetY, status.targetZ, activeMovement);
|
||||
return !this.matchesWiredMovementSource(status.x, status.y, (status.z + status.height), activeMovement)
|
||||
&& !this.matchesWiredMovementTarget(status.x, status.y, (status.z + status.height), activeMovement)
|
||||
&& !this.matchesWiredMovementSource(status.targetX, status.targetY, status.targetZ, activeMovement)
|
||||
&& !this.matchesWiredMovementTarget(status.targetX, status.targetY, status.targetZ, activeMovement);
|
||||
}
|
||||
|
||||
private matchesWiredMovementTarget(x: number, y: number, z: number, activeMovement: { expiresAt: number, targetX: number, targetY: number, targetZ: number }): boolean
|
||||
private matchesWiredMovementSource(x: number, y: number, z: number, activeMovement: { expiresAt: number, sourceX: number, sourceY: number, sourceZ: number, targetX: number, targetY: number, targetZ: number }): boolean
|
||||
{
|
||||
if(!activeMovement) return false;
|
||||
|
||||
return ((x === activeMovement.targetX)
|
||||
&& (y === activeMovement.targetY)
|
||||
&& (Math.abs(z - activeMovement.targetZ) <= RoomMessageHandler.WIRED_MOVEMENT_Z_EPSILON));
|
||||
return this.matchesWiredMovementLocation(x, y, z, activeMovement.sourceX, activeMovement.sourceY, activeMovement.sourceZ);
|
||||
}
|
||||
|
||||
private matchesWiredMovementTarget(x: number, y: number, z: number, activeMovement: { expiresAt: number, sourceX: number, sourceY: number, sourceZ: number, targetX: number, targetY: number, targetZ: number }): boolean
|
||||
{
|
||||
if(!activeMovement) return false;
|
||||
|
||||
return this.matchesWiredMovementLocation(x, y, z, activeMovement.targetX, activeMovement.targetY, activeMovement.targetZ);
|
||||
}
|
||||
|
||||
private matchesWiredMovementLocation(x: number, y: number, z: number, movementX: number, movementY: number, movementZ: number): boolean
|
||||
{
|
||||
return ((x === movementX)
|
||||
&& (y === movementY)
|
||||
&& (Math.abs(z - movementZ) <= RoomMessageHandler.WIRED_MOVEMENT_Z_EPSILON));
|
||||
}
|
||||
|
||||
private applyWiredUserDirectionUpdate(update: WiredUserDirectionUpdateData): void
|
||||
{
|
||||
this._roomEngine.updateRoomObjectUserLocation(
|
||||
this._currentRoomId,
|
||||
update.id,
|
||||
null,
|
||||
null,
|
||||
false,
|
||||
0,
|
||||
new Vector3d(update.bodyDirection),
|
||||
update.headDirection,
|
||||
true);
|
||||
const userObject = this._roomEngine.getRoomObjectUser(this._currentRoomId, update.id);
|
||||
|
||||
if(!userObject) return;
|
||||
|
||||
userObject.setDirection(new Vector3d(update.bodyDirection));
|
||||
|
||||
const model = userObject.model;
|
||||
|
||||
if(!model) return;
|
||||
|
||||
model.setValue(RoomObjectVariable.HEAD_DIRECTION, update.headDirection);
|
||||
}
|
||||
|
||||
private onObjectsDataUpdateEvent(event: ObjectsDataUpdateEvent): void
|
||||
@@ -658,6 +741,9 @@ export class RoomMessageHandler
|
||||
{
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, object.id, null, null, object.state, object.data);
|
||||
}
|
||||
|
||||
this.applyConfInvisStateToFloorObjects();
|
||||
this.applyAreaHideStateToFloorObjects();
|
||||
}
|
||||
|
||||
private onFurnitureAliasesEvent(event: FurnitureAliasesEvent): void
|
||||
@@ -678,6 +764,8 @@ export class RoomMessageHandler
|
||||
if(!item) return;
|
||||
|
||||
this.addRoomObjectFurnitureFloor(this._currentRoomId, item);
|
||||
this.applyConfInvisStateToFloorObjects([ item.itemId ]);
|
||||
this.applyAreaHideStateToFloorObjects([ item.itemId ]);
|
||||
}
|
||||
|
||||
private onFurnitureFloorEvent(event: FurnitureFloorEvent): void
|
||||
@@ -700,6 +788,10 @@ export class RoomMessageHandler
|
||||
|
||||
iterator++;
|
||||
}
|
||||
|
||||
this.applyConfInvisStateToFloorObjects();
|
||||
this.applyAreaHideStateToFloorObjects();
|
||||
this.scheduleAreaHideReapply(this._currentRoomId);
|
||||
}
|
||||
|
||||
private onFurnitureFloorRemoveEvent(event: FurnitureFloorRemoveEvent): void
|
||||
@@ -714,12 +806,18 @@ export class RoomMessageHandler
|
||||
{
|
||||
setTimeout(() =>
|
||||
{
|
||||
this._activeConfInvisHiddenItemIds.delete(parser.itemId);
|
||||
this._activeAreaHideControllers.delete(parser.itemId);
|
||||
this._roomEngine.removeRoomObjectFloor(this._currentRoomId, parser.itemId, (parser.isExpired) ? -1 : parser.userId, true);
|
||||
this.applyAreaHideStateToRoomObjects();
|
||||
}, parser.delay);
|
||||
}
|
||||
else
|
||||
{
|
||||
this._activeConfInvisHiddenItemIds.delete(parser.itemId);
|
||||
this._activeAreaHideControllers.delete(parser.itemId);
|
||||
this._roomEngine.removeRoomObjectFloor(this._currentRoomId, parser.itemId, (parser.isExpired) ? -1 : parser.userId, true);
|
||||
this.applyAreaHideStateToRoomObjects();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -737,6 +835,73 @@ export class RoomMessageHandler
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, item.itemId, location, direction, item.data.state, item.data, item.extra);
|
||||
this._roomEngine.updateRoomObjectFloorHeight(this._currentRoomId, item.itemId, item.stackHeight);
|
||||
this._roomEngine.updateRoomObjectFloorExpiration(this._currentRoomId, item.itemId, item.expires);
|
||||
this.applyConfInvisStateToFloorObjects([ item.itemId ]);
|
||||
this.applyAreaHideStateToFloorObjects([ item.itemId ]);
|
||||
}
|
||||
|
||||
private onConfInvisStateMessageEvent(event: ConfInvisStateMessageEvent): void
|
||||
{
|
||||
if(!(event instanceof ConfInvisStateMessageEvent) || !event.connection || !this._roomEngine) return;
|
||||
|
||||
const parser = event.getParser();
|
||||
|
||||
if(!parser?.stateData) return;
|
||||
if(parser.stateData.roomId !== this._currentRoomId) return;
|
||||
|
||||
this._isConfInvisControlActive = parser.stateData.active;
|
||||
this._activeConfInvisHiddenItemIds = new Set<number>(parser.stateData.hiddenItemIds);
|
||||
this.applyConfInvisStateToFloorObjects();
|
||||
this.applyAreaHideStateToRoomObjects();
|
||||
this.scheduleConfInvisReapply(parser.stateData.roomId);
|
||||
this.scheduleAreaHideReapply(parser.stateData.roomId);
|
||||
}
|
||||
|
||||
private applyConfInvisStateToFloorObjects(itemIds?: number[]): void
|
||||
{
|
||||
const floorObjects = ((this._roomEngine as any)?.getRoomObjects?.(this._currentRoomId, RoomObjectCategory.FLOOR) as IRoomObject[]) ?? [];
|
||||
|
||||
if(!floorObjects?.length) return;
|
||||
|
||||
const scopedIds = itemIds?.length ? new Set<number>(itemIds) : null;
|
||||
|
||||
for(const roomObject of floorObjects)
|
||||
{
|
||||
if(!roomObject?.model) continue;
|
||||
if(scopedIds && !scopedIds.has(roomObject.id)) continue;
|
||||
|
||||
roomObject.model.setValue(RoomObjectVariable.FURNITURE_CONF_INVIS_HIDDEN, this._activeConfInvisHiddenItemIds.has(roomObject.id) ? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
||||
private scheduleConfInvisReapply(roomId: number): void
|
||||
{
|
||||
this.clearConfInvisReapplyTimeouts();
|
||||
|
||||
const retryDelays = [ 0, 50, 150, 300, 600, 1000 ];
|
||||
|
||||
for(const delay of retryDelays)
|
||||
{
|
||||
const timeout = setTimeout(() =>
|
||||
{
|
||||
if(roomId !== this._currentRoomId) return;
|
||||
|
||||
this.applyConfInvisStateToFloorObjects();
|
||||
}, delay);
|
||||
|
||||
this._confInvisReapplyTimeouts.push(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
private clearConfInvisReapplyTimeouts(): void
|
||||
{
|
||||
if(!this._confInvisReapplyTimeouts.length) return;
|
||||
|
||||
for(const timeout of this._confInvisReapplyTimeouts)
|
||||
{
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
|
||||
this._confInvisReapplyTimeouts = [];
|
||||
}
|
||||
|
||||
private onFurnitureWallAddEvent(event: FurnitureWallAddEvent): void
|
||||
@@ -748,6 +913,7 @@ export class RoomMessageHandler
|
||||
if(!data) return;
|
||||
|
||||
this.addRoomObjectFurnitureWall(this._currentRoomId, data);
|
||||
this.applyAreaHideStateToWallObjects([ data.itemId ]);
|
||||
}
|
||||
|
||||
private onFurnitureWallEvent(event: FurnitureWallEvent): void
|
||||
@@ -770,6 +936,9 @@ export class RoomMessageHandler
|
||||
|
||||
iterator++;
|
||||
}
|
||||
|
||||
this.applyAreaHideStateToWallObjects();
|
||||
this.scheduleAreaHideReapply(this._currentRoomId);
|
||||
}
|
||||
|
||||
private onFurnitureWallRemoveEvent(event: FurnitureWallRemoveEvent): void
|
||||
@@ -781,6 +950,7 @@ export class RoomMessageHandler
|
||||
if(!parser) return;
|
||||
|
||||
this._roomEngine.removeRoomObjectWall(this._currentRoomId, parser.itemId, parser.userId);
|
||||
this.applyAreaHideStateToWallObjects();
|
||||
}
|
||||
|
||||
private onFurnitureWallUpdateEvent(event: FurnitureWallUpdateEvent): void
|
||||
@@ -800,6 +970,7 @@ export class RoomMessageHandler
|
||||
|
||||
this._roomEngine.updateRoomObjectWall(this._currentRoomId, item.itemId, location, direction, item.state, item.stuffData);
|
||||
this._roomEngine.updateRoomObjectWallExpiration(this._currentRoomId, item.itemId, item.secondsToExpiration);
|
||||
this.applyAreaHideStateToWallObjects([ item.itemId ]);
|
||||
}
|
||||
|
||||
private onFurnitureDataEvent(event: FurnitureDataEvent): void
|
||||
@@ -809,6 +980,8 @@ export class RoomMessageHandler
|
||||
const parser = event.getParser();
|
||||
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, parser.furnitureId, null, null, parser.objectData.state, parser.objectData);
|
||||
this.applyConfInvisStateToFloorObjects([ parser.furnitureId ]);
|
||||
this.applyAreaHideStateToFloorObjects([ parser.furnitureId ]);
|
||||
}
|
||||
|
||||
private onItemDataUpdateMessageEvent(event: ItemDataUpdateMessageEvent): void
|
||||
@@ -818,6 +991,7 @@ export class RoomMessageHandler
|
||||
const parser = event.getParser();
|
||||
|
||||
this._roomEngine.updateRoomObjectWallItemData(this._currentRoomId, parser.furnitureId, parser.data);
|
||||
this.applyAreaHideStateToWallObjects([ parser.furnitureId ]);
|
||||
}
|
||||
|
||||
private onOneWayDoorStatusMessageEvent(event: OneWayDoorStatusMessageEvent): void
|
||||
@@ -827,6 +1001,8 @@ export class RoomMessageHandler
|
||||
const parser = event.getParser();
|
||||
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, parser.itemId, null, null, parser.state, new LegacyDataType());
|
||||
this.applyConfInvisStateToFloorObjects([ parser.itemId ]);
|
||||
this.applyAreaHideStateToFloorObjects([ parser.itemId ]);
|
||||
}
|
||||
|
||||
private onAreaHideMessageEvent(event: AreaHideMessageEvent): void
|
||||
@@ -837,6 +1013,26 @@ export class RoomMessageHandler
|
||||
const areaData = parser.areaData;
|
||||
|
||||
this._roomEngine.updateAreaHide(this._currentRoomId, areaData.furniId, areaData.on, areaData.rootX, areaData.rootY, areaData.width, areaData.length, areaData.invert);
|
||||
|
||||
if(areaData.on)
|
||||
{
|
||||
this._activeAreaHideControllers.set(areaData.furniId, {
|
||||
rootX: areaData.rootX,
|
||||
rootY: areaData.rootY,
|
||||
width: areaData.width,
|
||||
length: areaData.length,
|
||||
invert: areaData.invert,
|
||||
wallItems: areaData.wallItems,
|
||||
invisibility: areaData.invisibility
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
this._activeAreaHideControllers.delete(areaData.furniId);
|
||||
}
|
||||
|
||||
this.applyAreaHideStateToRoomObjects();
|
||||
this.scheduleAreaHideReapply(this._currentRoomId);
|
||||
}
|
||||
|
||||
private onDiceValueMessageEvent(event: DiceValueMessageEvent): void
|
||||
@@ -846,6 +1042,210 @@ export class RoomMessageHandler
|
||||
const parser = event.getParser();
|
||||
|
||||
this._roomEngine.updateRoomObjectFloor(this._currentRoomId, parser.itemId, null, null, parser.value, new LegacyDataType());
|
||||
this.applyConfInvisStateToFloorObjects([ parser.itemId ]);
|
||||
this.applyAreaHideStateToFloorObjects([ parser.itemId ]);
|
||||
}
|
||||
|
||||
private applyAreaHideStateToRoomObjects(floorItemIds?: number[], wallItemIds?: number[]): void
|
||||
{
|
||||
this.applyAreaHideStateToFloorObjects(floorItemIds);
|
||||
this.applyAreaHideStateToWallObjects(wallItemIds);
|
||||
}
|
||||
|
||||
private applyAreaHideStateToFloorObjects(itemIds?: number[]): void
|
||||
{
|
||||
const floorObjects = ((this._roomEngine as any)?.getRoomObjects?.(this._currentRoomId, RoomObjectCategory.FLOOR) as IRoomObject[]) ?? [];
|
||||
|
||||
if(!floorObjects?.length) return;
|
||||
|
||||
const scopedIds = itemIds?.length ? new Set<number>(itemIds) : null;
|
||||
|
||||
for(const roomObject of floorObjects)
|
||||
{
|
||||
if(!roomObject?.model) continue;
|
||||
if(scopedIds && !scopedIds.has(roomObject.id)) continue;
|
||||
|
||||
roomObject.model.setValue(RoomObjectVariable.FURNITURE_AREA_HIDE_HIDDEN, this.shouldHideRoomObjectByAreaHide(roomObject, RoomObjectCategory.FLOOR) ? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
||||
private applyAreaHideStateToWallObjects(itemIds?: number[]): void
|
||||
{
|
||||
const wallObjects = ((this._roomEngine as any)?.getRoomObjects?.(this._currentRoomId, RoomObjectCategory.WALL) as IRoomObject[]) ?? [];
|
||||
|
||||
if(!wallObjects?.length) return;
|
||||
|
||||
const scopedIds = itemIds?.length ? new Set<number>(itemIds) : null;
|
||||
|
||||
for(const roomObject of wallObjects)
|
||||
{
|
||||
if(!roomObject?.model) continue;
|
||||
if(scopedIds && !scopedIds.has(roomObject.id)) continue;
|
||||
|
||||
roomObject.model.setValue(RoomObjectVariable.FURNITURE_AREA_HIDE_HIDDEN, this.shouldHideRoomObjectByAreaHide(roomObject, RoomObjectCategory.WALL) ? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
||||
private shouldHideRoomObjectByAreaHide(roomObject: IRoomObject, category: number): boolean
|
||||
{
|
||||
if(!roomObject?.model) return false;
|
||||
|
||||
const controllerState = this.getAreaHideControllerStateFromObject(roomObject, category);
|
||||
|
||||
if(controllerState)
|
||||
{
|
||||
return (controllerState.invisibility && this._isConfInvisControlActive);
|
||||
}
|
||||
|
||||
if(!this._activeAreaHideControllers.size) return false;
|
||||
|
||||
for(const activeState of this._activeAreaHideControllers.values())
|
||||
{
|
||||
if((activeState.width <= 0) || (activeState.length <= 0)) continue;
|
||||
if((category === RoomObjectCategory.WALL) && !activeState.wallItems) continue;
|
||||
|
||||
const intersectsArea = (category === RoomObjectCategory.WALL)
|
||||
? this.isWallObjectInsideArea(roomObject, activeState)
|
||||
: this.doesFloorObjectIntersectArea(roomObject, activeState);
|
||||
const shouldHide = (activeState.invert ? !intersectsArea : intersectsArea);
|
||||
|
||||
if(shouldHide) return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private doesFloorObjectIntersectArea(roomObject: IRoomObject, areaState: AreaHideControllerState): boolean
|
||||
{
|
||||
if(!roomObject?.model) return false;
|
||||
|
||||
const location = roomObject.getLocation();
|
||||
|
||||
if(!location) return false;
|
||||
|
||||
let sizeX = roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_SIZE_X);
|
||||
let sizeY = roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_SIZE_Y);
|
||||
|
||||
if(!sizeX || (sizeX < 1)) sizeX = 1;
|
||||
if(!sizeY || (sizeY < 1)) sizeY = 1;
|
||||
|
||||
const direction = roomObject.getDirection();
|
||||
const directionQuarterTurns = (((Math.trunc(((direction?.x ?? 0) + 45)) % 360) + 360) % 360) / 90;
|
||||
|
||||
if((directionQuarterTurns === 1) || (directionQuarterTurns === 3))
|
||||
{
|
||||
[ sizeX, sizeY ] = [ sizeY, sizeX ];
|
||||
}
|
||||
|
||||
const objectMinX = location.x;
|
||||
const objectMinY = location.y;
|
||||
const objectMaxX = objectMinX + sizeX;
|
||||
const objectMaxY = objectMinY + sizeY;
|
||||
const areaMinX = areaState.rootX;
|
||||
const areaMinY = areaState.rootY;
|
||||
const areaMaxX = areaMinX + areaState.width;
|
||||
const areaMaxY = areaMinY + areaState.length;
|
||||
|
||||
return (objectMinX < areaMaxX)
|
||||
&& (objectMaxX > areaMinX)
|
||||
&& (objectMinY < areaMaxY)
|
||||
&& (objectMaxY > areaMinY);
|
||||
}
|
||||
|
||||
private isWallObjectInsideArea(roomObject: IRoomObject, areaState: AreaHideControllerState): boolean
|
||||
{
|
||||
const location = roomObject?.getLocation();
|
||||
|
||||
if(!location) return false;
|
||||
|
||||
const xCandidates = Array.from(new Set([ Math.floor(location.x), Math.ceil(location.x), Math.round(location.x) ]));
|
||||
const yCandidates = Array.from(new Set([ Math.floor(location.y), Math.ceil(location.y), Math.round(location.y) ]));
|
||||
|
||||
for(const x of xCandidates)
|
||||
{
|
||||
for(const y of yCandidates)
|
||||
{
|
||||
if((x >= areaState.rootX)
|
||||
&& (x < (areaState.rootX + areaState.width))
|
||||
&& (y >= areaState.rootY)
|
||||
&& (y < (areaState.rootY + areaState.length)))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private getAreaHideControllerStateFromObject(roomObject: IRoomObject, category: number): AreaHideControllerState
|
||||
{
|
||||
if(!roomObject?.model || (category !== RoomObjectCategory.FLOOR)) return null;
|
||||
|
||||
if(this._activeAreaHideControllers.has(roomObject.id))
|
||||
{
|
||||
return this._activeAreaHideControllers.get(roomObject.id);
|
||||
}
|
||||
|
||||
if(!this.isAreaHideControllerObject(roomObject)) return null;
|
||||
|
||||
return {
|
||||
rootX: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_ROOT_X) ?? 0),
|
||||
rootY: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_ROOT_Y) ?? 0),
|
||||
width: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_WIDTH) ?? 0),
|
||||
length: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_LENGTH) ?? 0),
|
||||
invert: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_INVERT) === 1),
|
||||
wallItems: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_WALL_ITEMS) === 1),
|
||||
invisibility: (roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_INVISIBILITY) === 1)
|
||||
};
|
||||
}
|
||||
|
||||
private isAreaHideControllerObject(roomObject: IRoomObject): boolean
|
||||
{
|
||||
if(!roomObject?.model) return false;
|
||||
|
||||
const furniData = GetSessionDataManager().getFloorItemDataByName(roomObject.type);
|
||||
const customParams = (furniData?.customParams || '').toLowerCase();
|
||||
|
||||
if(customParams.includes('area_hide_control') || customParams.includes('wf_conf_area_hide') || customParams.includes('conf_area_hide'))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
const stuffData = roomObject.model.getValue<number[]>(RoomObjectVariable.FURNITURE_DATA);
|
||||
|
||||
return Array.isArray(stuffData) && (stuffData.length >= 8);
|
||||
}
|
||||
|
||||
private scheduleAreaHideReapply(roomId: number): void
|
||||
{
|
||||
this.clearAreaHideReapplyTimeouts();
|
||||
|
||||
const retryDelays = [ 0, 50, 150, 300, 600, 1000 ];
|
||||
|
||||
for(const delay of retryDelays)
|
||||
{
|
||||
const timeout = setTimeout(() =>
|
||||
{
|
||||
if(roomId !== this._currentRoomId) return;
|
||||
|
||||
this.applyAreaHideStateToRoomObjects();
|
||||
}, delay);
|
||||
|
||||
this._areaHideReapplyTimeouts.push(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
private clearAreaHideReapplyTimeouts(): void
|
||||
{
|
||||
if(!this._areaHideReapplyTimeouts.length) return;
|
||||
|
||||
for(const timeout of this._areaHideReapplyTimeouts)
|
||||
{
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
|
||||
this._areaHideReapplyTimeouts = [];
|
||||
}
|
||||
|
||||
private onRoomUnitDanceEvent(event: RoomUnitDanceEvent): void
|
||||
@@ -973,7 +1373,8 @@ export class RoomMessageHandler
|
||||
|
||||
if(height) height = (height / zScale);
|
||||
|
||||
const location = new Vector3d(status.x, status.y, (status.z + height));
|
||||
const releasedWiredLocation = this.getReleasedWiredStatusLocation(status);
|
||||
const location = (releasedWiredLocation || new Vector3d(status.x, status.y, (status.z + height)));
|
||||
const direction = new Vector3d(status.direction);
|
||||
|
||||
let goal: IVector3D = null;
|
||||
|
||||
@@ -87,6 +87,18 @@ export class RoomObjectEventHandler implements IRoomCanvasMouseListener, IRoomOb
|
||||
}
|
||||
}
|
||||
|
||||
if((event.type === MouseEventType.DOUBLE_CLICK) && (category === RoomObjectCategory.FLOOR) && object.model && (object.model.getValue<number>(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT) > 0))
|
||||
{
|
||||
const roomIdString = object.model.getValue<string>(RoomObjectVariable.OBJECT_ROOM_ID);
|
||||
const roomId = ((roomIdString && (parseInt(roomIdString.split('_')[0]) || 0)) || -1);
|
||||
|
||||
if((roomId >= 0) && GetEventDispatcher())
|
||||
{
|
||||
GetEventDispatcher().dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.REQUEST_STACK_HEIGHT, roomId, object.id, category));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(object.mouseHandler) object.mouseHandler.mouseEvent(event, geometry);
|
||||
}
|
||||
|
||||
|
||||
@@ -239,8 +239,6 @@ export class RoomPreviewer
|
||||
|
||||
if(this.isRoomEngineReady)
|
||||
{
|
||||
if((this._currentPreviewObjectCategory === RoomObjectCategory.FLOOR) && (this._currentPreviewObjectType === classId) && (this._currentPreviewObjectData === (extra || ''))) return RoomPreviewer.PREVIEW_OBJECT_ID;
|
||||
|
||||
this.reset(false);
|
||||
|
||||
this._currentPreviewObjectType = classId;
|
||||
|
||||
@@ -623,7 +623,17 @@ export class RoomPlaneParser
|
||||
}
|
||||
_local_3++;
|
||||
}
|
||||
const _local_4: Point = RoomPlaneParser.findEntranceTile(this._tileMatrix);
|
||||
const _local_4: Point = (() =>
|
||||
{
|
||||
const matrixWithFloorHoles = this._tileMatrix.map((row, rowIndex) =>
|
||||
{
|
||||
const floorHoleRow = this._floorHoleMatrix[rowIndex] || [];
|
||||
|
||||
return row.map((value, columnIndex) => (floorHoleRow[columnIndex] ? RoomPlaneParser.TILE_HOLE : value));
|
||||
});
|
||||
|
||||
return RoomPlaneParser.findEntranceTile(matrixWithFloorHoles);
|
||||
})();
|
||||
|
||||
_local_3 = 0;
|
||||
while(_local_3 < this._height)
|
||||
|
||||
@@ -6,6 +6,7 @@ import { RoomObjectLogicBase } from './RoomObjectLogicBase';
|
||||
export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
{
|
||||
public static DEFAULT_UPDATE_INTERVAL: number = 500;
|
||||
private static LOCATION_EPSILON: number = 0.01;
|
||||
private static TEMP_VECTOR: Vector3d = new Vector3d();
|
||||
|
||||
private _liftAmount: number;
|
||||
@@ -17,6 +18,7 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
private _lastUpdateTime: number;
|
||||
private _changeTime: number;
|
||||
private _updateInterval: number;
|
||||
private _queuedMoveMessages: ObjectMoveUpdateMessage[];
|
||||
|
||||
constructor()
|
||||
{
|
||||
@@ -31,11 +33,13 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
this._lastUpdateTime = 0;
|
||||
this._changeTime = 0;
|
||||
this._updateInterval = MovingObjectLogic.DEFAULT_UPDATE_INTERVAL;
|
||||
this._queuedMoveMessages = [];
|
||||
}
|
||||
|
||||
public dispose(): void
|
||||
{
|
||||
this._liftAmount = 0;
|
||||
this._queuedMoveMessages = [];
|
||||
|
||||
super.dispose();
|
||||
}
|
||||
@@ -46,6 +50,7 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
|
||||
const locationOffset = this.getLocationOffset();
|
||||
const model = this.object && this.object.model;
|
||||
let completedInterpolation = false;
|
||||
|
||||
if(model)
|
||||
{
|
||||
@@ -111,10 +116,13 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
this._locationDelta.x = 0;
|
||||
this._locationDelta.y = 0;
|
||||
this._locationDelta.z = 0;
|
||||
completedInterpolation = true;
|
||||
}
|
||||
}
|
||||
|
||||
this._lastUpdateTime = this.time;
|
||||
|
||||
if(completedInterpolation) this.processQueuedMoveMessage();
|
||||
}
|
||||
|
||||
public setObject(object: IRoomObjectController): void
|
||||
@@ -130,6 +138,17 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
|
||||
if(message instanceof ObjectMoveUpdateMessage)
|
||||
{
|
||||
if(this.shouldApplyInstantMoveMessage(message))
|
||||
{
|
||||
super.processUpdateMessage(message);
|
||||
|
||||
if(message.location) this._location.assign(message.location);
|
||||
|
||||
this.resetInterpolationState();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const requiresCustomMoveHandling = !!message.anchorObject || (message.elapsed > 0);
|
||||
|
||||
if(requiresCustomMoveHandling)
|
||||
@@ -147,15 +166,30 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
if(message instanceof ObjectMoveUpdateMessage) return this.processMoveMessage(message);
|
||||
}
|
||||
|
||||
private shouldApplyInstantMoveMessage(message: ObjectMoveUpdateMessage): boolean
|
||||
{
|
||||
if(!message || !message.location || message.isSlide || !!message.anchorObject || (message.elapsed > 0)) return false;
|
||||
|
||||
return this.matchesLocation(message.location, message.targetLocation);
|
||||
}
|
||||
|
||||
private processMoveMessage(message: ObjectMoveUpdateMessage): void
|
||||
{
|
||||
if(!message || !this.object || !message.location) return;
|
||||
|
||||
if(this.shouldQueueMoveMessage(message))
|
||||
{
|
||||
this.queueMoveMessage(message);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const hadActiveInterpolation = this.isInterpolating();
|
||||
const duration = ((message.duration > 0) ? message.duration : ObjectMoveUpdateMessage.DEFAULT_DURATION);
|
||||
const startLocation = hadActiveInterpolation
|
||||
? this.object.getLocation()
|
||||
: message.location;
|
||||
const elapsed = Math.max(0, Math.min(message.duration, message.elapsed));
|
||||
const elapsed = Math.max(0, Math.min(duration, message.elapsed));
|
||||
|
||||
this._location.assign(startLocation);
|
||||
this.object.setLocation(this._location);
|
||||
@@ -165,7 +199,7 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
else this._followOffset.assign(new Vector3d());
|
||||
|
||||
this._changeTime = (this._lastUpdateTime - elapsed);
|
||||
this.updateInterval = message.duration;
|
||||
this.updateInterval = duration;
|
||||
|
||||
this._locationDelta.assign(message.targetLocation);
|
||||
this._locationDelta.subtract(this._location);
|
||||
@@ -203,11 +237,86 @@ export class MovingObjectLogic extends RoomObjectLogicBase
|
||||
}
|
||||
}
|
||||
|
||||
private resetInterpolationState(): void
|
||||
{
|
||||
this._locationDelta.x = 0;
|
||||
this._locationDelta.y = 0;
|
||||
this._locationDelta.z = 0;
|
||||
this._followObject = null;
|
||||
this._followOffset.assign(new Vector3d());
|
||||
this._queuedMoveMessages = [];
|
||||
this._changeTime = this._lastUpdateTime;
|
||||
}
|
||||
|
||||
private isInterpolating(): boolean
|
||||
{
|
||||
return (this._locationDelta.length > 0) && ((this.time - this._changeTime) < this._updateInterval);
|
||||
}
|
||||
|
||||
private shouldQueueMoveMessage(message: ObjectMoveUpdateMessage): boolean
|
||||
{
|
||||
if(!message.isSlide || !!message.anchorObject || !this.isInterpolating() || !message.location || !message.targetLocation) return false;
|
||||
|
||||
const expectedStartLocation = this.getQueuedMovementTailLocation();
|
||||
|
||||
if(!expectedStartLocation) return false;
|
||||
|
||||
return this.matchesLocation(message.location, expectedStartLocation)
|
||||
&& !this.matchesLocation(message.targetLocation, expectedStartLocation);
|
||||
}
|
||||
|
||||
private queueMoveMessage(message: ObjectMoveUpdateMessage): void
|
||||
{
|
||||
this._queuedMoveMessages.push(new ObjectMoveUpdateMessage(
|
||||
message.location,
|
||||
message.targetLocation,
|
||||
message.direction,
|
||||
message.isSlide,
|
||||
message.duration,
|
||||
message.elapsed,
|
||||
message.anchorObject,
|
||||
message.anchorOffset));
|
||||
}
|
||||
|
||||
private processQueuedMoveMessage(): void
|
||||
{
|
||||
if(!this._queuedMoveMessages.length) return;
|
||||
|
||||
const nextMoveMessage = this._queuedMoveMessages.shift();
|
||||
|
||||
if(!nextMoveMessage) return;
|
||||
|
||||
this.processMoveMessage(nextMoveMessage);
|
||||
}
|
||||
|
||||
private getQueuedMovementTailLocation(): IVector3D
|
||||
{
|
||||
if(this._queuedMoveMessages.length)
|
||||
{
|
||||
const queuedMoveMessage = this._queuedMoveMessages[this._queuedMoveMessages.length - 1];
|
||||
|
||||
if(queuedMoveMessage?.targetLocation) return queuedMoveMessage.targetLocation;
|
||||
}
|
||||
|
||||
if(this._locationDelta.length <= 0) return null;
|
||||
|
||||
const targetLocation = new Vector3d();
|
||||
|
||||
targetLocation.assign(this._location);
|
||||
targetLocation.add(this._locationDelta);
|
||||
|
||||
return targetLocation;
|
||||
}
|
||||
|
||||
private matchesLocation(first: IVector3D, second: IVector3D): boolean
|
||||
{
|
||||
if(!first || !second) return false;
|
||||
|
||||
return (Math.abs(first.x - second.x) <= MovingObjectLogic.LOCATION_EPSILON)
|
||||
&& (Math.abs(first.y - second.y) <= MovingObjectLogic.LOCATION_EPSILON)
|
||||
&& (Math.abs(first.z - second.z) <= MovingObjectLogic.LOCATION_EPSILON);
|
||||
}
|
||||
|
||||
protected getLocationOffset(): IVector3D
|
||||
{
|
||||
return null;
|
||||
|
||||
@@ -294,7 +294,7 @@ export class RoomLogic extends RoomObjectLogicBase
|
||||
switch(message.type)
|
||||
{
|
||||
case ObjectRoomFloorHoleUpdateMessage.ADD:
|
||||
this._planeParser.addFloorHole(message.id, message.x, message.y, message.width, message.height);
|
||||
this._planeParser.addFloorHole(message.id, message.x, message.y, message.width, message.height, message.invert);
|
||||
this._needsMapUpdate = true;
|
||||
return;
|
||||
case ObjectRoomFloorHoleUpdateMessage.REMOVE:
|
||||
|
||||
@@ -25,7 +25,5 @@ export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic
|
||||
if(!this.object || !this.eventDispatcher) return;
|
||||
|
||||
this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object));
|
||||
|
||||
super.useObject();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,6 +398,13 @@ export class FurnitureLogic extends MovingObjectLogic
|
||||
{
|
||||
if(!this.object || !this.eventDispatcher) return;
|
||||
|
||||
if(this.object.model && (this.object.model.getValue<number>(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT) > 0))
|
||||
{
|
||||
this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const clickUrl = this.getAdClickUrl(this.object.model);
|
||||
|
||||
if(clickUrl && clickUrl.length)
|
||||
|
||||
@@ -164,18 +164,6 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement
|
||||
|
||||
if(this._avatarImage) this._avatarImage.dispose();
|
||||
|
||||
if(this._cachedAvatars)
|
||||
{
|
||||
for(const avatar of this._cachedAvatars.getValues()) avatar && avatar.dispose();
|
||||
this._cachedAvatars.reset();
|
||||
}
|
||||
|
||||
if(this._cachedAvatarEffects)
|
||||
{
|
||||
for(const avatar of this._cachedAvatarEffects.getValues()) avatar && avatar.dispose();
|
||||
this._cachedAvatarEffects.reset();
|
||||
}
|
||||
|
||||
if(this._reflectionOppositeTexture)
|
||||
{
|
||||
this._reflectionOppositeTexture.destroy(true);
|
||||
|
||||
@@ -237,8 +237,11 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization
|
||||
this._furnitureLift = (model.getValue<number>(RoomObjectVariable.FURNITURE_LIFT_AMOUNT) || 0);
|
||||
|
||||
let alphaMultiplier = model.getValue<number>(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER);
|
||||
const hiddenByConfInvisControl = (model.getValue<number>(RoomObjectVariable.FURNITURE_CONF_INVIS_HIDDEN) === 1);
|
||||
const hiddenByAreaHideControl = (model.getValue<number>(RoomObjectVariable.FURNITURE_AREA_HIDE_HIDDEN) === 1);
|
||||
|
||||
if(isNaN(alphaMultiplier)) alphaMultiplier = 1;
|
||||
if(hiddenByConfInvisControl || hiddenByAreaHideControl) alphaMultiplier = 0;
|
||||
|
||||
if(this._alphaMultiplier !== alphaMultiplier)
|
||||
{
|
||||
|
||||
@@ -27,17 +27,6 @@ export class IsometricImageFurniVisualization extends FurnitureAnimatedVisualiza
|
||||
this._photoUrl = null;
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
if (this._thumbnailTexture instanceof RenderTexture) {
|
||||
this._thumbnailTexture.destroy(true);
|
||||
}
|
||||
|
||||
this._thumbnailTexture = null;
|
||||
this._thumbnailImageNormal = null;
|
||||
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
public get hasThumbnailImage(): boolean {
|
||||
return !(this._thumbnailImageNormal == null);
|
||||
}
|
||||
|
||||
@@ -158,16 +158,6 @@ export class RoomPlane implements IRoomPlane
|
||||
this._animationLayers = [];
|
||||
}
|
||||
|
||||
this._windowReflectionLastVisible.clear();
|
||||
this._windowReflectionFadeOut.clear();
|
||||
this._windowReflectionFirstSeenAt.clear();
|
||||
|
||||
if(this._maskFilter)
|
||||
{
|
||||
this._maskFilter.destroy();
|
||||
this._maskFilter = null;
|
||||
}
|
||||
|
||||
this._disposed = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user