Merge pull request #246 from WhitestormJS/#242

#242 Update Three.js to r85

Author: sasha240100

examples/assets/vendor/three.min.js

@@ -29,7 +29,6 @@ const world = new WHS.App([
   new WHS.ResizeModule()
 ]);
 
-
 // world.$camera.lookAt(new THREE.Vector3(0, 0, 0));
 
 // Start rendering.
@@ -48,7 +47,7 @@ new WHS.Box({
   ],
 
   material: new THREE.MeshPhongMaterial({
-    color: 0xffffff,
+    color: 0xffffff
   }),
 
   position: {
@@ -58,14 +57,12 @@ new WHS.Box({
   }
 }).addTo(world);
 
-const egg = new WHS.Model({
-  geometry: {
-    path: `${process.assetsPath}/models/easter/egg_light.json`,
-  },
+const egg = new WHS.Importer({
+  url: `${process.assetsPath}/models/easter/egg_light.json`,
 
   modules: [
     new PHYSICS.ConvexModule({
-      path: `${process.assetsPath}/models/easter/egg_low.json`,
+      path: `${process.assetsPath}/models/easter/egg_low.json`
     }),
     new WHS.TextureModule({
       url: `${process.assetsPath}/textures/easter/egg1.jpg`
@@ -90,10 +87,8 @@ const egg = new WHS.Model({
   }
 });
 
-const rabbit = new WHS.Model({
-  geometry: {
-    path: `${process.assetsPath}/models/easter/rabbit.json`
-  },
+const rabbit = new WHS.Importer({
+  url: `${process.assetsPath}/models/easter/rabbit.json`,
 
   modules: [
     new PHYSICS.ConcaveModule({
@@ -102,11 +97,6 @@ const rabbit = new WHS.Model({
     })
   ],
 
-  material: new THREE.MeshLambertMaterial({
-    side: THREE.DoubleSide,
-    shading: THREE.SmoothShading
-  }),
-
   position: {
     y: 5,
     x: -3
@@ -119,7 +109,7 @@ const rabbit = new WHS.Model({
   scale: [0.5, 0.5, 0.5]
 });
 
-rabbit.addTo(world, 'wait');
+rabbit.addTo(world);
 
 new WHS.SpotLight({
   light: {

examples/design/easter/script.js

@@ -8,6 +8,7 @@
     "version": "gulp build --prod && git add .",
     "test": "xo ./src/**/*.js && jest",
     "start": "webpack-dashboard -t WhitestormJS -- gulp dev",
+    "start:physics": "webpack-dashboard -t WhitestormJS -- gulp dev --devPhysics 8001",
     "build": "gulp build & gulp examples:build",
     "deploy": "surge --project ./ --domain whs-dev.surge.sh"
   },

package.json

@@ -1,6 +1,5 @@
 import {
   Mesh,
-  MultiMaterial,
   JSONLoader
 } from 'three';
 
@@ -21,7 +20,7 @@ class Importer extends MeshComponent {
     useCustomMaterial: false,
 
     parser(geometry, materials) {
-      return new Mesh(geometry, new MultiMaterial(materials));
+      return new Mesh(geometry, materials);
     }
   };
 

src/components/meshes/Importer.js

@@ -89,20 +89,21 @@ class MeshComponent extends Component {
 
   wrap() {
     return new Promise(resolve => {
-      this.defer(() => {
-        const {position, rotation, scale, shadow} = this.params;
+      // TODO: Fix defer with physics
+      // this.defer(() => {
+      const {position, rotation, scale, shadow} = this.params;
 
-        this.position.set(position.x, position.y, position.z);
-        this.rotation.set(rotation.x, rotation.y, rotation.z);
-        this.scale.set(scale.x, scale.y, scale.z);
+      this.position.set(position.x, position.y, position.z);
+      this.rotation.set(rotation.x, rotation.y, rotation.z);
+      this.scale.set(scale.x, scale.y, scale.z);
 
-        this.native.castShadow = shadow.cast;
-        this.native.receiveShadow = shadow.receive;
+      this.native.castShadow = shadow.cast;
+      this.native.receiveShadow = shadow.receive;
 
-        this.applyBridge({onWrap: 1});
+      this.applyBridge({onWrap: 1});
 
-        resolve(this);
-      });
+      resolve(this);
+      // });
     });
   }
 

src/core/MeshComponent.js

@@ -0,0 +1,14 @@
+import {Importer} from './components/meshes/Importer';
+
+export class Model extends Importer {
+  constructor(params, ...additional) {
+    console.warn('Model is deprecated. Use Importer instead.');
+
+    if (params.geometry) {
+      params.url = params.geometry.path;
+      params.loader = params.geometry.loader;
+    }
+
+    super(params, ...additional);
+  }
+}

src/deprecation.js

@@ -11,7 +11,7 @@ const loader = new TextureLoader();
 
 export class TextureModule {
   static load(url) {
-    return new TextureModule({url}).texture;
+    return new TextureModule({url}).textures[0][1];
   }
 
   textures = [];