Skip to content

Commit 4efa6ee

Browse files
sigma-axissigma-axis
committed
v1.40-for-beta21
1 parent 8064277 commit 4efa6ee

File tree

4 files changed

+43
-45
lines changed

4 files changed

+43
-45
lines changed

‎@Basic_S.anm2‎

Lines changed: 27 additions & 27 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.40-test1 (for beta21) by σ軸
26+
--information:四隅丸め@Basic_S v1.40 (for beta21) by σ軸
2727
--label:Basic_S\クリッピング
2828
--track@radius:半径,0,2000,40,0.01
2929
--check@uniform:半径均一,true
@@ -279,7 +279,7 @@ obj.pixelshader("carve", "object", nil, {
279279
}, "mask");
280280

281281
@背景角丸矩形
282-
--information:背景角丸矩形@Basic_S v1.40-test1 (for beta21) by σ軸
282+
--information:背景角丸矩形@Basic_S v1.40 (for beta21) by σ軸
283283
--label:Basic_S\装飾
284284
--track@pad_X:余白X,-1000,1000,10,1
285285
--track@pad_Y:余白Y,-1000,1000,10,1
@@ -580,7 +580,7 @@ end
580580
obj.cx, obj.cy = obj.cx + (L - R) / 2, obj.cy + (T - B) / 2;
581581

582582
@背景楕円
583-
--information:背景楕円@Basic_S v1.40-test1 (for beta21) by σ軸
583+
--information:背景楕円@Basic_S v1.40 (for beta21) by σ軸
584584
--label:Basic_S\装飾
585585
--track@pad_X:余白X,-1000,1000,10,1
586586
--track@pad_Y:余白Y,-1000,1000,10,1
@@ -691,7 +691,7 @@ obj.effect("背景角丸矩形@Basic_S", "クリッピング", clip,
691691
pad_L, pad_R, pad_T, pad_B, line_x, line_y, back_x, back_y));
692692

693693
@背景菱形
694-
--information:背景菱形@Basic_S v1.40-test1 (for beta21) by σ軸
694+
--information:背景菱形@Basic_S v1.40 (for beta21) by σ軸
695695
--label:Basic_S\装飾
696696
--track@pad_X:余白X,-1000,1000,10,1
697697
--track@pad_Y:余白Y,-1000,1000,10,1
@@ -805,7 +805,7 @@ obj.effect("背景角丸矩形@Basic_S", "クリッピング", clip,
805805
pad_L, pad_R, pad_T, pad_B, line_x, line_y, back_x, back_y));
806806

807807
@透明度適用
808-
--information:透明度適用@Basic_S v1.40-test1 (for beta21) by σ軸
808+
--information:透明度適用@Basic_S v1.40 (for beta21) by σ軸
809809
--label:Basic_S\加工
810810
--track@alpha:透明度,-100,100,0,0.01
811811
--check@apply_former:累積分も適用,false
@@ -824,7 +824,7 @@ if apply_former then obj.alpha, alpha = 1, alpha * obj.alpha end
824824
if alpha ~= 1 then obj.pixelshader("const_alpha", "object", nil, { alpha }, "mask") end
825825

826826
@透明度二値化
827-
--information:透明度二値化@Basic_S v1.40-test1 (for beta21) by σ軸
827+
--information:透明度二値化@Basic_S v1.40 (for beta21) by σ軸
828828
--label:Basic_S\加工
829829
--track@alpha:基準透明度,0,100,50,0.01
830830
--track@buffer:ぼかし幅,0,100,8,0.01
@@ -864,7 +864,7 @@ if alpha > 0 or buffer < 1 then
864864
end
865865

866866
@色調補正
867-
--information:色調補正@Basic_S v1.40-test1 (for beta21) by σ軸
867+
--information:色調補正@Basic_S v1.40 (for beta21) by σ軸
868868
--label:Basic_S\色調整
869869
--track@add_light:明るさ,0,200,100,0.01
870870
--track@contrast:コントラスト,0,200,100,0.01
@@ -1153,7 +1153,7 @@ else
11531153
end
11541154

