mattmcw
/
stipple_gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

First attempt at using a scalar value to fix the canvas render to better match the resulting svg. I suspect 1.25 is overkill, but need to have a frame of reference for future tests.

This commit is contained in:
mattmcw 2021-03-26 11:43:39 -04:00
parent b040b21a56
commit f657b025da
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stipple_gen.pde
View File

@ -89,6 +89,7 @@ public class Config {
public int canvasWidth = 800; public int canvasWidth = 800;
public int canvasHeight = 600; public int canvasHeight = 600;
public float canvasScalar = 1.25;
public boolean display = true; public boolean display = true;
public int windowWidth = 800; public int windowWidth = 800;
@ -231,6 +232,9 @@ public class Config {
case "canvasHeight" : case "canvasHeight" :
canvasHeight = intOrDie(name, val); canvasHeight = intOrDie(name, val);
break; break;
case "canvasScalar" :
canvasScalar = floatOrDie(name, val);
break;
case "display" : case "display" :
display = boolOrDie(name, val); display = boolOrDie(name, val);
break; break;
@ -1264,8 +1268,8 @@ void draw () {
canvas.stroke(0); canvas.stroke(0);
} }
if (config.line >= 1.0) { if (config.line * config.canvasScalar >= 1.0) {
canvas.strokeWeight(config.line); canvas.strokeWeight(config.line * config.canvasScalar);
} else { } else {
canvas.strokeWeight(1.0); canvas.strokeWeight(1.0);
} }
@ -1286,10 +1290,10 @@ void draw () {
if (v < cutoffScaled) { if (v < cutoffScaled) {
//println(v); //println(v);
dotDiam = (config.maxDotSize - v * dotScale) * 2.0; dotDiam = (config.maxDotSize - v * dotScale) * 2.0 * config.canvasScalar;
canvas.ellipse(px, py, dotDiam, dotDiam); canvas.ellipse(px, py, dotDiam, dotDiam);
if (config.fill) { if (config.fill) {
hatchLines = fillCircle(px, py, dotDiam, 45.0, config.line); hatchLines = fillCircle(px, py, dotDiam, 45.0, config.line * config.canvasScalar);
if (hatchLines.size() > 0) { if (hatchLines.size() > 0) {
for (float[] linePoints : hatchLines) { for (float[] linePoints : hatchLines) {
canvas.line(linePoints[0], linePoints[1], linePoints[2], linePoints[3]); canvas.line(linePoints[0], linePoints[1], linePoints[2], linePoints[3]);
@ -1298,7 +1302,6 @@ void draw () {
} }
} }
} }
cellsCalculatedLast = cellsCalculated; cellsCalculatedLast = cellsCalculated;
} }
@ -1353,7 +1356,8 @@ void draw () {
//Need to get some background on this. //Need to get some background on this.
//what are these magic numbers? //what are these magic numbers?
float SVGscale = (800.0 / (float) config.canvasHeight); float SVGscale = (800.0 / (float) config.canvasHeight);
int xOffset = 0; //(int) (1536 - (SVGscale * config.canvasWidth / 2)); //not centering the image is more controllable
int xOffset = 0; //(int) (1536 - (SVGscale * config.canvasWidth / 2));
int yOffset = 0; //(int) (1056 - (SVGscale * config.canvasHeight / 2)); int yOffset = 0; //(int) (1056 - (SVGscale * config.canvasHeight / 2));
if (FileModeTSP) { if (FileModeTSP) {