From 1b66de906e5d997348d823797374cd863799e453 Mon Sep 17 00:00:00 2001 From: Victor Giers Date: Fri, 3 Apr 2026 01:02:53 +0200 Subject: [PATCH] Bump scene document version and update entity comparison --- src/document/scene-document.ts | 3 ++- src/entities/entity-instances.ts | 2 +- src/entities/entity-labels.ts | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/document/scene-document.ts b/src/document/scene-document.ts index eaf0b285..6d3860b0 100644 --- a/src/document/scene-document.ts +++ b/src/document/scene-document.ts @@ -6,7 +6,8 @@ import type { InteractionLink } from "../interactions/interaction-links"; import { cloneMaterialRegistry, createStarterMaterialRegistry, type MaterialDef } from "../materials/starter-material-library"; import { createDefaultWorldSettings, type WorldSettings } from "./world-settings"; -export const SCENE_DOCUMENT_VERSION = 14 as const; +export const SCENE_DOCUMENT_VERSION = 15 as const; +export const ENTITY_NAMES_SCENE_DOCUMENT_VERSION = 15 as const; export const SPATIAL_AUDIO_SCENE_DOCUMENT_VERSION = 13 as const; export const ANIMATION_PLAYBACK_SCENE_DOCUMENT_VERSION = 12 as const; export const LOCAL_LIGHTS_AND_SKYBOX_SCENE_DOCUMENT_VERSION = 10 as const; diff --git a/src/entities/entity-instances.ts b/src/entities/entity-instances.ts index 9dcb95d5..3084cb4f 100644 --- a/src/entities/entity-instances.ts +++ b/src/entities/entity-instances.ts @@ -517,7 +517,7 @@ export function cloneEntityRegistry(entities: Record): R } export function areEntityInstancesEqual(left: EntityInstance, right: EntityInstance): boolean { - if (left.kind !== right.kind || left.id !== right.id || !areVec3Equal(left.position, right.position)) { + if (left.kind !== right.kind || left.id !== right.id || left.name !== right.name || !areVec3Equal(left.position, right.position)) { return false; } diff --git a/src/entities/entity-labels.ts b/src/entities/entity-labels.ts index 7dbd4492..f384b87a 100644 --- a/src/entities/entity-labels.ts +++ b/src/entities/entity-labels.ts @@ -30,6 +30,10 @@ export function getEntityDisplayLabel( entities: Record, assets?: Record ): string { + if (entity.name !== undefined) { + return entity.name; + } + const typedEntities = getSortedEntitiesByKind(entities, entity.kind); const entityIndex = typedEntities.findIndex((candidate) => candidate.id === entity.id); const baseLabel = getEntityKindLabel(entity.kind);