Skip to content

Commit b79421f

Browse files
d3cod3d3cod3
authored
Merge pull request #14 from d3cod3/fixes-late-2023
Fixes late 2023
2 parents f152893 + ac2d603 commit b79421f

File tree

9 files changed

+55
-19
lines changed

9 files changed

+55
-19
lines changed

‎src/PatchObject.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,3 +323,5 @@ const std::string TYPE::objectCategory(CATEGORY);
323323
private: \
324324
static const std::string objectName; \
325325
static const std::string objectCategory; \
326+
327+
// ---------------------------------------------

‎src/core/imgui_node_canvas.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,8 @@ ImGuiEx::NodeConnectData ImGuiEx::NodeCanvas::AddNodePin( const int nodeID, cons
756756
ImGui::InvisibleButton("nodeBtn", ImMax(ImVec2(pinLayout.pinSpace.x,pinLayout.pinSpace.y*.8f), ImVec2(1,1)));
757757
# endif
758758

759+
IM_ASSERT( _label != NULL );
760+
759761
std::string _str_label(_label);
760762
std::string _gui_label(_label);
761763
_str_label += std::to_string(pinID);

‎src/core/imgui_plot.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ void PlotBands(ImDrawList* drawList, float width, float height, std::vector<floa
417417
float bin_w = Canvas.x / data->size();
418418

419419
for(unsigned int i=0;i<data->size();i++){
420-
drawList->AddRect(ImVec2( bb.Min.x + (bin_w*i), bb.Min.y+(Canvas.y*(max-data->at(i)) )),ImVec2(bb.Min.x + (bin_w*i) + bin_w, bb.Max.y),color);
420+
drawList->AddRect(ImVec2( bb.Min.x + (bin_w*i), bb.Min.y+(Canvas.y*(max-data->at(i)) )),ImVec2(bb.Min.x + (bin_w*i) + bin_w, bb.Max.y),color,0,0,1);
421421
}
422422

423423
}

‎src/objects/audio_analysis/AudioAnalyzer.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@ void AudioAnalyzer::audioOutObject(ofSoundBuffer &inputBuffer){
256256
lastBuffer.copyTo(monoBuffer, lastBuffer.getNumFrames(), 1, 0);
257257

258258
// autocorrelation + normalization
259-
doAutoCorrelation(monoBuffer.getBuffer().data());
259+
//doAutoCorrelation(monoBuffer.getBuffer().data());
260+
261+
memcpy(autoCorrelationNorm, &monoBuffer.getBuffer().data()[0], bufferSize * sizeof(float));
260262

261263

262264
// get volume
@@ -397,15 +399,19 @@ void AudioAnalyzer::doAutoCorrelation(float* signal){
397399
autoCorrelationResults[i] /= maxValue;
398400
}
399401
}
402+
400403
memcpy(autoCorrelationNorm, &autoCorrelationResults[0], bufferSize * sizeof(float));
404+
401405
}
402406

