JLine buffer func

jildertviet · Mar 21, 2023 · 0175810 · 0175810
1 parent d39ea9b
commit 0175810
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/exampleSimple/bin/exampleSimple b/exampleSimple/bin/exampleSimple
diff --git a/src/Event/JLine.cpp b/src/Event/JLine.cpp
@@ -69,14 +69,28 @@ void JLine::toRect(ofVec2f loc, ofVec2f size){
     // Make env to move loc and size
 }
 
-void JLine::fromBuffer(){
-  cout << "Fill from buffer" << endl;
+void JLine::fromBuffer(int bufferMode){
+  // cout << "Fill from buffer" << endl;
   mode = 2;
   line.clear();
-  line.addVertex(buffer[0], buffer[1]);
-  for(int i=1; i<buffer.size()/2; i++){
-    glm::vec2 v = glm::vec2(buffer[i*2], buffer[i*2+1]);
-    line.lineTo(ofPoint(v));
+  switch(bufferMode){
+    case 0:{
+      line.addVertex(buffer[0], buffer[1]);
+      for(int i=1; i<buffer.size()/2; i++){
+        glm::vec2 v = glm::vec2(buffer[i*2], buffer[i*2+1]);
+        line.lineTo(ofPoint(v));
+      }
+    }
+    break;
+    case 1:{
+      for(int i=0; i<buffer.size(); i++){
+        float x = size.x / buffer.size();
+        x *= i;
+        glm::vec2 v = glm::vec2(x, buffer[i]);
+        line.lineTo(ofPoint(v));
+      }
+    }
+    break;
   }
 
   // line.addVertex(buffer[buffer.size()-2], buffer[buffer.size()-1]);
@@ -114,6 +128,5 @@ void JLine::calcLine(){
   }
 }
 
-void JLine::customOne(float* v){
-  fromBuffer();
-}
+void JLine::customOne(float* v){fromBuffer(0);}
+void JLine::customTwo(float* v){fromBuffer(1);}
diff --git a/src/Event/JLine.hpp b/src/Event/JLine.hpp
@@ -32,11 +32,12 @@ class JLine: public JEvent{
 
     void toRect(ofVec2f loc, ofVec2f size);
 
-    void fromBuffer();
+    void fromBuffer(int bufferMode = 0);
     void setLoc(glm::vec3 loc) override;
     void setSize(glm::vec3 size) override;
     void calcLine();
 
     void customOne(float* v = nullptr) override;
+    void customTwo(float* v = nullptr) override;
 };
 #endif /* JLine_hpp */
diff --git a/src/MsgParser.cpp b/src/MsgParser.cpp
@@ -861,7 +861,7 @@ bool MsgParser::setBuffer(ofxOscMessage& m){
     int numFrames = m.getNumArgs()-4;
     target->buffer.clear();
     for(int i=0; i<numFrames; i++){
-      cout << "Add frame: " << m.getArgAsFloat(i+4) << endl;
+      // cout << "Add frame: " << m.getArgAsFloat(i+4) << endl;
       target->buffer.push_back(m.getArgAsFloat(i+4));
     }
   } else{