minerender 2.1.0-alpha.64 → 2.1.0-alpha.66

package/dist/browser/index.mjs

@@ -803,7 +803,7 @@ var init_Textures = __esm({
 });
 
 // src/Materials.ts
-import { Color, CustomBlending, DoubleSide, OneFactor, RepeatWrapping, FrontSide, MeshBasicMaterial, MeshStandardMaterial, ShaderChunk, ShaderMaterial, ZeroFactor } from "three";
+import { Color, CustomBlending, DoubleSide, OneFactor, OneMinusSrcAlphaFactor, RepeatWrapping, FrontSide, MeshBasicMaterial, MeshStandardMaterial, ShaderChunk, ShaderMaterial } from "three";
 var _Materials, Materials;
 var init_Materials = __esm({
   "src/Materials.ts"() {
@@ -892,8 +892,15 @@ var init_Materials = __esm({
             material.blending = CustomBlending;
             material.blendSrc = OneFactor;
             material.blendDst = OneFactor;
-            material.blendSrcAlpha = ZeroFactor;
-            material.blendDstAlpha = OneFactor;
+            material.blendSrcAlpha = OneFactor;
+            material.blendDstAlpha = OneMinusSrcAlphaFactor;
+            material.onBeforeCompile = (shader) => {
+              shader.fragmentShader = shader.fragmentShader.replace(
+                "#include <dithering_fragment>",
+                "gl_FragColor.a = max(gl_FragColor.r, max(gl_FragColor.g, gl_FragColor.b));\n#include <dithering_fragment>"
+              );
+            };
+            material.customProgramCacheKey = () => "energy_swirl";
             material.color.set(8421504);
             break;
           case "water_mask":
@@ -2913,16 +2920,17 @@ var init_UVMapper = __esm({
               positions[textureKey] = [x, y];
               const [width, height] = sizes[textureKey];
               const sequence = frames[textureKey];
-              const drawFrame = (index) => {
+              const getFrameData = (index) => {
                 const columns = texture.width / width;
-                image.putData(texture.getSectionData(
+                return texture.getSectionData(
                   index % columns * width,
                   Math.floor(index / columns) * height,
                   width,
                   height
-                ), x, y);
+                );
               };
-              drawFrame(sequence?.[0].index ?? 0);
+              const firstFrame = getFrameData(sequence?.[0].index ?? 0);
+              image.putData(firstFrame, x, y);
               if (texture.hasTransparency) {
                 hasTransparency = true;
               }
@@ -2930,13 +2938,28 @@ var init_UVMapper = __esm({
                 hasAnimation = true;
                 let t = 0;
                 let f = 0;
+                const interpolated = metaMap[textureKey]?.animation?.interpolate ? image.context.createImageData(width, height) : void 0;
+                let currentFrame = firstFrame;
+                let nextFrame = interpolated ? getFrameData(sequence[1].index) : firstFrame;
                 animatorFunctions[textureKey] = () => {
-                  if (++t < sequence[f].time) return false;
-                  t = 0;
-                  const previous = sequence[f].index;
-                  f = (f + 1) % sequence.length;
-                  if (sequence[f].index === previous) return false;
-                  drawFrame(sequence[f].index);
+                  if (++t >= sequence[f].time) {
+                    t = 0;
+                    const previous = sequence[f].index;
+                    f = (f + 1) % sequence.length;
+                    if (interpolated) {
+                      currentFrame = nextFrame;
+                      nextFrame = getFrameData(sequence[(f + 1) % sequence.length].index);
+                    }
+                    if (sequence[f].index === previous) return false;
+                    image.putData(interpolated ? currentFrame : getFrameData(sequence[f].index), x, y);
+                    return true;
+                  }
+                  if (!interpolated || sequence[f].index === sequence[(f + 1) % sequence.length].index) return false;
+                  const progress = Math.floor(Math.fround(Math.fround(t / sequence[f].time) * 1e3)) / 1e3;
+                  for (let i = 0; i < interpolated.data.length; i++) {
+                    interpolated.data[i] = currentFrame.data[i] + (nextFrame.data[i] - currentFrame.data[i]) * progress;
+                  }
+                  image.putData(interpolated, x, y);
                   return true;
                 };
               }