Skip to content

Commit f76c3e7

Browse files
authored
Merge pull request #1 from jaxrtech/master
Fix runtime errors with upgrade to whs@2.0.0-beta.9.1
2 parents 5ba9251 + 866365b commit f76c3e7

File tree

5 files changed

+6834
-9
lines changed

5 files changed

+6834
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@
136136
"redux-logger": "^3.0.1",
137137
"redux-thunk": "^2.2.0",
138138
"serve-favicon": "^2.3.2",
139-
"whs": "^2.0.0-beta.8"
139+
"whs": "^2.0.0-beta.9.1"
140140
}
141141
}

src/app/containers/Cube/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import * as WHS from 'whs/build/whitestorm';
2+
import * as WHS from 'whs';
33
import * as THREE from 'three';
44

55
import { add, remove } from 'modules/world/';

src/app/containers/Sphere/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const style = require('./style.css');
22

33
import * as React from 'react';
4-
import * as WHS from 'whs/build/whitestorm';
4+
import * as WHS from 'whs';
55
import * as THREE from 'three';
66

77
import { add, remove } from 'modules/world/';

src/app/redux/modules/world/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function remove(): IWorldAction {
4444
}
4545

4646
function newWorld() {
47-
const cameraModule = new WHS.app.CameraModule({
47+
const cameraModule = new WHS.CameraModule({
4848
position: {
4949
z: 30,
5050
y: 40
@@ -53,13 +53,13 @@ function newWorld() {
5353
near: 1
5454
});
5555

56-
const controlsModule = new WHS.controls.OrbitModule();
56+
const controlsModule = new WHS.OrbitControlsModule();
5757

5858
const world = new WHS.App([
59-
new WHS.app.ElementModule(),
60-
new WHS.app.SceneModule(),
59+
new WHS.ElementModule(),
60+
new WHS.SceneModule(),
6161
cameraModule,
62-
new WHS.app.RenderingModule({
62+
new WHS.RenderingModule({
6363
bgColor: 0x2a3340,
6464

6565
renderer: {
@@ -70,7 +70,7 @@ function newWorld() {
7070
}
7171
}),
7272
controlsModule,
73-
new WHS.app.ResizeModule()
73+
new WHS.ResizeModule()
7474
]);
7575

7676
new WHS.AmbientLight({

0 commit comments

Comments
 (0)