Use integer for randomized hachure-gap. Fixes #98

fskpf · Nov 18, 2023 · 3b6d5cc · 3b6d5cc
1 parent dcde0cc
commit 3b6d5cc
Show file tree

Hide file tree

Showing 125 changed files with 156 additions and 169 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svg2roughjs",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Leverages Rough.js to convert SVGs to a hand-drawn, sketchy representation",
   "author": "Fabian Schwarzkopf",
   "contributors": [
@@ -27,7 +27,7 @@
   "scripts": {
     "prepare": "npm run lint && npm run build",
     "build": "npm run clean && tsc && rollup -c rollup.config.js",
-    "clean": "rimraf dist/ && rimraf out-tsc/",
+    "clean": "rimraf -g *.tgz && rimraf dist/ && rimraf out-tsc/",
     "lint": "eslint --ext .ts ./src",
     "tsc": "tsc --noEmit",
     "test-all": "npm run clean && tsc && wtr"

diff --git a/sample-application/src/index.ts b/sample-application/src/index.ts
@@ -379,7 +379,7 @@ function run() {
     if (originalFontCheckbox.checked) {
       svg2roughjs.fontFamily = null
     } else {
-      svg2roughjs.fontFamily = 'Comic Sans MS, sans-serif'
+      svg2roughjs.fontFamily = 'Comic Sans MS, cursive'
     }
     setUIState(false)
     await svg2roughjs.sketch()

diff --git a/src/styles/pens.ts b/src/styles/pens.ts
@@ -39,7 +39,7 @@ function getPenConfiguration(fillStyle?: string): PenConfiguration {
     },
     gap: {
       normal: [2, 5],
-      small: [1.5, 2]
+      small: [1, 3]
     }
   }
 
@@ -52,7 +52,7 @@ function getPenConfiguration(fillStyle?: string): PenConfiguration {
       return {
         ...defaultConfig,
         weight: { normal: [0.5, 3], small: [0.5, 2] },
-        gap: { normal: [3.5, 6], small: [2.5, 4.5] }
+        gap: { normal: [2, 6], small: [2, 5] }
       }
     case 'cross-hatch':
       return {

diff --git a/src/styles/styles.ts b/src/styles/styles.ts
@@ -125,7 +125,7 @@ export function parseStyleConfig(
   if (context.randomize) {
     const { angle, gap, weight } = createPen(context, element)
     config.hachureAngle = angle
-    config.hachureGap = gap
+    config.hachureGap = Math.round(gap) // must be integer (avg gap in pixels)
     config.fillWeight = parseFloat(weight.toFixed(precision)) // value is used in the sketched output as-is
     // randomize double stroke effect if not explicitly set through user config
     if (typeof config.disableMultiStroke === 'undefined') {

diff --git a/test/complex/bpmn-diagram/config.json b/test/complex/bpmn-diagram/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/complex/bpmn-diagram/expect.svg b/test/complex/bpmn-diagram/expect.svg
diff --git a/test/complex/computer-network-diagram/expect.svg b/test/complex/computer-network-diagram/expect.svg
diff --git a/test/complex/flowchart-diagram/expect.svg b/test/complex/flowchart-diagram/expect.svg
diff --git a/test/complex/hierarchical1-diagram/config.json b/test/complex/hierarchical1-diagram/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"hachure","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/complex/hierarchical1-diagram/expect.svg b/test/complex/hierarchical1-diagram/expect.svg
diff --git a/test/complex/hierarchical2-diagram/config.json b/test/complex/hierarchical2-diagram/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"hachure","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/complex/hierarchical2-diagram/expect.svg b/test/complex/hierarchical2-diagram/expect.svg
diff --git a/test/complex/mindmap-diagram/expect.svg b/test/complex/mindmap-diagram/expect.svg
diff --git a/test/complex/movies-diagram/expect.svg b/test/complex/movies-diagram/expect.svg
diff --git a/test/complex/organic1-diagram/config.json b/test/complex/organic1-diagram/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"hachure","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/complex/organic1-diagram/expect.svg b/test/complex/organic1-diagram/expect.svg
diff --git a/test/complex/organic2-diagram/config.json b/test/complex/organic2-diagram/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"hachure","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/complex/organic2-diagram/expect.svg b/test/complex/organic2-diagram/expect.svg
diff --git a/test/complex/tree-diagram/expect.svg b/test/complex/tree-diagram/expect.svg
diff --git a/test/specs/circle-transform/expect.svg b/test/specs/circle-transform/expect.svg
diff --git a/test/specs/clippath-circle-transformed/config.json b/test/specs/clippath-circle-transformed/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/specs/clippath-circle-transformed/expect.svg b/test/specs/clippath-circle-transformed/expect.svg
diff --git a/test/specs/clippath-circle/config.json b/test/specs/clippath-circle/config.json
@@ -1 +1 @@
-{"roughConfig":{"bowing":0,"roughness":0,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
+{"roughConfig":{"bowing":1,"roughness":1,"fillStyle":"solid","fixedDecimalPlaceDigits":3,"seed":4242},"outputType":0,"pencilFilter":false,"sketchPatterns":true,"backgroundColor":"white"}
diff --git a/test/specs/clippath-circle/expect.svg b/test/specs/clippath-circle/expect.svg