From 79300575994b7779dc057caf68fafd6b77cec016 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Sun, 7 Jan 2024 17:21:02 +0100 Subject: [PATCH] GitHub Pages: Put all worker files in the same directory --- README.md | 2 +- packages/examples/obj2parallel_basic.html | 4 ++-- packages/examples/scripts/copyAssetsProduction.mts | 7 ++++--- .../src/examples/OBJLoader2BasicExampleOffscreen.ts | 2 +- ...lsBasicExample.ts => OBJLoader2ParallelBasicExample.ts} | 2 +- packages/examples/verify_obj2parallel_basic.html | 4 ++-- packages/objloader2/README.md | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) rename packages/examples/src/examples/{OBJLoader2ParallelsBasicExample.ts => OBJLoader2ParallelBasicExample.ts} (95%) diff --git a/README.md b/README.md index 2b607e2..a46c758 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ If you want to get started see take a look at the following examples. They get m * OBJLoader2 basic: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_basic.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2BasicExample.ts)] * OBJLoader2 basic (Offscreen Canvas): [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_basic_offscreen.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2BasicExampleOffscreen.ts)] -* OBJLoader2Parallel basic: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2parallel_basic.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2ParallelsBasicExample.ts)] +* OBJLoader2Parallel basic: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2parallel_basic.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2ParallelBasicExample.ts)] * OBJLoader2 usage options: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_options.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2OptionsExample.ts)] * OBJLoader2 / OBJLoader parser capability comparison: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_obj_compare.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2OBJLoaderCompareExample.ts)] * OBJLoader2 in react with a .jpg texture: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_react.html)] [[tsx](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/ReactExample.tsx)] diff --git a/packages/examples/obj2parallel_basic.html b/packages/examples/obj2parallel_basic.html index f862a01..b45c7f2 100644 --- a/packages/examples/obj2parallel_basic.html +++ b/packages/examples/obj2parallel_basic.html @@ -15,10 +15,10 @@ diff --git a/packages/examples/scripts/copyAssetsProduction.mts b/packages/examples/scripts/copyAssetsProduction.mts index a415573..72909cd 100644 --- a/packages/examples/scripts/copyAssetsProduction.mts +++ b/packages/examples/scripts/copyAssetsProduction.mts @@ -3,9 +3,6 @@ import shell from 'shelljs'; shell.mkdir('-p', './production/models/obj/main/cerberus'); shell.cp('-f', './models/obj/main/cerberus/*', './production/models/obj/main/cerberus/'); -shell.mkdir('-p', './production/worker/generated'); -shell.cp('-f', './src/worker/generated/*.js', './production/worker/generated'); - shell.mkdir('-p', './production/models/obj/main/female02'); shell.cp('-f', './models/obj/main/female02/*', './production/models/obj/main/female02/'); @@ -20,3 +17,7 @@ shell.cp('-f', './models/obj/main/verify/*', './production/models/obj/main/verif shell.mkdir('-p', './production/models/obj/main/walt'); shell.cp('-f', './models/obj/main/walt/*', './production/models/obj/main/walt/'); + +shell.mkdir('-p', './production/assets/worker'); +shell.cp('-f', './src/worker/generated/*.js', './production/assets/worker'); +shell.cp('-f', '../objloader2/lib/worker/OBJLoader2Worker*.js', './production/assets/worker'); diff --git a/packages/examples/src/examples/OBJLoader2BasicExampleOffscreen.ts b/packages/examples/src/examples/OBJLoader2BasicExampleOffscreen.ts index 1390613..7f61f5d 100644 --- a/packages/examples/src/examples/OBJLoader2BasicExampleOffscreen.ts +++ b/packages/examples/src/examples/OBJLoader2BasicExampleOffscreen.ts @@ -15,7 +15,7 @@ export class OBJLoader2BasicExampleOffscreen { // register the module worker const dev = import.meta.env?.DEV === true; - const url = new URL(dev ? '../worker/BasicExampleOffscreenWorker.ts' : '../worker/generated/BasicExampleOffscreenWorker-es.js', import.meta.url); + const url = new URL(dev ? '../worker/BasicExampleOffscreenWorker.ts' : './worker/BasicExampleOffscreenWorker-es.js', import.meta.url); const worker = new Worker(url.href, { type: 'module' }); diff --git a/packages/examples/src/examples/OBJLoader2ParallelsBasicExample.ts b/packages/examples/src/examples/OBJLoader2ParallelBasicExample.ts similarity index 95% rename from packages/examples/src/examples/OBJLoader2ParallelsBasicExample.ts rename to packages/examples/src/examples/OBJLoader2ParallelBasicExample.ts index 4f9852a..0e6e704 100644 --- a/packages/examples/src/examples/OBJLoader2ParallelsBasicExample.ts +++ b/packages/examples/src/examples/OBJLoader2ParallelBasicExample.ts @@ -2,7 +2,7 @@ import { Object3D, Vector3 } from 'three'; import { OBJLoader2Parallel } from 'wwobjloader2'; import { createThreeDefaultSetup, ExampleDefinition, renderDefault, reportProgress, ThreeDefaultSetup } from './ExampleCommons.js'; -export class OBJLoader2ParalleleBasicExample implements ExampleDefinition { +export class OBJLoader2ParallelBasicExample implements ExampleDefinition { private setup: ThreeDefaultSetup; diff --git a/packages/examples/verify_obj2parallel_basic.html b/packages/examples/verify_obj2parallel_basic.html index a8e2584..43748a5 100644 --- a/packages/examples/verify_obj2parallel_basic.html +++ b/packages/examples/verify_obj2parallel_basic.html @@ -25,10 +25,10 @@ diff --git a/packages/objloader2/README.md b/packages/objloader2/README.md index b9b1ede..048345c 100644 --- a/packages/objloader2/README.md +++ b/packages/objloader2/README.md @@ -40,7 +40,7 @@ If you want to get started see take a look at the following examples. They get m * OBJLoader2 basic: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_basic.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2BasicExample.ts)] * OBJLoader2 basic (Offscreen Canvas): [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_basic_offscreen.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2BasicExampleOffscreen.ts)] -* OBJLoader2Parallel basic: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2parallel_basic.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2ParallelsBasicExample.ts)] +* OBJLoader2Parallel basic: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2parallel_basic.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2ParallelBasicExample.ts)] * OBJLoader2 usage options: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_options.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2OptionsExample.ts)] * OBJLoader2 / OBJLoader parser capability comparison: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_obj_compare.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/OBJLoader2OBJLoaderCompareExample.ts)] * OBJLoader2 in react with a .jpg texture: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_react.html)] [[tsx](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/ReactExample.tsx)]