403407
//--------------------------------------------------------------
404408
void AudioAnalyzer::detectRMS(){
405-
for (int i = 0; i < bufferSize; i++) {
409+
/*for (int i = 0; i < bufferSize; i++) {
406410
rms += abs(autoCorrelation[i]);
407411
}
408-
rms /= bufferSize;
412+
rms /= bufferSize;*/
413+
414+
rms = ofClamp(static_cast<ofSoundBuffer *>(_inletParams[0])->getRMSAmplitude()*audioInputLevel,0.0,1.0);
409415
}
410416

411417
//--------------------------------------------------------------

‎src/objects/audio_analysis/RMSExtractor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void RMSExtractor::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
141141
// Visualize (Object main view)
142142
if( _nodeCanvas.BeginNodeContent(ImGuiExNodeView_Visualise) ){
143143

144-
ImGuiEx::plotValue(*(float *)&_outletParams[0], 0.f, 100.f,IM_COL32(255,255,120,255), this->scaleFactor);
144+
ImGuiEx::plotValue(*(float *)&_outletParams[0], 0.f, 1.f,IM_COL32(255,255,120,255), this->scaleFactor);
145145

146146
_nodeCanvas.EndNodeContent();
147147
}

‎src/objects/gui/moSonogram.cpp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,15 @@ void moSonogram::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRend
146146
ofPushMatrix();
147147
ofSetColor(0,0,0,0);
148148
ofDrawRectangle(0,0,static_cast<ofTexture *>(_outletParams[0])->getWidth(),static_cast<ofTexture *>(_outletParams[0])->getHeight());
149-
for(size_t s=0;s<static_cast<size_t>(static_cast<vector<float> *>(_inletParams[0])->size());s++){
150-
float valueDB = log10(ofMap(static_cast<vector<float> *>(_inletParams[0])->at(s),0.0f,1.0f,1.0f,10.0f,true));
151-
int colorIndex = static_cast<int>(floor(ofMap(valueDB,0.0f,1.0f,0,colors.size()-1,true)));
152-
ofSetColor(0);
153-
ofDrawRectangle(timePosition,ofMap(s,0,static_cast<int>(static_cast<vector<float> *>(_inletParams[0])->size()),static_cast<ofTexture *>(_outletParams[0])->getHeight(),0,true),1,1);
154-
ofSetColor(colors.at(colorIndex),255*valueDB);
155-
ofDrawRectangle(timePosition,ofMap(s,0,static_cast<int>(static_cast<vector<float> *>(_inletParams[0])->size()),static_cast<ofTexture *>(_outletParams[0])->getHeight(),0,true),1,1);
149+
if(!static_cast<vector<float> *>(_inletParams[0])->empty()){
150+
for(size_t s=0;s<static_cast<size_t>(static_cast<vector<float> *>(_inletParams[0])->size());s++){
151+
float valueDB = log10(ofMap(static_cast<vector<float> *>(_inletParams[0])->at(s),0.0f,1.0f,1.0f,10.0f,true));
152+
int colorIndex = static_cast<int>(floor(ofMap(valueDB,0.0f,1.0f,0,colors.size()-1,true)));
153+
ofSetColor(0);
154+
ofDrawRectangle(timePosition,ofMap(s,0,static_cast<int>(static_cast<vector<float> *>(_inletParams[0])->size()),static_cast<ofTexture *>(_outletParams[0])->getHeight(),0,true),1,1);
155+
ofSetColor(colors.at(colorIndex),255*valueDB);
156+
ofDrawRectangle(timePosition,ofMap(s,0,static_cast<int>(static_cast<vector<float> *>(_inletParams[0])->size()),static_cast<ofTexture *>(_outletParams[0])->getHeight(),0,true),1,1);
157+
}
156158
}
157159
ofPopMatrix();
158160
ofPopStyle();

‎src/objects/video/VideoGrabber.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ VideoGrabber::VideoGrabber() :
5454

5555
posX = posY = drawW = drawH = 0.0f;
5656

57-
camWidth = 320;
58-
camHeight = 240;
57+
camWidth = 1280;
58+
camHeight = 720;
5959
temp_width = camWidth;
6060
temp_height = camHeight;
6161

‎src/ofxVisualProgramming.cpp‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ ofxVisualProgramming::ofxVisualProgramming(){
6666
lastAddedObjectID = -1;
6767
bLoadingNewObject = false;
6868
bLoadingNewPatch = false;
69+
bPopulatingObjectsMap = false;
6970
clearingObjectsMap = false;
7071

7172
livePatchingObiID = -1;
@@ -225,7 +226,9 @@ void ofxVisualProgramming::update(){
225226
}
226227

227228
// Clear map from deleted objects
228-
clearObjectsMap();
229+
if(!bPopulatingObjectsMap){
230+
clearObjectsMap();
231+
}
229232

230233
// update patch objects
231234
if(!bLoadingNewPatch && !patchObjects.empty()){
@@ -622,7 +625,9 @@ void ofxVisualProgramming::audioProcess(float *input, int bufferSize, int nChann
622625
// compute audio input
623626
if(!inputBuffer.getBuffer().empty()){
624627
for(map<int,shared_ptr<PatchObject>>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){
625-
it->second->audioIn(inputBuffer);
628+
if(!it->second->getWillErase()){
629+
it->second->audioIn(inputBuffer);
630+
}
626631
}
627632

628633
lastInputBuffer = inputBuffer;
@@ -632,7 +637,9 @@ void ofxVisualProgramming::audioProcess(float *input, int bufferSize, int nChann
632637
if(audioGUIOUTChannels > 0){
633638
// compute audio output
634639
for(map<int,shared_ptr<PatchObject>>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){
635-
it->second->audioOut(emptyBuffer);
640+
if(!it->second->getWillErase()){
641+
it->second->audioOut(emptyBuffer);
642+
}
636643
}
637644
}
638645

@@ -660,6 +667,18 @@ void ofxVisualProgramming::addObject(string name,ofVec2f pos){
660667

661668
shared_ptr<PatchObject> tempObj = selectObject(name);
662669

670+
// selectObject can return nullptr !
671+
if( tempObj.get() == nullptr ){
672+
ofLogWarning("ofxVisualProgramming::addObject") << "The requested object « " << name << " » is not available !"
673+
#ifdef OFXVP_BUILD_WITH_MINIMAL_OBJECTS
674+
<< "\n(note: ofxVisualProgramming is compiling with OFXVP_BUILD_WITH_MINIMAL_OBJECTS enabled.)";
675+
#else
676+
;
677+
#endif
678+
bLoadingNewObject = false;
679+
return;
680+
}
681+
663682
tempObj->newObject();
664683
tempObj->setPatchfile(currentPatchFile);
665684
tempObj->setup(mainWindow);
@@ -1449,7 +1468,7 @@ void ofxVisualProgramming::loadPatch(string patchFile){
14491468
if(!audioDevicesID_IN.empty()){
14501469
isInputDeviceAvailable = true;
14511470
// select the first one available
1452-
audioGUIINIndex = audioDevicesID_IN.at(0);
1471+
audioGUIINIndex = 0;
14531472
audioINDev = audioDevicesID_IN.at(audioGUIINIndex);
14541473
}else{
14551474
isInputDeviceAvailable = false;
@@ -1474,7 +1493,7 @@ void ofxVisualProgramming::loadPatch(string patchFile){
14741493
if(!audioDevicesID_OUT.empty()){
14751494
isOutputDeviceAvailable = true;
14761495
// select the first one available
1477-
audioGUIOUTIndex = audioDevicesID_OUT.at(0);
1496+
audioGUIOUTIndex = 0;
14781497
audioOUTDev = audioDevicesID_OUT.at(audioGUIOUTIndex);
14791498
}else{
14801499
isOutputDeviceAvailable = false;
@@ -1556,6 +1575,8 @@ void ofxVisualProgramming::loadPatch(string patchFile){
15561575
XML.popTag();
15571576
}
15581577

1578+
bPopulatingObjectsMap = true;
1579+
15591580
int totalObjects = XML.getNumTags("object");
15601581

15611582
if(totalObjects > 0){
@@ -1633,6 +1654,8 @@ void ofxVisualProgramming::loadPatch(string patchFile){
16331654
}
16341655
}
16351656

1657+
bPopulatingObjectsMap = false;
1658+
16361659
activateDSP();
16371660

16381661
}

‎src/ofxVisualProgramming.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ class ofxVisualProgramming : public pdsp::Wrapper {
153153
int lastAddedObjectID;
154154
bool bLoadingNewObject;
155155
bool bLoadingNewPatch;
156+
bool bPopulatingObjectsMap;
156157
bool clearingObjectsMap;
157158

158159
// LOAD/SAVE

0 commit comments

Comments
 (0)