@jscad/web 2.4.4 → 2.5.3

package/locales/ja.json

@@ -12,13 +12,13 @@
 
   "Generation":"Geometry Generation",
   "enable geometry caching":"experimental geometry caching",
-  "timeout for generation":"timeout for solids generation",
+  "timeout for generation":"図形の生成タイムアウト",
 
   "Storage": "ストレージ",
   "settings storage path":"ストレージ パス",
 
   "File Handling":"ファイル処理",
-  "enable conversion to scripts":"Convert external formats to JSCAD scripts",
+  "enable conversion to scripts":"外部形式をスクリプトに変換",
 
   "Shortcuts":"キーボード ショートカット",
 
@@ -27,7 +27,7 @@
   "When":"場合",
   "type and hit enter":"type and hit enter",
 
-  "not settable":"(not settable)",
+  "not settable":"(変更不可)",
   "see":"see",
 
   "grid":"グリッド",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/web",
-  "version": "2.4.4",
+  "version": "2.5.3",
   "description": "Web Application for JSCAD",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "main": "src/index.js",
@@ -34,13 +34,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jscad/array-utils": "2.1.0",
-    "@jscad/core": "2.4.0",
+    "@jscad/array-utils": "2.1.1",
+    "@jscad/core": "2.5.3",
     "@jscad/examples": "2.3.1",
-    "@jscad/io": "2.1.0",
-    "@jscad/modeling": "2.6.0",
-    "@jscad/regl-renderer": "2.5.0",
-    "@jscad/vtree": "2.0.10",
+    "@jscad/io": "2.2.3",
+    "@jscad/modeling": "2.7.1",
+    "@jscad/regl-renderer": "2.5.3",
     "@most/create": "2.0.1",
     "brace": "0.11.1",
     "codemirror": "5.57.0",
@@ -67,5 +66,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "3d1d02f2863c65fd95406c7098c09297b3be1c10"
+  "gitHead": "95f05c5f11a53bff469a305d69b99f674dc7d6d3"
 }

package/src/ui/views/designParameters.js