11551155
@回転中心
1156-
--information:回転中心@Basic_S v1.40-test1 (for beta21) by σ軸
1156+
--information:回転中心@Basic_S v1.40 (for beta21) by σ軸
11571157
--label:Basic_S\配置
11581158
--track@X:X,-4000,4000,0,0.01
11591159
--track@Y:Y,-4000,4000,0,0.01
@@ -1163,7 +1163,7 @@ obj.cy = obj.cy + Y;
11631163
obj.cz = obj.cz + Z;
11641164

11651165
@回転中心アンカー指定
1166-
--information:回転中心アンカー指定@Basic_S v1.40-test1 (for beta21) by σ軸
1166+
--information:回転中心アンカー指定@Basic_S v1.40 (for beta21) by σ軸
11671167
--label:Basic_S\配置
11681168
--track0:X,-4000,4000,0,0.01
11691169
--track1:Y,-4000,4000,0,0.01
@@ -1211,7 +1211,7 @@ obj.ox, obj.oy, obj.oz = obj.ox + dx, obj.oy + dy, obj.oz + dz;
12111211
obj.cx,obj.cy,obj.cz = cx, cy, cz;
12121212

12131213
@上下左右揃え
1214-
--information:上下左右揃え@Basic_S v1.40-test1 (for beta21) by σ軸
1214+
--information:上下左右揃え@Basic_S v1.40 (for beta21) by σ軸
12151215
--label:Basic_S\配置
12161216
--track@X:左右%,-100,100,0,0.001
12171217
--track@Y:上下%,-100,100,0,0.001
@@ -1233,7 +1233,7 @@ if cx ~= obj.cx or cy ~= obj.cy then
12331233
end
12341234

12351235
@直角回転
1236-
--information:直角回転@Basic_S v1.40-test1 (for beta21) by σ軸
1236+
--information:直角回転@Basic_S v1.40 (for beta21) by σ軸
12371237
--label:Basic_S\配置
12381238
--select@rot:方向=0,なし=0,90°時計回り=1,180°反転=2,90°反時計回り=3,左右反転=4,上下反転=5,右上軸反転=6,左上軸反転=7
12391239
--check@move_center:中心の位置を変更,false
@@ -1280,7 +1280,7 @@ obj.copybuffer("object", "tempbuffer");
12801280
if not move_center then obj.cx, obj.cy = obj.cx + (cx - cx0), obj.cy + (cy - cy0) end
12811281

12821282
@XYZ追加回転
1283-
--information:XYZ追加回転@Basic_S v1.40-test1 (for beta21) by σ軸
1283+
--information:XYZ追加回転@Basic_S v1.40 (for beta21) by σ軸
12841284
--label:Basic_S\配置
12851285
--track@X:X,-720,720,0,0.01
12861286
--track@Y:Y,-720,720,0,0.01
@@ -1347,7 +1347,7 @@ if angle ~= 0 or draw then
13471347
end
13481348

13491349
@任意軸追加回転
1350-
--information:任意軸追加回転@Basic_S v1.40-test1 (for beta21) by σ軸
1350+
--information:任意軸追加回転@Basic_S v1.40 (for beta21) by σ軸
13511351
--label:Basic_S\配置
13521352
--track@angle:角度,-720,720,0,0.01
13531353
--track0:回転軸X,-512,512,0,0.001
@@ -1593,7 +1593,7 @@ else
15931593
end
15941594

15951595
@傾斜
1596-
--information:傾斜@Basic_S v1.40-test1 (for beta21) by σ軸
1596+
--information:傾斜@Basic_S v1.40 (for beta21) by σ軸
15971597
--label:Basic_S\変形
15981598
--track@angle:角度,-80,80,0,0.001
15991599
--track@slope:傾き%,-500,500,0,0.001
@@ -1671,7 +1671,7 @@ obj.copybuffer("object", "tempbuffer");
16711671
obj.cx, obj.cy = obj.cx - cx, obj.cy - cy;
16721672

