deeptwins-engine-3d 0.0.45 → 0.0.47

package/dist/material/shader/CircleWaveShader.glsl

@@ -1,32 +1,41 @@
 czm_material czm_getMaterial(czm_materialInput materialInput) {
     czm_material material = czm_getDefaultMaterial(materialInput);
     material.diffuse = 1.5 * color.rgb;
+
     vec2 st = materialInput.st;
     vec3 str = materialInput.str;
-    float dis = distance(st, vec2(0.5, 0.5));
+    float dis = distance(st, vec2(0.5));
     float per = fract(time);
-    if (abs(str.z) > 0.001) {
+    float perDis = 0.5 / count;
+
+    // discard if str.z != 0
+    float discardByStr = step(0.001, abs(str.z));
+    // discard if dis > 0.5
+    float discardByDis = step(0.5, dis);
+
+    if (discardByStr > 0.0 || discardByDis > 0.0) {
         discard;
     }
-    if (dis > 0.5) {
-        discard;
-    } else {
-        float perDis = 0.5 / count;
-        float disNum;
-        float bl = .0;
-        for (int i = 0; i <= 9; i++) {
-            if (float(i) <= count) {
-                disNum = perDis * float(i) - dis + per / count;
-                if (disNum > 0.0) {
-                    if (disNum < perDis) {
-                        bl = 1.0 - disNum / perDis;
-                    } else if (disNum - perDis < perDis) {
-                        bl = 1.0 - abs(1.0 - disNum / perDis);
-                    }
-                    material.alpha = pow(bl, gradient);
-                }
-            }
-        }
+
+    float bl = 0.0;
+
+    for (int i = 0; i <= 9; i++) {
+        float idx = float(i);
+        float valid = step(idx, count);  // 1.0 if i <= count, else 0.0
+
+        float disNum = perDis * idx - dis + per / count;
+        float inFirst = step(0.0, disNum) * (1.0 - step(perDis, disNum));
+        float inSecond = step(perDis, disNum) * (1.0 - step(2.0 * perDis, disNum));
+
+        float bl1 = 1.0 - disNum / perDis;
+        float bl2 = 1.0 - abs(1.0 - disNum / perDis);
+
+        float thisBl = mix(0.0, bl1, inFirst) + mix(0.0, bl2, inSecond);
+        thisBl *= valid; // only apply if i <= count
+
+        bl = max(bl, thisBl); // 保留最强的一层波纹
     }
+
+    material.alpha = pow(bl, gradient);
     return material;
 }

package/dist/material/shader/DynamicWallShader.glsl

@@ -4,23 +4,26 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     vec2 st = materialInput.st;
     float vertical = 1.0;
     float directionAdd = 1.0;
-    vec2 uv = vec2(0, 0);
-    // 判断排列方向
-    if (freely == vertical) {
-        // 判断运动方向
-        if (direction == directionAdd) {
-            uv = vec2(fract(st.s), fract(count * st.t + time));
-        } else {
-            uv = vec2(fract(st.s), fract(count * st.t - time));
-        }
-    } else {
-        // 判断运动方向
-        if (direction == directionAdd) {
-            uv = vec2(fract(count * st.s + time), fract(st.t));
-        } else {
-            uv = vec2(fract(count * st.s - time), fract(st.t));
-        }
-    }
+    // 使用 abs(a - b) < 0.0001（通过 step）判断浮点相等，避免精度误差
+    // 判断排列方向是否是纵向（freely == vertical）
+    float isVertical = 1.0 - step(0.0001, abs(freely - vertical));
+    // 判断运动方向是否是加（direction == directionAdd）
+    float isAdd = 1.0 - step(0.0001, abs(direction - directionAdd));
+
+    // 纵向排列：uv = (st.s, count * st.t ± time)
+    // 横向排列：uv = (count * st.s ± time, st.t)
+    vec2 uvVerticalAdd = vec2(fract(st.s), fract(count * st.t + time));
+    vec2 uvVerticalSub = vec2(fract(st.s), fract(count * st.t - time));
+    vec2 uvHorizontalAdd = vec2(fract(count * st.s + time), fract(st.t));
+    vec2 uvHorizontalSub = vec2(fract(count * st.s - time), fract(st.t));
+
+    // 按运动方向选择 mix(a, b, t) 作用类似于 t == 0 ? a : b
+    vec2 uvVertical = mix(uvVerticalSub, uvVerticalAdd, isAdd);
+    vec2 uvHorizontal = mix(uvHorizontalSub, uvHorizontalAdd, isAdd);
+
+    // 最终根据排列方向选择
+    vec2 uv = mix(uvHorizontal, uvVertical, isVertical);
+
     vec4 colorImage = texture(image, uv);
     vec3 mixedColor = mix(colorImage.rgb, color.rgb, mixRatio);
     vec4 fragColor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deeptwins-engine-3d",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "description": "map for 3d",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",