From 9ce8bff5d9a56cbb6742e2a0bac9c873e80d4f40 Mon Sep 17 00:00:00 2001 From: Xinyi Xu Date: Wed, 17 Jan 2024 11:12:09 -0800 Subject: [PATCH] chore(composer): clean up unused scene model fields --- packages/scene-composer/public/overlay.scene.json | 3 +-- packages/scene-composer/public/scene_1.scene.json | 3 +-- packages/scene-composer/public/scene_2.scene.json | 1 - .../scene-composer/src/components/StateManager.tsx | 5 ++--- .../scene-composer/src/interfaces/interfaces.tsx | 1 - packages/scene-composer/src/models/SceneModels.ts | 1 - .../src/store/helpers/serializationHelpers.ts | 3 --- .../src/store/slices/SceneDocumentSlice.spec.ts | 14 +++++++------- .../scene-composer/tests/scenes/matterport.json | 3 +-- packages/scene-composer/tests/scenes/scene_1.json | 3 +-- packages/scene-composer/tests/scenes/scene_2.json | 1 - 11 files changed, 13 insertions(+), 25 deletions(-) diff --git a/packages/scene-composer/public/overlay.scene.json b/packages/scene-composer/public/overlay.scene.json index ba177c624..f671a6f6f 100644 --- a/packages/scene-composer/public/overlay.scene.json +++ b/packages/scene-composer/public/overlay.scene.json @@ -541,6 +541,5 @@ } ] } - }, - "defaultCameraIndex": 0 + } } diff --git a/packages/scene-composer/public/scene_1.scene.json b/packages/scene-composer/public/scene_1.scene.json index 6bb1e3289..81a5a2aa4 100644 --- a/packages/scene-composer/public/scene_1.scene.json +++ b/packages/scene-composer/public/scene_1.scene.json @@ -480,6 +480,5 @@ } ] } - }, - "defaultCameraIndex": 0 + } } diff --git a/packages/scene-composer/public/scene_2.scene.json b/packages/scene-composer/public/scene_2.scene.json index b7a179f71..4ecdae788 100644 --- a/packages/scene-composer/public/scene_2.scene.json +++ b/packages/scene-composer/public/scene_2.scene.json @@ -223,7 +223,6 @@ ] } }, - "defaultCameraIndex": 0, "properties": { "environmentPreset": "neutral" } diff --git a/packages/scene-composer/src/components/StateManager.tsx b/packages/scene-composer/src/components/StateManager.tsx index ebb74dd8c..1775eaf94 100644 --- a/packages/scene-composer/src/components/StateManager.tsx +++ b/packages/scene-composer/src/components/StateManager.tsx @@ -92,7 +92,6 @@ const StateManager: React.FC = ({ const [updatedExternalLibraryConfig, setUpdatedExternalLibraryConfig] = useState( externalLibraryConfig, ); - const baseUrl = useStore(sceneComposerId)((state) => state.getSceneProperty(KnownSceneProperty.BaseUrl)); const messages = useStore(sceneComposerId)((state) => state.getMessages()); const matterportModelId = useStore(sceneComposerId)((state) => state.getSceneProperty(KnownSceneProperty.MatterportModelId), @@ -114,8 +113,8 @@ const StateManager: React.FC = ({ const { setActiveCameraSettings, setActiveCameraName } = useActiveCamera(); const standardUriModifier = useMemo( - () => createStandardUriModifier(sceneContentUri || '', baseUrl), - [sceneContentUri, baseUrl], + () => createStandardUriModifier(sceneContentUri || '', undefined), + [sceneContentUri], ); const isViewing = config.mode === 'Viewing'; diff --git a/packages/scene-composer/src/interfaces/interfaces.tsx b/packages/scene-composer/src/interfaces/interfaces.tsx index 89ecd4ba2..166c6c18c 100644 --- a/packages/scene-composer/src/interfaces/interfaces.tsx +++ b/packages/scene-composer/src/interfaces/interfaces.tsx @@ -65,7 +65,6 @@ export interface ISceneNode { } export enum KnownSceneProperty { - BaseUrl = 'baseUrl', EnvironmentPreset = 'environmentPreset', DataBindingConfig = 'dataBindingConfig', ComponentSettings = 'componentSettings', diff --git a/packages/scene-composer/src/models/SceneModels.ts b/packages/scene-composer/src/models/SceneModels.ts index 2a688d64c..7f79f3bc0 100644 --- a/packages/scene-composer/src/models/SceneModels.ts +++ b/packages/scene-composer/src/models/SceneModels.ts @@ -62,7 +62,6 @@ export interface Scene { properties?: KeyValuePair; rules?: Record; cameras?: Array; - defaultCameraIndex?: number; } export enum CameraType { diff --git a/packages/scene-composer/src/store/helpers/serializationHelpers.ts b/packages/scene-composer/src/store/helpers/serializationHelpers.ts index 5e5eca4a2..44eb51878 100644 --- a/packages/scene-composer/src/store/helpers/serializationHelpers.ts +++ b/packages/scene-composer/src/store/helpers/serializationHelpers.ts @@ -762,9 +762,6 @@ function serializeDocument(document: ISceneDocumentInternal, specVersion: string : [], rules, - - // TODO: allow picking a default camera, currently it's hard coded as the first camera - defaultCameraIndex: indexedObjectCollector[KnownComponentType.Camera] ? 0 : undefined, }; return JSON.stringify(exportedScene, ...stringifyArgs); diff --git a/packages/scene-composer/src/store/slices/SceneDocumentSlice.spec.ts b/packages/scene-composer/src/store/slices/SceneDocumentSlice.spec.ts index 1edf1f0f2..b3b51a2f6 100644 --- a/packages/scene-composer/src/store/slices/SceneDocumentSlice.spec.ts +++ b/packages/scene-composer/src/store/slices/SceneDocumentSlice.spec.ts @@ -909,18 +909,18 @@ describe('createSceneDocumentSlice', () => { it('should be able to getSceneProperty', () => { const document = { - properties: { baseUrl: 'baseUrlValue' }, + properties: { matterportModelId: 'abc' }, }; const get = jest.fn().mockReturnValue({ document }); // fake out get call const set = jest.fn(); // Act const { getSceneProperty } = createSceneDocumentSlice(set, get); - const result = getSceneProperty(KnownSceneProperty.BaseUrl); + const result = getSceneProperty(KnownSceneProperty.MatterportModelId); const result2 = getSceneProperty(KnownSceneProperty.EnvironmentPreset, 'default'); expect(get).toBeCalledTimes(2); - expect(result).toEqual(document.properties.baseUrl); + expect(result).toEqual(document.properties.matterportModelId); expect(result2).toEqual('default'); }); @@ -931,13 +931,13 @@ describe('createSceneDocumentSlice', () => { // Act const { getSceneProperty } = createSceneDocumentSlice(set, get); - const result = getSceneProperty(KnownSceneProperty.BaseUrl, 'default'); + const result = getSceneProperty(KnownSceneProperty.EnvironmentPreset, 'default'); expect(get).toBeCalled(); expect(result).toEqual('default'); }); - [{}, { properties: { baseUrl: 'original' } }].forEach((document) => { + [{}, { properties: { environmentPreset: 'neutral' } }].forEach((document) => { it(`should be able to setSceneProperty ${document.properties ? 'with' : 'without'} set properties`, () => { const draft = { lastOperation: undefined, document }; const get = jest.fn(); // fake out get call @@ -945,10 +945,10 @@ describe('createSceneDocumentSlice', () => { // Act const { setSceneProperty } = createSceneDocumentSlice(set, get); - setSceneProperty(KnownSceneProperty.BaseUrl, 'setValue'); + setSceneProperty(KnownSceneProperty.EnvironmentPreset, 'setValue'); expect(draft.lastOperation!).toEqual('setSceneProperty'); - expect(draft.document.properties!.baseUrl).toEqual('setValue'); + expect(draft.document.properties!.environmentPreset).toEqual('setValue'); }); }); diff --git a/packages/scene-composer/tests/scenes/matterport.json b/packages/scene-composer/tests/scenes/matterport.json index 21918dfc7..c47c435e7 100644 --- a/packages/scene-composer/tests/scenes/matterport.json +++ b/packages/scene-composer/tests/scenes/matterport.json @@ -362,6 +362,5 @@ } ] } - }, - "defaultCameraIndex": 0 + } } diff --git a/packages/scene-composer/tests/scenes/scene_1.json b/packages/scene-composer/tests/scenes/scene_1.json index b85903db2..200372068 100644 --- a/packages/scene-composer/tests/scenes/scene_1.json +++ b/packages/scene-composer/tests/scenes/scene_1.json @@ -468,6 +468,5 @@ } ] } - }, - "defaultCameraIndex": 0 + } } diff --git a/packages/scene-composer/tests/scenes/scene_2.json b/packages/scene-composer/tests/scenes/scene_2.json index a2d063691..7d7fd8796 100644 --- a/packages/scene-composer/tests/scenes/scene_2.json +++ b/packages/scene-composer/tests/scenes/scene_2.json @@ -223,7 +223,6 @@ ] } }, - "defaultCameraIndex": 0, "properties": { "environmentPreset": "neutral", "componentSettings": {