Skip to content

Commit 224ba0c

Browse files
sigma-axissigma-axis
committed
v1.20-for-beta20
+Added easing scripts. +Added a script to load another layer. +Added to README a new option to install.
1 parent a6933bf commit 224ba0c

4 files changed

Lines changed: 313 additions & 36 deletions

File tree

‎@Basic_S.anm2‎

Lines changed: 26 additions & 26 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.11 (for beta20) by σ軸
26+
--information:四隅丸め@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
282+
--information:背景角丸矩形@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
583+
--information:背景楕円@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
694+
--information:背景菱形@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
808+
--information:透明度適用@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
827+
--information:透明度二値化@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
867+
--information:色調補正@Basic_S v1.20 (for beta20) by σ軸
868868
--label:Basic_S\色調整
869869
--track@add_light:明るさ,0,200,100,0.01
870870
--track@contrast:コントラスト,0,200,100,0.01
@@ -1103,7 +1103,7 @@ else
11031103
end
11041104

11051105
@回転中心
1106-
--information:回転中心@Basic_S v1.11 (for beta20) by σ軸
1106+
--information:回転中心@Basic_S v1.20 (for beta20) by σ軸
11071107
--label:Basic_S\配置
11081108
--track@X:X,-4000,4000,0,0.01
11091109
--track@Y:Y,-4000,4000,0,0.01
@@ -1113,7 +1113,7 @@ obj.cy = obj.cy + Y;
11131113
obj.cz = obj.cz + Z;
11141114

11151115
@回転中心アンカー指定
1116-
--information:回転中心アンカー指定@Basic_S v1.11 (for beta20) by σ軸
1116+
--information:回転中心アンカー指定@Basic_S v1.20 (for beta20) by σ軸
11171117
--label:Basic_S\配置
11181118
--track0:X,-4000,4000,0,0.01
11191119
--track1:Y,-4000,4000,0,0.01
@@ -1161,7 +1161,7 @@ obj.ox, obj.oy, obj.oz = obj.ox + dx, obj.oy + dy, obj.oz + dz;
11611161
obj.cx,obj.cy,obj.cz = cx, cy, cz;
11621162

11631163
@上下左右揃え
1164-
--information:上下左右揃え@Basic_S v1.11 (for beta20) by σ軸
1164+
--information:上下左右揃え@Basic_S v1.20 (for beta20) by σ軸
11651165
--label:Basic_S\配置
11661166
--track@X:左右%,-100,100,0,0.001
11671167
--track@Y:上下%,-100,100,0,0.001
@@ -1183,7 +1183,7 @@ if cx ~= obj.cx or cy ~= obj.cy then
11831183
end
11841184

11851185
@直角回転
1186-
--information:直角回転@Basic_S v1.11 (for beta20) by σ軸
1186+
--information:直角回転@Basic_S v1.20 (for beta20) by σ軸
11871187
--label:Basic_S\配置
11881188
--select@rot:方向=0,なし=0,90°時計回り=1,180°反転=2,90°反時計回り=3,左右反転=4,上下反転=5,右上軸反転=6,左上軸反転=7
11891189
--check@move_center:中心の位置を変更,false
@@ -1230,7 +1230,7 @@ obj.copybuffer("object", "tempbuffer");
12301230
if not move_center then obj.cx, obj.cy = obj.cx + (cx - cx0), obj.cy + (cy - cy0) end
12311231

12321232
@XYZ追加回転
1233-
--information:XYZ追加回転@Basic_S v1.11 (for beta20) by σ軸
1233+
--information:XYZ追加回転@Basic_S v1.20 (for beta20) by σ軸
12341234
--label:Basic_S\配置
12351235
--track@X:X,-720,720,0,0.01
12361236
--track@Y:Y,-720,720,0,0.01
@@ -1297,7 +1297,7 @@ if angle ~= 0 or draw then
12971297
end
12981298

12991299
@任意軸追加回転
1300-
--information:任意軸追加回転@Basic_S v1.11 (for beta20) by σ軸
1300+
--information:任意軸追加回転@Basic_S v1.20 (for beta20) by σ軸
13011301
--label:Basic_S\配置
13021302
--track@angle:角度,-720,720,0,0.01
13031303
--track0:回転軸X,-512,512,0,0.001
@@ -1543,7 +1543,7 @@ else
15431543
end
15441544

15451545
@傾斜
1546-
--information:傾斜@Basic_S v1.11 (for beta20) by σ軸
1546+
--information:傾斜@Basic_S v1.20 (for beta20) by σ軸
15471547
--label:Basic_S\変形
15481548
--track@angle:角度,-80,80,0,0.001
15491549
--track@slope:傾き%,-500,500,0,0.001
@@ -1621,7 +1621,7 @@ obj.copybuffer("object", "tempbuffer");
16211621
obj.cx, obj.cy = obj.cx - cx, obj.cy - cy;
16221622

