h3n3/cadhub
1
0
Fork 0
Code Issues 35 Pull Requests Packages Projects Releases Wiki Activity

jscad parameters default values and float type #582

Merged
hrgdavor merged 1 commits from fix-getParameterDefinitions into main 2022-01-08 20:32:32 +01:00
Conversation 3 Commits 1 Files Changed 3 +11 -3
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.idea .idea
.history
.DS_Store .DS_Store
.env .env
.netlify .netlify

4
app/web/src/helpers/cadPackages/jsCad/jscadParams.ts
View File

@@ -8,6 +8,7 @@ type JscadTypeNames =
| 'group' | 'group'
| 'text' | 'text'
| 'int' | 'int'
| 'float'
| 'number' | 'number'
| 'slider' | 'slider'
| 'email' | 'email'
@@ -37,7 +38,7 @@ interface JscadTextParam extends JscadParamBase {
maxLength: number maxLength: number
} }
interface JscadIntNumberSliderParam extends JscadParamBase { interface JscadIntNumberSliderParam extends JscadParamBase {
type: 'int' | 'number' | 'slider' type: 'int' | 'number' | 'float' | 'slider'
initial: number initial: number
min?: number min?: number
max?: number max?: number
@@ -93,6 +94,7 @@ export function jsCadToCadhubParams(input: JsCadParams[]): CadhubParams[] {
switch (param.type) { switch (param.type) {
case 'slider': case 'slider':
case 'number': case 'number':
case 'float':
case 'int': case 'int':
return { return {
type: 'number', type: 'number',

9
app/web/src/helpers/cadPackages/jsCad/jscadWorker.ts
View File

@@ -315,9 +315,12 @@ function parseDef(code, line) {
} }
const makeScriptWorker = ({ callback, convertToSolids }) => { const makeScriptWorker = ({ callback, convertToSolids }) => {
let onInit, main, scriptStats, entities let onInit, main, scriptStats, entities, lastParamsDef
Irev-Dev commented 2022-01-07 22:52:24 +01:00 (Migrated from github.com)
Review
Copy Link

Should jscad handle a missing param and use the scripts default value by itself?

Should jscad handle a missing param and use the scripts default value by itself?
hrgdavor commented 2022-01-07 23:27:46 +01:00 (Migrated from github.com)
Review
Copy Link

Yes, that is expected behavior in jscad currently, just not properly implemented in my integration for CadHub.

Yes, that is expected behavior in jscad currently, just not properly implemented in my integration for CadHub.
function runMain(params = {}) { function runMain(params = {}) {
if(lastParamsDef) lastParamsDef.forEach(def=>{
if(!(def.name in params) && 'initial' in def) params[def.name] = def.initial
})
let time = Date.now() let time = Date.now()
let solids let solids
const transfer = [] const transfer = []
@@ -397,10 +400,12 @@ const makeScriptWorker = ({ callback, convertToSolids }) => {
if (idx === -1) { if (idx === -1) {
paramsDef.push(p) paramsDef.push(p)
} else { } else {
paramsDef.splice(idx, 1, p) paramsDef[idx] = p
} }
}) })
} }
console.log('paramsDef', paramsDef)
lastParamsDef = paramsDef
callback({ callback({
action: 'parameterDefinitions', action: 'parameterDefinitions',
worker: 'main', worker: 'main',