Merge pull request #1 from metrica-sports/fran/allow-rendering-in-web…

…workers Allow rendering in web-workers
protectwise · Oct 3, 2023 · e1034c2 · e1034c2
2 parents 5266f19 + 18ae87c
commit e1034c2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.48.1",
+  "version": "1.0.0",
   "command": {
     "version": {
       "conventionalCommits": true

diff --git a/packages/troika-2d/src/HitTestContext.js b/packages/troika-2d/src/HitTestContext.js
@@ -6,8 +6,8 @@
  * whether an Object2DFacade is under the mouse cursor, by passing this as the context
  * to its render() method.
  */
-
-const hitTestContext = document.createElement('canvas').getContext('2d')
+const canvas = typeof document === 'undefined' ? new OffscreenCanvas() : document.createElement('canvas')
+const hitTestContext = canvas.getContext('2d')
 hitTestContext.save()
 
 /**

diff --git a/packages/troika-3d/src/facade/WorldTextureProvider.js b/packages/troika-3d/src/facade/WorldTextureProvider.js
@@ -76,7 +76,7 @@ export function makeWorldTextureProvider(WrappedFacadeClass) {
         }
         if (newWorldConfig) {
           this.worldTexture.dispose()
-          const canvas = document.createElement('canvas')
+          const canvas = typeof document === 'undefined' ? new OffscreenCanvas() : document.createElement('canvas')
           canvas.width = newWorldConfig.width
           canvas.height = newWorldConfig.height
           this.worldTexture = new CanvasTexture(canvas)

diff --git a/packages/troika-animation/src/Interpolators.js b/packages/troika-animation/src/Interpolators.js
@@ -50,7 +50,7 @@ const colorValueToNumber = (function() {
 
       // 2D canvas for evaluating string values
       if (!colorCanvas) {
-        colorCanvas = document.createElement('canvas')
+        colorCanvas = typeof document === 'undefined' ? new OffscreenCanvas() : document.createElement('canvas')
         colorCanvasCtx = colorCanvas.getContext('2d')
       }
 

diff --git a/packages/troika-three-text/package.json b/packages/troika-three-text/package.json
@@ -1,11 +1,22 @@
 {
   "name": "troika-three-text",
-  "version": "0.48.1",
   "description": "SDF-based text rendering for Three.js",
-  "author": "Jason Johnston <jason.johnston@protectwise.com>",
+  "version": "1.0.0",
+  "author": {
+    "name": "Metrica Sports",
+    "email": "info@metrica-sports.com"
+  },
+  "versionForked": "0.48.1",
+  "authorForked": {
+    "name": "Jason Johnston",
+    "email": "jason.johnston@protectwise.com"
+  },
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com/"
+  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/protectwise/troika.git",
+    "url": "https://github.com/metrica-sports/troika.git",
     "directory": "packages/troika-three-text"
   },
   "license": "MIT",

diff --git a/packages/troika-three-text/src/TextBuilder.js b/packages/troika-three-text/src/TextBuilder.js
@@ -164,7 +164,7 @@ function getTextRenderInfo(args, callback) {
   const glyphsPerRow = (textureWidth / sdfGlyphSize * 4)
   let atlas = atlases[sdfGlyphSize]
   if (!atlas) {
-    const canvas = document.createElement('canvas')
+    const canvas = typeof document === 'undefined' ? new OffscreenCanvas() : document.createElement('canvas')
     canvas.width = textureWidth
     canvas.height = sdfGlyphSize * 256 / glyphsPerRow // start tall enough to fit 256 glyphs
     atlas = atlases[sdfGlyphSize] = {