@@ -4,10 +4,11 @@ const { createParamControls } = require('./parameterControls')
 
 const designParameters = (state, paramsCallbacktoStream, i18n) => {
   const { parameterValues, parameterDefinitions, parameterDefaults } = state.design
-  const { controls } = createParamControls(
-    Object.assign({}, parameterDefaults, parameterValues), parameterDefinitions, paramsCallbacktoStream.callback
-  )
-  return html`
+  try {
+    const { controls } = createParamControls(
+      Object.assign({}, parameterDefaults, parameterValues), parameterDefinitions, paramsCallbacktoStream.callback
+    )
+    return html`
   <section id='params' style='visibility:${state.design.parameterDefinitions.length === 0 ? 'hidden' : 'visible'};color:${state.themes.themeSettings.secondaryTextColor}'>
     <span id='paramsTable'>
       <table>
@@ -22,6 +23,10 @@ const designParameters = (state, paramsCallbacktoStream, i18n) => {
     </span>
   </section>
 `
+  } catch (e) {
+    e.stack = undefined // remove unhelpful stacktrace
+    state.status.error = e
+  }
 }
 
 module.exports = designParameters

package/src/ui/views/options.js

@@ -33,9 +33,6 @@ const options = (state, i18n) => {
 
   <fieldset>
     <legend> <h3> ${i18n`Generation`}</h3> </legend>
-    <label>${i18n`enable geometry caching`} ${i18n`see`} <a href='https://github.com/jscad/jscad-desktop#geometry-caching' target="_blank">docs</a>
-      <input id='toggleVtreeMode' type='checkbox' checked=${state.design.vtreeMode}/>
-    </label>
     <label>${i18n`timeout for generation`}
       <input id='solidsTimeout' type='number' min=0 max=200000 value=${state.design.solidsTimeOut} />
     </label>

package/src/ui/views/viewer.js

@@ -232,11 +232,9 @@ const setup = (element) => {
     entities: []
   }
   if (type === 'webgl') {
-    if (!gl.getExtension('OES_element_index_uint')) {
-      error = 'Your browser uses an old version of WebGL without OES_element_index_uint. Please upgrade your browser to use this application'
+    if (gl.getExtension('OES_element_index_uint')) {
+      viewerOptions.glOptions.optionalExtensions = ['oes_element_index_uint']
     }
-
-    viewerOptions.glOptions.optionalExtensions = ['oes_element_index_uint']
   }
   return { viewerOptions, camera, error }
 }

package/src/ui/umd.js

@@ -1,168 +0,0 @@
-/**
- * @prettier
- */
-// == OpenJSCAD.org, Copyright (c) 2017, Licensed under MIT License
-const AlertUserOfUncaughtExceptions = require('./errorDispatcher')
-
-const version = require('../../package.json').version
-const Processor = require('../jscad/processor-bare')
-
-let gProcessor = null
-
-/**
- * Initialize a jscad viewer.  You can prevent the processor from creating
- * a new `canvas` element by passing a canvas element on `glOptions`.
- *
- * If the viewer element has a `design-url` attribute, that url will be loaded
- * with a `XMLHttpRequest`.  Otherwise load the design using `setJsCad`.
- *
- * @param {Object} viewer - A DOM element to use as the base element.
- * @param {JscadViewerOptions} options - options passed to the viewer processor
- */
-const init = (viewer, options) => {
-  const versionText = 'UMD OpenJSCAD.org Version ' + version
-  console.log('umd init', versionText, options)
-
-  // Show all exceptions to the user: // WARNING !! this is not practical at dev time
-  AlertUserOfUncaughtExceptions()
-
-  const design = viewer.getAttribute('design-url')
-
-  gProcessor = new Processor(viewer, options)
-
-  // load the given design
-  if (design) {
-    const xhr = new XMLHttpRequest()
-    xhr.open('GET', design, true)
-    gProcessor.setStatus('Loading ' + design)
-
-    xhr.onload = function () {
-      const source = this.responseText
-
-      if (design.match(/\.jscad$/i) || design.match(/\.js$/i)) {
-        gProcessor.setStatus('Processing ' + design)
-        gProcessor.setJsCad(source, design)
-      }
-    }
-    xhr.send()
-  }
-
-  return {
-    /**
-     * Start the processor on generating an output file. Once
-     * the file has been created, the `
-     * @param {FormatInfo} format
-     */
-    generateOutputFile: function (format) {
-      return gProcessor.generateOutputFile(format)
-    },
-
-    clearOutputFile: function () {
-      return gProcessor.clearOutputFile()
-    },
-
-    resetCamera () {
-      return gProcessor.viewer.resetCamera()
-    },
-
-    abort () {
-      return gProcessor.abort()
-    },
-
-    setJsCad (source, design) {
-      gProcessor.setJsCad(source, design)
-    },
-
-    rebuildSolids () {
-      gProcessor.rebuildSolids()
-    }
-  }
-}
-
-module.exports = init
-
-/**
- * @typedef {Object} XYZCoord
- * @property {number} x
- * @property {number} y
- * @property {number} z
- */
-
-/**
- * @typedef {Object} MinMax
- * @property {number} min
- * @property {number} max
- */
-
-/**
- * Camera settings
- * @typedef {Object} CameraSettings
- * @property {number} fov - field of view.
- * @property {XYZCoord} angle - view angle about XYZ axis.
- * @property {XYZCoord} position - initial position at XYZ.
- * @property {MinMax} clip - rendering outside this range is clipped.
- */
-
-/**
- * @typedef {Object} RgbaColor
- * @property {number} r - red (values 0.0 - 1.0).
- * @property {number} g - green (values 0.0 - 1.0).
- * @property {number} b - blue (values 0.0 - 1.0).
- * @property {number} a - alpha (values 0.0 - 1.0).
- */
-
-/**
- * Grid settings
- * @typedef {Object} GridSettings
- * @property {number} i - number of units between grid lines.
- * @property {RgbaColor} color - color.
- */
-
-/**
- * @typedef {Object} PlateSettings
- * @property {boolean} draw draw or not (default: true).
- * @property {number} size plate size (X and Y) (default: 200).
- * @property {GridSettings} m minor grid settings.
- * @property {GridSettings} M major grid settings.
- */
-
-/**
- *
- * @typedef {Object} PosNegColor
- * @property {RgbaColor} neg color in negative direction.
- * @property {RgbaColor} pos color in positive direction.
- */
-
-/**
- * @typedef {Object} AxisSettings
- * @property {boolean} draw - draw or not (default: false).
- * @property {PosNegColor} x
- * @property {PosNegColor} y
- * @property {PosNegColor} z
- */
-
-/**
- * @typedef {Object} LightGLOptions
- * @property {Object} canvas - Uses the HTML canvas given in 'options' or creates a new one if necessary.
- * @property {number} width - width applied to the canvas created when `options.canvas` is not set. (default: 800).
- * @property {number} height - height applied to the canvas created when `options.canvas` is not set. (default: 600).
- * @property {number} alpha - The alpha channel is disabled by default because it usually causes unintended transparencies in the canvas.
- *
- */
-
-/**
- * @typedef {Object} JscadViewerOptions
- * @property {PlateSettings} plate - The grid show in the viewer.
- * @property {CameraSettings} camera
- * @property {AxisSettings} axis
- * @property {LightGLOptions} glOptions - Options sent to `GL.create()`.
- * @property {Object} processor - options used by the viewer processor.
- */
-
-/**
- * @typedef {Object} ProcessorOptions
- * @property {Element} viewerContext - The main element that jscad uses.  If no canvas element is set, jscad creates one.
- * @property {Element} viewerdiv - Jscad moves the canvas tag here, or creates one and places it here.
- * @property {Element} parameterstable - A Table element reference.  The design parameters will be added here.
- * @property {Element} viewerCanvas - A Canvas element reference that will be used to draw the GL canvas.
- */