commit b7a604648cc4edfe5122bcec6e6a67b92d638f7e
parent 25f9748076756b3c58b69bbba4003532683ea8ee
Author: Adam M <[email protected]>
Date: Sat, 9 Nov 2019 14:07:45 -0600
Remove unused code
Diffstat:
3 files changed, 110 insertions(+), 88 deletions(-)
diff --git a/src/ComputerscareBlank.cpp b/src/ComputerscareBlank.cpp
@@ -8,19 +8,14 @@
struct ComputerscareBlank;
-const int numKnobs = 16;
-
-const int numToggles = 16;
-const int numOutputs = 16;
-
struct ComputerscareBlank : Module {
- int counter = 0;
bool loading = true;
bool loadedJSON = false;
std::string path;
std::string lastPath;
float width = 120;
float height = 380;
+ int rotation = 0;
bool invertY = true;
float zoom = 1.f;
float xOffset = 0.f;
@@ -50,8 +45,13 @@ struct ComputerscareBlank : Module {
void process(const ProcessArgs &args) override {
}
+ void onReset() override {
+ zoom = 1;
+ xOffset = 0;
+ yOffset = 0;
+ }
void loadImageDialog() {
- std::string dir = this->path.empty() ? asset::user("") : rack::string::directory(this->path);
+ std::string dir = this->path.empty() ? asset::user("../") : rack::string::directory(this->path);
char* pathC = osdialog_file(OSDIALOG_OPEN, dir.c_str(), NULL, NULL);
if (!pathC) {
return;
@@ -81,6 +81,7 @@ struct ComputerscareBlank : Module {
json_object_set_new(rootJ, "zoom", json_real(zoom));
json_object_set_new(rootJ, "xOffset", json_real(xOffset));
json_object_set_new(rootJ, "yOffset", json_real(yOffset));
+ json_object_set_new(rootJ, "rotation", json_integer(rotation));
return rootJ;
}
@@ -95,6 +96,7 @@ struct ComputerscareBlank : Module {
width = json_number_value(widthJ);
json_t *imageFitEnumJ = json_object_get(rootJ, "imageFitEnum");
if (imageFitEnumJ) { imageFitEnum = json_integer_value(imageFitEnumJ); }
+
json_t *invertYJ = json_object_get(rootJ, "invertY");
if (invertYJ) { invertY = json_is_true(invertYJ); }
json_t *zoomJ = json_object_get(rootJ, "zoom");
@@ -109,14 +111,16 @@ struct ComputerscareBlank : Module {
if (yOffsetJ) {
yOffset = json_number_value(yOffsetJ);
}
+ json_t *rotationJ = json_object_get(rootJ, "rotation");
+ if (rotationJ) { rotation = json_integer_value(rotationJ); }
this->loading = false;
}
};
struct LoadImageItem : MenuItem {
- ComputerscareBlank* module;
+ ComputerscareBlank* blankModule;
void onAction(const event::Action& e) override {
- module->loadImageDialog();
+ blankModule->loadImageDialog();
}
};
struct ImageFitModeItem : MenuItem {
@@ -145,7 +149,7 @@ struct InvertYMenuItem: MenuItem {
};
struct PNGDisplay : TransparentWidget {
- ComputerscareBlank *module;
+ ComputerscareBlank *blankModule;
const float width = 125.0f;
const float height = 130.0f;
@@ -160,37 +164,36 @@ struct PNGDisplay : TransparentWidget {
}
void draw(const DrawArgs &args) override {
- if (module && module->loadedJSON) {
- if (path != module->path) {
- img = nvgCreateImage(args.vg, module->path.c_str(), 0);
+ if (blankModule && blankModule->loadedJSON) {
+ if (path != blankModule->path) {
+ img = nvgCreateImage(args.vg, blankModule->path.c_str(), 0);
nvgImageSize(args.vg, img, &imgWidth, &imgHeight);
imgRatio = ((float)imgWidth / (float)imgHeight);
- path = module->path;
+ path = blankModule->path;
}
- /*if (module->imageFitEnum != lastEnum) {
- lastEnum = module->imageFitEnum;
- module->xOffset = 0;
- module->yOffset = 0;
- module->zoom = 1;
- }*/
+ if (blankModule->imageFitEnum != lastEnum && lastEnum != -1) {
+ lastEnum = blankModule->imageFitEnum;
+ blankModule->xOffset = 0;
+ blankModule->yOffset = 0;
+ blankModule->zoom = 1;
+ }
+ lastEnum = blankModule->imageFitEnum;
if (!path.empty()) {
nvgBeginPath(args.vg);
NVGpaint imgPaint;
- //if (module->width>0 && module->height>0)
- nvgScale(args.vg, module->zoom, module->zoom);
- if (module->imageFitEnum == 0) {
- imgPaint = nvgImagePattern(args.vg, module->xOffset, module->yOffset, module->width, module->height, 0, img, 1.0f);
+ nvgScale(args.vg, blankModule->zoom, blankModule->zoom);
+ if (blankModule->imageFitEnum == 0) { //stretch both dimensions
+ imgPaint = nvgImagePattern(args.vg, blankModule->xOffset, blankModule->yOffset, blankModule->width, blankModule->height, 0, img, 1.0f);
}
- else if (module->imageFitEnum == 1) { // fit width
- //nvgScale(args.vg, width/module->width, height/module->height);
- imgPaint = nvgImagePattern(args.vg, module->xOffset, module->yOffset, module->width, module->width / imgRatio, 0, img, 1.0f);
+ else if (blankModule->imageFitEnum == 1) { // fit width
+ imgPaint = nvgImagePattern(args.vg, blankModule->xOffset, blankModule->yOffset, blankModule->width, blankModule->width / imgRatio, 0, img, 1.0f);
}
- else if (module->imageFitEnum == 2) {
- imgPaint = nvgImagePattern(args.vg, module->xOffset, module->yOffset, module->height * imgRatio, module->height, 0, img, 1.0f);
+ else if (blankModule->imageFitEnum == 2) { // fit height
+ imgPaint = nvgImagePattern(args.vg, blankModule->xOffset, blankModule->yOffset, blankModule->height * imgRatio, blankModule->height, 0, img, 1.0f);
}
- nvgRect(args.vg, 0, 0, module->width, module->height);
+ nvgRect(args.vg, 0, 0, blankModule->width, blankModule->height);
nvgFillPaint(args.vg, imgPaint);
nvgFill(args.vg);
nvgClosePath(args.vg);
@@ -213,42 +216,54 @@ void PNGDisplay::onHoverKey(const event::HoverKey& e) {
arrowSpeed *= 4.0;
else if ((e.mods & RACK_MOD_MASK) == GLFW_MOD_SHIFT)
arrowSpeed /= 4.0;*/
- if (e.action == RACK_HELD) {
+ //duplicate is ctrl-d, ignore keys if mods are pressed so duplication doesnt translate the image
+ if (e.action == RACK_HELD && !e.mods ) {
switch (e.key) {
case GLFW_KEY_A: {
- module->xOffset += dPosition;
+ blankModule->xOffset += dPosition;
e.consume(this);
} break;
case GLFW_KEY_S: {
- module->yOffset -= module->invertY ? dPosition : -dPosition;
+ blankModule->yOffset -= blankModule->invertY ? dPosition : -dPosition;
e.consume(this);
} break;
case GLFW_KEY_D: {
- module->xOffset -= dPosition;
+ blankModule->xOffset -= dPosition;
e.consume(this);
} break;
case GLFW_KEY_W: {
- module->yOffset += module->invertY ? dPosition : -dPosition;
+ blankModule->yOffset += blankModule->invertY ? dPosition : -dPosition;
e.consume(this);
} break;
case GLFW_KEY_Z: {
- module->zoom += dZoom;
+ blankModule->zoom += dZoom;
e.consume(this);
} break;
case GLFW_KEY_X: {
- module->zoom -= dZoom;
+ blankModule->zoom -= dZoom;
+ e.consume(this);
+ } break;
+ case GLFW_KEY_Q: {
+ blankModule->rotation += 1;
+ blankModule->rotation %= 4;
+ e.consume(this);
+ } break;
+ case GLFW_KEY_E: {
+ blankModule->rotation -= 1;
+ blankModule->rotation += 4;
+ blankModule->rotation %= 4;
e.consume(this);
} break;
}
}
}
struct ComputerscareBlankWidget : ModuleWidget {
- ComputerscareBlankWidget(ComputerscareBlank *module) {
+ ComputerscareBlankWidget(ComputerscareBlank *blankModule) {
- setModule(module);
- if (module) {
- this->blankModule = module;
- box.size = Vec(module->width, module->height);
+ setModule(blankModule);
+ if (blankModule) {
+ this->blankModule = blankModule;
+ box.size = Vec(blankModule->width, blankModule->height);
} else {
box.size = Vec(8 * 15, 380);
}
@@ -262,16 +277,16 @@ struct ComputerscareBlankWidget : ModuleWidget {
panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareCustomBlankPanel.svg")));
this->panel = panel;
addChild(panel);
-
+
}
- if (module) {
+ if (blankModule) {
{
PNGDisplay *pngDisplay = new PNGDisplay();
- pngDisplay->module = module;
+ pngDisplay->blankModule = blankModule;
pngDisplay->box.pos = Vec(0, 0);
- pngDisplay->box.size = Vec( module->width , module->height );
+ pngDisplay->box.size = Vec( blankModule->width , blankModule->height );
this->pngDisplay = pngDisplay;
addChild(pngDisplay);
@@ -288,12 +303,12 @@ struct ComputerscareBlankWidget : ModuleWidget {
}
void appendContextMenu(Menu* menu) override {
- ComputerscareBlank* blank = dynamic_cast<ComputerscareBlank*>(this->module);
+ ComputerscareBlank* blank = dynamic_cast<ComputerscareBlank*>(this->blankModule);
menu->addChild(new MenuEntry);
LoadImageItem* loadImageItem = createMenuItem<LoadImageItem>("Load image");
- loadImageItem->module = blank;
+ loadImageItem->blankModule = blank;
menu->addChild(loadImageItem);
menu->addChild(construct<MenuLabel>(&MenuLabel::text, ""));
@@ -313,7 +328,29 @@ struct ComputerscareBlankWidget : ModuleWidget {
}
- void step() override;
+ void step() override {
+ if (module) {
+ if (blankModule && !blankModule->loadedJSON) {
+ box.size.x = blankModule->width;
+ panel->box.size.x = blankModule->width;
+ bgPanel->box.size.x = blankModule->width;
+ panel->box.pos.x = blankModule->width / 2 - 60.f;
+ pngDisplay->box.size.x = blankModule->width;
+ rightHandle->box.pos.x = blankModule->width - rightHandle->box.size.x;
+ blankModule->loadedJSON = true;
+ }
+ else {
+ if (box.size.x != blankModule->width) {
+ blankModule->width = box.size.x;
+ panel->box.pos.x = box.size.x / 2 - panel->box.size.x / 2;
+ pngDisplay->box.size.x = box.size.x;
+ bgPanel->box.size.x = box.size.x;
+ rightHandle->box.pos.x = box.size.x - rightHandle->box.size.x;
+ }
+ }
+ ModuleWidget::step();
+ }
+ };
ComputerscareBlank *blankModule;
PNGDisplay *pngDisplay;
ComputerscareSVGPanel *panel;
@@ -323,29 +360,29 @@ struct ComputerscareBlankWidget : ModuleWidget {
ComputerscareResizeHandle *rightHandle;
SmallLetterDisplay* smallLetterDisplay;
};
-void ComputerscareBlankWidget::step() {
- if (blankModule) {
- if (!blankModule->loadedJSON) {
- box.size.x = blankModule->width;
- panel->box.size.x = blankModule->width;
- bgPanel->box.size.x=blankModule->width;
- panel->box.pos.x = blankModule->width / 2 - 60.f;
- pngDisplay->box.size.x = blankModule->width;
- rightHandle->box.pos.x = blankModule->width - rightHandle->box.size.x;
- blankModule->loadedJSON = true;
- }
- else {
- if (box.size.x != blankModule->width) {
- blankModule->width = box.size.x;
- panel->box.pos.x = box.size.x / 2 - panel->box.size.x / 2;
- pngDisplay->box.size.x = box.size.x;
- bgPanel->box.size.x=box.size.x;
- rightHandle->box.pos.x = box.size.x - rightHandle->box.size.x;
- }
- }
- ModuleWidget::step();
- }
-}
+// void ComputerscareBlankWidget::step() {
+// if (blankModule) {
+// if (blankModule && !blankModule->loadedJSON) {
+// box.size.x = blankModule->width;
+// panel->box.size.x = blankModule->width;
+// bgPanel->box.size.x=blankModule->width;
+// panel->box.pos.x = blankModule->width / 2 - 60.f;
+// pngDisplay->box.size.x = blankModule->width;
+// rightHandle->box.pos.x = blankModule->width - rightHandle->box.size.x;
+// blankModule->loadedJSON = true;
+// }
+// else {
+// if (box.size.x != blankModule->width) {
+// blankModule->width = box.size.x;
+// panel->box.pos.x = box.size.x / 2 - panel->box.size.x / 2;
+// pngDisplay->box.size.x = box.size.x;
+// bgPanel->box.size.x=box.size.x;
+// rightHandle->box.pos.x = box.size.x - rightHandle->box.size.x;
+// }
+// }
+// ModuleWidget::step();
+// }
+// }
Model *modelComputerscareBlank = createModel<ComputerscareBlank, ComputerscareBlankWidget>("computerscare-blank");
diff --git a/src/ComputerscareFolyPace.cpp b/src/ComputerscareFolyPace.cpp
@@ -226,20 +226,7 @@ struct FolyPaceDisplay : TransparentWidget {
float mpx = ox - 3 * sin(G + I + A);
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);
-
-
NVGcolor eyecolor = nvgHSLA(0.5, 0.9, 0.5, 0xff);
- float mex = mpx + 30 * sf + 3 * sin(G + K / 2);
- float mey = mpy + 5 * (1 + sf) * sin(G + 992.2);
-
-
- float m1x = mpx - 15 * sf + 3 * sin(A / 3 - M);
- float m1y = mpy - 6 * sf * sin(M) + 14 * sf * cos(E - C + A);
-
- float m2x = mpx + 15 * sf - 10 * sf * sin(-N) + 14 * sf * sin(E);
- float m2y = mpy - 1 * sf * sin(G - A / 2);
float epx = ox;
float epy = oy - 10 * (2 + sf + sin(I - J / 2));
@@ -420,7 +407,6 @@ struct FolyPaceDisplay : TransparentWidget {
}
else {
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]);
-
}
}
};
@@ -448,7 +434,7 @@ struct FolyPaceWidget : ModuleWidget {
}
addInput(createInput<PointingUpPentagonPort>(Vec(1, 353), module, FolyPace::X_INPUT));
- addParam(createParam<SmallKnob>(Vec(31, 356), module, FolyPace::TRIM));
+ addParam(createParam<SmallKnob>(Vec(31, 357), module, FolyPace::TRIM));
addParam(createParam<SmoothKnob>(Vec(51, 353), module, FolyPace::OFFSET));
diff --git a/src/ComputerscareSolyPequencer.cpp b/src/ComputerscareSolyPequencer.cpp
@@ -56,7 +56,6 @@ struct ComputerscareSolyPequencer : Module {
int numInputChannels = inputs[POLY_INPUT].getChannels();
int numReset = inputs[RESET_INPUT].getChannels();
int numClock = inputs[CLOCK_INPUT].getChannels();
- int numNumSteps = inputs[NUM_STEPS_INPUT].getChannels();
int numOutputChannels = numClock > 0 ? numClock : 1;
bool globalClocked = globalManualClockTrigger.process(params[MANUAL_CLOCK_BUTTON].getValue());
outputs[POLY_OUTPUT].setChannels(numOutputChannels);
