commit 9a54f0027441831dd9156f86af7ad3837cc4c3ca
parent 467c155ba933d1cc90062a97a4fcd650ede8c4b3
Author: Adam M <[email protected]>
Date: Sat, 9 Feb 2019 15:55:40 -0600
Override SVGPanel to remove outline
Diffstat:
4 files changed, 163 insertions(+), 3 deletions(-)
diff --git a/res/ComputerscareTotallyEmptyPanel.svg b/res/ComputerscareTotallyEmptyPanel.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="140"
+ height="380"
+ viewBox="0 0 37.041668 100.54167"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ sodipodi:docname="ComputerscareTotallyEmptyPanel.svg"
+ style="enable-background:new">
+ <defs
+ id="defs2">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 50.270835 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="23.812501 : 50.270835 : 1"
+ inkscape:persp3d-origin="11.906251 : 33.51389 : 1"
+ id="perspective1881" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#ea3266"
+ borderopacity="0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="12"
+ inkscape:zoom="2.8284273"
+ inkscape:cx="-3.804725"
+ inkscape:cy="281.43433"
+ inkscape:document-units="mm"
+ inkscape:current-layer="g1669"
+ showgrid="false"
+ units="px"
+ inkscape:snap-bbox="false"
+ inkscape:snap-page="true"
+ inkscape:bbox-nodes="true"
+ inkscape:snap-bbox-edge-midpoints="true"
+ inkscape:window-width="1440"
+ inkscape:window-height="856"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:snap-object-midpoints="false"
+ inkscape:snap-others="false"
+ inkscape:snap-nodes="false"
+ inkscape:snap-global="false"
+ showguides="false"
+ showborder="false"
+ inkscape:pagecheckerboard="false" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-196.45832)"
+ style="display:none">
+ <path
+ style="opacity:0;vector-effect:none;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.48607069;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+ d="M 0,196.45831 H 23.8125 V 296.99999 H 0 Z"
+ id="rect817"
+ inkscape:connector-curvature="0" />
+
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="bg" />
+ <g
+ style="display:inline"
+ transform="translate(0,-196.45832)"
+ id="g1669"
+ inkscape:groupmode="layer"
+ inkscape:label="Layer 1 copy" />
+</svg>
diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp
@@ -1,7 +1,6 @@
#pragma once
#include "rack.hpp"
-
using namespace rack;
// Forward-declare the Plugin, defined in Template.cpp
@@ -33,6 +32,12 @@ extern Model *modelComputerscareLaundrySoup;
extern Model *modelComputerscareILoveCookies;
extern Model *modelComputerscareOhPeas;
extern Model *modelComputerscareIso;
+struct ComputerscareSVGPanel;
+
+struct ComputerscareSVGPanel : FramebufferWidget {
+ void step() override;
+ void setBackground(std::shared_ptr<SVG> svg);
+};
struct IsoButton : SVGSwitch, ToggleSwitch {
IsoButton() {
diff --git a/src/ComputerscareIso.cpp b/src/ComputerscareIso.cpp
@@ -40,9 +40,28 @@ struct ComputerscareIso : Module {
struct ComputerscareIsoWidget : ModuleWidget {
float randAmt = 1.f;
ComputerscareIsoWidget(ComputerscareIso *module) : ModuleWidget(module) {
- setPanel(SVG::load(assetPlugin(plugin, "res/ComputerscareIsoPanel.svg")));
-
+ //ComputerscareSVGPanel *csPanel = new ComputerscareSVGPanel();
+ box.size = Vec(15*9, 380);
+ {
+ ComputerscareSVGPanel *panel = new ComputerscareSVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin,"res/ComputerscareIsoPanel.svg")));
+ addChild(panel);
+ //setPanel(SVG::load(assetPlugin(plugin, "res/ComputerscareTotallyEmptyPanel.svg")));
+ }
}
+ void drawShadow(NVGcontext *vg) {
+ nvgBeginPath(vg);
+ float r = 20; // Blur radius
+ float c = 20; // Corner radius
+ Vec b = Vec(-10, 30); // Offset from each corner
+ nvgRect(vg, b.x - r, b.y - r, box.size.x - 2*b.x + 2*r, box.size.y - 2*b.y + 2*r);
+ NVGcolor shadowColor = nvgRGBAf(0, 220, 0, 0.2);
+ NVGcolor transparentColor = nvgRGBAf(0, 0, 0, 0);
+ nvgFillPaint(vg, nvgBoxGradient(vg, b.x, b.y, box.size.x - 2*b.x, box.size.y - 2*b.y, c, r, shadowColor, transparentColor));
+ nvgFill(vg);
+}
+
};
diff --git a/src/ComputerscareSVGPanel.cpp b/src/ComputerscareSVGPanel.cpp
@@ -0,0 +1,41 @@
+#include "app.hpp"
+#include "window.hpp"
+#include "Computerscare.hpp"
+
+
+
+
+struct PanelBorder : TransparentWidget {
+ void draw(NVGcontext *vg) override {
+ NVGcolor borderColor = nvgRGBAf(0.5, 0.5, 0.5, 0.5);
+ nvgBeginPath(vg);
+ nvgRect(vg, 0.5, 0.5, box.size.x - 1.0, box.size.y - 1.0);
+ nvgStrokeColor(vg, borderColor);
+ nvgStrokeWidth(vg, 1.0);
+ //nvgStroke(vg);
+ }
+};
+
+
+void ComputerscareSVGPanel::step() {
+ if (isNear(gPixelRatio, 1.0)) {
+ // Small details draw poorly at low DPI, so oversample when drawing to the framebuffer
+ oversample = 2.0;
+ }
+ FramebufferWidget::step();
+}
+
+void ComputerscareSVGPanel::setBackground(std::shared_ptr<SVG> svg) {
+ SVGWidget *sw = new SVGWidget();
+ sw->setSVG(svg);
+ addChild(sw);
+
+ // Set size
+ box.size = sw->box.size.div(RACK_GRID_SIZE).round().mult(RACK_GRID_SIZE);
+
+ PanelBorder *pb = new PanelBorder();
+ pb->box.size = box.size;
+ addChild(pb);
+}
+
+
