Skip to content

Commit cc8393c

Browse files
mimarakamimaraka
committed
v1.0.3
1 parent 592756f commit cc8393c

23 files changed

+680
-346
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Curve Editor v1.0.2 for AviUtl
1+
# Curve Editor v1.0.3 for AviUtl
22
![graph](https://user-images.githubusercontent.com/106879397/208284126-54f9caf2-8525-4a1b-8c89-6e3726afe3c1.png)
33

44
様々なイージングをウィンドウ上で編集できるAviUtlプラグイン&スクリプトです。
55

66
## ダウンロード
7-
最新バージョン: **v1.0.2**
7+
最新バージョン: **v1.0.3**
88

9-
<a href="https://github.com/mimaraka/aviutl-plugin-curve_editor/releases/download/v1.0.2/curve_editor-v1.0.2.zip">![Download](https://user-images.githubusercontent.com/106879397/198503637-3f0ca637-08cf-47b0-afdc-10f9974c7b37.png)</a>
9+
<a href="https://github.com/mimaraka/aviutl-plugin-curve_editor/releases/download/v1.0.3/curve_editor-v1.0.3.zip">![Download](https://user-images.githubusercontent.com/106879397/198503637-3f0ca637-08cf-47b0-afdc-10f9974c7b37.png)</a>
1010

1111
## インストール
1212
同梱されている`curve_editor.auf`を`exedit.auf`のあるフォルダもしくは`plugins`フォルダ内に入れ、`@Curve Editor.tra`を`script`フォルダ**直下**に入れてください。

‎curve_editor/curve_editor.rc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ BEGIN
6565
CONTROL "1�X�e�b�v�O�̕ҏW��Ԃ�\��",IDC_PREVIOUSCURVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,72,111,10
6666
CONTROL "�l�������ŃR�s�[(�x�W�F�E�U���E�o�E���X���[�h)",IDC_AUTOCOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,160,161,10
6767
LTEXT "�J�[�u�̐F",IDC_STATIC,15,41,34,8
68-
CONTROL "�V�����o�[�W������ʒm",IDC_LATEST_VERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,86,89,10
68+
CONTROL "�A�b�v�f�[�g��ʒm",IDC_NOTIFY_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,86,73,10
6969
PUSHBUTTON "�ύX",IDC_CURVE_COLOR,196,39,50,14
7070
CONTROL "�n���h���𓮂������Ƃ��ɃJ�[�u�������Ŕ��f(�x�W�F(����)���[�h)",IDC_AUTO_APPLY,
7171
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,174,218,10
@@ -90,24 +90,24 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
9090
BEGIN
9191
DEFPUSHBUTTON "OK",IDOK,114,44,50,14
9292
PUSHBUTTON "�L�����Z��",IDCANCEL,166,44,50,14
93-
LTEXT """X1, Y1, X2, Y2""�̌`���ŃJ�[�u�̃p�����[�^����͂��Ă��������B",IDC_STATIC,7,7,209,8
94-
EDITTEXT IDC_EDIT_VALUE,7,22,209,14,ES_AUTOHSCROLL
93+
LTEXT "�x�W�F�̃p�����[�^����͂��Ă��������B\n( �`���FX1, Y1, X2, Y2 )",IDC_STATIC,7,7,209,18
94+
EDITTEXT IDC_EDIT_VALUE,7,27,209,14,ES_AUTOHSCROLL
9595
END
9696

9797
IDD_READ DIALOGEX 0, 0, 181, 63
9898
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
99-
CAPTION "�l�����"
99+
CAPTION "�J�[�u�̐��l�����"
100100
FONT 8, "MS Shell Dlg", 400, 0, 0x1
101101
BEGIN
102102
DEFPUSHBUTTON "OK",IDOK,71,42,50,14
103103
PUSHBUTTON "�L�����Z��",IDCANCEL,124,42,50,14
104104
EDITTEXT IDC_EDIT_READ,7,21,167,14,ES_AUTOHSCROLL
105-
LTEXT "1�����̃J�[�u�l����͂��Ă�������",IDC_STATIC,7,7,110,8
105+
LTEXT "�J�[�u�̐��l����͂��Ă��������B",IDC_STATIC,7,7,104,8
106106
END
107107

108108
IDD_ABOUT DIALOGEX 0, 0, 310, 177
109109
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
110-
CAPTION "Dialog"
110+
CAPTION "Curve Editor"
111111
FONT 8, "MS Shell Dlg", 400, 0, 0x1
112112
BEGIN
113113
DEFPUSHBUTTON "OK",IDOK,199,156,50,14
@@ -122,15 +122,15 @@ BEGIN
122122
DEFPUSHBUTTON "OK",IDOK,71,42,50,14
123123
PUSHBUTTON "�L�����Z��",IDCANCEL,124,42,50,14
124124
EDITTEXT IDC_EDIT_ID,7,21,167,14,ES_AUTOHSCROLL | ES_NUMBER
125-
LTEXT "1~1024�͈̔͂�ID����͂��Ă�������",IDC_STATIC,7,7,119,8
125+
LTEXT "�ړ�������ID(1~1024)����͂��Ă��������B",IDC_STATIC,7,7,135,8
126126
END
127127

128-
IDD_LATEST_VERSION DIALOGEX 0, 0, 171, 39
128+
IDD_CHECK_UPDATE DIALOGEX 0, 0, 125, 35
129129
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
130130
CAPTION "Curve Editor"
131131
FONT 8, "MS Shell Dlg", 400, 0, 0x1
132132
BEGIN
133-
LTEXT "�ŐV�̃o�[�W�������`�F�b�N���Ă��܂�...",IDC_STATIC,7,7,120,8
133+
LTEXT "�A�b�v�f�[�g���`�F�b�N���Ă��܂�...",IDC_STATIC,7,7,102,8
134134
END
135135

136136

@@ -190,12 +190,12 @@ BEGIN
190190
BOTTOMMARGIN, 56
191191
END
192192

193-
IDD_LATEST_VERSION, DIALOG
193+
IDD_CHECK_UPDATE, DIALOG
194194
BEGIN
195195
LEFTMARGIN, 7
196-
RIGHTMARGIN, 164
196+
RIGHTMARGIN, 118
197197
TOPMARGIN, 7
198-
BOTTOMMARGIN, 32
198+
BOTTOMMARGIN, 28
199199
END
200200
END
201201
#endif // APSTUDIO_INVOKED
@@ -236,7 +236,7 @@ BEGIN
236236
0
237237
END
238238

239-
IDD_LATEST_VERSION AFX_DIALOG_LAYOUT
239+
IDD_CHECK_UPDATE AFX_DIALOG_LAYOUT
240240
BEGIN
241241
0
242242
END
@@ -290,7 +290,7 @@ BEGIN
290290
MENUITEM "�ݒ�", ID_MENU_CONFIG
291291
MENUITEM "�w���v", ID_MENU_HELP
292292
MENUITEM "About", ID_MENU_ABOUT
293-
MENUITEM "�ŐV�o�[�W�������m�F", ID_MENU_LATEST_VERSION
293+
MENUITEM "�A�b�v�f�[�g���m�F", ID_MENU_CHECK_UPDATE
294294
END
295295
END
296296

@@ -320,7 +320,7 @@ BEGIN
320320
POPUP "APPLY"
321321
BEGIN
322322
MENUITEM "�ʏ�", ID_APPLY_NORMAL
323-
MENUITEM "���ԓ_����", ID_APPLY_IGNOREKEY
323+
MENUITEM "���ԓ_����", ID_APPLY_IGNOREMID
324324
END
325325
END
326326

‎curve_editor/curve_editor.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ copy "$(SolutionDir)@Curve Editor.tra" "C:\Users\njotn\UserDirectory\AviUtl_Plug
199199
</ItemDefinitionGroup>
200200
<ItemGroup>
201201
<ClCompile Include="cve_bitmap_buffer.cpp" />
202-
<ClCompile Include="cve_control.cpp">
202+
<ClCompile Include="cve_button.cpp">
203203
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
204204
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
205205
</ClCompile>
@@ -227,6 +227,7 @@ copy "$(SolutionDir)@Curve Editor.tra" "C:\Users\njotn\UserDirectory\AviUtl_Plug
227227
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
228228
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
229229
</ClCompile>
230+
<ClCompile Include="cve_editbox.cpp" />
230231
<ClCompile Include="cve_func.cpp">
231232
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
232233
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
@@ -266,8 +267,10 @@ copy "$(SolutionDir)@Curve Editor.tra" "C:\Users\njotn\UserDirectory\AviUtl_Plug
266267
</ItemGroup>
267268
<ItemGroup>
268269
<ClInclude Include="cve_class.hpp" />
270+
<ClInclude Include="cve_extern.hpp" />
269271
<ClInclude Include="cve_header.hpp" />
270272
<ClInclude Include="cve_macro.hpp" />
273+
<ClInclude Include="cve_preset.hpp" />
271274
<ClInclude Include="cve_struct.hpp" />
272275
<ClInclude Include="cve_framework.hpp" />
273276
<ClInclude Include="resource.h" />

‎curve_editor/curve_editor.vcxproj.filters

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<ClCompile Include="cve_bitmap_buffer.cpp">
3131
<Filter>ソース ファイル</Filter>
3232
</ClCompile>
33-
<ClCompile Include="cve_control.cpp">
33+
<ClCompile Include="cve_button.cpp">
3434
<Filter>ソース ファイル</Filter>
3535
</ClCompile>
3636
<ClCompile Include="cve_func_filter.cpp">
@@ -78,6 +78,9 @@
7878
<ClCompile Include="cve_wndproc_library.cpp">
7979
<Filter>ソース ファイル</Filter>
8080
</ClCompile>
81+
<ClCompile Include="cve_editbox.cpp">
82+
<Filter>ソース ファイル</Filter>
83+
</ClCompile>
8184
</ItemGroup>
8285
<ItemGroup>
8386
<ClInclude Include="cve_header.hpp">
@@ -98,6 +101,12 @@
98101
<ClInclude Include="cve_struct.hpp">
99102
<Filter>ヘッダー ファイル</Filter>
100103
</ClInclude>
104+
<ClInclude Include="cve_extern.hpp">
105+
<Filter>ヘッダー ファイル</Filter>
106+
</ClInclude>
107+
<ClInclude Include="cve_preset.hpp">
108+
<Filter>ヘッダー ファイル</Filter>
109+
</ClInclude>
101110
</ItemGroup>
102111
<ItemGroup>
103112
<None Include="curve_editor.def">

‎curve_editor/cve_bitmap_buffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ void cve::Bitmap_Buffer::draw_panel_editor()
348348
// ベジェモードのとき
349349
case Mode_Bezier:
350350
if (g_config.trace)
351-
g_curve_normal_previous.draw_curve(this, rect, CVE_DRAW_CURVE_TRACE);
351+
g_curve_bezier_previous.draw_curve(this, rect, CVE_DRAW_CURVE_TRACE);
352352

353353
g_curve_bezier.draw_curve(this, rect, CVE_DRAW_CURVE_REGULAR);
354354
break;

‎curve_editor/cve_control.cpp renamed to ‎curve_editor/cve_button.cpp

File renamed without changes.

‎curve_editor/cve_class.hpp

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,34 @@ namespace cve {
375375

376376

377377

378+
//---------------------------------------------------------------------
379+
// エディットボックス
380+
//---------------------------------------------------------------------
381+
class Edit_Box : public Button {
382+
private:
383+
COLORREF bg_color;
384+
COLORREF tx_color;
385+
int line_height;
386+
387+
LRESULT wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
388+
389+
public:
390+
HWND editbox;
391+
392+
BOOL initialize(
393+
HWND hwnd_p,
394+
LPCTSTR name,
395+
int l_height,
396+
COLORREF bg_cl,
397+
COLORREF tx_cl,
398+
int ct_id,
399+
const RECT& rect,
400+
int flag
401+
);
402+
};
403+
404+
405+
378406
//---------------------------------------------------------------------
379407
// 矩形
380408
//---------------------------------------------------------------------

‎curve_editor/cve_curve.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,6 @@ void cve::Curve::draw_dash_line(Bitmap_Buffer* bitmap_buffer, const RECT& rect_w
911911
bitmap_buffer->brush, CVE_GR_POINT_LINE_THICKNESS, style_dash
912912
);
913913
}
914-
915914
}
916915

917916

@@ -926,7 +925,6 @@ void cve::Curve::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& rect_wnd,
926925

927926
const bool is_preset = drawing_mode == CVE_DRAW_CURVE_PRESET;
928927

929-
930928
if (drawing_mode == CVE_DRAW_CURVE_REGULAR) {
931929
handle_color = g_theme[g_config.theme].handle;
932930
curve_color = g_config.curve_color;
@@ -937,7 +935,7 @@ void cve::Curve::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& rect_wnd,
937935
}
938936
else {
939937
handle_color = g_theme[g_config.theme].handle_preset;
940-
curve_color = g_theme[g_config.theme].curve_prset;
938+
curve_color = g_theme[g_config.theme].curve_preset;
941939
}
942940

943941

‎curve_editor/cve_curve_bounce.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void cve::Curve_Bounce::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& rec
162162
}
163163
else {
164164
handle_color = g_theme[g_config.theme].handle_preset;
165-
curve_color = g_theme[g_config.theme].curve_prset;
165+
curve_color = g_theme[g_config.theme].curve_preset;
166166
}
167167

168168
float left_side = to_client(0, 0).x;
@@ -181,7 +181,7 @@ void cve::Curve_Bounce::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& rec
181181

182182
bitmap_buffer->brush->SetColor(D2D1::ColorF(TO_BGR(curve_color)));
183183

184-
float y1, y2;
184+
double y1, y2;
185185

186186
for (float x = left_side; x < right_side; x += CVE_DRAW_GRAPH_INCREASEMENT) {
187187
if (reverse) {
@@ -195,10 +195,10 @@ void cve::Curve_Bounce::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& rec
195195
g_render_target->DrawLine(
196196
D2D1::Point2F(
197197
x,
198-
(float)(to_clientf(0.0f, y1 * CVE_GRAPH_RESOLUTION).y)),
198+
(to_clientf(0.0f, (float)(y1 * CVE_GRAPH_RESOLUTION)).y)),
199199
D2D1::Point2F(
200200
x + CVE_DRAW_GRAPH_INCREASEMENT,
201-
(float)(to_clientf(0.0f, y2 * CVE_GRAPH_RESOLUTION).y)),
201+
(to_clientf(0.0f, (float)(y2 * CVE_GRAPH_RESOLUTION)).y)),
202202
bitmap_buffer->brush, CVE_CURVE_THICKNESS
203203
);
204204
}

‎curve_editor/cve_curve_elastic.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ void cve::Curve_Elastic::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& re
226226
}
227227
else {
228228
handle_color = g_theme[g_config.theme].handle_preset;
229-
curve_color = g_theme[g_config.theme].curve_prset;
229+
curve_color = g_theme[g_config.theme].curve_preset;
230230
}
231231

232232
float left_side = to_client(0, 0).x;
@@ -245,7 +245,7 @@ void cve::Curve_Elastic::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& re
245245

246246
bitmap_buffer->brush->SetColor(D2D1::ColorF(TO_BGR(curve_color)));
247247

248-
float y1, y2;
248+
double y1, y2;
249249

250250
for (float x = left_side; x < right_side; x += CVE_DRAW_GRAPH_INCREASEMENT) {
251251
if (reverse) {
@@ -259,10 +259,10 @@ void cve::Curve_Elastic::draw_curve(Bitmap_Buffer* bitmap_buffer, const RECT& re
259259
g_render_target->DrawLine(
260260
D2D1::Point2F(
261261
x,
262-
(float)(to_clientf(0.0f, y1 * CVE_GRAPH_RESOLUTION).y)),
262+
(float)(to_clientf(0.0f, (float)(y1 * CVE_GRAPH_RESOLUTION)).y)),
263263
D2D1::Point2F(
264264
x + CVE_DRAW_GRAPH_INCREASEMENT,
265-
(float)(to_clientf(0.0f, y2 * CVE_GRAPH_RESOLUTION).y)),
265+
(float)(to_clientf(0.0f, (float)(y2 * CVE_GRAPH_RESOLUTION)).y)),
266266
bitmap_buffer->brush, CVE_CURVE_THICKNESS
267267
);
268268
}

0 commit comments

Comments
 (0)