heavy restructuring with smart pointers, not finished
This commit is contained in:
@@ -12,7 +12,7 @@ class SignalManager{
|
||||
|
||||
public:
|
||||
SignalManager() {}
|
||||
SignalManager(GraphManager *gm, std::mutex *mutex) : mutex(mutex), gm(gm), nm(nm) {}
|
||||
SignalManager(GraphManager *gm, std::mutex *mutex) : mutex(mutex), gm(gm) {}
|
||||
|
||||
Midi midi;
|
||||
|
||||
@@ -39,7 +39,7 @@ class SignalManager{
|
||||
|
||||
void reset(){
|
||||
for(auto &s : signals){
|
||||
s.position = gm->nodes[s.start].position + Vec2D<float>{0.1, 0.1};
|
||||
s.position = gm->node(s.start)->position + Vec2D<float>{0.1, 0.1};
|
||||
s.next = s.start;
|
||||
s.last = s.start;
|
||||
}
|
||||
@@ -57,7 +57,7 @@ class SignalManager{
|
||||
|
||||
void addSignalAtNode(int node_id){
|
||||
Color c = {(unsigned char)(20 + (rand() % 200)), 100, (unsigned char)(20 + (int)(rand() % 200)), 200};
|
||||
signals.emplace(signals.end(), Signal(gm->nodes[node_id].position.x+1, gm->nodes[node_id].position.y+1, 8.0f, 0, c)); // position + 1 or else it does not render. why? no idea!
|
||||
signals.emplace(signals.end(), Signal(gm->node(node_id)->position.x+1, gm->node(node_id)->position.y+1, 8.0f, 0, c)); // position + 1 or else it does not render. why? no idea!
|
||||
signals.back().next = node_id;
|
||||
signals.back().last = node_id;
|
||||
signals.back().start = node_id;
|
||||
@@ -75,18 +75,18 @@ class SignalManager{
|
||||
mutex->lock();
|
||||
if(play){
|
||||
for(auto& s : signals){
|
||||
s.direction = (gm->node(s.next).position - s.position).norm();
|
||||
s.direction = (gm->node(s.next)->position - s.position).norm();
|
||||
s.update(diff.count());
|
||||
if(s.position.dist(&gm->nodes[s.next].position) < 0.6f) {
|
||||
if(s.position.dist(&gm->node(s.next)->position) < 0.6f) {
|
||||
int n = gm->next(s.next, s.last);
|
||||
gm->triggerNode(s.next);
|
||||
|
||||
if(n != s.next && n != -1) {
|
||||
for(auto &m : gm->nodes[s.next].midi_outs){
|
||||
for(auto &m : gm->node(s.next)->midi_outs){
|
||||
if(m.second.enabled) {
|
||||
if(gm->nodes[s.next].send_note) midi.note(m.second.i, gm->nodes[s.next].midi_note_channel, gm->nodes[s.next].midi_note, gm->nodes[s.next].midi_velocity, gm->nodes[s.next].midi_gate);
|
||||
if(gm->nodes[s.next].send_cc) midi.cc(m.second.i, gm->nodes[s.next].midi_cc_channel, gm->nodes[s.next].midi_cc, gm->nodes[s.next].midi_cc_value);
|
||||
if(gm->nodes[s.next].send_pitch_bend) midi.pitch_bend(m.second.i, gm->nodes[s.next].midi_pitch_bend_channel, gm->nodes[s.next].midi_pitch_bend);
|
||||
if(gm->node(s.next)->send_note) midi.note(m.second.i, gm->node(s.next)->midi_note_channel, gm->node(s.next)->midi_note, gm->node(s.next)->midi_velocity, gm->node(s.next)->midi_gate);
|
||||
if(gm->node(s.next)->send_cc) midi.cc(m.second.i, gm->node(s.next)->midi_cc_channel, gm->node(s.next)->midi_cc, gm->node(s.next)->midi_cc_value);
|
||||
if(gm->node(s.next)->send_pitch_bend) midi.pitch_bend(m.second.i, gm->node(s.next)->midi_pitch_bend_channel, gm->node(s.next)->midi_pitch_bend);
|
||||
}
|
||||
}
|
||||
s.last = s.next;
|
||||
|
||||
Reference in New Issue
Block a user