fix(canvas): ACT-1219 fix ao and contact shadow conflict

readyplayerme · Dec 19, 2024 · a1b8f4d · a1b8f4d
1 parent 8527e1f
commit a1b8f4d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/components/Avatar/Avatar.component.tsx b/src/components/Avatar/Avatar.component.tsx
@@ -355,7 +355,9 @@ const Avatar: FC<AvatarProps> = ({
       />
       {AvatarModel}
       {children}
-      {shadows && <ContactShadows position={[0, 0, 0]} opacity={2} scale={10} blur={1.0} far={1.0} resolution={256} />}
+      {shadows && (
+        <ContactShadows opacity={effects?.ambientOcclusion ? 1 : 2} scale={4} blur={2} far={1.0} resolution={256} />
+      )}
       {background?.src && <Box {...background} />}
       {capture && <Capture {...capture} />}
       {background?.color && <BackgroundColor color={background.color} />}

diff --git a/src/components/BaseCanvas/BaseCanvas.component.tsx b/src/components/BaseCanvas/BaseCanvas.component.tsx
@@ -41,7 +41,7 @@ export const BaseCanvas: FC<BaseCanvasProps> = ({
     dpr={dpr}
     camera={{ fov, position }}
     resize={{ scroll: true, debounce: { scroll: 50, resize: 0 } }}
-    style={{ ...style, background: 'transparent' }}
+    style={{ ...style, background: canvasConfig.alpha ? 'transparent' : style?.background }}
   >
     {children}
   </Canvas>

diff --git a/src/components/Models/Model/Model.component.tsx b/src/components/Models/Model/Model.component.tsx
@@ -68,7 +68,6 @@ export const Model: FC<ModelProps> = ({
     if ((node as Mesh).isMesh) {
       node.castShadow = true;
       node.receiveShadow = true;
-      node.frustumCulled = false;
     }
   });