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

asset directories, part 4

Browse source 
partially working
This commit is contained in:
tildearrow 2023-05-15 19:11:50 -05:00
parent c523d80fc3
commit 1f5b08e09e
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gui/dataList.cpp
View file

@ -25,6 +25,7 @@
#include "../ta-log.h" #include "../ta-log.h"
#include <fmt/printf.h> #include <fmt/printf.h>
#include <imgui.h> #include <imgui.h>
#include <imgui_internal.h>
const char* sampleNote[12]={ const char* sampleNote[12]={
"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"
@ -44,13 +45,23 @@ const char* sampleNote[12]={
const ImGuiPayload* dragItem=ImGui::AcceptDragDropPayload("FUR_DIR"); \ const ImGuiPayload* dragItem=ImGui::AcceptDragDropPayload("FUR_DIR"); \
if (dragItem!=NULL) { \ if (dragItem!=NULL) { \
if (dragItem->IsDataType("FUR_DIR")) { \ if (dragItem->IsDataType("FUR_DIR")) { \
if (dirToMove!=_d || assetToMove!=_a) { \ if (assetToMove==-1) { \
logV("%d/%d -> %d/%d",dirToMove,assetToMove,_d,_a); \ if (dirToMove!=_d && _a==-1) { \
e->lockEngine([&]() { \ e->lockEngine([&]() { \
int val=e->song.insDir[dirToMove].entries[assetToMove]; \ DivAssetDir val=_type[dirToMove]; \
e->song.insDir[dirToMove].entries.erase(e->song.insDir[dirToMove].entries.begin()+assetToMove); \ _type.erase(_type.begin()+dirToMove); \
e->song.insDir[_d].entries.insert(e->song.insDir[_d].entries.begin()+_a,val); \ _type.insert(_type.begin()+_d,val); \
}); \ }); \
} \
} else { \
if (dirToMove!=_d || assetToMove!=_a) { \
logV("%d/%d -> %d/%d",dirToMove,assetToMove,_d,_a); \
e->lockEngine([&]() { \
int val=_type[dirToMove].entries[assetToMove]; \
_type[dirToMove].entries.erase(_type[dirToMove].entries.begin()+assetToMove); \
_type[_d].entries.insert(_type[_d].entries.begin()+MAX(_a,0),val); \
}); \
} \
} \ } \
dirToMove=-1; \ dirToMove=-1; \
assetToMove=-1; \ assetToMove=-1; \
@ -578,7 +589,10 @@ void FurnaceGUI::drawInsList(bool asChild) {
insListItem(-1,-1,-1); insListItem(-1,-1,-1);
int dirIndex=0; int dirIndex=0;
for (DivAssetDir& i: e->song.insDir) { for (DivAssetDir& i: e->song.insDir) {
if (ImGui::TreeNode(i.name.empty()?"<uncategorized>":i.name.c_str())) { bool treeNode=ImGui::TreeNode(i.name.empty()?"<uncategorized>":i.name.c_str());
DRAG_SOURCE(dirIndex,-1);
DRAG_TARGET(dirIndex,-1,e->song.insDir);
if (treeNode) {
int assetIndex=0; int assetIndex=0;
for (int j: i.entries) { for (int j: i.entries) {
insListItem(j,dirIndex,assetIndex); insListItem(j,dirIndex,assetIndex);
@ -586,8 +600,6 @@ void FurnaceGUI::drawInsList(bool asChild) {
} }
ImGui::TreePop(); ImGui::TreePop();
} }
DRAG_SOURCE(dirIndex,-1);
DRAG_TARGET(dirIndex,-1,e->song.insDir);
dirIndex++; dirIndex++;
} }
} else { } else {