From f315a38503cadfb3a99f460420866621b676a9bb Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Wed, 5 Feb 2025 16:43:46 -0800 Subject: [PATCH 1/3] filter out rigged cyclists --- .../modals/ScreenshotModal/ScreenshotModal.component.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx index 5e3596e9..5804fdbc 100644 --- a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx +++ b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx @@ -123,7 +123,8 @@ function ScreenshotModal() { (category.includes('people') || category.includes('people-rigged') || category.includes('vehicles') || - category.includes('vehicles-transit')) + category.includes('vehicles-transit') || + category.includes('cyclists')) ) { node.visible = visible; console.log( From bab4eb78f5164938a75c44fa0d739d8dc1ea0507 Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Wed, 5 Feb 2025 16:47:17 -0800 Subject: [PATCH 2/3] don't include geospatial in AR Ready export --- .../modals/ScreenshotModal/ScreenshotModal.component.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx index 5804fdbc..72d40192 100644 --- a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx +++ b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx @@ -142,7 +142,11 @@ function ScreenshotModal() { if (isPro) { try { const sceneName = getSceneName(AFRAME.scenes[0]); - const scene = AFRAME.scenes[0].object3D; + let scene = AFRAME.scenes[0].object3D; + if (hideRigged) { + // only export user layers, not geospatial + scene = document.querySelector('#street-container').object3D; + } posthog.capture('export_scene_to_gltf_clicked', { scene_id: STREET.utils.getCurrentSceneId() }); From 08271ea98ffdeddf9b1bb25693900ce969c4333a Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Wed, 5 Feb 2025 16:50:43 -0800 Subject: [PATCH 3/3] call "arReady" what it is --- .../modals/ScreenshotModal/ScreenshotModal.component.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx index 72d40192..a1f3d4d6 100644 --- a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx +++ b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.component.jsx @@ -138,12 +138,12 @@ function ScreenshotModal() { } }); }; - const exportSceneToGLTF = (isPro, hideRigged) => { + const exportSceneToGLTF = (isPro, arReady) => { if (isPro) { try { const sceneName = getSceneName(AFRAME.scenes[0]); let scene = AFRAME.scenes[0].object3D; - if (hideRigged) { + if (arReady) { // only export user layers, not geospatial scene = document.querySelector('#street-container').object3D; } @@ -152,7 +152,7 @@ function ScreenshotModal() { }); // if AR Ready mode, then remove rigged vehicles and people from the scene - if (hideRigged) { + if (arReady) { filterRiggedEntities(scene, false); } filterHelpers(scene, false); @@ -166,7 +166,7 @@ function ScreenshotModal() { let finalBuffer = buffer; // Post-process GLB if AR Ready option is selected - if (hideRigged) { + if (arReady) { try { finalBuffer = await transformUVs(buffer); console.log('Successfully post-processed GLB file');