diff options
| author | yum <yum.food.vr@gmail.com> | 2023-08-31 23:36:38 -0700 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2023-08-31 23:36:38 -0700 |
| commit | 62b8dfa0e315f0d960afe20e116fb4ca3d59a08a (patch) | |
| tree | f13291e5cbd06b23445bc1245d0bdb4a19fe177f /GUI | |
| parent | 45f983b2f2670a79cbb83d2c8944d922015291be (diff) | |
libtastt.py now uses config file where appropriate
Diffstat (limited to 'GUI')
| -rw-r--r-- | GUI/GUI/GUI/Frame.cpp | 1 | ||||
| -rw-r--r-- | GUI/GUI/GUI/PythonWrapper.cpp | 11 | ||||
| -rw-r--r-- | GUI/GUI/GUI/PythonWrapper.h | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/GUI/GUI/GUI/Frame.cpp b/GUI/GUI/GUI/Frame.cpp index 5416abe..bcf0a2a 100644 --- a/GUI/GUI/GUI/Frame.cpp +++ b/GUI/GUI/GUI/Frame.cpp @@ -1791,6 +1791,7 @@ void Frame::OnGenerateFX(wxCommandEvent& event) std::string out;
if (!PythonWrapper::GenerateAnimator(
*app_c_,
+ std::string(AppConfig::kConfigPath),
unity_animator_generated_dir,
unity_animator_generated_name,
unity_parameters_generated_name,
diff --git a/GUI/GUI/GUI/PythonWrapper.cpp b/GUI/GUI/GUI/PythonWrapper.cpp index a855b4c..4acb51d 100644 --- a/GUI/GUI/GUI/PythonWrapper.cpp +++ b/GUI/GUI/GUI/PythonWrapper.cpp @@ -492,6 +492,7 @@ std::future<bool> PythonWrapper::StartApp( bool PythonWrapper::GenerateAnimator( const AppConfig& config, + const std::string& config_path, const std::string& unity_animator_generated_dir, const std::string& unity_animator_generated_name, const std::string& unity_parameters_generated_name, @@ -749,10 +750,7 @@ bool PythonWrapper::GenerateAnimator( if (!InvokeWithArgs({ libtastt_path, "gen_anims", "--gen_anim_dir", Quote(tastt_animations_path), "--guid_map", Quote(guid_map_path), - "--chars_per_sync", std::to_string(config.chars_per_sync), - "--bytes_per_char", std::to_string(config.bytes_per_char), - "--rows", std::to_string(config.rows), - "--cols", std::to_string(config.cols)}, + "--config", Quote(config_path) }, "Failed to generate animations", out)) { return false; } @@ -763,10 +761,7 @@ bool PythonWrapper::GenerateAnimator( "--fx_dest", Quote(tastt_fx0_path), "--gen_anim_dir", Quote(tastt_animations_path), "--guid_map", Quote(guid_map_path), - "--chars_per_sync", std::to_string(config.chars_per_sync), - "--bytes_per_char", std::to_string(config.bytes_per_char), - "--rows", std::to_string(config.rows), - "--cols", std::to_string(config.cols) }, + "--config", Quote(config_path) }, "Failed to generate FX layer", out)) { return false; } diff --git a/GUI/GUI/GUI/PythonWrapper.h b/GUI/GUI/GUI/PythonWrapper.h index 477224d..0f370a2 100644 --- a/GUI/GUI/GUI/PythonWrapper.h +++ b/GUI/GUI/GUI/PythonWrapper.h @@ -81,6 +81,7 @@ namespace PythonWrapper bool GenerateAnimator( const AppConfig& config, + const std::string& config_path, const std::string& unity_animator_generated_dir, const std::string& unity_animator_generated_name, const std::string& unity_parameters_generated_name, |