Skip to content

Commit eda2b0f

Browse files
committed
Removed --filter flag from one effect.
+ Blur effect does not work properly as a filter object, most likely due to a bug of AviUtl2 beta25. + Added version check before calling `obj.getinfo("filter")`. Might remove in a subsequent version.
1 parent 81dd143 commit eda2b0f

1 file changed

Lines changed: 34 additions & 31 deletions

File tree

@Basic_S.anm2

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SOFTWARE.
2323
https://mit-license.org/
2424
]]
2525
@四隅丸め
26-
--information:四隅丸め@Basic_S v1.60-beta1 (for beta25) by σ軸
26+
--information:四隅丸め@Basic_S v1.60-beta3 (for beta25) by σ軸
2727
--label:Basic_S\クリッピング
2828
--filter
2929
--track@radius:半径,0,2000,40,0.01
@@ -282,7 +282,7 @@ obj.pixelshader("carve", "object", nil, {
282282
}, "mask");
283283

284284
@背景角丸矩形
285-
--information:背景角丸矩形@Basic_S v1.60-beta1 (for beta25) by σ軸
285+
--information:背景角丸矩形@Basic_S v1.60-beta3 (for beta25) by σ軸
286286
--label:Basic_S\装飾
287287
--track@pad_X:余白X,-1000,1000,10,1
288288
--track@pad_Y:余白Y,-1000,1000,10,1
@@ -587,7 +587,7 @@ end
587587
obj.cx, obj.cy = obj.cx + (L - R) / 2, obj.cy + (T - B) / 2;
588588

589589
@背景楕円
590-
--information:背景楕円@Basic_S v1.60-beta1 (for beta25) by σ軸
590+
--information:背景楕円@Basic_S v1.60-beta3 (for beta25) by σ軸
591591
--label:Basic_S\装飾
592592
--track@pad_X:余白X,-1000,1000,10,1
593593
--track@pad_Y:余白Y,-1000,1000,10,1
@@ -701,7 +701,7 @@ obj.effect("背景角丸矩形@Basic_S", "クリッピング", clip,
701701
pad_L, pad_R, pad_T, pad_B, line_x, line_y, back_x, back_y));
702702

703703
@背景菱形
704-
--information:背景菱形@Basic_S v1.60-beta1 (for beta25) by σ軸
704+
--information:背景菱形@Basic_S v1.60-beta3 (for beta25) by σ軸
705705
--label:Basic_S\装飾
706706
--track@pad_X:余白X,-1000,1000,10,1
707707
--track@pad_Y:余白Y,-1000,1000,10,1
@@ -818,7 +818,7 @@ obj.effect("背景角丸矩形@Basic_S", "クリッピング", clip,
818818
pad_L, pad_R, pad_T, pad_B, line_x, line_y, back_x, back_y));
819819

820820
@透明度適用
821-
--information:透明度適用@Basic_S v1.60-beta1 (for beta25) by σ軸
821+
--information:透明度適用@Basic_S v1.60-beta3 (for beta25) by σ軸
822822
--label:Basic_S\加工
823823
--filter
824824
--track@alpha:透明度,-100,100,0,0.01
@@ -838,7 +838,7 @@ if apply_former then obj.alpha, alpha = 1, alpha * obj.alpha end
838838
if alpha ~= 1 then obj.pixelshader("const_alpha", "object", nil, { alpha }, "mask") end
839839

840840
@透明度二値化
841-
--information:透明度二値化@Basic_S v1.60-beta1 (for beta25) by σ軸
841+
--information:透明度二値化@Basic_S v1.60-beta3 (for beta25) by σ軸
842842
--label:Basic_S\加工
843843
--filter
844844
--track@alpha:基準透明度,0,100,50,0.01
@@ -880,7 +880,7 @@ if alpha > 0 or buffer < 1 then
880880
end
881881

882882
@色調補正
883-
--information:色調補正@Basic_S v1.60-beta1 (for beta25) by σ軸
883+
--information:色調補正@Basic_S v1.60-beta3 (for beta25) by σ軸
884884
--label:Basic_S\色調整
885885
--filter
886886
--track@add_light:明るさ,0,200,100,0.01
@@ -1171,7 +1171,7 @@ else
11711171
end
11721172

