@zephyr3d/scene 0.7.0 → 0.8.0

package/dist/render/shadowmap_pass.js

@@ -23,19 +23,18 @@ import { ShaderHelper } from '../material/shader/helper.js';
     /** @internal */ _getGlobalBindGroupHash(ctx) {
         return `${ctx.shadowMapInfo.get(this.light).shaderHash}`;
     }
-    /** @internal */ renderItems(ctx, renderQueue) {
+    /** @internal */ renderItems(ctx, camera, renderQueue) {
         const items = renderQueue.itemList;
         if (items) {
             ctx.drawEnvLight = false;
             ctx.env = null;
-            ctx.fogFlags = 0;
             ctx.flip = this.isAutoFlip(ctx);
-            ctx.renderPassHash = this.getGlobalBindGroupHash(ctx);
+            ctx.renderPassHash = this.getGlobalBindGroupHash(ctx, camera);
             const bindGroup = ctx.globalBindGroupAllocator.getGlobalBindGroup(ctx);
             ctx.device.setBindGroup(0, bindGroup);
             ShaderHelper.setLightUniformsShadowMap(bindGroup, ctx, this._currentLight);
-            ShaderHelper.setCameraUniforms(bindGroup, ctx, true);
-            const reverseWinding = ctx.camera.worldMatrixDet < 0;
+            ShaderHelper.setCameraUniforms(bindGroup, ctx, camera, true);
+            const reverseWinding = camera.worldMatrixDet < 0;
             for (const lit of items.opaque.lit){
                 this.drawItemList(lit, ctx, reverseWinding);
             }

package/dist/render/shadowmap_pass.js.map

@@ -1 +1 @@
-{"version":3,"file":"shadowmap_pass.js","sources":["../../src/render/shadowmap_pass.ts"],"sourcesContent":["import { RenderPass } from './renderpass';\r\nimport { RENDER_PASS_TYPE_SHADOWMAP } from '../values';\r\nimport type { PunctualLight } from '../scene/light';\r\nimport type { RenderQueue } from './render_queue';\r\nimport type { DrawContext } from './drawable';\r\nimport { ShaderHelper } from '../material/shader/helper';\r\n\r\n/**\r\n * Shadow map render pass\r\n *\r\n * @public\r\n */\r\nexport class ShadowMapPass extends RenderPass {\r\n  /** @internal */\r\n  protected _currentLight: PunctualLight;\r\n  /**\r\n   * Creates an instance of ShadowMapPass\r\n   */\r\n  constructor() {\r\n    super(RENDER_PASS_TYPE_SHADOWMAP);\r\n    this._currentLight = null;\r\n  }\r\n  /** The light that will be used to render shadow map */\r\n  get light(): PunctualLight {\r\n    return this._currentLight;\r\n  }\r\n  set light(light: PunctualLight) {\r\n    this._currentLight = light;\r\n  }\r\n  /** @internal */\r\n  protected _getGlobalBindGroupHash(ctx: DrawContext) {\r\n    return `${ctx.shadowMapInfo.get(this.light).shaderHash}`;\r\n  }\r\n  /** @internal */\r\n  protected renderItems(ctx: DrawContext, renderQueue: RenderQueue) {\r\n    const items = renderQueue.itemList;\r\n    if (items) {\r\n      ctx.drawEnvLight = false;\r\n      ctx.env = null;\r\n      ctx.fogFlags = 0;\r\n      ctx.flip = this.isAutoFlip(ctx);\r\n      ctx.renderPassHash = this.getGlobalBindGroupHash(ctx);\r\n      const bindGroup = ctx.globalBindGroupAllocator.getGlobalBindGroup(ctx);\r\n      ctx.device.setBindGroup(0, bindGroup);\r\n      ShaderHelper.setLightUniformsShadowMap(bindGroup, ctx, this._currentLight);\r\n      ShaderHelper.setCameraUniforms(bindGroup, ctx, true);\r\n      const reverseWinding = ctx.camera.worldMatrixDet < 0;\r\n      for (const lit of items.opaque.lit) {\r\n        this.drawItemList(lit, ctx, reverseWinding);\r\n      }\r\n      for (const unlit of items.opaque.unlit) {\r\n        this.drawItemList(unlit, ctx, reverseWinding);\r\n      }\r\n      for (const lit of items.transmission.lit) {\r\n        this.drawItemList(lit, ctx, reverseWinding);\r\n      }\r\n      for (const unlit of items.transmission.unlit) {\r\n        this.drawItemList(unlit, ctx, reverseWinding);\r\n      }\r\n    }\r\n  }\r\n}\r\n"],"names":["ShadowMapPass","RenderPass","RENDER_PASS_TYPE_SHADOWMAP","_currentLight","light","_getGlobalBindGroupHash","ctx","shadowMapInfo","get","shaderHash","renderItems","renderQueue","items","itemList","drawEnvLight","env","fogFlags","flip","isAutoFlip","renderPassHash","getGlobalBindGroupHash","bindGroup","globalBindGroupAllocator","getGlobalBindGroup","device","setBindGroup","ShaderHelper","setLightUniformsShadowMap","setCameraUniforms","reverseWinding","camera","worldMatrixDet","lit","opaque","drawItemList","unlit","transmission"],"mappings":";;;;AAOA;;;;IAKO,MAAMA,aAAsBC,SAAAA,UAAAA,CAAAA;qBAEjC,aAAuC;AACvC;;AAEC,MACD,WAAc,EAAA;AACZ,QAAA,KAAK,CAACC,0BAAAA,CAAAA;QACN,IAAI,CAACC,aAAa,GAAG,IAAA;AACvB;4DAEA,IAAIC,KAAuB,GAAA;QACzB,OAAO,IAAI,CAACD,aAAa;AAC3B;IACA,IAAIC,KAAAA,CAAMA,KAAoB,EAAE;QAC9B,IAAI,CAACD,aAAa,GAAGC,KAAAA;AACvB;AACA,qBACUC,uBAAwBC,CAAAA,GAAgB,EAAE;QAClD,OAAO,CAAA,EAAGA,GAAIC,CAAAA,aAAa,CAACC,GAAG,CAAC,IAAI,CAACJ,KAAK,CAAEK,CAAAA,UAAU,CAAE,CAAA;AAC1D;AACA,qBACA,WAAUC,CAAYJ,GAAgB,EAAEK,WAAwB,EAAE;QAChE,MAAMC,KAAAA,GAAQD,YAAYE,QAAQ;AAClC,QAAA,IAAID,KAAO,EAAA;AACTN,YAAAA,GAAAA,CAAIQ,YAAY,GAAG,KAAA;AACnBR,YAAAA,GAAAA,CAAIS,GAAG,GAAG,IAAA;AACVT,YAAAA,GAAAA,CAAIU,QAAQ,GAAG,CAAA;AACfV,YAAAA,GAAAA,CAAIW,IAAI,GAAG,IAAI,CAACC,UAAU,CAACZ,GAAAA,CAAAA;AAC3BA,YAAAA,GAAAA,CAAIa,cAAc,GAAG,IAAI,CAACC,sBAAsB,CAACd,GAAAA,CAAAA;AACjD,YAAA,MAAMe,SAAYf,GAAAA,GAAAA,CAAIgB,wBAAwB,CAACC,kBAAkB,CAACjB,GAAAA,CAAAA;AAClEA,YAAAA,GAAAA,CAAIkB,MAAM,CAACC,YAAY,CAAC,CAAGJ,EAAAA,SAAAA,CAAAA;AAC3BK,YAAAA,YAAAA,CAAaC,yBAAyB,CAACN,SAAAA,EAAWf,GAAK,EAAA,IAAI,CAACH,aAAa,CAAA;YACzEuB,YAAaE,CAAAA,iBAAiB,CAACP,SAAAA,EAAWf,GAAK,EAAA,IAAA,CAAA;AAC/C,YAAA,MAAMuB,cAAiBvB,GAAAA,GAAAA,CAAIwB,MAAM,CAACC,cAAc,GAAG,CAAA;AACnD,YAAA,KAAK,MAAMC,GAAOpB,IAAAA,KAAAA,CAAMqB,MAAM,CAACD,GAAG,CAAE;AAClC,gBAAA,IAAI,CAACE,YAAY,CAACF,GAAAA,EAAK1B,GAAKuB,EAAAA,cAAAA,CAAAA;AAC9B;AACA,YAAA,KAAK,MAAMM,KAASvB,IAAAA,KAAAA,CAAMqB,MAAM,CAACE,KAAK,CAAE;AACtC,gBAAA,IAAI,CAACD,YAAY,CAACC,KAAAA,EAAO7B,GAAKuB,EAAAA,cAAAA,CAAAA;AAChC;AACA,YAAA,KAAK,MAAMG,GAAOpB,IAAAA,KAAAA,CAAMwB,YAAY,CAACJ,GAAG,CAAE;AACxC,gBAAA,IAAI,CAACE,YAAY,CAACF,GAAAA,EAAK1B,GAAKuB,EAAAA,cAAAA,CAAAA;AAC9B;AACA,YAAA,KAAK,MAAMM,KAASvB,IAAAA,KAAAA,CAAMwB,YAAY,CAACD,KAAK,CAAE;AAC5C,gBAAA,IAAI,CAACD,YAAY,CAACC,KAAAA,EAAO7B,GAAKuB,EAAAA,cAAAA,CAAAA;AAChC;AACF;AACF;AACF;;;;"}
+{"version":3,"file":"shadowmap_pass.js","sources":["../../src/render/shadowmap_pass.ts"],"sourcesContent":["import { RenderPass } from './renderpass';\r\nimport { RENDER_PASS_TYPE_SHADOWMAP } from '../values';\r\nimport type { PunctualLight } from '../scene/light';\r\nimport type { RenderQueue } from './render_queue';\r\nimport type { DrawContext } from './drawable';\r\nimport { ShaderHelper } from '../material/shader/helper';\r\nimport type { Nullable } from '@zephyr3d/base';\r\nimport type { Camera } from '../camera';\r\n\r\n/**\r\n * Shadow map render pass\r\n *\r\n * @public\r\n */\r\nexport class ShadowMapPass extends RenderPass {\r\n  /** @internal */\r\n  protected _currentLight: Nullable<PunctualLight>;\r\n  /**\r\n   * Creates an instance of ShadowMapPass\r\n   */\r\n  constructor() {\r\n    super(RENDER_PASS_TYPE_SHADOWMAP);\r\n    this._currentLight = null;\r\n  }\r\n  /** The light that will be used to render shadow map */\r\n  get light() {\r\n    return this._currentLight;\r\n  }\r\n  set light(light) {\r\n    this._currentLight = light;\r\n  }\r\n  /** @internal */\r\n  protected _getGlobalBindGroupHash(ctx: DrawContext) {\r\n    return `${ctx.shadowMapInfo!.get(this.light!)!.shaderHash}`;\r\n  }\r\n  /** @internal */\r\n  protected renderItems(ctx: DrawContext, camera: Camera, renderQueue: RenderQueue) {\r\n    const items = renderQueue.itemList;\r\n    if (items) {\r\n      ctx.drawEnvLight = false;\r\n      ctx.env = null;\r\n      ctx.flip = this.isAutoFlip(ctx);\r\n      ctx.renderPassHash = this.getGlobalBindGroupHash(ctx, camera);\r\n      const bindGroup = ctx.globalBindGroupAllocator.getGlobalBindGroup(ctx);\r\n      ctx.device.setBindGroup(0, bindGroup);\r\n      ShaderHelper.setLightUniformsShadowMap(bindGroup, ctx, this._currentLight!);\r\n      ShaderHelper.setCameraUniforms(bindGroup, ctx, camera, true);\r\n      const reverseWinding = camera.worldMatrixDet < 0;\r\n      for (const lit of items.opaque.lit) {\r\n        this.drawItemList(lit, ctx, reverseWinding);\r\n      }\r\n      for (const unlit of items.opaque.unlit) {\r\n        this.drawItemList(unlit, ctx, reverseWinding);\r\n      }\r\n      for (const lit of items.transmission.lit) {\r\n        this.drawItemList(lit, ctx, reverseWinding);\r\n      }\r\n      for (const unlit of items.transmission.unlit) {\r\n        this.drawItemList(unlit, ctx, reverseWinding);\r\n      }\r\n    }\r\n  }\r\n}\r\n"],"names":["ShadowMapPass","RenderPass","RENDER_PASS_TYPE_SHADOWMAP","_currentLight","light","_getGlobalBindGroupHash","ctx","shadowMapInfo","get","shaderHash","camera","renderQueue","items","itemList","drawEnvLight","env","flip","isAutoFlip","renderPassHash","getGlobalBindGroupHash","bindGroup","globalBindGroupAllocator","getGlobalBindGroup","device","setBindGroup","ShaderHelper","setLightUniformsShadowMap","setCameraUniforms","reverseWinding","worldMatrixDet","lit","opaque","drawItemList","unlit","transmission"],"mappings":";;;;AASA;;;;IAKO,MAAMA,aAAsBC,SAAAA,UAAAA,CAAAA;qBAEjC,aAAiD;AACjD;;AAEC,MACD,WAAc,EAAA;AACZ,QAAA,KAAK,CAACC,0BAAAA,CAAAA;QACN,IAAI,CAACC,aAAa,GAAG,IAAA;AACvB;4DAEA,IAAIC,KAAQ,GAAA;QACV,OAAO,IAAI,CAACD,aAAa;AAC3B;IACA,IAAIC,KAAAA,CAAMA,KAAK,EAAE;QACf,IAAI,CAACD,aAAa,GAAGC,KAAAA;AACvB;AACA,qBACUC,uBAAwBC,CAAAA,GAAgB,EAAE;QAClD,OAAO,CAAA,EAAGA,GAAIC,CAAAA,aAAa,CAAEC,GAAG,CAAC,IAAI,CAACJ,KAAK,CAAIK,CAAAA,UAAU,CAAE,CAAA;AAC7D;qBAEA,WAAsBH,CAAAA,GAAgB,EAAEI,MAAc,EAAEC,WAAwB,EAAE;QAChF,MAAMC,KAAAA,GAAQD,YAAYE,QAAQ;AAClC,QAAA,IAAID,KAAO,EAAA;AACTN,YAAAA,GAAAA,CAAIQ,YAAY,GAAG,KAAA;AACnBR,YAAAA,GAAAA,CAAIS,GAAG,GAAG,IAAA;AACVT,YAAAA,GAAAA,CAAIU,IAAI,GAAG,IAAI,CAACC,UAAU,CAACX,GAAAA,CAAAA;AAC3BA,YAAAA,GAAAA,CAAIY,cAAc,GAAG,IAAI,CAACC,sBAAsB,CAACb,GAAKI,EAAAA,MAAAA,CAAAA;AACtD,YAAA,MAAMU,SAAYd,GAAAA,GAAAA,CAAIe,wBAAwB,CAACC,kBAAkB,CAAChB,GAAAA,CAAAA;AAClEA,YAAAA,GAAAA,CAAIiB,MAAM,CAACC,YAAY,CAAC,CAAGJ,EAAAA,SAAAA,CAAAA;AAC3BK,YAAAA,YAAAA,CAAaC,yBAAyB,CAACN,SAAAA,EAAWd,GAAK,EAAA,IAAI,CAACH,aAAa,CAAA;AACzEsB,YAAAA,YAAAA,CAAaE,iBAAiB,CAACP,SAAWd,EAAAA,GAAAA,EAAKI,MAAQ,EAAA,IAAA,CAAA;YACvD,MAAMkB,cAAAA,GAAiBlB,MAAOmB,CAAAA,cAAc,GAAG,CAAA;AAC/C,YAAA,KAAK,MAAMC,GAAOlB,IAAAA,KAAAA,CAAMmB,MAAM,CAACD,GAAG,CAAE;AAClC,gBAAA,IAAI,CAACE,YAAY,CAACF,GAAAA,EAAKxB,GAAKsB,EAAAA,cAAAA,CAAAA;AAC9B;AACA,YAAA,KAAK,MAAMK,KAASrB,IAAAA,KAAAA,CAAMmB,MAAM,CAACE,KAAK,CAAE;AACtC,gBAAA,IAAI,CAACD,YAAY,CAACC,KAAAA,EAAO3B,GAAKsB,EAAAA,cAAAA,CAAAA;AAChC;AACA,YAAA,KAAK,MAAME,GAAOlB,IAAAA,KAAAA,CAAMsB,YAAY,CAACJ,GAAG,CAAE;AACxC,gBAAA,IAAI,CAACE,YAAY,CAACF,GAAAA,EAAKxB,GAAKsB,EAAAA,cAAAA,CAAAA;AAC9B;AACA,YAAA,KAAK,MAAMK,KAASrB,IAAAA,KAAAA,CAAMsB,YAAY,CAACD,KAAK,CAAE;AAC5C,gBAAA,IAAI,CAACD,YAAY,CAACC,KAAAA,EAAO3B,GAAKsB,EAAAA,cAAAA,CAAAA;AAChC;AACF;AACF;AACF;;;;"}

package/dist/render/sky.js

@@ -2,7 +2,7 @@ import { linearToGamma } from '../shaders/misc.js';
 import { smoothNoise3D } from '../shaders/noise.js';
 import { getDevice, getEngine } from '../app/api.js';
 import { getDefaultAtmosphereParams, getAerialPerspectiveLut, renderAtmosphereLUTs, getAtmosphereParamsStruct, createTransmittanceLutProgram, createMultiScatteringLutProgram, createSkyViewLutProgram, createAPLutProgram, skyBox, atmosphereLUTRendered, getTransmittanceLut, getSkyViewLut } from '../shaders/atmosphere.js';
-import { Matrix4x4, Disposable, DRef, Vector4, Vector2, Vector3, CubeFace } from '@zephyr3d/base';
+import { Matrix4x4, Disposable, DRef, Vector4, Vector2, Vector3, CubeFace, objectKeys } from '@zephyr3d/base';
 import { Primitive } from './primitive.js';
 import { BoxShape } from '../shapes/box.js';
 import '../shapes/cylinder.js';
@@ -10,7 +10,6 @@ import '../shapes/torus.js';
 import '../shapes/plane.js';
 import '../shapes/sphere.js';
 import '../shapes/tetrahedron.js';
-import { Camera } from '../camera/camera.js';
 import { prefilterCubemap } from '../utility/pmrem.js';
 import { ShaderHelper } from '../material/shader/helper.js';
 import { fetchSampler } from '../utility/misc.js';
@@ -19,6 +18,8 @@ import { uniformSphereSamples, Fog } from '../values.js';
 import { getDefaultHeightFogParams, MAX_FOG_HEIGHT, getHeightFogParamsStruct, calculateFog } from '../shaders/fog.js';
 import { drawFullscreenQuad } from './fullscreenquad.js';
 import { panoramaToCubemap } from '../utility/panorama.js';
+import '../camera/camera.js';
+import { PerspectiveCamera } from '../camera/perspectivecamera.js';
 
 const fogTypeMap = {
     height_fog: Fog.FOG_TYPE_HEIGHT,
@@ -30,9 +31,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
  * @public
  */ class SkyRenderer extends Disposable {
     static _skyCamera = (()=>{
-        const camera = new Camera(null);
-        camera.setPerspective(Math.PI / 2, 1, 1, 20);
-        return camera;
+        return new PerspectiveCamera(null, Math.PI * 0.5, 1, 20, 1);
     })();
     static transmittanceLutProgram = null;
     static multiScatteringLutProgram = null;
@@ -93,7 +92,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
    */ constructor(){
         super();
         this._skyType = 'scatter';
-        this._skyColor = Vector4.one();
+        this._skyColor = new Vector4(0, 0, 0, 1);
         this._skyImage = new DRef();
         this._skyboxTexture = new DRef();
         this._skyboxTextureSize = 1024;
@@ -128,8 +127,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
         this._bindgroupSky = {};
         this._bindgroupFog = new DRef();
         this._bindgroupFogNoDepth = new DRef();
-        const texCaps = getDevice().getDeviceCaps().textureCaps;
-        this._format = texCaps.getTextureFormatInfo('rg11b10uf')?.renderable ? 'rg11b10uf' : texCaps.supportHalfFloatColorBuffer && texCaps.supportLinearHalfFloatTexture ? 'rgba16f' : 'rgba32f';
+        this._format = null;
     }
     /** @internal */ getHash(_ctx) {
         return `${this.skyType}:${this.fogType}`;
@@ -137,6 +135,10 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
     /**
    * Gets the preferred environment texture format.
    */ get envTextureFormat() {
+        if (!this._format) {
+            const texCaps = getDevice().getDeviceCaps().textureCaps;
+            this._format = texCaps.getTextureFormatInfo('rg11b10uf')?.renderable ? 'rg11b10uf' : texCaps.supportHalfFloatColorBuffer && texCaps.supportLinearHalfFloatTexture ? 'rgba16f' : 'rgba32f';
+        }
         return this._format;
     }
     /** Which type of the sky should be rendered */ get skyType() {
@@ -387,7 +389,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
    * Radiance map of the sky.
    */ get radianceMap() {
         if (!this._radianceMap.get()) {
-            this._radianceMap.set(getDevice().createCubeTexture(this._format, this._radianceMapWidth));
+            this._radianceMap.set(getDevice().createCubeTexture(this.envTextureFormat, this._radianceMapWidth));
             this._radianceMap.get().name = 'SkyRadianceMap';
         }
         return this._radianceMap.get();
@@ -501,7 +503,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
             this._bakedSkyboxDirty = true;
         }
         if (!this._skyDistantLightLut.get()) {
-            const tex = ctx.device.createTexture2D(this._format, 1, 1, {
+            const tex = ctx.device.createTexture2D(this.envTextureFormat, 1, 1, {
                 mipmapping: false
             });
             tex.name = 'DistantSkyLut';
@@ -566,7 +568,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
     }
     updateBakedSkyMap(ctx) {
         const device = ctx.device;
-        const tex = this._bakedSkyboxTexture.get() && this._bakedSkyboxTexture.get().width === this._bakedSkyboxTextureSize ? this._bakedSkyboxTexture.get() : device.createCubeTexture(this._format, this._bakedSkyboxTextureSize, {
+        const tex = this._bakedSkyboxTexture.get() && this._bakedSkyboxTexture.get().width === this._bakedSkyboxTextureSize ? this._bakedSkyboxTexture.get() : device.createCubeTexture(this.envTextureFormat, this._bakedSkyboxTextureSize, {
             mipmapping: false
         });
         tex.name = 'BakedSkyboxTexture';
@@ -691,8 +693,8 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
             this._skyDistantLightLut.dispose();
         }
         this._bindgroupDistantLight.dispose();
-        for(const k in this._bindgroupSky){
-            this._bindgroupSky[k].dispose();
+        for (const k of objectKeys(this._bindgroupSky)){
+            this._bindgroupSky[k]?.dispose();
         }
         this._bindgroupSky = {};
         this._bindgroupFog.dispose();
@@ -704,7 +706,7 @@ const defaultSkyWorldMatrix = Matrix4x4.identity();
                 if (!tex.isTexture2D()) {
                     console.error(`Invalid panorama texture asset: ${this._panoramaAsset}`);
                 } else {
-                    const skyboxTexture = getDevice().createCubeTexture(this._format, this._skyboxTextureSize, {
+                    const skyboxTexture = getDevice().createCubeTexture(this.envTextureFormat, this._skyboxTextureSize, {
                         mipmapping: false
                     });
                     panoramaToCubemap(tex, skyboxTexture);