16231623
@XY軸変形
1624-
--information:XY軸変形@Basic_S v1.11 (for beta20) by σ軸
1624+
--information:XY軸変形@Basic_S v1.20 (for beta20) by σ軸
16251625
--label:Basic_S\変形
16261626
--value@axis_X:X軸,{100,0}
16271627
--check@stretch_X:X長さ変更,false
@@ -1676,7 +1676,7 @@ obj.drawpoly(
16761676
obj.copybuffer("object", "tempbuffer");
16771677

16781678
@領域サイズ変更
1679-
--information:領域サイズ変更@Basic_S v1.11 (for beta20) by σ軸
1679+
--information:領域サイズ変更@Basic_S v1.20 (for beta20) by σ軸
16801680
--label:Basic_S\クリッピング
16811681
--track@T:上,-4000,4000,0,1
16821682
--track@B:下,-4000,4000,0,1
@@ -1763,7 +1763,7 @@ end
17631763
obj.cx, obj.cy = cx, cy;
17641764

17651765
@領域割合サイズ変更
1766-
--information:領域割合サイズ変更@Basic_S v1.11 (for beta20) by σ軸
1766+
--information:領域割合サイズ変更@Basic_S v1.20 (for beta20) by σ軸
17671767
--label:Basic_S\クリッピング
17681768
--track@T:上%,-100,100,0,0.001
17691769
--track@B:下%,-100,100,0,0.001
@@ -1817,7 +1817,7 @@ if L ~= 0 or R ~= 0 or T ~= 0 or B ~= 0 then
18171817
end
18181818

18191819
@領域サイズ指定
1820-
--information:領域サイズ指定@Basic_S v1.11 (for beta20) by σ軸
1820+
--information:領域サイズ指定@Basic_S v1.20 (for beta20) by σ軸
18211821
--label:Basic_S\クリッピング
18221822
--track0:X,-4000,4000,0,0.1
18231823
--track1:Y,-4000,4000,0,0.1
@@ -1911,7 +1911,7 @@ elseif L ~= 0 or R ~= 0 or T ~= 0 or B ~= 0 then
19111911
end
19121912

19131913
@カットずらし
1914-
--information:カットずらし@Basic_S v1.11 (for beta20) by σ軸
1914+
--information:カットずらし@Basic_S v1.20 (for beta20) by σ軸
19151915
--label:Basic_S\クリッピング
19161916
--track0:ずれX,-4000,4000,40,1
19171917
--track1:ずれY,-4000,4000,0,1
@@ -2120,7 +2120,7 @@ if not move_center then
21202120
end
21212121

21222122
@中抜きクリッピング
2123-
--information:中抜きクリッピング@Basic_S v1.11 (for beta20) by σ軸
2123+
--information:中抜きクリッピング@Basic_S v1.20 (for beta20) by σ軸
21242124
--label:Basic_S\クリッピング
21252125
--track0:X,-4000,4000,0,0.1
21262126
--track1:Y,-4000,4000,0,0.1
@@ -2220,7 +2220,7 @@ else
22202220
end
22212221

22222222
@小数ぼかし
2223-
--information:小数ぼかし@Basic_S v1.11 (for beta20) by σ軸
2223+
--information:小数ぼかし@Basic_S v1.20 (for beta20) by σ軸
22242224
--label:Basic_S\ぼかし
22252225
--track@range:範囲,0,1000,5,0.01
22262226
--track@aspect:縦横比,-100,100,0,0.001
@@ -2363,7 +2363,7 @@ if luma_weight > 0 then
23632363
end
23642364

23652365
@縁取りα
2366-
--information:縁取りα@Basic_S v1.11 (for beta20) by σ軸
2366+
--information:縁取りα@Basic_S v1.20 (for beta20) by σ軸
23672367
--label:Basic_S\装飾
23682368
--track@size:サイズ,-500,500,5,1
23692369
--track@blur:ぼかし,0,100,5,1
@@ -2540,7 +2540,7 @@ elseif alpha_front > 0 then
25402540
end
25412541

25422542
@四角縁取り
2543-
--information:四角縁取り@Basic_S v1.11 (for beta20) by σ軸
2543+
--information:四角縁取り@Basic_S v1.20 (for beta20) by σ軸
25442544
--label:Basic_S\装飾
25452545
--track@size:サイズ,-500,500,5,0.01
25462546
--track@aspect:縦横比,-100,100,0,0.001
@@ -2782,7 +2782,7 @@ else
27822782
end
27832783

27842784
@内側シャドウ
2785-
--information:内側シャドウ@Basic_S v1.11 (for beta20) by σ軸
2785+
--information:内側シャドウ@Basic_S v1.20 (for beta20) by σ軸
27862786
--label:Basic_S\装飾
27872787
--track@X:X,-1000,1000,-40,0.01
27882788
--track@Y:Y,-1000,1000,24,0.01
@@ -2940,7 +2940,7 @@ obj.copybuffer("object", "tempbuffer");
29402940
obj.pixelshader("identity", "object", cache_name, nil, "mask");
29412941

29422942
@画像ファイル合成
2943-
--information:画像ファイル合成 v1.11 (for beta20) by σ軸
2943+
--information:画像ファイル合成 v1.20 (for beta20) by σ軸
29442944
--label:Basic_S\加工
29452945
--file@file:画像ファイル
29462946
--track0:X,-4000,4000,0,0.01
@@ -3206,7 +3206,7 @@ obj.ox, obj.oy, obj.oz, obj.cx, obj.cy, obj.cz, obj.rx, obj.ry, obj.rz, obj.sx,
32063206
obj.cx, obj.cy = obj.cx + dcx, obj.cy + dcy;
32073207

32083208
@動画ファイル合成
3209-
--information:動画ファイル合成 v1.11 (for beta20) by σ軸
3209+
--information:動画ファイル合成 v1.20 (for beta20) by σ軸
32103210
--label:Basic_S\加工
32113211
--file@file:動画ファイル
32123212
--track@start:再生開始秒,0,3600,0,0.001

‎@Basic_S.obj2‎

Lines changed: 79 additions & 4 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.11 (for beta20) by σ軸
26+
--information:角丸矩形@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
159+
--information:楕円@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
266+
--information:菱形@Basic_S v1.20 (for beta20) 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.11 (for beta20) by σ軸
373+
--information:スーパー楕円@Basic_S v1.20 (for beta20) by σ軸
374374
--label:Basic_S\図形
375375
--track@exponent:膨らみ,-300,300,-60,0.001
376376
--track@width:幅,0,4000,100,1
@@ -478,3 +478,78 @@ if not do_fill then
478478
obj.effect("縁取りα@Basic_S", "サイズ", -line, "ぼかし", 0,
479479
"縁色", color, "前景透明度", 100 * (1 - alpha_back))
480480
end
481+
482+
@別レイヤー
483+
--information:別レイヤー@Basic_S v1.20 (for beta20) by σ軸
484+
--label:Basic_S
485+
--select@index_base:レイヤー位置=1,絶対指定=0,相対指定=1
486+
--value@index:番号,-1
487+
--check@effect:フィルタ効果,true
488+
--check@position:位置の復元,false
489+
--check@rotation:回転拡大の復元,false
490+
--check@alpha:透明度の復元,false
491+
--value@PI:PI,{}
492+
local obj, tonumber, type = obj, tonumber, type;
493+
494+
-- take parameters.
495+
--[==[
496+
PI = {
497+
index_base: string?,
498+
index: number?,
499+
effect: boolean|number|nil,
500+
position: boolean|number|nil,
501+
rotation: boolean|number|nil,
502+
alpha: boolean|number|nil,
503+
}
504+
]==]
505+
local function as_bool(t, v)
506+
if type(t) == "boolean" then return t;
507+
elseif type(t) == "number" then return t ~= 0;
508+
else return v end
509+
end
510+
if PI.index_base then
511+
local name2num = {
512+
["絶対指定"] = 0, ["相対指定"] = 1,
513+
};
514+
index_base = name2num[PI.index_base] or index_base;
515+
end
516+
index = tonumber(PI.index) or tonumber(index) or -1;
517+
effect = as_bool(PI.effect, effect);
518+
position = as_bool(PI.position, position);
519+
rotation = as_bool(PI.rotation, rotation);
520+
alpha = as_bool(PI.alpha, alpha);
521+
522+
-- normalize parameters.
523+
if index_base == 1 then index = obj.layer + index end
524+
if index == obj.layer or index <= 0 then return end -- invalid layer index.
525+
526+
-- load the layer.
527+
local gv, hdr = obj.getvalue, "layer"..index;
528+
if not gv(hdr) then return end -- no object on the layer.
529+
obj.load("layer", index, effect);
530+
if obj.w <= 0 or obj.h <= 0 then return end -- failed to load the layer.
531+
532+
-- restore properties.
533+
-- note that fields like `obj.ox` are initialized to default,
534+
-- even if the object on the target layer had modified them.
535+
if position then
536+
obj.ox = gv(hdr..".x");
537+
obj.oy = gv(hdr..".y");
538+
obj.oz = gv(hdr..".z");
539+
540+
obj.cx = gv(hdr..".cx");
541+
obj.cy = gv(hdr..".cy");
542+
obj.cz = gv(hdr..".cz");
543+
end
544+
if rotation then
545+
obj.rx = gv(hdr..".rx");
546+
obj.ry = gv(hdr..".ry");
547+
obj.rz = gv(hdr..".rz");
548+
549+
obj.sx = gv(hdr..".sx");
550+
obj.sy = gv(hdr..".sy");
551+
obj.sz = gv(hdr..".sz");
552+
end
553+
if alpha then
554+
obj.alpha = gv(hdr..".alpha");
555+
end

0 commit comments

Comments
 (0)