Skip to content

feat: Add additional scale inputs (Y and Z axes) for Condition effects #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arran4 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add additional scale inputs (Y and Z axes) for Condition effects #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ffdstudio
41 changes: 18 additions & 23 deletions ffb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,29 +116,24 @@ cout << "Converted value: " << sdlValue << endl;
}
effect.condition.length = effect_data.get_length(); // 3 seconds long
effect.condition.delay = effect_data.get_delay();
/* switch(axes_enabled){
case 2:
effect.condition.right_sat[2] = effect_data.get_right_sat_2();
effect.condition.left_sat[2] = effect_data.get_left_sat_2();
effect.condition.right_coeff[2] = effect_data.get_right_coeff_2();
effect.condition.left_coeff[2] = effect_data.get_left_coeff_2();
effect.condition.deadband[2] = effect_data.get_deadband_2();
effect.condition.center[2] = effect_data.get_center_2();
case 1:
effect.condition.right_sat[1] = effect_data.get_right_sat_1();
effect.condition.left_sat[1] = effect_data.get_left_sat_1();
effect.condition.right_coeff[1] = effect_data.get_right_coeff_1();
effect.condition.left_coeff[1] = effect_data.get_left_coeff_1();
effect.condition.deadband[1] = effect_data.get_deadband_1();
effect.condition.center[1] = effect_data.get_center_1();
default:
effect.condition.right_sat[0] = effect_data.get_right_sat_0();
effect.condition.left_sat[0] = effect_data.get_left_sat_0();
effect.condition.right_coeff[0] = effect_data.get_right_coeff_0();
effect.condition.left_coeff[0] = effect_data.get_left_coeff_0();
effect.condition.deadband[0] = effect_data.get_deadband_0();
effect.condition.center[0] = effect_data.get_center_0();
}*/
effect.condition.right_sat[2] = effect_data.get_right_sat_2();
effect.condition.left_sat[2] = effect_data.get_left_sat_2();
effect.condition.right_coeff[2] = effect_data.get_right_coeff_2();
effect.condition.left_coeff[2] = effect_data.get_left_coeff_2();
effect.condition.deadband[2] = effect_data.get_deadband_2();
effect.condition.center[2] = effect_data.get_center_2();
effect.condition.right_sat[1] = effect_data.get_right_sat_1();
effect.condition.left_sat[1] = effect_data.get_left_sat_1();
effect.condition.right_coeff[1] = effect_data.get_right_coeff_1();
effect.condition.left_coeff[1] = effect_data.get_left_coeff_1();
effect.condition.deadband[1] = effect_data.get_deadband_1();
effect.condition.center[1] = effect_data.get_center_1();
effect.condition.right_sat[0] = effect_data.get_right_sat_0();
effect.condition.left_sat[0] = effect_data.get_left_sat_0();
effect.condition.right_coeff[0] = effect_data.get_right_coeff_0();
effect.condition.left_coeff[0] = effect_data.get_left_coeff_0();
effect.condition.deadband[0] = effect_data.get_deadband_0();
effect.condition.center[0] = effect_data.get_center_0();
break;
case custom:
cout << "Custom" << endl;
Expand Down
16 changes: 14 additions & 2 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ void FFDWindow::on_save_profile_button_clicked()

void FFDWindow::clean_effect_grid()
{
// effect_create_grid.remove_column(3);
effect_create_grid.remove_column(3);
effect_create_grid.remove_column(2);
effect_create_grid.remove_column(1);
effect_create_grid.remove_column(0);
Expand Down Expand Up @@ -1106,17 +1106,29 @@ void FFDWindow::on_condition_button_clicked()
effect_create_grid.attach(delay,1,4,1,1);
effect_create_grid.attach(right_sat_label,0,5,1,1);
effect_create_grid.attach(right_sat_0,1,5,1,1);
effect_create_grid.attach(right_sat_1,2,5,1,1);
effect_create_grid.attach(right_sat_2,3,5,1,1);
effect_create_grid.attach(left_sat_label,0,6,1,1);
effect_create_grid.attach(left_sat_0,1,6,1,1);
effect_create_grid.attach(left_sat_1,2,6,1,1);
effect_create_grid.attach(left_sat_2,3,6,1,1);
effect_create_grid.attach(right_coeff_label,0,7,1,1);
effect_create_grid.attach(right_coeff_0,1,7,1,1);
effect_create_grid.attach(right_coeff_1,2,7,1,1);
effect_create_grid.attach(right_coeff_2,3,7,1,1);
effect_create_grid.attach(left_coeff_label,0,8,1,1);
effect_create_grid.attach(left_coeff_0,1,8,1,1);
effect_create_grid.attach(left_coeff_1,2,8,1,1);
effect_create_grid.attach(left_coeff_2,3,8,1,1);
effect_create_grid.attach(deadband_label,0,9,1,1);
effect_create_grid.attach(deadband_0,1,9,1,1);
effect_create_grid.attach(deadband_1,2,9,1,1);
effect_create_grid.attach(deadband_2,3,9,1,1);
effect_create_grid.attach(center_label,0,10,1,1);
effect_create_grid.attach(center_0,1,10,1,1);
effect_create_grid.attach(test_effect_button,0,11,3,1);
effect_create_grid.attach(center_1,2,10,1,1);
effect_create_grid.attach(center_2,3,10,1,1);
effect_create_grid.attach(test_effect_button,0,11,4,1);
align_all();
this->chosen == 1;
}
Expand Down