11731173
@回転中心
1174-
--information:回転中心@Basic_S v1.60-beta1 (for beta25) by σ軸
1174+
--information:回転中心@Basic_S v1.60-beta3 (for beta25) by σ軸
11751175
--label:Basic_S\配置
11761176
--track@X:X,-4000,4000,0,0.01
11771177
--track@Y:Y,-4000,4000,0,0.01
@@ -1181,7 +1181,7 @@ obj.cy = obj.cy + Y;
11811181
obj.cz = obj.cz + Z;
11821182

11831183
@回転中心アンカー指定
1184-
--information:回転中心アンカー指定@Basic_S v1.60-beta1 (for beta25) by σ軸
1184+
--information:回転中心アンカー指定@Basic_S v1.60-beta3 (for beta25) by σ軸
11851185
--label:Basic_S\配置
11861186
--track0:X,-4000,4000,0,0.01
11871187
--track1:Y,-4000,4000,0,0.01
@@ -1230,7 +1230,7 @@ obj.ox, obj.oy, obj.oz = obj.ox + dx, obj.oy + dy, obj.oz + dz;
12301230
obj.cx,obj.cy,obj.cz = cx, cy, cz;
12311231

12321232
@上下左右揃え
1233-
--information:上下左右揃え@Basic_S v1.60-beta1 (for beta25) by σ軸
1233+
--information:上下左右揃え@Basic_S v1.60-beta3 (for beta25) by σ軸
12341234
--label:Basic_S\配置
12351235
--track@X:左右%,-100,100,0,0.001
12361236
--track@Y:上下%,-100,100,0,0.001
@@ -1253,7 +1253,7 @@ if cx ~= obj.cx or cy ~= obj.cy then
12531253
end
12541254

12551255
@直角回転
1256-
--information:直角回転@Basic_S v1.60-beta1 (for beta25) by σ軸
1256+
--information:直角回転@Basic_S v1.60-beta3 (for beta25) by σ軸
12571257
--label:Basic_S\配置
12581258
--select@rot:方向=0,なし=0,90°時計回り=1,180°反転=2,90°反時計回り=3,左右反転=4,上下反転=5,右上軸反転=6,左上軸反転=7
12591259
--check@move_center:中心の位置を変更,false
@@ -1300,7 +1300,7 @@ obj.copybuffer("object", "tempbuffer");
13001300
if not move_center then obj.cx, obj.cy = obj.cx + (cx - cx0), obj.cy + (cy - cy0) end
13011301

13021302
@XYZ追加回転
1303-
--information:XYZ追加回転@Basic_S v1.60-beta1 (for beta25) by σ軸
1303+
--information:XYZ追加回転@Basic_S v1.60-beta3 (for beta25) by σ軸
13041304
--label:Basic_S\配置
13051305
--track@X:X,-720,720,0,0.01
13061306
--track@Y:Y,-720,720,0,0.01
@@ -1369,7 +1369,7 @@ if angle ~= 0 or draw then
13691369
end
13701370

13711371
@任意軸追加回転
1372-
--information:任意軸追加回転@Basic_S v1.60-beta1 (for beta25) by σ軸
1372+
--information:任意軸追加回転@Basic_S v1.60-beta3 (for beta25) by σ軸
13731373
--label:Basic_S\配置
13741374
--track@angle:角度,-720,720,0,0.01
13751375
--track0:回転軸X,-512,512,0,0.001
@@ -1617,7 +1617,7 @@ else
16171617
end
16181618

16191619
@傾斜
1620-
--information:傾斜@Basic_S v1.60-beta1 (for beta25) by σ軸
1620+
--information:傾斜@Basic_S v1.60-beta3 (for beta25) by σ軸
16211621
--label:Basic_S\変形
16221622
--track@angle:角度,-80,80,0,0.001
16231623
--track@slope:傾き%,-500,500,0,0.001
@@ -1696,7 +1696,7 @@ obj.copybuffer("object", "tempbuffer");
16961696
obj.cx, obj.cy = obj.cx - cx, obj.cy - cy;
16971697

