Skip to content

Commit

Permalink
Align with wtd v3 release version
Browse files Browse the repository at this point in the history
  • Loading branch information
Kai Salmen committed Jan 5, 2024
1 parent b510a24 commit e0eec46
Show file tree
Hide file tree
Showing 7 changed files with 358 additions and 827 deletions.
1,127 changes: 329 additions & 798 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,20 @@
"keywords": [],
"homepage": "https://github.com/kaisalmen/WWOBJLoader#README",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "~6.13.2",
"@types/node": "~18.18.14",
"@typescript-eslint/eslint-plugin": "~6.17.0",
"@types/node": "~20.10.6",
"editorconfig": "~2.0.0",
"eslint": "~8.55.0",
"eslint": "~8.56.0",
"shelljs": "~0.8.5",
"shx": "~0.3.4",
"typedoc": "~0.25.4",
"typedoc": "~0.25.6",
"typedoc-plugin-markdown": "~3.17.1",
"typescript": "~5.3.2",
"vite": "~5.0.5",
"vitest": "~0.34.6"
"typescript": "~5.3.3",
"vite": "~5.0.11"
},
"volta": {
"node": "18.18.2",
"npm": "9.8.1"
"node": "20.10.0",
"npm": "10.2.3"
},
"workspaces": [
"packages/objloader2",
Expand Down
18 changes: 9 additions & 9 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@
"verify": "http-server --port 20001 ./"
},
"volta": {
"node": "18.18.2",
"npm": "9.8.1"
"node": "20.10.0",
"npm": "10.2.3"
},
"dependencies": {
"@react-three/fiber": "~8.15.12",
"wtd-core": "~3.0.0-next.5",
"wwobjloader2": "~6.2.0-next.5",
"@react-three/fiber": "~8.15.13",
"wtd-core": "~3.0.0",
"wwobjloader2": "~6.2.0",
"lil-gui": "~0.19.1",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"three": "~0.159.0"
"three": "~0.160.0"
},
"devDependencies": {
"@types/react": "~18.2.42",
"@types/react-dom": "~18.2.17",
"@types/three": "~0.159.0",
"@types/react": "~18.2.46",
"@types/react-dom": "~18.2.18",
"@types/three": "~0.160.0",
"http-server": "~14.1.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class OBJLoader2BasicExampleOffscreen {
const canvas = document.getElementById('example') as HTMLCanvasElement;

// only create worker, but do not init
workerTask.createWorker();
workerTask.connectWorker();

// delegate events from main to offscreen
const handlingInstructions = buildDefaultEventHandlingInstructions();
Expand All @@ -44,6 +44,7 @@ export class OBJLoader2BasicExampleOffscreen {
await initOffscreenCanvas(workerTask, canvas);

// once the init Promise returns enqueue the execution
// TODO: make this a raw payload
const dataPayload = new DataPayload();
dataPayload.message.params = {
modelUrl: new URL('./models/obj/main/female02/female02_vertex_colors.obj', window.location.href).href
Expand Down
14 changes: 7 additions & 7 deletions packages/objloader2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wwobjloader2",
"version": "6.2.0-next.5",
"version": "6.2.0",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
Expand Down Expand Up @@ -65,19 +65,19 @@
"serve": "tsc && vite preview"
},
"volta": {
"node": "18.18.2",
"npm": "9.8.1"
"node": "20.10.0",
"npm": "10.2.3"
},
"dependencies": {
"three": "~0.159.0",
"wtd-core": "~3.0.0-next.5",
"wtd-three-ext": "~3.0.0-next.5"
"three": "~0.160.0",
"wtd-core": "~3.0.0",
"wtd-three-ext": "~3.0.0"
},
"peerDependencies": {
"three": ">= 0.137.5 < 1"
},
"devDependencies": {
"@types/three": "~0.159.0"
"@types/three": "~0.160.0"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/objloader2/src/OBJLoader2Parallel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export class OBJLoader2Parallel extends OBJLoader2 {
}
};

this.workerTask!.createWorker();
this.workerTask!.connectWorker();
return this.workerTask!.initWorker({ message: WorkerTaskMessage.fromPayload(dataPayload) });
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/UpdateVersions.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import shell from 'shelljs';

const versionPattern = '.*[0-9]\\.[0-9]\\.[0-9].*';

const version_wtd_core_real = '~3.0.0-next.5';
const version_wtd_core_real = '~3.0.0';
const version_wtd_core_dev = '../../../wtd/packages/wtd-core';

const version_wtd_three_ext_real = '~3.0.0-next.5';
const version_wtd_three_ext_real = '~3.0.0';
const version_wtd_three_ext_dev = '../../../wtd/packages/wtd-three-ext';

const what = process.argv[2];
Expand Down

0 comments on commit e0eec46

Please sign in to comment.