16731673
@XY軸変形
1674-
--information:XY軸変形@Basic_S v1.40-test1 (for beta21) by σ軸
1674+
--information:XY軸変形@Basic_S v1.40 (for beta21) by σ軸
16751675
--label:Basic_S\変形
16761676
--value@axis_X:X軸,{100,0}
16771677
--check@stretch_X:X長さ変更,false
@@ -1726,7 +1726,7 @@ obj.drawpoly(
17261726
obj.copybuffer("object", "tempbuffer");
17271727

17281728
@領域サイズ変更
1729-
--information:領域サイズ変更@Basic_S v1.40-test1 (for beta21) by σ軸
1729+
--information:領域サイズ変更@Basic_S v1.40 (for beta21) by σ軸
17301730
--label:Basic_S\クリッピング
17311731
--track@T:上,-4000,4000,0,1
17321732
--track@B:下,-4000,4000,0,1
@@ -1813,7 +1813,7 @@ end
18131813
obj.cx, obj.cy = cx, cy;
18141814

18151815
@領域割合サイズ変更
1816-
--information:領域割合サイズ変更@Basic_S v1.40-test1 (for beta21) by σ軸
1816+
--information:領域割合サイズ変更@Basic_S v1.40 (for beta21) by σ軸
18171817
--label:Basic_S\クリッピング
18181818
--track@T:上%,-100,100,0,0.001
18191819
--track@B:下%,-100,100,0,0.001
@@ -1867,7 +1867,7 @@ if L ~= 0 or R ~= 0 or T ~= 0 or B ~= 0 then
18671867
end
18681868

18691869
@領域サイズ指定
1870-
--information:領域サイズ指定@Basic_S v1.40-test1 (for beta21) by σ軸
1870+
--information:領域サイズ指定@Basic_S v1.40 (for beta21) by σ軸
18711871
--label:Basic_S\クリッピング
18721872
--track0:X,-4000,4000,0,0.1
18731873
--track1:Y,-4000,4000,0,0.1
@@ -1961,7 +1961,7 @@ elseif L ~= 0 or R ~= 0 or T ~= 0 or B ~= 0 then
19611961
end
19621962

19631963
@カットずらし
1964-
--information:カットずらし@Basic_S v1.40-test1 (for beta21) by σ軸
1964+
--information:カットずらし@Basic_S v1.40 (for beta21) by σ軸
19651965
--label:Basic_S\クリッピング
19661966
--track0:ずれX,-4000,4000,40,1
19671967
--track1:ずれY,-4000,4000,0,1
@@ -2170,7 +2170,7 @@ if not move_center then
21702170
end
21712171

21722172
@中抜きクリッピング
2173-
--information:中抜きクリッピング@Basic_S v1.40-test1 (for beta21) by σ軸
2173+
--information:中抜きクリッピング@Basic_S v1.40 (for beta21) by σ軸
21742174
--label:Basic_S\クリッピング
21752175
--track0:X,-4000,4000,0,0.1
21762176
--track1:Y,-4000,4000,0,0.1
@@ -2270,7 +2270,7 @@ else
22702270
end
22712271

22722272
@小数ぼかし
2273-
--information:小数ぼかし@Basic_S v1.40-test1 (for beta21) by σ軸
2273+
--information:小数ぼかし@Basic_S v1.40 (for beta21) by σ軸
22742274
--label:Basic_S\ぼかし
22752275
--track@range:範囲,0,1000,5,0.01
22762276
--track@aspect:縦横比,-100,100,0,0.001
@@ -2413,7 +2413,7 @@ if luma_weight > 0 then
24132413
end
24142414

24152415
@縁取りα
2416-
--information:縁取りα@Basic_S v1.40-test1 (for beta21) by σ軸
2416+
--information:縁取りα@Basic_S v1.40 (for beta21) by σ軸
24172417
--label:Basic_S\装飾
24182418
--track@size:サイズ,-500,500,5,1
24192419
--track@blur:ぼかし,0,100,5,1
@@ -2590,7 +2590,7 @@ elseif alpha_front > 0 then
25902590
end
25912591

25922592
@四角縁取り
2593-
--information:四角縁取り@Basic_S v1.40-test1 (for beta21) by σ軸
2593+
--information:四角縁取り@Basic_S v1.40 (for beta21) by σ軸
25942594
--label:Basic_S\装飾
25952595
--track@size:サイズ,-500,500,5,0.01
25962596
--track@aspect:縦横比,-100,100,0,0.001
@@ -2832,7 +2832,7 @@ else
28322832
end
28332833

28342834
@内側シャドウ
2835-
--information:内側シャドウ@Basic_S v1.40-test1 (for beta21) by σ軸
2835+
--information:内側シャドウ@Basic_S v1.40 (for beta21) by σ軸
28362836
--label:Basic_S\装飾
28372837
--track@X:X,-1000,1000,-40,0.01
28382838
--track@Y:Y,-1000,1000,24,0.01
@@ -2990,7 +2990,7 @@ obj.copybuffer("object", "tempbuffer");
29902990
obj.pixelshader("identity", "object", cache_name, nil, "mask");
29912991

29922992
@画像ファイル合成
2993-
--information:画像ファイル合成 v1.40-test1 (for beta21) by σ軸
2993+
--information:画像ファイル合成 v1.40 (for beta21) by σ軸
29942994
--label:Basic_S\加工
29952995
--file@file:画像ファイル
29962996
--track0:X,-4000,4000,0,0.01
@@ -3256,7 +3256,7 @@ obj.ox, obj.oy, obj.oz, obj.cx, obj.cy, obj.cz, obj.rx, obj.ry, obj.rz, obj.sx,
32563256
obj.cx, obj.cy = obj.cx + dcx, obj.cy + dcy;
32573257

32583258
@動画ファイル合成
3259-
--information:動画ファイル合成 v1.40-test1 (for beta21) by σ軸
3259+
--information:動画ファイル合成 v1.40 (for beta21) by σ軸
32603260
--label:Basic_S\加工
32613261
--file@file:動画ファイル
32623262
--track@start:再生開始秒,0,3600,0,0.001
@@ -3539,7 +3539,7 @@ obj.ox, obj.oy, obj.oz, obj.cx, obj.cy, obj.cz, obj.rx, obj.ry, obj.rz, obj.sx,
35393539
obj.cx, obj.cy = obj.cx + dcx, obj.cy + dcy;
35403540

35413541
@別レイヤー同期
3542-
--information:別レイヤー同期 v1.40-test1 (for beta21) by σ軸
3542+
--information:別レイヤー同期 v1.40 (for beta21) by σ軸
35433543
--label:Basic_S\配置
35443544
--select@index_base:レイヤー位置=1,絶対指定=0,相対指定=1
35453545
--value@index:番号,-1

‎@Basic_S.obj2‎

Lines changed: 5 additions & 5 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.40-test1 (for beta21) by σ軸
26+
--information:角丸矩形@Basic_S v1.40 (for beta21) by σ軸
2727
--label:Basic_S\図形
2828
--track@width:幅,0,4000,100,1
2929
--track@height:高さ,0,4000,100,1
@@ -156,7 +156,7 @@ obj.pixelshader("combine", "object", { "object", "tempbuffer" }, {
156156
});
157157

158158
@楕円
159-
--information:楕円@Basic_S v1.40-test1 (for beta21) by σ軸
159+
--information:楕円@Basic_S v1.40 (for beta21) by σ軸
160160
--label:Basic_S\図形
161161
--track@width:幅,0,4000,100,1
162162
--track@height:高さ,0,4000,100,1
@@ -263,7 +263,7 @@ obj.pixelshader("combine", "object", { "object", "tempbuffer" }, {
263263
});
264264

265265
@菱形
266-
--information:菱形@Basic_S v1.40-test1 (for beta21) by σ軸
266+
--information:菱形@Basic_S v1.40 (for beta21) by σ軸
267267
--label:Basic_S\図形
268268
--track@width:幅,0,4000,100,1
269269
--track@height:高さ,0,4000,100,1
@@ -370,7 +370,7 @@ obj.pixelshader("combine", "object", { "object", "tempbuffer" }, {
370370
});
371371

372372
@スーパー楕円
373-
--information:スーパー楕円@Basic_S v1.40-test1 (for beta21) by σ軸
373+
--information:スーパー楕円@Basic_S v1.40 (for beta21) by σ軸
374374
--label:Basic_S\図形
375375
--track@exponent:膨らみ,-300,300,-60,0.001
376376
--track@width:幅,0,4000,100,1
@@ -480,7 +480,7 @@ if not do_fill then
480480
end
481481

482482
@別レイヤー
483-
--information:別レイヤー@Basic_S v1.40-test1 (for beta21) by σ軸
483+
--information:別レイヤー@Basic_S v1.40 (for beta21) by σ軸
484484
--label:Basic_S
485485
--select@index_base:レイヤー位置=1,絶対指定=0,相対指定=1
486486
--value@index:番号,-1

‎@Basic_S.tra2‎

Lines changed: 10 additions & 10 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.40-test1 (for beta21) by σ軸
26+
--information:等速移動(秒)@Basic_S v1.40 (for beta21) by σ軸
2727
--label:Basic_S
2828
--twopoint
2929
--param:1
@@ -34,7 +34,7 @@ if T == 0 then T = 1 end
3434
return v0 + (v1 - v0) * t / T;
3535

3636
@等速移動(フレーム)
37-
--information:等速移動(フレーム)@Basic_S v1.40-test1 (for beta21) by σ軸
37+
--information:等速移動(フレーム)@Basic_S v1.40 (for beta21) by σ軸
3838
--label:Basic_S
3939
--twopoint
4040
--param:60
@@ -46,7 +46,7 @@ if F == 0 then F = 1 end
4646
return v0 + (v1 - v0) * f / F;
4747

4848
@コマ落ち反復(秒)
49-
--information:コマ落ち反復(秒)@Basic_S v1.40-test1 (for beta21) by σ軸
49+
--information:コマ落ち反復(秒)@Basic_S v1.40 (for beta21) by σ軸
5050
--label:Basic_S\コマ落ち
5151
--twopoint
5252
--param:0.5
@@ -57,7 +57,7 @@ if T == 0 then T = 1 end
5757
return gp(((t / T) % 1) < 0.5 and 0 or 1);
5858

5959
@コマ落ち反復(フレーム)
60-
--information:コマ落ち反復(フレーム)@Basic_S v1.40-test1 (for beta21) by σ軸
60+
--information:コマ落ち反復(フレーム)@Basic_S v1.40 (for beta21) by σ軸
6161
--label:Basic_S\コマ落ち
6262
--twopoint
6363
--param:30
@@ -69,7 +69,7 @@ if F == 0 then F = 1 end
6969
return gp(((f / F) % 1) < 0.5 and 0 or 1);
7070

7171
@コマ落ち反復(Hz)
72-
--information:コマ落ち反復(Hz)@Basic_S v1.40-test1 (for beta21) by σ軸
72+
--information:コマ落ち反復(Hz)@Basic_S v1.40 (for beta21) by σ軸
7373
--label:Basic_S\コマ落ち
7474
--twopoint
7575
--param:2
@@ -79,7 +79,7 @@ if 1 / N < 0 then t, N = t - gp("time", 1) - 1 / gp("framerate"), -N end
7979
return gp(((t * N) % 1) < 0.5 and 0 or 1);
8080

8181
@コマ落ち反復(BPM)
82-
--information:コマ落ち反復(BPM)@Basic_S v1.40-test1 (for beta21) by σ軸
82+
--information:コマ落ち反復(BPM)@Basic_S v1.40 (for beta21) by σ軸
8383
--label:Basic_S\コマ落ち
8484
--twopoint
8585
--param:120
@@ -89,7 +89,7 @@ if 1 / N < 0 then t, N = t - gp("time", 1) - 1 / gp("framerate"), -N end
8989
return gp(((t * N / 60) % 1) < 0.5 and 0 or 1);
9090

9191
@コマ落ちランダム(秒)
92-
--information:コマ落ち反復(秒)@Basic_S v1.40-test1 (for beta21) by σ軸
92+
--information:コマ落ち反復(秒)@Basic_S v1.40 (for beta21) by σ軸
9393
--label:Basic_S\コマ落ち
9494
--twopoint
9595
--param:0.5
@@ -101,7 +101,7 @@ local v0, v1 = gp(0), gp(1);
101101
return v0 + (v1 - v0) * rand1(2525, math.floor(t / T) + 1);
102102

103103
@コマ落ちランダム(フレーム)
104-
--information:コマ落ち反復(フレーム)@Basic_S v1.40-test1 (for beta21) by σ軸
104+
--information:コマ落ち反復(フレーム)@Basic_S v1.40 (for beta21) by σ軸
105105
--label:Basic_S\コマ落ち
106106
--twopoint
107107
--param:30
@@ -114,7 +114,7 @@ local v0, v1 = gp(0), gp(1);
114114
return v0 + (v1 - v0) * rand1(2525, math.floor(f / F) + 1);
115115

116116
@コマ落ちランダム(Hz)
117-
--information:コマ落ち反復(Hz)@Basic_S v1.40-test1 (for beta21) by σ軸
117+
--information:コマ落ち反復(Hz)@Basic_S v1.40 (for beta21) by σ軸
118118
--label:Basic_S\コマ落ち
119119
--twopoint
120120
--param:2
@@ -125,7 +125,7 @@ local v0, v1 = gp(0), gp(1);
125125
return v0 + (v1 - v0) * rand1(2525, math.floor(t * N) + 1);
126126

127127
@コマ落ちランダム(BPM)
128-
--information:コマ落ち反復(BPM)@Basic_S v1.40-test1 (for beta21) by σ軸
128+
--information:コマ落ち反復(BPM)@Basic_S v1.40 (for beta21) by σ軸
129129
--label:Basic_S\コマ落ち
130130
--twopoint
131131
--param:120

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,16 +388,14 @@ https://github.com/user-attachments/assets/65a2eb86-3b2a-406d-829b-ccdbaa29f123
388388

389389
## 改版履歴
390390

391-
- **v1.40 (for beta??)** (2025-??-??)
391+
- **v1.40 (for beta21)** (2025-11-28)
392392

393393
- 「別レイヤー同期」フィルタを追加．
394394

395395
- 「別レイヤー」オブジェクトで回転角度や回転中心の計算手順を変更．
396396
- 参照元レイヤーの回転角度や拡大率などで拡縮回転した後，自身の「標準描画」等の回転角度や回転中心移動を合成するように．以前は単純な加算計算だった．
397397
- 破壊的変更になります．「回転拡大の復元」が ON でかつ，参照元と参照先の両方の「標準描画」に軸の異なる回転を適用していたり，参照元に回転角度や拡大率がある状態で参照先の回転中心を変更していた場合に影響があります．
398398

399-
- `beta??` での動作確認．
400-
401399
- **v1.30 (for beta21)** (2025-11-23)
402400

403401
- 「色調補正」フィルタに色空間 `OKLCH` を追加．

0 commit comments

Comments
 (0)