Use DefineModule instead of CameraModule

Former-commit-id: b7c066e
hllhx · Jun 22, 2017 · b3397ca · b3397ca
1 parent 8b85613
commit b3397ca
Show file tree

Hide file tree

Showing 30 changed files with 58 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ You can find lots of examples at [showcases](https://whs-dev.surge.sh/examples/)
     const app = new WHS.App([
       new WHS.ElementModule(), // attach to DOM
       new WHS.SceneModule(), // creates THREE.Scene instance
-      new WHS.CameraModule(), // creates PerspectiveCamera instance
+      new WHS.DefineModule('camera', new WHS.PerspectiveCamera()), // creates PerspectiveCamera instance
       new WHS.RenderingModule() // creates WebGLRenderer instance
     ]);
 
@@ -185,9 +185,9 @@ Try on [**Codepen**](http://codepen.io/sasha240100/pen/JELBGX):
 const app = new WHS.App([
   new WHS.ElementModule(), // attach to DOM
   new WHS.SceneModule(), // creates THREE.Scene instance
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 0, -10)
-  }), // creates PerspectiveCamera instance
+  })), // creates PerspectiveCamera instance
   new WHS.RenderingModule(), // creates WebGLRenderer instance
   new WHS.OrbitControlsModule() // orbit controls
 ]);
@@ -234,11 +234,11 @@ export class Application extends Component {
     return (
       <App modules={[
         new WHS.SceneModule(),
-        new WHS.CameraModule({
+        new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
           position: {
             z: 20
           }
-        }),
+        })),
         new WHS.RenderingModule(),
         new WHS.OrbitControlsModule()
       ]}>

diff --git a/docs/data/Hello World!.md b/docs/data/Hello World!.md
@@ -22,9 +22,9 @@ const app = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
 
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 0, 50)
-  }),
+  })),
 
   new WHS.RenderingModule({bgColor: 0x162129}),
   new WHS.ResizeModule()

diff --git a/docs/data/Welcome.md b/docs/data/Welcome.md
@@ -17,9 +17,9 @@ const app = new WHS.App([
   new WHS.ElementModule(), // Apply to DOM.
   new WHS.SceneModule(), // Create a new THREE.Scene and set it to app.
 
-  new WHS.CameraModule({ // Apply a camera.
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({ // Apply a camera.
     position: new Vector3(0, 0, 50)
-  }),
+  })),
 
   new WHS.RenderingModule({bgColor: 0x162129}), // Apply THREE.WebGLRenderer
   new WHS.ResizeModule() // Make it resizable.

diff --git a/examples/VRKit/basic/script.js b/examples/VRKit/basic/script.js
@@ -5,7 +5,7 @@ const postprocessor = new WHS.PostProcessorModule();
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule(UTILS.appDefaults.camera),
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera(UTILS.appDefaults.camera)),
   new WHS.RenderingModule(UTILS.appDefaults.rendering, {
     shadow: true
   }),

diff --git a/examples/VRKit/controls/script.js b/examples/VRKit/controls/script.js
@@ -5,7 +5,7 @@ const postprocessor = new WHS.PostProcessorModule();
 const app = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule(UTILS.appDefaults.camera),
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera(UTILS.appDefaults.camera)),
   new WHS.RenderingModule(UTILS.appDefaults.rendering, {
     shadow: true
   }),

diff --git a/examples/VRKit/post-processing/script.js b/examples/VRKit/post-processing/script.js
@@ -5,7 +5,7 @@ const postprocessor = new WHS.PostProcessorModule();
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule(UTILS.appDefaults.camera),
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera(UTILS.appDefaults.camera)),
   new WHS.RenderingModule(UTILS.appDefaults.rendering, {
     shadow: true
   }),

diff --git a/examples/basic/embeded/script.js b/examples/basic/embeded/script.js
@@ -8,9 +8,9 @@ const world = new WHS.App([
     container: document.getElementById('embed')
   }),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 10, 50)
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/basic/fogexp/script.js b/examples/basic/fogexp/script.js
@@ -1,14 +1,14 @@
 import * as UTILS from '../../globals';
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: -30,
     y: 20,
     x: -20
   },
   far: 20000,
   near: 1
-});
+}));
 
 const controlsModule = new WHS.OrbitControlsModule();
 const fogModule = new WHS.FogModule({color: 0xaaaaaa, near: 10, far: 200});

diff --git a/examples/basic/helloworld/script.js b/examples/basic/helloworld/script.js
@@ -3,7 +3,7 @@ import * as UTILS from '../../globals';
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule(UTILS.appDefaults.camera),
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera(UTILS.appDefaults.camera),
   new WHS.RenderingModule(UTILS.appDefaults.rendering, {
     shadow: true
   }),

diff --git a/examples/basic/mouse/script.js b/examples/basic/mouse/script.js
@@ -5,9 +5,9 @@ const mouse = new WHS.VirtualMouseModule();
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 10, 50)
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/basic/threejs/script.js b/examples/basic/threejs/script.js
@@ -35,9 +35,9 @@ mesh2.add(mesh3);
 world.setScene(scene);
 
 world
