computerscare-vcv-modules

commit f627b3859b4b59ef601e7ded06403e06c0075024
parent ae0f2b4cdb90a3195553d20df977a0ee6529b33e
Author: Adam M <[email protected]>
Date:   Wed, 28 Nov 2018 23:39:25 -0600

Hack the new AbsoluteSequence in to be used by ilovecookies

Diffstat:
M
src/ComputerscareILoveCookies.cpp
 | 
12
++++++++++--
M
src/dtpulse.cpp
 | 
8
++++++--
M
src/dtpulse.hpp
 | 
1
+

3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/ComputerscareILoveCookies.cpp b/src/ComputerscareILoveCookies.cpp
@@ -251,6 +251,7 @@ ComputerscareILoveCookies() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LI
     nextAbsoluteSequences[index].resize(0);
     nextAbsoluteSequences[index]  = parseStringAsValues(textFields[index]->text,knobandinputlookup);
     printf("setNextAbsoluteSequence index:%i,val[0]:%i\n",index,nextAbsoluteSequences[index][0]);
+    newABS[index] = AbsoluteSequence(textFields[index]->text,knobandinputlookup);
   }
   void setAbsoluteSequenceFromQueue(int index) {
     absoluteSequences[index].resize(0);
@@ -293,6 +294,10 @@ void onCreate () override
 
   */
   void incrementInternalStep(int i) {
+    newABS[i].incrementAndCheck();
+    if(i==0) {
+      printVector(newABS[i].workingIndexSequence);
+    }
     this->displayString[i] = this->getDisplayString(i);
     if(this->absoluteStep[i] == 0) {
       this->setChangeImminent(i,false);
@@ -411,6 +416,8 @@ void ComputerscareILoveCookies::step() {
       }
       activeKnobIndex[i] = absoluteSequences[i][this->absoluteStep[i]];
     }
+
+    activeKnobIndex[i] = newABS[i].peekWorkingStep();
     //outputs[TRG_OUTPUT + i].value = params[KNOB_PARAM + activeKnob].value;
 		// how to handle a randomization input here?
 		// negative integers?
@@ -426,7 +433,7 @@ void ComputerscareILoveCookies::step() {
       outputs[TRG_OUTPUT + i].value = knobRawValue; 
     }
     else if(activeKnobIndex[i] < 78) {
-      outputs[TRG_OUTPUT + i].value = 1.11;
+      outputs[TRG_OUTPUT + i].value = newABS[i].exactFloats[activeKnobIndex[i] - 52];
     }
     else if(activeKnobIndex[i] <104) {
       outputs[TRG_OUTPUT + i].value = 2.22;
@@ -489,7 +496,8 @@ void MyTextFieldCookie::onTextChange() {
   module->checkLength(this->rowIndex);
   std::string value = module->textFields[this->rowIndex]->text;
   if(matchParens(value)) {
-    whoKnows(value);
+    //whoKnows(value);
+    
     printf("row: %i\n",this->rowIndex);
     module->setNextAbsoluteSequence(this->rowIndex);
   }
diff --git a/src/dtpulse.cpp b/src/dtpulse.cpp
@@ -340,7 +340,7 @@ void whoKnows(std::string input) {
 }
 
 AbsoluteSequence::AbsoluteSequence() {
-  AbsoluteSequence("",knobandinputlookup);
+  AbsoluteSequence("a",knobandinputlookup);
 }
 AbsoluteSequence::AbsoluteSequence(std::string expr, std::string lookup) {
 	Parser p = Parser(expr);
@@ -375,6 +375,9 @@ int AbsoluteSequence::skipAndPeek() {
 int AbsoluteSequence::peekStep() {
   return indexSequence[readHead];
 }
+int AbsoluteSequence::peekWorkingStep() {
+  return workingIndexSequence[readHead];
+}
 void AbsoluteSequence::incrementAndCheck() {
   //printf("readHead:%i,  peek:%i\n",readHead,peekStep());
   if(skipAndPeek()>=78) {
@@ -401,7 +404,7 @@ void AbsoluteSequence::print() {
 	printFloatVector(exactFloats);
   printTokenVector(randomTokens);
 	printf("  stack:\n");
-  for(int i = 0; i < tokenStack.size(); i++) {
+  for(unsigned int i = 0; i < tokenStack.size(); i++) {
     tokenStack[i].print();
   }
 }
@@ -460,6 +463,7 @@ void Parser::ParseExactValue(Token t) {
 		if(t.type=="RightAngle") {
 			skipToken();
 			int sizeInt = static_cast<int>(exactFloats.size());
+      num = ((num.length() == 0) || num==".") ? "0" : num;
 			tokenStack.push_back(Token("ExactValue",num,sizeInt + 52));
 			exactFloats.push_back(std::stof(num));	
 		} 
diff --git a/src/dtpulse.hpp b/src/dtpulse.hpp
@@ -63,6 +63,7 @@ class AbsoluteSequence {
 		void print();
 		void skipStep();
 		int peekStep();
+		int peekWorkingStep();
 		int skipAndPeek();
 		void incrementAndCheck();
 		int getReadHead();