commit 9a28ae6b9e871dc1c8e6b86e7abc9e3fbc3a3333
parent da83777982044aaebb623fccf9e69c7b337dece4
Author: Adam M <[email protected]>
Date: Sat, 3 Aug 2019 01:52:50 -0500
Folypace
Diffstat:
3 files changed, 157 insertions(+), 3 deletions(-)
diff --git a/presets/computerscare-boly-puttons/All A.vcvm b/presets/computerscare-boly-puttons/All A.vcvm
@@ -0,0 +1,75 @@
+{
+ "id": 76,
+ "plugin": "computerscare",
+ "version": "1.0.3",
+ "model": "computerscare-bolyputtons",
+ "params": [
+ {
+ "id": 0,
+ "value": 0.0
+ },
+ {
+ "id": 1,
+ "value": 0.0
+ },
+ {
+ "id": 2,
+ "value": 0.0
+ },
+ {
+ "id": 3,
+ "value": 0.0
+ },
+ {
+ "id": 4,
+ "value": 0.0
+ },
+ {
+ "id": 5,
+ "value": 0.0
+ },
+ {
+ "id": 6,
+ "value": 0.0
+ },
+ {
+ "id": 7,
+ "value": 0.0
+ },
+ {
+ "id": 8,
+ "value": 0.0
+ },
+ {
+ "id": 9,
+ "value": 0.0
+ },
+ {
+ "id": 10,
+ "value": 0.0
+ },
+ {
+ "id": 11,
+ "value": 0.0
+ },
+ {
+ "id": 12,
+ "value": 0.0
+ },
+ {
+ "id": 13,
+ "value": 0.0
+ },
+ {
+ "id": 14,
+ "value": 0.0
+ },
+ {
+ "id": 15,
+ "value": 0.0
+ }
+ ],
+ "leftModuleId": 75,
+ "rightModuleId": 77,
+ "outputRange": 0
+}
+\ No newline at end of file
diff --git a/presets/computerscare-boly-puttons/All B.vcvm b/presets/computerscare-boly-puttons/All B.vcvm
@@ -0,0 +1,75 @@
+{
+ "id": 76,
+ "plugin": "computerscare",
+ "version": "1.0.3",
+ "model": "computerscare-bolyputtons",
+ "params": [
+ {
+ "id": 0,
+ "value": 1.0
+ },
+ {
+ "id": 1,
+ "value": 1.0
+ },
+ {
+ "id": 2,
+ "value": 1.0
+ },
+ {
+ "id": 3,
+ "value": 1.0
+ },
+ {
+ "id": 4,
+ "value": 1.0
+ },
+ {
+ "id": 5,
+ "value": 1.0
+ },
+ {
+ "id": 6,
+ "value": 1.0
+ },
+ {
+ "id": 7,
+ "value": 1.0
+ },
+ {
+ "id": 8,
+ "value": 1.0
+ },
+ {
+ "id": 9,
+ "value": 1.0
+ },
+ {
+ "id": 10,
+ "value": 1.0
+ },
+ {
+ "id": 11,
+ "value": 1.0
+ },
+ {
+ "id": 12,
+ "value": 1.0
+ },
+ {
+ "id": 13,
+ "value": 1.0
+ },
+ {
+ "id": 14,
+ "value": 1.0
+ },
+ {
+ "id": 15,
+ "value": 1.0
+ }
+ ],
+ "leftModuleId": 75,
+ "rightModuleId": 77,
+ "outputRange": 0
+}
+\ No newline at end of file
diff --git a/src/ComputerscareFolyPace.cpp b/src/ComputerscareFolyPace.cpp
@@ -259,12 +259,14 @@ struct FolyPaceDisplay : TransparentWidget {
drawHead(args,fx,fy,frx,fry,faceColor);
- float leftEyebrowHeight = fry*0.1;
- float rightEyebrowHeight = fry*0.1;
+
+ float leftEyebrowHeight = erly*(1.3 + 0.3*sin(G));
+ float rightEyebrowHeight = erly*(1.3 + 0.3*sin(G-2.2+N));
float leftEyebrowAngle = 0.3*sin(C);
float rightEyebrowAngle = 0.3*sin(F);
NVGcolor eyebrowColor = nvgHSLA(0.1,0.2,0.2,0xff);
float eyebrowThickness = 5.f;
+ float eyebrowLength = frx*0.3*(1.3+0.3*sin(G));
drawEyes(args, epx, epy, eyeSpacing, erlx, erly, 1, irisRad, pupilRad, gazeDir, gazeStrength, irisColor, pupilColor);
drawEyebrows(args,epx,epy,eyeSpacing,leftEyebrowHeight,rightEyebrowHeight,leftEyebrowAngle,rightEyebrowAngle,eyebrowColor,eyebrowThickness,eyebrowLength);
@@ -302,7 +304,7 @@ struct FolyPaceDisplay : TransparentWidget {
float r = eyebrowLength / 2;
nvgMoveTo(args.vg,x - eyeSpacing/2 - r * cosLeft,y - leftEyebrowHeight - r*sinLeft);
- nvgLineTo(args.vg,x - eyeSpacing/2 + r * cosLeft,y - leftEyebrowHeight + r*sinLeft)
+ nvgLineTo(args.vg,x - eyeSpacing/2 + r * cosLeft,y - leftEyebrowHeight + r*sinLeft);
//nvgStroke(args.vg);
nvgMoveTo(args.vg,x + eyeSpacing/2 - r * cosRight,y - rightEyebrowHeight - r*sinRight);
