Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit 1b22f00

Browse files
kenwheelerkenwheeler
committed
updating for 16
1 parent a4434c5 commit 1b22f00

File tree

10 files changed

+237
-199
lines changed

10 files changed

+237
-199
lines changed

‎demo/game/character.js‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { observer } from 'mobx-react';
34
import Matter from 'matter-js';
45

5-
import {
6-
AudioPlayer,
7-
Body,
8-
Sprite,
9-
} from '../../src';
6+
import { AudioPlayer, Body, Sprite } from '../../src';
107

118
@observer
129
export default class Character extends Component {
13-
1410
static propTypes = {
1511
keys: PropTypes.object,
1612
onEnterBuilding: PropTypes.func,
@@ -22,7 +18,7 @@ export default class Character extends Component {
2218
scale: PropTypes.number,
2319
};
2420

25-
handlePlayStateChanged = (state) => {
21+
handlePlayStateChanged = state => {
2622
this.setState({
2723
spritePlaying: state ? true : false,
2824
});
@@ -32,14 +28,10 @@ export default class Character extends Component {
3228
Matter.Body.setVelocity(body, { x, y: 0 });
3329
};
3430

35-
jump = (body) => {
31+
jump = body => {
3632
this.jumpNoise.play();
3733
this.isJumping = true;
38-
Matter.Body.applyForce(
39-
body,
40-
{ x: 0, y: 0 },
41-
{ x: 0, y: -0.15 },
42-
);
34+
Matter.Body.applyForce(body, { x: 0, y: 0 }, { x: 0, y: -0.15 });
4335
Matter.Body.set(body, 'friction', 0.0001);
4436
};
4537

@@ -49,13 +41,13 @@ export default class Character extends Component {
4941
characterState: 4,
5042
repeat: false,
5143
});
52-
}
44+
};
5345

54-
getDoorIndex = (body) => {
46+
getDoorIndex = body => {
5547
let doorIndex = null;
5648

57-
const doorPositions = [...Array(6).keys()].map((a) => {
58-
return [(512 * a) + 208, (512 * a) + 272];
49+
const doorPositions = [...Array(6).keys()].map(a => {
50+
return [512 * a + 208, 512 * a + 272];
5951
});
6052

6153
doorPositions.forEach((dp, di) => {
@@ -65,9 +57,9 @@ export default class Character extends Component {
6557
});
6658

6759
return doorIndex;
68-
}
60+
};
6961

70-
enterBuilding = (body) => {
62+
enterBuilding = body => {
7163
const doorIndex = this.getDoorIndex(body);
7264

7365
if (doorIndex !== null) {
@@ -117,7 +109,7 @@ export default class Character extends Component {
117109
characterState,
118110
repeat: characterState < 2,
119111
});
120-
}
112+
};
121113

122114
update = () => {
123115
const { store } = this.props;
@@ -126,7 +118,8 @@ export default class Character extends Component {
126118
const midPoint = Math.abs(store.stageX) + 448;
127119

128120
const shouldMoveStageLeft = body.position.x < midPoint && store.stageX < 0;
129-
const shouldMoveStageRight = body.position.x > midPoint && store.stageX > -2048;
121+
const shouldMoveStageRight =
122+
body.position.x > midPoint && store.stageX > -2048;
130123

131124
const velY = parseFloat(body.velocity.y.toFixed(10));
132125

@@ -199,7 +192,9 @@ export default class Character extends Component {
199192
<Body
200193
args={[x, 384, 64, 64]}
201194
inertia={Infinity}
202-
ref={(b) => { this.body = b; }}
195+
ref={b => {
196+
this.body = b;
197+
}}
203198
>
204199
<Sprite
205200
repeat={this.state.repeat}

‎demo/game/fade.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23

3-
const Fade = (props) => (
4-
<div
5-
className={`fade ${props.visible && 'active'}`}
6-
/>
7-
);
4+
const Fade = props => <div className={`fade ${props.visible && 'active'}`} />;
85

96
Fade.propTypes = {
107
visible: PropTypes.bool,

‎demo/game/index.js‎

Lines changed: 38 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import Matter from 'matter-js';
34

4-
import {
5-
AudioPlayer,
6-
Loop,
7-
Stage,
8-
KeyListener,
9-
World,
10-
} from '../../src';
5+
import { AudioPlayer, Loop, Stage, KeyListener, World } from '../../src';
116

127
import Character from './character';
138
import Level from './level';
@@ -19,68 +14,54 @@ const KEY_D = 68;
1914
const KEY_A = 65;
2015

2116
export default class Game extends Component {
22-
2317
static propTypes = {
2418
onLeave: PropTypes.func,
2519
};
2620

27-
physicsInit = (engine) => {
28-
const ground = Matter.Bodies.rectangle(
29-
512 * 3, 448,
30-
1024 * 3, 64,
31-
{
32-
isStatic: true,
33-
},
34-
);
21+
physicsInit = engine => {
22+
const ground = Matter.Bodies.rectangle(512 * 3, 448, 1024 * 3, 64, {
23+
isStatic: true,
24+
});
3525

36-
const leftWall = Matter.Bodies.rectangle(
37-
-64, 288,
38-
64, 576,
39-
{
40-
isStatic: true,
41-
},
42-
);
26+
const leftWall = Matter.Bodies.rectangle(-64, 288, 64, 576, {
27+
isStatic: true,
28+
});
4329

44-
const rightWall = Matter.Bodies.rectangle(
45-
3008, 288,
46-
64, 576,
47-
{
48-
isStatic: true,
49-
},
50-
);
30+
const rightWall = Matter.Bodies.rectangle(3008, 288, 64, 576, {
31+
isStatic: true,
32+
});
5133

5234
Matter.World.addBody(engine.world, ground);
5335
Matter.World.addBody(engine.world, leftWall);
5436
Matter.World.addBody(engine.world, rightWall);
5537

5638
Matter.Events.on(engine, 'afterUpdate', this.update);
5739

58-
const unsubscribeFromUpdate = () => {
40+
this.unsubscribeFromUpdate = () => {
5941
Matter.Events.off(engine, 'afterUpdate', this.update);
60-
}
61-
}
42+
};
43+
};
6244

63-
handleEnterBuilding = (index) => {
45+
handleEnterBuilding = index => {
6446
this.setState({
6547
fade: true,
6648
});
6749
setTimeout(() => {
6850
this.props.onLeave(index);
6951
}, 500);
70-
}
52+
};
7153

7254
update = () => {
73-
7455
// On first press of "d", enable debug mode
7556
if (this.keyListener.isDown(KEY_D)) {
7657
if (!this.previousDown) {
7758
this.previousDown = true;
78-
this.setState({debug: !this.state.debug});
59+
this.setState({ debug: !this.state.debug });
7960
}
8061
} else {
8162
this.previousDown = false;
8263
}
83-
}
64+
};
8465

8566
constructor(props) {
8667
super(props);
@@ -97,14 +78,18 @@ export default class Game extends Component {
9778

9879
componentDidMount() {
9980
this.player = new AudioPlayer('/assets/music.wav', () => {
100-
this.stopMusic = this.player.play({ loop: true, offset: 1, volume: 0.35 });
81+
this.stopMusic = this.player.play({
82+
loop: true,
83+
offset: 1,
84+
volume: 0.35,
85+
});
10186
});
10287

10388
this.setState({
10489
fade: false,
10590
});
10691

107-
this.stageXUIUnsubscribe = GameStore.onStageXChange((stageX) => {
92+
this.stageXUIUnsubscribe = GameStore.onStageXChange(stageX => {
10893
this.forceUpdate();
10994
});
11095

@@ -131,17 +116,19 @@ export default class Game extends Component {
131116
<Stage style={{ background: '#3a9bdc' }}>
132117
<World
133118
onInit={this.physicsInit}
134-
debug={this.state.debug && {
135-
offset: {
136-
x: -GameStore.stageX,
137-
y: 0,
138-
},
139-
background: 'rgba(0, 0, 0, 0.5)',
140-
}}
119+
debug={
120+
this.state.debug ? (
121+
{
122+
offset: {
123+
x: -GameStore.stageX,
124+
y: 0,
125+
},
126+
background: 'rgba(0, 0, 0, 0.5)',
127+
}
128+
) : null
129+
}
141130
>
142-
<Level
143-
store={GameStore}
144-
/>
131+
<Level store={GameStore} />
145132
<Character
146133
onEnterBuilding={this.handleEnterBuilding}
147134
store={GameStore}
@@ -153,5 +140,4 @@ export default class Game extends Component {
153140
</Loop>
154141
);
155142
}
156-
157143
}

0 commit comments

Comments
 (0)