etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2025-01-06 23:51:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: patchbay connection

Browse source 
some improvements left to do
This commit is contained in:
tildearrow 2023-01-10 14:17:06 -05:00
parent 9b79bc0e7b
commit 4bc2418dd6
3 changed files with 73 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/gui.cpp
View file

@ -5729,8 +5729,6 @@ FurnaceGUI::FurnaceGUI():
zsmExportTickRate(60),
macroPointSize(16),
waveEditStyle(0),
selectedPortSet(0x1fff),
selectedSubPort(-1),
displayInsTypeListMakeInsSample(-1),
mobileEditPage(0),
mobileMenuPos(0.0f),
@ -6023,6 +6021,12 @@ FurnaceGUI::FurnaceGUI():
openSampleAmplifyOpt(false),
openSampleSilenceOpt(false),
openSampleFilterOpt(false),
selectedPortSet(0x1fff),
selectedSubPort(-1),
hoveredPortSet(0x1fff),
hoveredSubPort(-1),
portDragActive(false),
subPortPos(0.0f,0.0f),
oscTotal(0),
oscZoom(0.5f),
oscWindowSize(20.0f),

16
src/gui/gui.h
View file

@ -1113,11 +1113,6 @@ class FurnaceGUI {
int zsmExportTickRate;
int macroPointSize;
int waveEditStyle;
// 0xxx: output
// 1xxx: input
unsigned int selectedPortSet;
// any value not between 0 and 15 are "none"
int selectedSubPort;
int displayInsTypeListMakeInsSample;
int mobileEditPage;
float mobileMenuPos, autoButtonSize, mobileEditAnim;
@ -1661,6 +1656,17 @@ class FurnaceGUI {
size_t sampleClipboardLen;
bool openSampleResizeOpt, openSampleResampleOpt, openSampleAmplifyOpt, openSampleSilenceOpt, openSampleFilterOpt;
// mixer
// 0xxx: output
// 1xxx: input
unsigned int selectedPortSet;
// any value not between 0 and 15 are "none"
int selectedSubPort;
unsigned int hoveredPortSet;
int hoveredSubPort;
bool portDragActive;
ImVec2 subPortPos;
// oscilloscope
int oscTotal;
float oscValues[512];

98
src/gui/mixer.cpp
View file

@ -80,6 +80,7 @@ bool FurnaceGUI::portSet(String label, unsigned int portSetID, int ins, int outs
bool active=(hovered && ImGui::IsMouseClicked(ImGuiMouseButton_Left));
if (hovered) hoveredPortSet=portSetID;
if (active) clickedPort=-1;
// label
@ -114,32 +115,14 @@ bool FurnaceGUI::portSet(String label, unsigned int portSetID, int ins, int outs
portPos[(portSetID<<4)|i]=ImLerp(portMin,portMax,ImVec2(0.0f,0.5f));
if (ImGui::ItemAdd(portRect,ImGui::GetID(subPortID.c_str()))) {
ImGui::KeepAliveID(ImGui::GetID(subPortID.c_str()));
dl->AddRectFilled(portMin,portMax,ImGui::GetColorU32(portColor),0.0f);
dl->AddRect(portMin,portMax,ImGui::GetColorU32(portBorderColor),0.0f,dpiScale);
dl->AddText(portLabelPos,ImGui::GetColorU32(uiColors[GUI_COLOR_TEXT]),portLabel.c_str());
ImGui::ItemHoverable(portRect,ImGui::GetID(subPortID.c_str()));
// connection
if (ImGui::BeginDragDropSource()) {
// set up
ImGui::SetDragDropPayload("FUR_PBIN",NULL,0,ImGuiCond_Once);
logV("bdds");
ImGui::EndDragDropSource();
}
if (ImGui::BeginDragDropTarget()) {
const ImGuiPayload* dragItem=ImGui::AcceptDragDropPayload("FUR_PBIN");
if (dragItem!=NULL) {
if (dragItem->IsDataType("FUR_PBIN")) {
}
}
ImGui::EndDragDropTarget();
}
}
if (active) {
if (ImGui::IsMouseHoveringRect(portMin,portMax)) clickedPort=i;
if (ImGui::IsMouseHoveringRect(portMin,portMax)) {
hoveredSubPort=i;
if (active) clickedPort=i;
}
}
@ -173,28 +156,11 @@ bool FurnaceGUI::portSet(String label, unsigned int portSetID, int ins, int outs
dl->AddRectFilled(portMin,portMax,ImGui::GetColorU32(portColor),0.0f);
dl->AddRect(portMin,portMax,ImGui::GetColorU32(portBorderColor),0.0f,dpiScale);
dl->AddText(portLabelPos,ImGui::GetColorU32(uiColors[GUI_COLOR_TEXT]),portLabel.c_str());
ImGui::ItemHoverable(portRect,ImGui::GetID(subPortID.c_str()));
// connection
if (ImGui::BeginDragDropSource()) {
// set up
ImGui::SetDragDropPayload("FUR_PBIN",NULL,0,ImGuiCond_Once);
logV("bdds");
ImGui::EndDragDropSource();
}
if (ImGui::BeginDragDropTarget()) {
const ImGuiPayload* dragItem=ImGui::AcceptDragDropPayload("FUR_PBIN");
if (dragItem!=NULL) {
if (dragItem->IsDataType("FUR_PBIN")) {
}
}
ImGui::EndDragDropTarget();
}
}
if (active) {
if (ImGui::IsMouseHoveringRect(portMin,portMax)) clickedPort=i;
if (ImGui::IsMouseHoveringRect(portMin,portMax)) {
if (active) clickedPort=i;
hoveredSubPort=i;
}
}
@ -283,24 +249,72 @@ void FurnaceGUI::drawMixer() {
ImGui::EndTable();
}
}
hoveredPortSet=0x1fff;
hoveredSubPort=-1;
if (ImGui::BeginChild("Patchbay",ImVec2(0,0),true)) {
ImDrawList* dl=ImGui::GetWindowDrawList();
ImVec2 topPos=ImGui::GetCursorPos();
topPos.x+=ImGui::GetContentRegionAvail().x-60.0*dpiScale;
if (portDragActive) {
dl->AddLine(subPortPos,ImGui::GetMousePos(),ImGui::GetColorU32(uiColors[GUI_COLOR_PATCHBAY_CONNECTION]),2.0f*dpiScale);
}
for (int i=0; i<e->song.systemLen; i++) {
DivDispatch* dispatch=e->getDispatch(i);
if (dispatch==NULL) continue;
int outputs=dispatch->getOutputCount();
if (portSet(fmt::sprintf("%d. %s",i+1,getSystemName(e->song.system[i])),i,0,outputs,0,outputs,selectedSubPort,portPos)) {
selectedPortSet=i;
if (selectedSubPort>=0) {
portDragActive=true;
try {
subPortPos=portPos.at((selectedPortSet<<4)|selectedSubPort);
} catch (std::out_of_range& e) {
portDragActive=false;
}
}
}
}
ImGui::SetCursorPos(topPos);
if (portSet("System",0x1000,e->getAudioDescGot().outChans,0,e->getAudioDescGot().outChans,0,selectedSubPort,portPos)) {
selectedPortSet=0x1000;
if (selectedSubPort>=0) {
portDragActive=true;
try {
subPortPos=portPos.at((selectedPortSet<<4)|selectedSubPort);
} catch (std::out_of_range& e) {
portDragActive=false;
}
}
}
if (portDragActive) {
if (ImGui::IsMouseReleased(ImGuiMouseButton_Left)) {
portDragActive=false;
if (hoveredPortSet!=0x1fff && hoveredSubPort>=0) {
unsigned int src=(selectedPortSet<<4)|selectedSubPort;
unsigned int dest=(hoveredPortSet<<4)|hoveredSubPort;
if (src&0x10000) {
src^=dest;
dest^=src;
src^=dest;
}
src&=0xffff;
dest&=0xffff;
if (!e->patchConnect(src,dest)) {
e->patchDisconnect(src,dest);
}
}
}
}
// draw connections
ImDrawList* dl=ImGui::GetWindowDrawList();
for (unsigned int i: e->song.patchbay) {
try {
ImVec2 portSrc=portPos.at(i>>16);