otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

code style

Browse source 
and the fix
This commit is contained in:
tildearrow 2023-02-06 01:36:19 -05:00
parent 056c895c69
commit 4c39de927b
1 changed files with 259 additions and 366 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
src/gui/waveEdit.cpp
View file

@ -47,7 +47,7 @@ double rectSin(double x) {
return sin(x) > 0 ? sin(x) : 0; return sin(x) > 0 ? sin(x) : 0;
} }
double absSin(double x) { double absSin(double x) {
return abs(sin(x)); return fabs(sin(x));
} }
double square(double x) { double square(double x) {
@ -58,22 +58,15 @@ double rectSquare(double x) {
} }
double quartSin(double x) { double quartSin(double x) {
//if (x < M_PI / 2 || (x >= M_PI && x < (M_PI + M_PI / 2)))
// return absSin(x);
//return 0;
return absSin(x) * rectSquare(2 * x); return absSin(x) * rectSquare(2 * x);
} }
double squiSin(double x) { double squiSin(double x) {
return sin(x) >= 0 ? sin(2 * x) : 0; return sin(x) >= 0 ? sin(2 * x) : 0;
} }
double squiAbsSin(double x) { double squiAbsSin(double x) {
return abs(squiSin(x)); return fabs(squiSin(x));
} }
double saw(double x) { double saw(double x) {
return atan(tan(x / 2)) / (M_PI / 2); return atan(tan(x / 2)) / (M_PI / 2);
} }
@ -95,7 +88,6 @@ double absCubSaw(double x) {
return pow(absSaw(x), 3); return pow(absSaw(x), 3);
} }
double cubSine(double x) { double cubSine(double x) {
return pow(sin(x), 3); return pow(sin(x), 3);
} }
@ -115,7 +107,6 @@ double squishAbsCubSin(double x) {
return pow(squiAbsSin(x), 3); return pow(squiAbsSin(x), 3);
} }
double triangle(double x) { double triangle(double x) {
return asin(sin(x)) / (M_PI / 2); return asin(sin(x)) / (M_PI / 2);
} }
@ -123,22 +114,18 @@ double rectTri(double x) {
return triangle(x) > 0 ? triangle(x) : 0; return triangle(x) > 0 ? triangle(x) : 0;
} }
double absTri(double x) { double absTri(double x) {
return abs(triangle(x)); return fabs(triangle(x));
} }
double quartTri(double x) { double quartTri(double x) {
//if (x < M_PI / 2 || (x >= M_PI && x < (M_PI + M_PI / 2)))
// return absTri(x);
//return 0;
return absTri(x) * rectSquare(2 * x); return absTri(x) * rectSquare(2 * x);
} }
double squiTri(double x) { double squiTri(double x) {
return sin(x) >= 0 ? triangle(2 * x) : 0; return sin(x) >= 0 ? triangle(2 * x) : 0;
} }
double absSquiTri(double x) { double absSquiTri(double x) {
return abs(squiTri(x)); return fabs(squiTri(x));
} }
double cubTriangle(double x) { double cubTriangle(double x) {
return pow(triangle(x), 3); return pow(triangle(x), 3);
} }
@ -155,10 +142,9 @@ double cubSquiTri(double x) {
return pow(squiTri(x), 3); return pow(squiTri(x), 3);
} }
double absCubSquiTri(double x) { double absCubSquiTri(double x) {
return abs(cubSquiTri(x)); return fabs(cubSquiTri(x));
} }
typedef double (*WaveFunc) (double a); typedef double (*WaveFunc) (double a);
WaveFunc waveFuncs[]={ WaveFunc waveFuncs[]={
@ -243,6 +229,8 @@ const char* fmWaveforms[] = {
"Squish. Abs. Cub. Triangle", "Squish. Abs. Cub. Triangle",
}; };
const size_t fmWaveformsLen=sizeof(fmWaveforms)/sizeof(fmWaveforms[0]);
const float multFactors[17]={ const float multFactors[17]={
M_PI, M_PI,
2*M_PI, 2*M_PI,
@ -263,8 +251,6 @@ const float multFactors[17]={
32*M_PI, 32*M_PI,
}; };
void FurnaceGUI::doGenerateWave() { void FurnaceGUI::doGenerateWave() {
float finalResult[256]; float finalResult[256];
if (curWave<0 || curWave>=(int)e->song.wave.size()) return; if (curWave<0 || curWave>=(int)e->song.wave.size()) return;
@ -302,7 +288,6 @@ void FurnaceGUI::doGenerateWave() {
s0fb0=s0fb1; s0fb0=s0fb1;
s0fb1=s0; s0fb1=s0;
s1=waveFuncs[fmWaveform[1]]((pos + s1=waveFuncs[fmWaveform[1]]((pos +
(waveGenFB[1] ? ((s1fb0 + s1fb1) * pow(2.0f, waveGenFB[1] - 8)) : 0.0f) + (waveGenFB[1] ? ((s1fb0 + s1fb1) * pow(2.0f, waveGenFB[1] - 8)) : 0.0f) +
(waveGenFMCon1[3] ? s3 : 0.0f) + (waveGenFMCon1[3] ? s3 : 0.0f) +
@ -313,7 +298,6 @@ void FurnaceGUI::doGenerateWave() {
s1fb0=s1fb1; s1fb0=s1fb1;
s1fb1=s1; s1fb1=s1;
s2=waveFuncs[fmWaveform[2]]((pos + s2=waveFuncs[fmWaveform[2]]((pos +
(waveGenFB[2] ? ((s2fb0 + s2fb1) * pow(2.0f, waveGenFB[2] - 8)) : 0.0f) + (waveGenFB[2] ? ((s2fb0 + s2fb1) * pow(2.0f, waveGenFB[2] - 8)) : 0.0f) +
(waveGenFMCon2[3] ? s3 : 0.0f) + (waveGenFMCon2[3] ? s3 : 0.0f) +
@ -324,7 +308,6 @@ void FurnaceGUI::doGenerateWave() {
s2fb0=s2fb1; s2fb0=s2fb1;
s2fb1=s2; s2fb1=s2;
s3=waveFuncs[fmWaveform[3]]((pos + s3=waveFuncs[fmWaveform[3]]((pos +
(waveGenFB[3] ? ((s3fb0 + s3fb1) * pow(2.0f, waveGenFB[3] - 8)) : 0.0f) + (waveGenFB[3] ? ((s3fb0 + s3fb1) * pow(2.0f, waveGenFB[3] - 8)) : 0.0f) +
(waveGenFMCon3[3] ? s3 : 0.0f) + (waveGenFMCon3[3] ? s3 : 0.0f) +
@ -339,7 +322,6 @@ void FurnaceGUI::doGenerateWave() {
if (waveGenFMCon1[4]) finalResult[i]+=s1; if (waveGenFMCon1[4]) finalResult[i]+=s1;
if (waveGenFMCon2[4]) finalResult[i]+=s2; if (waveGenFMCon2[4]) finalResult[i]+=s2;
if (waveGenFMCon3[4]) finalResult[i]+=s3; if (waveGenFMCon3[4]) finalResult[i]+=s3;
//finalResult[i]+=s3;
} }
} else { } else {
switch (waveGenBaseShape) { switch (waveGenBaseShape) {
@ -405,15 +387,9 @@ void FurnaceGUI::doGenerateWave() {
MARK_MODIFIED; MARK_MODIFIED;
} }
#define CENTER_TEXT(text) \ #define CENTER_TEXT(text) \
ImGui::SetCursorPosX(ImGui::GetCursorPosX()+0.5*(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize(text).x)); ImGui::SetCursorPosX(ImGui::GetCursorPosX()+0.5*(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize(text).x));
//int lengthArray()
void FurnaceGUI::drawWaveEdit() { void FurnaceGUI::drawWaveEdit() {
if (nextWindow==GUI_WINDOW_WAVE_EDIT) { if (nextWindow==GUI_WINDOW_WAVE_EDIT) {
waveEditOpen=true; waveEditOpen=true;
@ -733,8 +709,6 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::EndTable(); ImGui::EndTable();
} }
if (ImGui::BeginTable("WGFMWAVE",2)) { if (ImGui::BeginTable("WGFMWAVE",2)) {
ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,ImGui::CalcTextSize("Op").x); ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,ImGui::CalcTextSize("Op").x);
ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,1); ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,1);
@ -753,92 +727,17 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::PushID(i); ImGui::PushID(i);
if (CWSliderInt("##WGWAVEFORM", &fmWaveform[i], 0, _countof(fmWaveforms)-1, fmWaveforms[fmWaveform[i]])) { if (CWSliderInt("##WGWAVEFORM",&fmWaveform[i],0,fmWaveformsLen-1,fmWaveforms[fmWaveform[i]])) {
doGenerateWave(); doGenerateWave();
} }
ImGui::PopID(); ImGui::PopID();
} }
ImGui::EndTable(); ImGui::EndTable();
} }
CENTER_TEXT("Connection Diagram"); CENTER_TEXT("Connection Diagram");
ImGui::Text("Connection Diagram"); ImGui::Text("Connection Diagram");
//if (ImGui::BeginTable("WGFMCon",5)) {
// ImGui::TableNextRow();
// ImGui::TableNextColumn();
// ImGui::Text(">>");
// ImGui::TableNextColumn();
// ImGui::Text("2");
// ImGui::TableNextColumn();
// ImGui::Text("3");
// ImGui::TableNextColumn();
// ImGui::Text("4");
// ImGui::TableNextColumn();
// ImGui::Text("Out");
// ImGui::TableNextRow();
// ImGui::TableNextColumn();
// ImGui::Text("1");
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con12",&waveGenFMCon1[0])) {
// doGenerateWave();
// }
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con13",&waveGenFMCon1[1])) {
// doGenerateWave();
// }
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con14",&waveGenFMCon1[2])) {
// doGenerateWave();
// }
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con1O",&waveGenFMCon1[3])) {
// doGenerateWave();
// }
// ImGui::TableNextRow();
// ImGui::TableNextColumn();
// ImGui::Text("2");
// ImGui::TableNextColumn();
// // blank
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con23",&waveGenFMCon2[0])) {
// doGenerateWave();
// }
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con24",&waveGenFMCon2[1])) {
// doGenerateWave();
// }
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con2O",&waveGenFMCon2[2])) {
// doGenerateWave();
// }
// ImGui::TableNextRow();
// ImGui::TableNextColumn();
// ImGui::Text("3");
// ImGui::TableNextColumn();
// // blank
// ImGui::TableNextColumn();
// // blank
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con34",&waveGenFMCon3[0])) {
// doGenerateWave();
// }
// ImGui::TableNextColumn();
// if (ImGui::Checkbox("##Con3O",&waveGenFMCon3[1])) {
// doGenerateWave();
// }
// ImGui::EndTable();
//}
if (ImGui::BeginTable("WGFMCon",6)) { if (ImGui::BeginTable("WGFMCon",6)) {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -852,8 +751,6 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("4"); ImGui::Text("4");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
//ImGui::Text("4");
//ImGui::TableNextColumn();
ImGui::Text("Out"); ImGui::Text("Out");
ImGui::TableNextRow(); ImGui::TableNextRow();
@ -880,7 +777,6 @@ void FurnaceGUI::drawWaveEdit() {
doGenerateWave(); doGenerateWave();
} }
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("2"); ImGui::Text("2");
@ -905,7 +801,6 @@ void FurnaceGUI::drawWaveEdit() {
doGenerateWave(); doGenerateWave();
} }
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("3"); ImGui::Text("3");
@ -930,7 +825,6 @@ void FurnaceGUI::drawWaveEdit() {
doGenerateWave(); doGenerateWave();
} }
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("4"); ImGui::Text("4");
@ -958,7 +852,6 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::EndTable(); ImGui::EndTable();
} }
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
if (ImGui::BeginTabItem("WaveTools")) { if (ImGui::BeginTabItem("WaveTools")) {