Merge pull request #10 from martinRenou/update_three

Upgrade to last Threejs version

Author: martinRenou

Diff for: .travis.yml

@@ -1,12 +1,19 @@
-language: node_js
-node_js:
-  - 12
+language: generic
 os:
  - linux
  - osx
-addons:
- chrome: beta
-script:
+before_install:
+  - if [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get update; fi
+  - if [[ $TRAVIS_OS_NAME == linux ]]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
+  - if [[ $TRAVIS_OS_NAME == osx ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  - conda info -a
+  - conda create -q -n test-environment nodejs
+  - source activate test-environment
+install:
   - npm install
   - npm run build
-

Diff for: package-lock.json

@@ -31,11 +31,11 @@
     "backbone": "^1.4.0",
     "binary-search-tree": "^0.2.6",
     "jquery": "^3.4.1",
-    "three": "^0.110.0",
+    "three": "^0.112.0",
     "uuid": "^3.3.3"
   },
   "devDependencies": {
-    "@types/node": "^10.11.6",
+    "@types/node": "^10.17.13",
     "typescript": "~3.1.2"
   }
 }

Diff for: package.json

@@ -80,9 +80,6 @@ class NodeMesh {
 
     this.hasIndex = this.geometry.index != null;
 
-    // @ts-ignore: Monkey patching material, workaround for github.com/mrdoob/three.js/issues/12132
-    this.material.version = 0;
-
     this.mesh = new T(geometry, this.material);
 
     // We need to set this to false because we directly play with the position matrix
@@ -140,11 +137,8 @@ class NodeMesh {
     this.material.flatShading = true;
     this.material.side = THREE.DoubleSide;
 
-    // @ts-ignore
     this.material.position = position;
-    // @ts-ignore
     this.material.alpha = alpha;
-    // @ts-ignore
     this.material.color = color;
 
     // Workaround for https://github.com/mrdoob/three.js/issues/18152
@@ -156,9 +150,6 @@ class NodeMesh {
     this.material.alphaTest = 0.1;
 
     this.material.build();
-
-    // @ts-ignore
-    this.material.version++;
   }
 
   copy () {
@@ -237,7 +228,7 @@ class NodeMesh {
       const vertex = this.geometry.getAttribute('position').array;
 
       let indices: ArrayLike<number>;
-      if (this.hasIndex) {
+      if (this.hasIndex && this.geometry.index !== null) {
         indices = this.geometry.index.array;
       } else {
         indices = Array.from(Array(vertex.length / 3).keys());
@@ -284,7 +275,7 @@ class NodeMesh {
         newIndices[3 * i + 2] = indices[3 * triangleIndex + 2]
       }
 
-      if (this.hasIndex) {
+      if (this.hasIndex && this.geometry.index !== null) {
         this.geometry.index.set(newIndices);
         this.geometry.index.needsUpdate = true;
       } else {
@@ -300,7 +291,7 @@ class NodeMesh {
   }
 
   geometry: THREE.BufferGeometry;
-  material: Nodes.NodeMaterial;
+  material: Nodes.StandardNodeMaterial;
   mesh: THREE.Object3D;
   readonly data: Data[];
 

Diff for: src/NodeMesh.ts

@@ -1,5 +1,4 @@
 import * as THREE from 'three';
-import * as Nodes from 'three/examples/jsm/nodes/Nodes';
 
 import {
   TrackballControls
@@ -170,21 +169,6 @@ class Renderer {
   private animate () {
     this.animationID = window.requestAnimationFrame(this.animate.bind(this));
 
-    // This is a workaround for github.com/mrdoob/three.js/issues/12132
-    for (const child of this.scene.scene.children) {
-      if (child instanceof THREE.Mesh && child.material instanceof Nodes.StandardNodeMaterial) {
-        const id = child.material.uuid;
-        // @ts-ignore
-        const version = child.material.version
-
-        if (id in this.materialVersions && this.materialVersions[id] != version) {
-          child.material.needsUpdate = true;
-        }
-
-        this.materialVersions[id] = version;
-      }
-    }
-
     this.renderer.render(this.scene.scene, this.camera);
 
     this.controls.update();