@expofp/renderer 3.2.2 → 3.2.4

package/dist/index.js

@@ -1,4 +1,4 @@
-import { AlwaysDepth, BatchedMesh, Box3, BufferAttribute, BufferGeometry, Camera, Clock, Color, CustomBlending, DataTexture, DirectionalLight, DoubleSide, DynamicDrawUsage, FloatType, Frustum, Group, HemisphereLight, IntType, LessDepth, LessEqualDepth, LinearSRGBColorSpace, MathUtils, Matrix3, Matrix4, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, MeshStandardMaterial, NotEqualStencilFunc, OneFactor, PMREMGenerator, PerspectiveCamera, Plane, PlaneGeometry, Quaternion, RGBAFormat, RGBAIntegerFormat, RGFormat, RGIntegerFormat, Raycaster, RedFormat, RedIntegerFormat, ReplaceStencilOp, SRGBColorSpace, Scene, Sphere, Spherical, StreamDrawUsage, Texture, UnsignedIntType, Vector2, Vector3, Vector4, WebGLRenderer } from "three";
+import { AlwaysDepth, BatchedMesh, Box3, BufferAttribute, BufferGeometry, Camera, Clock, Color, CustomBlending, DataTexture, DirectionalLight, DoubleSide, DynamicDrawUsage, FloatType, Frustum, Group, HemisphereLight, IntType, LessDepth, LessEqualDepth, LinearSRGBColorSpace, MathUtils, Matrix3, Matrix4, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, MeshStandardMaterial, NotEqualStencilFunc, OneFactor, PMREMGenerator, PerspectiveCamera, Plane, PlaneGeometry, Quaternion, RGBAFormat, RGBAIntegerFormat, RGFormat, RGIntegerFormat, Raycaster, RedFormat, RedIntegerFormat, ReplaceStencilOp, SRGBColorSpace, Scene, Sphere, Spherical, SrcAlphaFactor, StreamDrawUsage, Texture, UnsignedIntType, Vector2, Vector3, Vector4, WebGLRenderer } from "three";
 import { traverseAncestorsGenerator } from "three/examples/jsm/utils/SceneUtils.js";
 import createLog from "debug";
 import { BatchedText, Text } from "troika-three-text";
@@ -1080,14 +1080,13 @@ var dimColorFrag = `
 */
 var POLYGON_OFFSET_MULTIPLIER = 12;
 /**
-* Stencil refs for line materials are allocated downward from 255 to stay clear of
-* maplibre's stencil IDs (tile clipping masks), which grow upward from 1 in external
-* mode where the stencil buffer is shared. Allocation wraps back to 255 at the floor;
-* two line layers only share a ref (and stop blending where they overlap) in scenes
-* with more line layers than the 255..200 range holds.
+* Stencil ref used by every line material. The stencil buffer is cleared before each line
+* batch draws (see {@link MaterialSystem.createLineMaterial}), so the ref only has to be
+* non-zero — distinguishing "stamped by this batch" from the cleared-to-zero background is
+* all the per-pixel dedup needs. A single constant works for all layers precisely because
+* the clear, not a unique ref, is what isolates one batch's stamps from another's.
 */
-var LINE_STENCIL_REF_MAX = 255;
-var LINE_STENCIL_REF_MIN = 200;
+var LINE_STENCIL_REF = 255;
 var sharedParameters = {
 	side: DoubleSide,
 	forceSinglePass: true,
@@ -1098,7 +1097,6 @@ var MaterialSystem = class {
 	backgroundMaterial;
 	viewport = new Vector4();
 	lightingMaterials = [];
-	nextLineStencilRef = LINE_STENCIL_REF_MAX;
 	/**
 	* Creates a line material.
 	* @param params {@link LineMaterialParameters}
@@ -1112,8 +1110,7 @@ var MaterialSystem = class {
 		material.stencilWrite = true;
 		material.stencilFunc = NotEqualStencilFunc;
 		material.stencilZPass = ReplaceStencilOp;
-		material.stencilRef = this.nextLineStencilRef;
-		this.nextLineStencilRef = this.nextLineStencilRef <= LINE_STENCIL_REF_MIN ? LINE_STENCIL_REF_MAX : this.nextLineStencilRef - 1;
+		material.stencilRef = LINE_STENCIL_REF;
 		material.onBeforeCompile = (shader) => {
 			shader.defines ??= {};
 			shader.defines["USE_BATCHING_COLOR"] = "";
@@ -1126,6 +1123,7 @@ var MaterialSystem = class {
             `);
 		};
 		material.onBeforeRender = (renderer) => {
+			renderer.clearStencil();
 			const uniforms = material.uniforms;
 			if (uniforms) {
 				renderer.getViewport(this.viewport);
@@ -1166,10 +1164,12 @@ var MaterialSystem = class {
 	createTextureMaterial(params) {
 		const material = new MeshBasicMaterial({
 			...sharedParameters,
-			map: params.map,
-			transparent: true,
-			depthFunc: LessDepth
+			map: params.map
 		});
+		material.blending = CustomBlending;
+		material.blendSrc = SrcAlphaFactor;
+		material.blendSrcAlpha = OneFactor;
+		if (params.depthEnable) material.depthFunc = LessEqualDepth;
 		if (params.uvOffset) material.onBeforeCompile = (shader) => {
 			shader.vertexShader = shader.vertexShader.replace("#include <uv_vertex>", `
               #include <uv_vertex>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/renderer",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "type": "module",
   "files": [
     "dist"