Skip to content

Commit e7e240a

Browse files
mimarakamimaraka
authored
Merge pull request #83 from mimaraka/develop
v2.0-beta1.3
2 parents 3de9212 + 81ca2a8 commit e7e240a

24 files changed

+222
-103
lines changed

‎curve_editor/config.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ namespace curve_editor::global {
2525
ignore_autosaver_warning_{ false },
2626
separator_pos_{ 0.56 },
2727
preset_size_{ 64 },
28+
preset_simple_view_{ false },
2829
select_window_size_{ 300, 450 }
2930
{
3031
pref_.reset();
@@ -176,6 +177,7 @@ namespace curve_editor::global {
176177
util::set_from_json(this, data, GET_KEY(ignore_autosaver_warning_), &Config::set_ignore_autosaver_warning);
177178
util::set_from_json(this, data, GET_KEY(separator_pos_), &Config::set_separator_pos);
178179
util::set_from_json(this, data, GET_KEY(preset_size_), &Config::set_preset_size);
180+
util::set_from_json(this, data, GET_KEY(preset_simple_view_), &Config::set_preset_simple_view);
179181
util::set_from_json(data, "select_window_width", select_window_size_.width);
180182
util::set_from_json(data, "select_window_height", select_window_size_.height);
181183
}
@@ -209,6 +211,7 @@ namespace curve_editor::global {
209211
{GET_KEY(ignore_autosaver_warning_), ignore_autosaver_warning_},
210212
{GET_KEY(separator_pos_), separator_pos_},
211213
{GET_KEY(preset_size_), preset_size_},
214+
{GET_KEY(preset_simple_view_), preset_simple_view_},
212215
{"select_window_width", select_window_size_.width},
213216
{"select_window_height", select_window_size_.height}
214217
};

‎curve_editor/config.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ namespace curve_editor::global {
3333
bool ignore_autosaver_warning_;
3434
double separator_pos_;
3535
int preset_size_;
36+
bool preset_simple_view_;
3637
mkaul::Size<uint32_t> select_window_size_;
3738

3839
std::filesystem::path dir_aviutl_;
@@ -145,6 +146,9 @@ namespace curve_editor::global {
145146
auto get_preset_size() const noexcept { return preset_size_; }
146147
void set_preset_size(int preset_size) noexcept { preset_size_ = mkaul::clamp(preset_size, 20, 200); }
147148

149+
auto get_preset_simple_view() const noexcept { return preset_simple_view_; }
150+
void set_preset_simple_view(bool preset_simple_view) noexcept { preset_simple_view_ = preset_simple_view; }
151+
148152
const auto& get_select_window_size() const noexcept { return select_window_size_; }
149153
void set_select_window_size(const mkaul::Size<uint32_t>& select_window_size) noexcept { select_window_size_ = select_window_size; }
150154

‎curve_editor/constants.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace curve_editor::global {
2626
inline constexpr auto PLUGIN_VERSION = mkaul::Version{
2727
mkaul::VersionNumber{2},
2828
mkaul::PreviewType{mkaul::PreviewType::Type::Beta},
29-
mkaul::VersionNumber{1, 2, 0}
29+
mkaul::VersionNumber{1, 3}
3030
};
3131
inline constexpr auto PLUGIN_DEVELOPER = L"mimaraka";
3232
inline constexpr auto PLUGIN_TRANSLATOR = L"Deepdive";

‎curve_editor/curve_editor.rc

-12 KB
Binary file not shown.

‎curve_editor/curve_editor.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,14 @@ msbuild mkaul\mkaul.vcxproj /p:Configuration=$(Configuration) /p:Platform=$(Plat
468468
</ItemGroup>
469469
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
470470
<ImportGroup Label="ExtensionTargets">
471-
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\native\Microsoft.Web.WebView2.targets')" />
472-
<Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
471+
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.3124.44\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.3124.44\build\native\Microsoft.Web.WebView2.targets')" />
472+
<Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
473473
</ImportGroup>
474474
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
475475
<PropertyGroup>
476476
<ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
477477
</PropertyGroup>
478-
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\native\Microsoft.Web.WebView2.targets'))" />
479-
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
478+
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.3124.44\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.3124.44\build\native\Microsoft.Web.WebView2.targets'))" />
479+
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
480480
</Target>
481481
</Project>

‎curve_editor/curve_editor.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@
583583
<None Include="curve_editor.def">
584584
<Filter>Module</Filter>
585585
</None>
586-
<None Include="packages.config" />
587586
<None Include="%40Curve Editor.tra">
588587
<Filter>Source Files</Filter>
589588
</None>
@@ -701,6 +700,7 @@
701700
<None Include="ui\src\host_object.ts">
702701
<Filter>Source Files\Web UI</Filter>
703702
</None>
703+
<None Include="packages.config" />
704704
</ItemGroup>
705705
<ItemGroup>
706706
<ResourceCompile Include="curve_editor.rc">

‎curve_editor/drag_and_drop.cpp

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ namespace curve_editor {
9696
void DragAndDrop::apply_easing_to_track(int32_t obj_idx, int32_t track_idx) noexcept {
9797
int16_t type_idx = 0;
9898
int32_t param;
99-
auto obj_array = *(global::exedit_internal.p_array_obj());
99+
auto obj_array = *global::exedit_internal.p_array_obj();
100100
auto p_obj = &obj_array[obj_idx];
101101
EditMode mode = EditMode::Normal;
102102

@@ -120,13 +120,41 @@ namespace curve_editor {
120120
int16_t apply_mode = (int16_t)global::config.get_apply_mode(mode);
121121
int16_t script_idx_offset = type_idx * (int16_t)ApplyMode::NumApplyMode + apply_mode;
122122

123-
// track_mode, track_paramの該当要素の値を変更
124-
mkaul::replace_var(&(p_obj->track_mode[track_idx].num), ExEdit::Object::TrackMode::isScript);
125-
mkaul::replace_var(
126-
&(p_obj->track_mode[track_idx].script_idx),
127-
(int16_t)(get_track_script_idx() + script_idx_offset)
128-
);
129-
mkaul::replace_var(&(p_obj->track_param[track_idx]), param);
123+
if (p_obj->index_midpt_leader != -1) {
124+
auto track_value_left = p_obj->track_value_left[track_idx];
125+
auto track_value_right = p_obj->track_value_right[track_idx];
126+
127+
auto loop_n = *global::exedit_internal.p_obj_num();
128+
for (int32_t i = 0; i < loop_n; i++) {
129+
auto p_obj_tmp = &obj_array[i];
130+
if ((p_obj_tmp->flag & ExEdit::Object::Flag::Exist) == static_cast<ExEdit::Object::Flag>(0)) {
131+
loop_n++;
132+
continue;
133+
}
134+
if (p_obj_tmp->index_midpt_leader == p_obj->index_midpt_leader) {
135+
// midpt_leaderが設定されている場合、そのオブジェクトのトラックバーにもイージングを適用する
136+
mkaul::replace_var(&(p_obj_tmp->track_mode[track_idx].num), ExEdit::Object::TrackMode::isScript);
137+
mkaul::replace_var(
138+
&(p_obj_tmp->track_mode[track_idx].script_idx),
139+
(int16_t)(get_track_script_idx() + script_idx_offset)
140+
);
141+
mkaul::replace_var(&(p_obj_tmp->track_param[track_idx]), param);
142+
143+
// トラックバーの開始値・終了値も合わせる
144+
mkaul::replace_var(&(p_obj_tmp->track_value_left[track_idx]), track_value_left);
145+
mkaul::replace_var(&(p_obj_tmp->track_value_right[track_idx]), track_value_right);
146+
}
147+
}
148+
}
149+
else {
150+
// track_mode, track_paramの該当要素の値を変更
151+
mkaul::replace_var(&(p_obj->track_mode[track_idx].num), ExEdit::Object::TrackMode::isScript);
152+
mkaul::replace_var(
153+
&(p_obj->track_mode[track_idx].script_idx),
154+
(int16_t)(get_track_script_idx() + script_idx_offset)
155+
);
156+
mkaul::replace_var(&(p_obj->track_param[track_idx]), param);
157+
}
130158
}
131159

132160
void DragAndDrop::apply_easing_to_tracks(int32_t obj_idx, int32_t track_idx) noexcept {

‎curve_editor/external/FastNoiseLite

‎curve_editor/external/sol2

‎curve_editor/host_object_config.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ namespace curve_editor {
4343
register_member(L"separatorPos", DispatchType::PropertyPut, +[](double separator_pos) { global::config.set_separator_pos(separator_pos); });
4444
register_member(L"presetSize", DispatchType::PropertyGet, +[] { return global::config.get_preset_size(); });
4545
register_member(L"presetSize", DispatchType::PropertyPut, +[](int preset_size) { global::config.set_preset_size(preset_size); });
46+
register_member(L"presetSimpleView", DispatchType::PropertyGet, +[] { return global::config.get_preset_simple_view(); });
47+
register_member(L"presetSimpleView", DispatchType::PropertyPut, +[](bool preset_simple_view) { global::config.set_preset_simple_view(preset_simple_view); });
4648
register_member(L"applyButtonHeight", DispatchType::PropertyGet, +[] { return global::config.get_apply_button_height(); });
4749
}
4850
};

0 commit comments

Comments
 (0)