commit e9df9a5ee50de50bf2174793e717bb77100aa2da
parent d07168790de97b337c9dbc154fa8858ceeb50eb5
Author: Adam M <[email protected]>
Date: Thu, 1 Aug 2019 16:53:06 -0500
Remove some unused stuff
Diffstat:
1 file changed, 69 insertions(+), 127 deletions(-)
diff --git a/src/ComputerscareFolyPace.cpp b/src/ComputerscareFolyPace.cpp
@@ -177,64 +177,16 @@ struct FolyPace : Module {
struct FolyPaceDisplay : TransparentWidget {
FolyPace *module;
- int statsFrame = 0;
std::shared_ptr<Font> font;
- struct Stats {
- float vpp = 0.f;
- float vmin = 0.f;
- float vmax = 0.f;
-
- void calculate(float *buffer, int channels) {
- vmax = -INFINITY;
- vmin = INFINITY;
- for (int i = 0; i < BUFFER_SIZE * channels; i++) {
- float v = buffer[i];
- vmax = std::fmax(vmax, v);
- vmin = std::fmin(vmin, v);
- }
- vpp = vmax - vmin;
- }
- };
-
- Stats statsX, statsY;
FolyPaceDisplay() {
font = APP->window->loadFont(asset::plugin(pluginInstance, "res/Oswald-Regular.ttf"));
}
- void drawWaveform(const DrawArgs &args, float *bufferX, float offsetX, float gainX, float *bufferY, float offsetY, float gainY) {
- assert(bufferY);
- nvgSave(args.vg);
- Rect b = Rect(Vec(0, 15), box.size.minus(Vec(0, 15 * 2)));
- nvgScissor(args.vg, b.pos.x, b.pos.y, b.size.x, b.size.y);
- nvgBeginPath(args.vg);
- for (int i = 0; i < BUFFER_SIZE; i++) {
- Vec v;
- if (bufferX)
- v.x = (bufferX[i] + offsetX) * gainX / 2.f + 0.5f;
- else
- v.x = (float) i / (BUFFER_SIZE - 1);
- v.y = (bufferY[i] + offsetY) * gainY / 2.f + 0.5f;
- Vec p;
- p.x = rescale(v.x, 0.f, 1.f, b.pos.x, b.pos.x + b.size.x);
- p.y = rescale(v.y, 0.f, 1.f, b.pos.y + b.size.y, b.pos.y);
- if (i == 0)
- nvgMoveTo(args.vg, p.x, p.y);
- else
- nvgLineTo(args.vg, p.x, p.y);
- }
- nvgLineCap(args.vg, NVG_ROUND);
- nvgMiterLimit(args.vg, 2.f);
- nvgStrokeWidth(args.vg, 1.5f);
- nvgGlobalCompositeOperation(args.vg, NVG_SOURCE_OVER);
- nvgStroke(args.vg);
- nvgResetScissor(args.vg);
- nvgRestore(args.vg);
- }
void drawFace(const DrawArgs &args, float A, float B, float C, float D, float E, float F, float G, float H, float I, float J, float K, float L, float M, float N, float O, float P) {
-
+ //nvgReset(args.vg);
float sf = 1 + 0.3 * sin(B - C); //scaleFactor
float ox = 67.5 + sf * 20.33 * sin(D - C / 2);
@@ -250,9 +202,10 @@ struct FolyPaceDisplay : TransparentWidget {
float frx = sf * (70 + 40 * sin(A - B / 2)); // face x radius
float fry = sf * (150 + 80 * sin(F / 2.2)); //face y radius
float fr = 0.04 * sin(H - M) + 0.02 * sin(H / 3 + 2.2) + 0.02 * sin(L + P + 8.222); //face rotation
+ NVGcolor faceColor=nvgHSLA(h, s, l, 0xff);
float mpx = ox - 3 * sin(G + I + A);
- float mpy = oy + 20 + sf * sin(G - I);
+ float mpy = oy +20 + sf *(7+0.2* sin(G - I));
float msx = mpx - 30 * sf + 3 * sin(G);
float msy = mpy + 5 * sin(L + I + P);
@@ -272,142 +225,138 @@ struct FolyPaceDisplay : TransparentWidget {
float epx = ox;
float epy = oy - 10 * (2 + sf + sin(I - J / 2));
- float es = sf * 10 + 4 + 2 * sin(K - G + H);
- float erlx = 10 + 2 * sin(A) + 5 * sin(-L);
- float erly = 10 + 3 * sin(O - P) - 2 * sin(G);
+ float es = sf * 30 + 15 * sin(K - G + H);
+ float erlx = 20 + 10 * sin(A) + 5 * sin(-L);
+ float erly = 30 + 15 * sin(O - P) - 10 * sin(G);
float errx = 10 + 3 * sin(M) + 4 * sin(M - 2 - 882.2);
float erry = 10 + 2 * sin(J) + 4 * sin(J - erly / 20);
+ float irisRad = erlx * 0.1 * (1.5 + sin(N));
+ float pupilRad = irisRad * 0.3 * (1 + sin(E));
- //assert(bufferY);
- nvgSave(args.vg);
- Rect b = Rect(Vec(0, 0), box.size);
+ float gazeDir = 3.14159 * (1 + sin(B - K));
+ float gazeStrength = 4 * (1.2 + 0.3 * sin(D - 1) + 0.4 * sin(1 - L / 2));
- nvgFillColor(args.vg, nvgHSLA(h, s, l, 0xff));
- nvgScissor(args.vg, b.pos.x, b.pos.y, b.size.x, b.size.y);
- nvgBeginPath(args.vg);
+ NVGcolor irisColor = nvgHSLA(0.4, 0.8, 0.3, 0xff);
+ NVGcolor pupilColor = nvgHSLA(0.1, 0.1, 0.1, 0xff);
+ //assert(bufferY);
+ //nvgSave(args.vg);
- nvgLineCap(args.vg, NVG_ROUND);
- nvgMiterLimit(args.vg, 2.f);
- nvgStrokeWidth(args.vg, 4.5f);
+ Rect b = Rect(Vec(0, 0), box.size);
+ nvgFillColor(args.vg, faceColor);
+ nvgScissor(args.vg, b.pos.x, b.pos.y, b.size.x, b.size.y);
nvgRotate(args.vg, fr);
- nvgEllipse(args.vg, fx, fy, frx, fry);
- nvgClosePath(args.vg);
- nvgFill(args.vg);
- nvgStroke(args.vg);
- nvgFillColor(args.vg, eyecolor);
- nvgStrokeWidth(args.vg, 1.5f);
- nvgBeginPath(args.vg);
-
- nvgEllipse(args.vg, epx - es, epy, erlx, erly);
- nvgEllipse(args.vg, epx + es, epy, errx, erry);
+ drawHead(args,fx,fy,frx,fry,faceColor);
- nvgClosePath(args.vg);
- nvgFill(args.vg);
- nvgStroke(args.vg);
+ drawEyes(args, epx, epy, es, erlx, erly, 1, irisRad, pupilRad, gazeDir, gazeStrength, irisColor, pupilColor);
- nvgFillColor(args.vg, nvgRGB(0, 0, 0));
- nvgBeginPath(args.vg);
- nvgEllipse(args.vg, epx - es, epy, 2, 2);
- nvgEllipse(args.vg, epx + es, epy, 2, 2);
+ float mouthX = ox;
+ float mouthY = oy + 10 * (sf + sin(E));
+ float mouthWidth = sf * 30.f * (1.2 + sin(C));
+ float mouthOpen = 10 * (1 + sin(B));
+ float mouthSmile = sin(D) * 1.3;
+ float mouthSkew = sin(L) - sin(H);
+ float mouthThickness = 3.4f;
+ NVGcolor mouthLipColor = nvgHSLA(0.5f, 0.2, 0.5, 0xff);
- nvgClosePath(args.vg);
- nvgFill(args.vg);
+ nvgGlobalCompositeOperation(args.vg, NVG_ATOP);
+ drawMouth(args, mouthX, mouthY, mouthWidth, mouthOpen, mouthSmile, mouthSkew, mouthThickness, mouthLipColor);
- nvgFill(args.vg);
- nvgStroke(args.vg);
- nvgClosePath(args.vg);
- float mouthX = ox;
- float mouthY = oy + 10*(sf+sin(E));
- float mouthWidth = sf*30.f*(1.2+sin(C));
- float mouthOpen = 10*(1+sin(B));
- float mouthSmile = sin(D)*1.3;
- float mouthSkew = sin(L)-sin(H);
- float mouthThickness = 3.4f;
- NVGcolor mouthLipColor=nvgHSLA(0.5f,0.2,0.5,0xff);
-
- drawMouth(args,mouthX,mouthY,mouthWidth,mouthOpen,mouthSmile,mouthSkew,mouthThickness,mouthLipColor);
+ nvgResetScissor(args.vg);
+ //nvgRestore(args.vg);
+ }
+ void drawHead(const DrawArgs &args, float x, float y, float width, float height, NVGcolor color) {
+ nvgBeginPath(args.vg);
+ nvgLineCap(args.vg, NVG_ROUND);
+ nvgMiterLimit(args.vg, 2.f);
+ nvgStrokeWidth(args.vg, 4.5f);
- nvgResetScissor(args.vg);
- nvgRestore(args.vg);
+ nvgEllipse(args.vg, x, y, width, height);
+ nvgClosePath(args.vg);
+ nvgGlobalCompositeOperation(args.vg, NVG_SOURCE_OVER);
+ nvgFill(args.vg);
}
- void drawMouth(const DrawArgs &args, float x, float y,float width, float open, float smile, float skew, float thickness,NVGcolor lipColor) {
+ void drawMouth(const DrawArgs &args, float x, float y, float width, float open, float smile, float skew, float thickness, NVGcolor lipColor) {
nvgBeginPath(args.vg);
nvgStrokeWidth(args.vg, thickness);
//nvgStrokeWidth(args.vg, 4.5f);
- nvgGlobalCompositeOperation(args.vg, NVG_SOURCE_OVER);
- nvgMoveTo(args.vg, x-width/2,y-10.f*smile);
+
+ nvgMoveTo(args.vg, x - width / 2, y - 10.f * smile);
//top
- nvgBezierTo(args.vg, x-width/4, y-open*smile, x+width/4, y-open*smile, x+width/2, y-10.f*smile);
+ 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 - 10.f * smile);
+ nvgGlobalCompositeOperation(args.vg, NVG_ATOP);
nvgStroke(args.vg);
nvgClosePath(args.vg);
}
- void drawEyes(const DrawArgs &args,float x,float y, float spacing, float rx, float ry, float open, float irisRad, float pupilRad, float gazeDir, float gazeStrength, NVGcolor irisColor, NVGcolor pupilColor) {
- float leftX = x - spacing/2;
- float rightX = x + spacing/2;
- float pupilOffsetX = gazeStrength*cos(gazeDir);
- float pupilOffsetY = gazeStrength*sin(gazeDir);
+ void drawEyes(const DrawArgs &args, float x, float y, float spacing, float rx, float ry, float open, float irisRad, float pupilRad, float gazeDir, float gazeStrength, NVGcolor irisColor, NVGcolor pupilColor) {
+ float leftX = x - spacing / 2;
+ float rightX = x + spacing / 2;
+ float pupilOffsetX = gazeStrength * cos(gazeDir);
+ float pupilOffsetY = gazeStrength * sin(gazeDir);
float leftPupilX = leftX + pupilOffsetX;
float leftPupilY = y + pupilOffsetY;
float rightPupilX = rightX + pupilOffsetX;
float rightPupilY = y + pupilOffsetY;
nvgBeginPath(args.vg);
- nvgStrokeWidth(args.vg,1.f);
+ nvgStrokeWidth(args.vg, 1.f);
//nvgStrokeWidth(args.vg, 4.5f);
//whites of eyes
- nvgFillColor(args.vg, nvgRGB(250,250,250));
- nvgGlobalCompositeOperation(args.vg, NVG_SOURCE_OVER);
-
+ nvgFillColor(args.vg, nvgRGB(250, 250, 250));
+
+
nvgEllipse(args.vg, leftX, y, rx, ry);
nvgEllipse(args.vg, rightX, y, rx, ry);
+ nvgGlobalCompositeOperation(args.vg, NVG_SOURCE_OVER);
nvgFill(args.vg);
nvgClosePath(args.vg);
//iris
+
nvgBeginPath(args.vg);
nvgFillColor(args.vg, irisColor);
+
+
+ nvgCircle(args.vg, leftPupilX, leftPupilY, irisRad);
+ nvgCircle(args.vg, rightPupilX, rightPupilY, irisRad);
nvgGlobalCompositeOperation(args.vg, NVG_ATOP);
-
- nvgCircle(args.vg, leftPupilX, y, irisRad);
- nvgCircle(args.vg, rightPupilX, y, irisRad);
nvgFill(args.vg);
nvgClosePath(args.vg);
-//pupil
+ //pupil
nvgBeginPath(args.vg);
nvgFillColor(args.vg, pupilColor);
+
+
+ nvgCircle(args.vg, leftPupilX, leftPupilY, pupilRad);
+ nvgCircle(args.vg, rightPupilX, rightPupilY, pupilRad);
nvgGlobalCompositeOperation(args.vg, NVG_ATOP);
-
- nvgCircle(args.vg, leftPupilX, y, pupilRad);
- nvgCircle(args.vg, rightPupilX, y, pupilRad);
nvgFill(args.vg);
nvgClosePath(args.vg);
- nvgGlobalCompositeOperation(args.vg,NVG_SOURCE_OVER);
+ nvgGlobalCompositeOperation(args.vg, NVG_SOURCE_OVER);
//eyebrows
}
- void drawNose(const DrawArgs &args,float x, float y, float height, float width, float thickness, NVGcolor color) {
+ void drawNose(const DrawArgs &args, float x, float y, float height, float width, float thickness, NVGcolor color) {
}
@@ -417,13 +366,6 @@ struct FolyPaceDisplay : TransparentWidget {
drawFace(args, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10, random::uniform() * 10);
}
else {
-
- float gainX = std::pow(2.f, std::round(module->params[FolyPace::X_SCALE_PARAM].getValue())) / 10.f;
- float gainY = std::pow(2.f, std::round(module->params[FolyPace::Y_SCALE_PARAM].getValue())) / 10.f;
- float offsetX = module->params[FolyPace::X_POS_PARAM].getValue();
- float offsetY = module->params[FolyPace::Y_POS_PARAM].getValue();
-
- int lissajousChannels = std::max(module->channelsX, module->channelsY);
drawFace(args, module->bufferX[0][0], module->bufferX[1][0], module->bufferX[2][0], module->bufferX[3][0], module->bufferX[4][0], module->bufferX[5][0], module->bufferX[6][0], module->bufferX[7][0], module->bufferX[8][0], module->bufferX[9][0], module->bufferX[10][0], module->bufferX[11][0], module->bufferX[12][0], module->bufferX[13][0], module->bufferX[14][0], module->bufferX[15][0]);
}
