abstract-3d 4.0.3 → 4.0.5

package/src/renderers/three/shadow/key-light.ts

@@ -8,10 +8,12 @@ import { getShadowCasters } from "./shadow.js";
  */
 
 const direction = new Vector3(-1, 2, 1.2).normalize();
-const intensity = 1.6;
-const mapSize = 2048;
+const intensity = 1.2;
+const mapSize = 1024;
 /** Of the key light kept out of its shadows, so faces under an overhang, e.g. a recessed base frame, aren't black */
-const shadowIntensity = 0.6;
+const shadowIntensity = 0.55;
+/** The penumbra's reach, in shadow map texels */
+const penumbra = 8;
 
 /** The light and its target, to add to the scene, with or without shadows; undefined for a scene without solids */
 export function createKeyLight(built: BuiltScene, shadows: boolean): Group | undefined {
@@ -29,7 +31,7 @@ export function createKeyLight(built: BuiltScene, shadows: boolean): Group | und
   light.shadow.camera.updateProjectionMatrix();
   light.shadow.mapSize.set(mapSize, mapSize);
   // Offsets along the normal by three texels, against shadow acne on the lit faces
-  Object.assign(light.shadow, { bias: -0.0005, normalBias: (radius * 6) / mapSize, radius: 3, intensity: shadowIntensity });
+  Object.assign(light.shadow, { bias: -0.0005, normalBias: (radius * 6) / mapSize, radius: penumbra, intensity: shadowIntensity });
   return new Group().add(light, light.target);
 }
 

package/src/renderers/three/shadow/shadow.ts

@@ -37,8 +37,8 @@ const shadowLayer = 1;
 /** Of the texture's longer side */
 const resolution = 512;
 /** The blur's reach, of the solids' height */
-const softness = 0.22;
-const opacity = 1;
+const softness = 0.16;
+const opacity = 0.9;
 /** A pool of light on the floor the shadow lies in, so it shows on a dark background, which a shadow alone can't darken; on white it's invisible */
 const floorLight = 0.06;
 /** The pool's reach beyond the solids, of their height */

package/src/renderers/three/viewer/options.ts

@@ -41,14 +41,14 @@ export type ViewerOptions<Content> = {
   readonly fitPadding?: number;
   readonly controls?: ControlsOptions;
   readonly gizmo?: ControlsHelper;
-  /** Lights added to the photographed studio and key light that light the scene; none by default */
+  /** Lights added to the studio and key light that light the scene; none by default */
   readonly lights?: ReadonlyArray<Object3D> | ((scene: Scene) => ReadonlyArray<Object3D>);
-  /** Of the studio's light, or without the studio of its plain light, 0.6 by default, the key light giving the rest */
+  /** Of the studio's light, 0.45 by default, or without the studio of its plain light, 0.6 by default, the key light giving the rest */
   readonly environmentIntensity?: number;
   /**
-   * The photographed studio's light and reflections, on by default. Off, three-point lighting emulates it, a weak sky and floor light, the key light,
-   * a fill and a rim light, without reflections, so metals are satin at most; a first visit then shows the scene about 400 ms sooner, as its shaders
-   * compile without the reflection code. Changing it rebuilds the scene
+   * The studio's light and reflections, a room with soft area lights, on by default. Off, three-point lighting emulates it, a weak sky and floor
+   * light, the key light, a fill and a rim light, without reflections, so metals are satin at most; a first visit then shows the scene about 400 ms
+   * sooner, as its shaders compile without the reflection code. Changing it rebuilds the scene
    */
   readonly studio?: boolean;
   /** A soft shadow on the ground under the scene, rendered once per build; on by default */

package/src/renderers/three/viewer/viewer.ts

@@ -8,10 +8,10 @@ import {
   PerspectiveCamera,
   Raycaster,
   Scene as ThreeScene,
-  type Texture,
   Vector2,
   Vector3,
   WebGLRenderer,
+  type WebGLRenderTarget,
 } from "three";
 import type { ViewportGizmo } from "three-viewport-gizmo";
 import type { StructureState } from "../appearance/appearance.js";
@@ -81,7 +81,7 @@ export type Viewer<Content> = {
   keyLight?: Group;
   governor?: TierGovernor;
   /** The studio environment, loading and once loaded */
-  readonly studio: { loading?: Promise<unknown>; texture?: Texture };
+  readonly studio: { loading?: Promise<unknown>; target?: WebGLRenderTarget };
   /** The scene is built and its shaders compiled */
   loaded: boolean;
   fitted: boolean;
@@ -183,7 +183,7 @@ export function disposeViewer<Content>(v: Viewer<Content>): void {
   if (v.keyLight) {
     disposeKeyLight(v.keyLight);
   }
-  v.studio.texture?.dispose();
+  v.studio.target?.dispose();
   v.geometries.forEach((g) => g.dispose());
   v.atlas.texture.dispose();
   disposeTextures(v.textures);
@@ -521,13 +521,13 @@ function getGroupArgs<Content>(
   }
 }
 
-/** The scene is lit by a photographed studio as its environment, or without it by a plain sky and floor light; apps can add their own lights */
+/** The scene is lit by a studio room as its environment, or without it by a plain sky and floor light; apps can add their own lights */
 function updateLights<Content>(v: Viewer<Content>): void {
-  const { scene, lights, environmentIntensity = studioIntensity, studio = true } = v.options;
+  const { scene, lights, studio = true, environmentIntensity = studio ? studioIntensity : plainIntensity } = v.options;
   v.lights.clear();
   (typeof lights === "function" ? (scene ? lights(scene) : []) : (lights ?? [])).forEach((o) => v.lights.add(o));
   v.scene.environmentIntensity = environmentIntensity;
-  v.scene.environment = studio ? (v.studio.texture ?? null) : null;
+  v.scene.environment = studio ? (v.studio.target?.texture ?? null) : null;
   if (studio) {
     loadStudio(v).catch(() => undefined);
   } else {
@@ -545,18 +545,16 @@ function updateLights<Content>(v: Viewer<Content>): void {
 
 /** The studio, loaded once, its own chunk; set when it arrives, so the scene's shaders are compiled after it, with it */
 function loadStudio<Content>(v: Viewer<Content>): Promise<unknown> {
-  v.studio.loading ??= import("../environment/studio.js")
-    .then(({ loadStudio: load }) => load())
-    .then((texture) => {
-      if (v.disposed) {
-        texture.dispose();
-        return texture;
-      }
-      v.studio.texture = texture;
-      v.scene.environment = v.options.studio === false ? null : texture;
-      invalidate(v);
-      return texture;
-    });
+  v.studio.loading ??= import("../environment/studio.js").then(({ createStudio }) => {
+    if (v.disposed) {
+      return undefined;
+    }
+    const target = createStudio(v.renderer);
+    v.studio.target = target;
+    v.scene.environment = v.options.studio === false ? null : target.texture;
+    invalidate(v);
+    return target;
+  });
   return v.studio.loading;
 }
 
@@ -582,7 +580,8 @@ function updateOverlays<Content>(v: Viewer<Content>): void {
 }
 
 /** The studio's share of the light, the key light giving the rest, so the key light's shadows show */
-const studioIntensity = 0.6;
+const studioIntensity = 0.45;
+const plainIntensity = 0.6;
 /** Without the studio, of its three-point lighting, by the environment's intensity; the key light is the studio's, the floor as the studio's */
 const skyIntensity = 2.5;
 const fillIntensity = 2;