-  .module(new WHS.CameraModule({
+  .module(new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 2, 12)
-  }))
+  })))
   .module(new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/design/easter/script.js b/examples/design/easter/script.js
@@ -11,11 +11,11 @@ const app = new WHS.App([
       z: 0
     },
   }),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(-8, 5, 20),
     fov: 45,
     far: 2000
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0xffffff,
 

diff --git a/examples/design/points/script.js b/examples/design/points/script.js
@@ -1,12 +1,12 @@
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(-8, 5, 20),
     far: 2000,
     near: 1,
     fov: 45
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0xffffff,
 

diff --git a/examples/design/saturn/script.js b/examples/design/saturn/script.js
@@ -15,11 +15,11 @@ const colors = {
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 100, 400),
     far: 2000,
     near: 1
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x2a3340,
 

diff --git a/examples/fps/shooter/script.js b/examples/fps/shooter/script.js
@@ -24,9 +24,9 @@ const sphere = new WHS.Sphere({ // Create sphere comonent.
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 10, 50)
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/lights/ambient/script.js b/examples/lights/ambient/script.js
@@ -1,14 +1,14 @@
 import * as UTILS from '../../globals';
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: -30,
     y: 20,
     x: -20
   },
   far: 20000,
   near: 1
-});
+}));
 
 const controlsModule = new WHS.OrbitControlsModule();
 

diff --git a/examples/lights/area/script.js b/examples/lights/area/script.js
@@ -3,14 +3,14 @@ import * as UTILS from '../../globals';
 const ad = UTILS.appDefaults;
 
 const controlsModule = new WHS.OrbitControlsModule();
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: 500,
     y: 400
   },
   far: 30000,
   near: 10
-});
+}));
 
 const world = new WHS.App([
   ...UTILS.appModules({

diff --git a/examples/lights/directional/script.js b/examples/lights/directional/script.js
@@ -1,13 +1,13 @@
 import * as UTILS from '../../globals';
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: 50,
     y: 60
   },
   far: 20000,
   near: 1
-});
+}));
 
 const controlsModule = new WHS.OrbitControlsModule();
 

diff --git a/examples/lights/hemisphere/script.js b/examples/lights/hemisphere/script.js
@@ -1,14 +1,14 @@
 import * as UTILS from '../../globals';
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: -30,
     y: 20,
     x: -40
   },
   far: 5000,
   near: 1
-});
+}));
 
 const controlsModule = new WHS.OrbitControlsModule();
 

diff --git a/examples/lights/point/script.js b/examples/lights/point/script.js
@@ -5,14 +5,14 @@ const blue = 0x6666ff;
 const white = 0xffffff;
 const lightIntensity = 1;
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: 30,
     y: 40
   },
   far: 20000,
   near: 1
-});
+}));
 
 const controlsModule = new WHS.OrbitControlsModule();
 

diff --git a/examples/lights/spot/script.js b/examples/lights/spot/script.js
@@ -4,15 +4,15 @@ const white = 0xffffff;
 const lightIntensity = 1;
 const lightDistance = 80;
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: -30,
     y: 20,
     x: -20
   },
   far: 20000,
   near: 1
-});
+}));
 
 const controlsModule = new WHS.OrbitControlsModule();
 

diff --git a/examples/performance/softbodies/script.js b/examples/performance/softbodies/script.js
@@ -3,10 +3,10 @@ import * as UTILS from '../../globals';
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 6, 18),
     far: 10000
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/softbody/cloth/script.js b/examples/softbody/cloth/script.js
@@ -3,10 +3,10 @@ import * as UTILS from '../../globals';
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 60, 120),
     far: 10000
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/softbody/cloth2/script.js b/examples/softbody/cloth2/script.js
@@ -3,10 +3,10 @@ import * as UTILS from '../../globals';
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 60, 120),
     far: 10000
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/softbody/cloth3/script.js b/examples/softbody/cloth3/script.js
@@ -5,10 +5,10 @@ const mouse = new WHS.VirtualMouseModule();
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 60, 120),
     far: 10000
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/softbody/ropes/script.js b/examples/softbody/ropes/script.js
@@ -3,10 +3,10 @@ const mouse = new WHS.VirtualMouseModule();
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 15, 60),
     far: 10000
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/softbody/sphere/script.js b/examples/softbody/sphere/script.js
@@ -3,9 +3,9 @@ import * as UTILS from '../../globals';
 const world = new WHS.App([
   new WHS.ElementModule(),
   new WHS.SceneModule(),
-  new WHS.CameraModule({
+  new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
     position: new THREE.Vector3(0, 10, 50)
-  }),
+  })),
   new WHS.RenderingModule({
     bgColor: 0x162129,
 

diff --git a/examples/whs-module-audio/positional/script.js b/examples/whs-module-audio/positional/script.js
@@ -2,15 +2,15 @@ import * as UTILS from '../../globals';
 
 const controlsModule = new WHS.OrbitControlsModule();
 
-const cameraModule = new WHS.CameraModule({
+const cameraModule = new WHS.DefineModule('camera', new WHS.PerspectiveCamera({
   position: {
     z: 250,
     y: 100
   },
 
   far: 30000,
   near: 1
-});
+}));
 
 const world = new WHS.App([
   ...UTILS.appModules({