16981698
@XY軸変形
1699-
--information:XY軸変形@Basic_S v1.60-beta1 (for beta25) by σ軸
1699+
--information:XY軸変形@Basic_S v1.60-beta3 (for beta25) by σ軸
17001700
--label:Basic_S\変形
17011701
--value@axis_X:X軸,{100,0}
17021702
--check@stretch_X:X長さ変更,false
@@ -1752,7 +1752,7 @@ obj.drawpoly(
17521752
obj.copybuffer("object", "tempbuffer");
17531753

17541754
@領域サイズ変更
1755-
--information:領域サイズ変更@Basic_S v1.60-beta1 (for beta25) by σ軸
1755+
--information:領域サイズ変更@Basic_S v1.60-beta3 (for beta25) by σ軸
17561756
--label:Basic_S\クリッピング
17571757
--track@T:上,-4000,4000,0,1
17581758
--track@B:下,-4000,4000,0,1
@@ -1840,7 +1840,7 @@ end
18401840
obj.cx, obj.cy = cx, cy;
18411841

18421842
@領域割合サイズ変更
1843-
--information:領域割合サイズ変更@Basic_S v1.60-beta1 (for beta25) by σ軸
1843+
--information:領域割合サイズ変更@Basic_S v1.60-beta3 (for beta25) by σ軸
18441844
--label:Basic_S\クリッピング
18451845
--track@T:上%,-100,100,0,0.001
18461846
--track@B:下%,-100,100,0,0.001
@@ -1895,7 +1895,7 @@ if L ~= 0 or R ~= 0 or T ~= 0 or B ~= 0 then
18951895
end
18961896

18971897
@領域サイズ指定
1898-
--information:領域サイズ指定@Basic_S v1.60-beta1 (for beta25) by σ軸
1898+
--information:領域サイズ指定@Basic_S v1.60-beta3 (for beta25) by σ軸
18991899
--label:Basic_S\クリッピング
19001900
--track0:X,-4000,4000,0,0.1
19011901
--track1:Y,-4000,4000,0,0.1
@@ -1992,7 +1992,7 @@ elseif L ~= 0 or R ~= 0 or T ~= 0 or B ~= 0 then
19921992
end
19931993

19941994
@カットずらし
1995-
--information:カットずらし@Basic_S v1.60-beta1 (for beta25) by σ軸
1995+
--information:カットずらし@Basic_S v1.60-beta3 (for beta25) by σ軸
19961996
--label:Basic_S\クリッピング
19971997
--track0:ずれX,-4000,4000,40,1
19981998
--track1:ずれY,-4000,4000,0,1
@@ -2203,7 +2203,7 @@ if not move_center then
22032203
end
22042204

22052205
@中抜きクリッピング
2206-
--information:中抜きクリッピング@Basic_S v1.60-beta1 (for beta25) by σ軸
2206+
--information:中抜きクリッピング@Basic_S v1.60-beta3 (for beta25) by σ軸
22072207
--label:Basic_S\クリッピング
22082208
--track0:X,-4000,4000,0,0.1
22092209
--track1:Y,-4000,4000,0,0.1
@@ -2306,9 +2306,9 @@ else
23062306
end
23072307

23082308
@小数ぼかし
2309-
--information:小数ぼかし@Basic_S v1.60-beta1 (for beta25) by σ軸
2309+
--information:小数ぼかし@Basic_S v1.60-beta3 (for beta25) by σ軸
23102310
--label:Basic_S\ぼかし
2311-
--filter
2311+
-- --filter
23122312
--track@range:範囲,0,1000,5,0.01
23132313
--track@aspect:縦横比,-100,100,0,0.001
23142314
--track@luma_weight:光の強さ,0,60,0,0.1
@@ -2412,7 +2412,8 @@ range = math.min(math.max(range, 0), 1000);
24122412
aspect = math.min(math.max(aspect / 100, -1), 1);
24132413
luma_weight = math.min(math.max(luma_weight, 0), 60);
24142414
if range == 0 then return end
2415-
fixed_size = fixed_size or obj.getinfo("filter");
2415+
-- fixed_size = fixed_size
2416+
-- or (obj.getinfo("version") >= 2002400 and obj.getinfo("filter"));
24162417

24172418
-- further calculations.
24182419
local span_x, span_y = range * math.min(1 + aspect, 1) + 1, range * math.min(1 - aspect, 1) + 1;
@@ -2452,7 +2453,7 @@ if luma_weight > 0 then
24522453
end
24532454

24542455
@縁取りα
2455-
--information:縁取りα@Basic_S v1.60-beta1 (for beta25) by σ軸
2456+
--information:縁取りα@Basic_S v1.60-beta3 (for beta25) by σ軸
24562457
--label:Basic_S\装飾
24572458
--track@size:サイズ,-500,500,5,1
24582459
--track@blur:ぼかし,0,100,5,1
@@ -2631,7 +2632,7 @@ elseif alpha_front > 0 then
26312632
end
26322633

26332634
@四角縁取り
2634-
--information:四角縁取り@Basic_S v1.60-beta1 (for beta25) by σ軸
2635+
--information:四角縁取り@Basic_S v1.60-beta3 (for beta25) by σ軸
26352636
--label:Basic_S\装飾
26362637
--track@size:サイズ,-500,500,5,0.01
26372638
--track@aspect:縦横比,-100,100,0,0.001
@@ -2875,7 +2876,7 @@ else
28752876
end
28762877

28772878
@内側シャドウ
2878-
--information:内側シャドウ@Basic_S v1.60-beta1 (for beta25) by σ軸
2879+
--information:内側シャドウ@Basic_S v1.60-beta3 (for beta25) by σ軸
28792880
--label:Basic_S\装飾
28802881
--filter
28812882
--track@X:X,-1000,1000,-40,0.01
@@ -3030,7 +3031,7 @@ obj.copybuffer("object", "tempbuffer");
30303031
obj.pixelshader("identity", "object", cache_name, nil, "mask");
30313032

30323033
@画像ファイル合成
3033-
--information:画像ファイル合成 v1.60-beta1 (for beta25) by σ軸
3034+
--information:画像ファイル合成 v1.60-beta3 (for beta25) by σ軸
30343035
--label:Basic_S\加工
30353036
--filter
30363037
--file@file:画像ファイル
@@ -3201,7 +3202,8 @@ blend = ({
32013202
[100] = "alpha_add", [101] = "alpha_max", [102] = "alpha_sub", [103] = "alpha_add2",
32023203
})[blend] or "none";
32033204

3204-
fixed_size = fixed_size or mode_tile ~= 0 or mode_draw >= 2 or obj.getinfo("filter");
3205+
fixed_size = fixed_size or mode_tile ~= 0 or mode_draw >= 2
3206+
or (obj.getinfo("version") >= 2002400 and obj.getinfo("filter"));
32053207
if #file < 4 or -- no valid file name.
32063208
zoom <= 0 or (alpha <= 0 and fixed_size) then
32073209
return;
@@ -3301,7 +3303,7 @@ obj.ox, obj.oy, obj.oz, obj.cx, obj.cy, obj.cz, obj.rx, obj.ry, obj.rz, obj.sx,
33013303
obj.cx, obj.cy = obj.cx + dcx, obj.cy + dcy;
33023304

33033305
@動画ファイル合成
3304-
--information:動画ファイル合成 v1.60-beta1 (for beta25) by σ軸
3306+
--information:動画ファイル合成 v1.60-beta3 (for beta25) by σ軸
33053307
--label:Basic_S\加工
33063308
--filter
33073309
--file@file:動画ファイル
@@ -3484,7 +3486,8 @@ blend = ({
34843486
[100] = "alpha_add", [101] = "alpha_max", [102] = "alpha_sub", [103] = "alpha_add2",
34853487
})[blend] or "none";
34863488

3487-
fixed_size = fixed_size or mode_tile ~= 0 or mode_draw >= 2 or obj.getinfo("filter");
3489+
fixed_size = fixed_size or mode_tile ~= 0 or mode_draw >= 2
3490+
or (obj.getinfo("version") >= 2002400 and obj.getinfo("filter"));
34883491
if #file < 4 or -- no valid file name.
34893492
zoom <= 0 or (alpha <= 0 and fixed_size) then
34903493
return;
@@ -3590,7 +3593,7 @@ obj.ox, obj.oy, obj.oz, obj.cx, obj.cy, obj.cz, obj.rx, obj.ry, obj.rz, obj.sx,
35903593
obj.cx, obj.cy = obj.cx + dcx, obj.cy + dcy;
35913594

35923595
@別レイヤー同期
3593-
--information:別レイヤー同期 v1.60-beta1 (for beta25) by σ軸
3596+
--information:別レイヤー同期 v1.60-beta3 (for beta25) by σ軸
35943597
--label:Basic_S\配置
35953598
--select@index_base:レイヤー位置=1,絶対指定=0,相対指定=1
35963599
--value@index:番号,-1

0 commit comments

Comments
 (0)