From 1e18cf4572db98ca628f67269f6162602e564fbd Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Mon, 15 Oct 2018 22:24:32 +0200 Subject: [PATCH] Prepare 2.5.0 release --- CHANGELOG.md | 6 ++++-- package.json | 10 +++++----- src/loaders/OBJLoader2.js | 2 +- src/loaders/support/LoaderBuilder.js | 2 +- src/loaders/support/LoaderWorkerDirector.js | 2 +- src/loaders/support/LoaderWorkerSupport.js | 2 +- test/meshspray/MeshSpray.js | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2ea4c97..7c5fddef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Changelog -## 2.5.0-dev -- Pull Request #46: Add nodejs support by @Cobertos +## 2.5.0 +- Issue #47: Fixed incorrect vertex color pointerC initialization (omitting first set of values) +- Pull Request #46: It is now possible to run `THREE.OBJLoader2` in nodejs 10.5.0+. Thanks to @Cobertos +- Replaced Singletons with pure function/prototype definitions (backport from dev (V3.0.0)). Reason: Counter issues with worker code Blob generation from minified code base (e.g when using webpack) - three.js issue 12942: Align `setPath` and `setResourcePath` meaning and handling ## 2.4.2 diff --git a/package.json b/package.json index 22c644be..90e79a6b 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "wwobjloader2", - "version": "2.5.0-dev", + "version": "2.5.0", "versions": { - "loader_obj2": "2.5.0-dev", - "loader_worker_director": "2.3.0-dev", - "loader_worker_support": "2.3.0-dev", - "loader_mesh_builder": "1.3.0-dev" + "loader_obj2": "2.5.0", + "loader_worker_director": "2.3.0", + "loader_worker_support": "2.3.0", + "loader_mesh_builder": "1.3.0" }, "previous_versions": { "loader_obj2": "2.4.2", diff --git a/src/loaders/OBJLoader2.js b/src/loaders/OBJLoader2.js index 35e8aa21..669bfcd2 100644 --- a/src/loaders/OBJLoader2.js +++ b/src/loaders/OBJLoader2.js @@ -34,7 +34,7 @@ THREE.OBJLoader2 = function ( manager ) { this.terminateWorkerOnLoad = true; }; -THREE.OBJLoader2.OBJLOADER2_VERSION = '2.5.0-dev'; +THREE.OBJLoader2.OBJLOADER2_VERSION = '2.5.0'; THREE.OBJLoader2.prototype = { diff --git a/src/loaders/support/LoaderBuilder.js b/src/loaders/support/LoaderBuilder.js index b229afcd..86df8dd8 100644 --- a/src/loaders/support/LoaderBuilder.js +++ b/src/loaders/support/LoaderBuilder.js @@ -15,7 +15,7 @@ THREE.LoaderSupport.MeshBuilder = function() { this.callbacks = new THREE.LoaderSupport.Callbacks(); this.materials = []; }; -THREE.LoaderSupport.MeshBuilder.LOADER_MESH_BUILDER_VERSION = '1.3.0-dev'; +THREE.LoaderSupport.MeshBuilder.LOADER_MESH_BUILDER_VERSION = '1.3.0'; THREE.LoaderSupport.MeshBuilder.prototype = { diff --git a/src/loaders/support/LoaderWorkerDirector.js b/src/loaders/support/LoaderWorkerDirector.js index ed5f39e2..f3dc7e61 100644 --- a/src/loaders/support/LoaderWorkerDirector.js +++ b/src/loaders/support/LoaderWorkerDirector.js @@ -37,7 +37,7 @@ THREE.LoaderSupport.WorkerDirector = function ( classDef ) { } -THREE.LoaderSupport.WorkerDirector.LOADER_WORKER_DIRECTOR_VERSION = '2.3.0-dev'; +THREE.LoaderSupport.WorkerDirector.LOADER_WORKER_DIRECTOR_VERSION = '2.3.0'; THREE.LoaderSupport.WorkerDirector.MAX_WEB_WORKER = 16; THREE.LoaderSupport.WorkerDirector.MAX_QUEUE_SIZE = 2048; diff --git a/src/loaders/support/LoaderWorkerSupport.js b/src/loaders/support/LoaderWorkerSupport.js index c94553a4..41c360d7 100644 --- a/src/loaders/support/LoaderWorkerSupport.js +++ b/src/loaders/support/LoaderWorkerSupport.js @@ -14,7 +14,7 @@ THREE.LoaderSupport.WorkerSupport = function () { this.loaderWorker = typeof window !== "undefined" ? new THREE.LoaderSupport.WorkerSupport.LoaderWorker() : new THREE.LoaderSupport.WorkerSupport.NodeLoaderWorker(); }; -THREE.LoaderSupport.WorkerSupport.WORKER_SUPPORT_VERSION = '2.3.0-dev'; +THREE.LoaderSupport.WorkerSupport.WORKER_SUPPORT_VERSION = '2.3.0'; THREE.LoaderSupport.WorkerSupport.prototype = { diff --git a/test/meshspray/MeshSpray.js b/test/meshspray/MeshSpray.js index 738d9e76..7202fc87 100644 --- a/test/meshspray/MeshSpray.js +++ b/test/meshspray/MeshSpray.js @@ -178,7 +178,7 @@ MeshSpray.Parser.prototype = { var fixedOffsetY; var fixedOffsetZ; var s, t; - // complete triagle + // complete triangle var sizeVaring = this.sizeFactor * Math.random(); // local coords offset var localOffsetFactor = this.localOffsetFactor;