computerscare-vcv-modules

commit 9224280d191f2edd60104d15b47358b41fe49b64
parent e0e832670539ec5913a513e9e8f1dcce6751767c
Author: Adam M <[email protected]>
Date:   Sun, 27 Oct 2019 14:50:13 -0500

Merge branch 'folypace' into laundrypoly

# Conflicts:
#	src/dtpulse.cpp
#	src/dtpulse.hpp

Diffstat:
M
src/ComputerscareFolyPace.cpp
 | 
14
+++++++-------
M
src/dtpulse.cpp
 | 
48
+++++++++++++-----------------------------------

2 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/src/ComputerscareFolyPace.cpp b/src/ComputerscareFolyPace.cpp
@@ -207,7 +207,7 @@ struct FolyPaceDisplay : TransparentWidget {
 
 		//nvgReset(args.vg);
 
-		float sf = 1 + 0.3 * sin(B - C); //scaleFactor
+		float sf = 1 + 0.2 * sin(B - C); //scaleFactor
 		float ox = 67.5 + sf * 20.33 * sin(D - C / 2);
 		float oy = 180 + sf * 30.33 * sin(G - F);
 
@@ -245,8 +245,8 @@ struct FolyPaceDisplay : TransparentWidget {
 		float epy = oy - 10 * (2 + sf + sin(I - J / 2));
 
 		float eyeSpacing = frx / 2 * (1.8 + 0.5 * sin(200 - J));
-		float erlx = frx / 3 * (1 + 0.4 * sin(G));
-		float erly = frx / 3 * (1 + 0.4 * sin(H - N + 100));
+		float erlx = frx / 4 * (1 + 0.4 * sin(G));
+		float erly = frx / 4 * (1 + 0.4 * sin(H - N + 100));
 		float errx = 10 + 3 * sin(M) + 4 * sin(M - 2 - 882.2);
 		float erry = 10 + 2 * sin(J) + 4 * sin(J - erly / 20);
 
@@ -284,10 +284,10 @@ struct FolyPaceDisplay : TransparentWidget {
 
 
 		float mouthX = ox;
-		float mouthY = oy + 0.5 * fry * (1 + 0.4 * sin(C / 2));
-		float mouthWidth = frx * 0.7 * (1.2 + 0.6 * sin(C));
+		float mouthY = oy + 0.4 * fry * (1 + 0.4 * sin(C / 2));
+		float mouthWidth = frx * 0.6 * (1.2 + 0.6 * sin(C));
 		float mouthOpen = fry * 0.06 * (1 + sin(O) - sin(A * 2 + 44));
-		float mouthSmile = sin(D) * 2.3;
+		float mouthSmile = sin(D) * 2.0;
 		float mouthSkew = sin(L) - sin(H);
 		float mouthThickness = 5.4 * (sin(H) - sin(M / 2));
 		NVGcolor mouthLipColor = nvgHSLA(0.1 * sin(N) - 0.1, 0.6 + 0.3 * sin(M), 0.5 + .4 * sin(I), 0xff);
@@ -349,7 +349,7 @@ struct FolyPaceDisplay : TransparentWidget {
 		nvgBezierTo(args.vg, x - width / 4, y - open * smile, x + width / 4, y - open * smile, x + width / 2, y - 10.f * smile);
 
 		//bottom
-		nvgBezierTo(args.vg, x + width / 4, y + smile * open, x - width / 4, y + smile * open, x - width / 2, y - 10.f * smile);
+		nvgBezierTo(args.vg, x + width / 4, y + smile * open, x - width / 4, y + smile * open, x - width / 2, y - 20.f * smile);
 		nvgClosePath(args.vg);
 		nvgGlobalCompositeOperation(args.vg, NVG_ATOP);
 		nvgFillColor(args.vg, nvgRGBA(0, 0, 0, 0xff));
diff --git a/src/dtpulse.cpp b/src/dtpulse.cpp
@@ -655,24 +655,6 @@ void Parser::setForLaundryPoly() {
   printf("setForLaundryPoly\n");
   printTokenVector(tokenStack);
 }
-void Parser::setForQuantizer() {
-printf("horseman\n");
-	if(tokens.size() > 0) {
-printf("pluto mcfeely\n");
-		currentIndex=0;
-		printTokenVector(tokens);
-		printTokenVector(tokenStack);
-		tokenStack={};
-		printTokenVector(tokens);
-		setForExactIntegers(tokens[0]);
-		printf("got there\n");
-		printTokenVector(tokenStack);
-		if(!inError) {
-			currentIndex=0;
-			tokens=tokenStack;
-		}
-	}
-}
 void Parser::setForLaundry() {
 	std::vector<std::string> laundryBinaryOp = {"Plus","Minus","Asterix","Backslash","Caret","Ampersand"};
   std::vector<std::string> laundryInterleaveAny = {"Letter", "Integer", "ChanceOfInteger", "Digit", "LeftParen", "RightParen", "Channel"};
@@ -1333,23 +1315,19 @@ Quantizer::Quantizer(std::string intervals, int divisions, int trans) {
   //printFloatVector(mappedValues);
 }
 std::vector<float> Quantizer::generateMappedValues() {
-	std::vector<float> output;
-	float sum = 0.f;
-	float currentVal = 0.f;
-  printf("tokens size %i\n",scaleParser.tokens.size());
-	scaleParser.setForQuantizer();
-	std::vector<Token> stack = scaleParser.tokens;
-	
-printf("tokens size after %i\n",scaleParser.tokens.size());
-	output.push_back(0.f);
-	for(unsigned int i = 0; i < stack.size(); i++) {
-		if(stack[i].type=="Digit" || stack[i].type=="Integer") {
-			sum += std::stof(stack[i].value);
-			currentVal = sum/fNumDivisions; 
-			output.push_back(currentVal);
-		}
-	}
-	return output;
+  std::vector<float> output;
+  float sum = 0.f;
+  float currentVal = 0.f;
+  std::vector<Token> stack = scaleParser.tokens;
+  output.push_back(0.f);
+  for (unsigned int i = 0; i < stack.size(); i++) {
+    if (stack[i].type == "Digit") {
+      sum += std::stof(stack[i].value);
+      currentVal = sum / fNumDivisions;
+      output.push_back(currentVal);
+    }
+  }
+  return output;
 }
 float Quantizer::findEvenSpacingValue(float input, std::vector<float> allowedValues) {
   return allowedValues[floor(input * allowedValues.size())];