fix(composer): black screen on Matterport scene

fix(composer): show matterport section in Edit mode only
awslabs · Mar 23, 2023 · 70b4b7c · 70b4b7c
1 parent 0405bdc
commit 70b4b7c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/packages/scene-composer/package.json b/packages/scene-composer/package.json
@@ -174,7 +174,7 @@
         "lines": 76.32,
         "statements": 75.63,
         "functions": 75.34,
-        "branches": 61.11,
+        "branches": 61,
         "branchesTrue": 100
       }
     }

diff --git a/packages/scene-composer/src/components/WebGLCanvasManager.tsx b/packages/scene-composer/src/components/WebGLCanvasManager.tsx
@@ -40,6 +40,7 @@ export const WebGLCanvasManager: React.FC = () => {
   const { gl } = useThree();
   const domRef = useRef<HTMLElement>(gl.domElement.parentElement);
   const environmentPreset = getSceneProperty(KnownSceneProperty.EnvironmentPreset);
+  const matterportModelId = getSceneProperty(KnownSceneProperty.MatterportModelId);
   const rootNodeRefs = document.rootNodeRefs;
   const [startingPointerPosition, setStartingPointerPosition] = useState<THREE.Vector2>(new THREE.Vector2());
 
@@ -121,6 +122,7 @@ export const WebGLCanvasManager: React.FC = () => {
               rotation={[THREE.MathUtils.degToRad(270), 0, 0]}
               onPointerUp={onPointerUp}
               onPointerDown={onPointerDown}
+              renderOrder={matterportModelId ? 1 : undefined}
             >
               <planeGeometry args={[1000, 1000]} />
               <meshBasicMaterial colorWrite={false} />

diff --git a/packages/scene-composer/src/components/panels/SettingsPanel.tsx b/packages/scene-composer/src/components/panels/SettingsPanel.tsx
@@ -134,7 +134,7 @@ export const SettingsPanel: React.FC<SettingsPanelProps> = ({ valueDataBindingPr
         </ExpandableInfoSection>
       )}
 
-      {matterportEnabled && (
+      {matterportEnabled && isEditing && (
         <ExpandableInfoSection
           title={intl.formatMessage({
             description: 'ExpandableInfoSection Title',