@onerjs/core 8.46.6 → 8.46.8

package/Materials/PBR/pbrBaseMaterial.d.ts

@@ -21,6 +21,42 @@ import { PBRSheenConfiguration } from "./pbrSheenConfiguration.js";
 import { PBRSubSurfaceConfiguration } from "./pbrSubSurfaceConfiguration.js";
 import { DetailMapConfiguration } from "../material.detailMapConfiguration.js";
 declare const PBRMaterialDefinesBase_base: {
+    new (...args: any[]): {
+        PREPASS: boolean;
+        PREPASS_COLOR: boolean;
+        PREPASS_COLOR_INDEX: number;
+        PREPASS_IRRADIANCE_LEGACY: boolean;
+        PREPASS_IRRADIANCE_LEGACY_INDEX: number;
+        PREPASS_IRRADIANCE: boolean;
+        PREPASS_IRRADIANCE_INDEX: number;
+        PREPASS_ALBEDO: boolean;
+        PREPASS_ALBEDO_INDEX: number;
+        PREPASS_ALBEDO_SQRT: boolean;
+        PREPASS_ALBEDO_SQRT_INDEX: number;
+        PREPASS_DEPTH: boolean;
+        PREPASS_DEPTH_INDEX: number;
+        PREPASS_SCREENSPACE_DEPTH: boolean;
+        PREPASS_SCREENSPACE_DEPTH_INDEX: number;
+        PREPASS_NORMALIZED_VIEW_DEPTH: boolean;
+        PREPASS_NORMALIZED_VIEW_DEPTH_INDEX: number;
+        PREPASS_NORMAL: boolean;
+        PREPASS_NORMAL_INDEX: number;
+        PREPASS_NORMAL_WORLDSPACE: boolean;
+        PREPASS_WORLD_NORMAL: boolean;
+        PREPASS_WORLD_NORMAL_INDEX: number;
+        PREPASS_POSITION: boolean;
+        PREPASS_POSITION_INDEX: number;
+        PREPASS_LOCAL_POSITION: boolean;
+        PREPASS_LOCAL_POSITION_INDEX: number;
+        PREPASS_VELOCITY: boolean;
+        PREPASS_VELOCITY_INDEX: number;
+        PREPASS_VELOCITY_LINEAR: boolean;
+        PREPASS_VELOCITY_LINEAR_INDEX: number;
+        PREPASS_REFLECTIVITY: boolean;
+        PREPASS_REFLECTIVITY_INDEX: number;
+        SCENE_MRT_COUNT: number;
+    };
+} & {
     new (...args: any[]): {
         MAINUV1: boolean;
         MAINUV2: boolean;
@@ -159,37 +195,6 @@ export declare class PBRMaterialDefines extends PBRMaterialDefines_base {
     INSTANCES: boolean;
     THIN_INSTANCES: boolean;
     INSTANCESCOLOR: boolean;
-    PREPASS: boolean;
-    PREPASS_COLOR: boolean;
-    PREPASS_COLOR_INDEX: number;
-    PREPASS_IRRADIANCE: boolean;
-    PREPASS_IRRADIANCE_INDEX: number;
-    PREPASS_ALBEDO: boolean;
-    PREPASS_ALBEDO_INDEX: number;
-    PREPASS_ALBEDO_SQRT: boolean;
-    PREPASS_ALBEDO_SQRT_INDEX: number;
-    PREPASS_DEPTH: boolean;
-    PREPASS_DEPTH_INDEX: number;
-    PREPASS_SCREENSPACE_DEPTH: boolean;
-    PREPASS_SCREENSPACE_DEPTH_INDEX: number;
-    PREPASS_NORMALIZED_VIEW_DEPTH: boolean;
-    PREPASS_NORMALIZED_VIEW_DEPTH_INDEX: number;
-    PREPASS_NORMAL: boolean;
-    PREPASS_NORMAL_INDEX: number;
-    PREPASS_NORMAL_WORLDSPACE: boolean;
-    PREPASS_WORLD_NORMAL: boolean;
-    PREPASS_WORLD_NORMAL_INDEX: number;
-    PREPASS_POSITION: boolean;
-    PREPASS_POSITION_INDEX: number;
-    PREPASS_LOCAL_POSITION: boolean;
-    PREPASS_LOCAL_POSITION_INDEX: number;
-    PREPASS_VELOCITY: boolean;
-    PREPASS_VELOCITY_INDEX: number;
-    PREPASS_VELOCITY_LINEAR: boolean;
-    PREPASS_VELOCITY_LINEAR_INDEX: number;
-    PREPASS_REFLECTIVITY: boolean;
-    PREPASS_REFLECTIVITY_INDEX: number;
-    SCENE_MRT_COUNT: number;
     NUM_BONE_INFLUENCERS: number;
     BonesPerMesh: number;
     BONETEXTURE: boolean;

package/Materials/PBR/pbrBaseMaterial.js

@@ -30,9 +30,10 @@ import { PrepareVertexPullingUniforms, BindVertexPullingUniforms } from "../vert
 import { BindBonesParameters, BindFogParameters, BindLights, BindLogDepth, BindMorphTargetParameters, BindTextureMatrix, BindIBLParameters, BindIBLSamplers, HandleFallbacksForShadows, PrepareAttributesForBakedVertexAnimation, PrepareAttributesForBones, PrepareAttributesForInstances, PrepareAttributesForMorphTargets, PrepareDefinesForAttributes, PrepareDefinesForFrameBoundValues, PrepareDefinesForLights, PrepareDefinesForIBL, PrepareDefinesForMergedUV, PrepareDefinesForMisc, PrepareDefinesForMultiview, PrepareDefinesForOIT, PrepareDefinesForPrePass, PrepareUniformsAndSamplersList, PrepareUniformsAndSamplersForIBL, PrepareUniformLayoutForIBL, } from "../materialHelper.functions.js";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering.js";
 import { UVDefinesMixin } from "../uv.defines.js";
+import { PrepassDefinesMixin } from "../prepass.defines.js";
 import { ImageProcessingMixin } from "../imageProcessing.js";
 const onCreatedEffectParameters = { effect: null, subMesh: null };
-class PBRMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {
+class PBRMaterialDefinesBase extends PrepassDefinesMixin(UVDefinesMixin(MaterialDefines)) {
 }
 /**
  * Manages the defines for the PBR Material.
@@ -142,37 +143,6 @@ export class PBRMaterialDefines extends ImageProcessingDefinesMixin(PBRMaterialD
         this.INSTANCES = false;
         this.THIN_INSTANCES = false;
         this.INSTANCESCOLOR = false;
-        this.PREPASS = false;
-        this.PREPASS_COLOR = false;
-        this.PREPASS_COLOR_INDEX = -1;
-        this.PREPASS_IRRADIANCE = false;
-        this.PREPASS_IRRADIANCE_INDEX = -1;
-        this.PREPASS_ALBEDO = false;
-        this.PREPASS_ALBEDO_INDEX = -1;
-        this.PREPASS_ALBEDO_SQRT = false;
-        this.PREPASS_ALBEDO_SQRT_INDEX = -1;
-        this.PREPASS_DEPTH = false;
-        this.PREPASS_DEPTH_INDEX = -1;
-        this.PREPASS_SCREENSPACE_DEPTH = false;
-        this.PREPASS_SCREENSPACE_DEPTH_INDEX = -1;
-        this.PREPASS_NORMALIZED_VIEW_DEPTH = false;
-        this.PREPASS_NORMALIZED_VIEW_DEPTH_INDEX = -1;
-        this.PREPASS_NORMAL = false;
-        this.PREPASS_NORMAL_INDEX = -1;
-        this.PREPASS_NORMAL_WORLDSPACE = false;
-        this.PREPASS_WORLD_NORMAL = false;
-        this.PREPASS_WORLD_NORMAL_INDEX = -1;
-        this.PREPASS_POSITION = false;
-        this.PREPASS_POSITION_INDEX = -1;
-        this.PREPASS_LOCAL_POSITION = false;
-        this.PREPASS_LOCAL_POSITION_INDEX = -1;
-        this.PREPASS_VELOCITY = false;
-        this.PREPASS_VELOCITY_INDEX = -1;
-        this.PREPASS_VELOCITY_LINEAR = false;
-        this.PREPASS_VELOCITY_LINEAR_INDEX = -1;
-        this.PREPASS_REFLECTIVITY = false;
-        this.PREPASS_REFLECTIVITY_INDEX = -1;
-        this.SCENE_MRT_COUNT = 0;
         this.NUM_BONE_INFLUENCERS = 0;
         this.BonesPerMesh = 0;
         this.BONETEXTURE = false;
@@ -276,7 +246,7 @@ export class PBRBaseMaterial extends PBRBaseMaterialBase {
      * Quality switch for realtime filtering
      */
     get realTimeFilteringQuality() {
-        return this._realTimeFilteringQuality ?? 1;
+        return this._realTimeFilteringQuality;
     }
     set realTimeFilteringQuality(n) {
         this._realTimeFilteringQuality = n;
@@ -656,7 +626,7 @@ export class PBRBaseMaterial extends PBRBaseMaterialBase {
         this._forceIrradianceInFragment = false;
         this._systemRealTimeFiltering = undefined;
         this._realTimeFiltering = undefined;
-        this._realTimeFilteringQuality = undefined;
+        this._realTimeFilteringQuality = 8;
         /**
          * Force normal to face away from face.
          * @internal