Skip to content

Commit

Permalink
Prepare 2.5.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisalmen committed Oct 15, 2018
1 parent 0c40574 commit 1e18cf4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/loaders/OBJLoader2.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {

Expand Down
2 changes: 1 addition & 1 deletion src/loaders/support/LoaderBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {

Expand Down
2 changes: 1 addition & 1 deletion src/loaders/support/LoaderWorkerDirector.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/loaders/support/LoaderWorkerSupport.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {

Expand Down
2 changes: 1 addition & 1 deletion test/meshspray/MeshSpray.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1e18cf4

Please sign in to comment.