From 153ef9eceb233da0f1ac0b9a54862639ab66dc0f Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Mon, 4 Sep 2023 10:48:54 -0400
Subject: [PATCH] Use fast-csg and parallel with 8 jobs hardcoded

---
 app/data/cfg.json         | 2 +-
 app/package-lock.json     | 2 +-
 app/package.json          | 2 +-
 data/cfg.json             | 2 +-
 package-lock.json         | 4 ++--
 package.json              | 2 +-
 processing/mcopy/cfg.json | 2 +-
 scripts/common.sh         | 2 +-
 scripts/openscadPart.sh   | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/data/cfg.json b/app/data/cfg.json
index 2140d83..9a3e9b9 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.15",
+  "version": "1.8.16",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/app/package-lock.json b/app/package-lock.json
index c93d293..ee7bfb8 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.15",
+  "version": "1.8.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/app/package.json b/app/package.json
index f3c81ec..e733c15 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.15",
+  "version": "1.8.16",
   "description": "GUI for the mcopy small gauge film optical printer platform",
   "main": "main.js",
   "scripts": {
diff --git a/data/cfg.json b/data/cfg.json
index 2140d83..9a3e9b9 100644
--- a/data/cfg.json
+++ b/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.15",
+  "version": "1.8.16",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/package-lock.json b/package-lock.json
index 7cd8a5c..45b7a1d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.8.15",
+  "version": "1.8.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.8.15",
+      "version": "1.8.16",
       "license": "MIT",
       "dependencies": {
         "arduino": "file:app/lib/arduino",
diff --git a/package.json b/package.json
index 62af448..14a0919 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.8.15",
+  "version": "1.8.16",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {
diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json
index 2140d83..9a3e9b9 100644
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.15",
+  "version": "1.8.16",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/scripts/common.sh b/scripts/common.sh
index af75697..3086fe9 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -13,5 +13,5 @@ allParts () {
 
 parallelParts () {
 	PARTS=($(listParts "scad/${1}.scad"))
-	parallel --use-cpus-instead-of-cores -j -1 bash ./scripts/openscadPart.sh "${1}.scad" "{}" "${1}_{}.stl" ::: "${PARTS[@]}"
+	parallel --jobs 8 bash ./scripts/openscadPart.sh "${1}.scad" "{}" "${1}_{}.stl" ::: "${PARTS[@]}"
 }
\ No newline at end of file
diff --git a/scripts/openscadPart.sh b/scripts/openscadPart.sh
index 4962827..3412679 100644
--- a/scripts/openscadPart.sh
+++ b/scripts/openscadPart.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-openscad --enable=fast-csg -o "./stl/${3}" -D"PART=\"${2}\"" "./scad/${1}"
+openscad --enable=fast-csg --enable=fast-csg-trust-corefinement --export-format=asciistl -o "./stl/${3}" -D"PART=\"${2}\"" "./scad/${1}"
 echo "Compiled ${3} from ${1}"
 if [ -f "./scad/common/c14n_stl.py" ]; then
 	python3 ./scad/common/c14n_stl.py "./stl/${3}"