Skip to content

Commit

Permalink
Merge pull request #1 from RomanValihura/stoikov
Browse files Browse the repository at this point in the history
Stoikov
  • Loading branch information
olecksamdr authored Mar 30, 2017
2 parents b675938 + 1932226 commit c61cd10
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 13 deletions.
37 changes: 25 additions & 12 deletions example/demo.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
"use strict";

var game = new JSGameEngine({
import {JSGameEngine} from "./lib/Class/JSGameEngine";
import {Sprite} from "./lib/GameObjects/Sprite.js";
import {Vector2} from "./lib/Components/Vector2.js";
import {ParticleSystem} from "./lib/GameObjects/ParticleSystem.js";
import {Text} from "./lib/GameObjects/Text.js";
import {Color} from "./lib/Components/Color.js";
import {Transform} from "./lib/Components/Transform.js";
import {Input} from "./lib/Components/Input.js";
import {Time} from "./lib/Util/Time.js";



const game = new JSGameEngine({
canvas: document.getElementById("screen")
});

var sprite = game.addComponent(new Sprite({
const sprite = game.addComponent(new Sprite({
image: "assets/sprite.png",
size: new Vector2({
x: 100,
Expand All @@ -13,14 +25,14 @@ var sprite = game.addComponent(new Sprite({
visible: false
}));

var particles = game.addComponent(new ParticleSystem());
const particles = game.addComponent(new ParticleSystem());
particles.transform.position.x = (game.width / 2) - particles.width / 2;
particles.transform.position.y = (game.height / 2) - particles.height / 2;

sprite.transform.position.y = game.height - sprite.height;
sprite.visible = true;

var fps = game.addComponent(new Text({
const fps = game.addComponent(new Text({
size: 40,
text: "0 fps",
color: new Color().yellow()
Expand All @@ -33,10 +45,11 @@ fps.transform.position.x = 10;
sprite.target = new Transform(sprite.transform);
sprite.addComponent(new Input(), "input"); //add input handler


//handle multiple inputs
sprite.components.input.onUpdate = function(JSGameEngine){
var speed = 5;
for(var key in this.keys){
sprite.components.input.onUpdate = (JSGameEngine) => {
const speed = 5;
for(let key in this.keys){
key = parseInt(key);
if(this.keys[key]){
switch(key){
Expand All @@ -58,11 +71,11 @@ sprite.components.input.onUpdate = function(JSGameEngine){
break;
}
}
}
}
}

//apply movement
sprite.onUpdate = function(){
sprite.onUpdate = () => {
if(Time.frameCount % 4 == 0){
this.index++;
}
Expand All @@ -81,6 +94,6 @@ sprite.onUpdate = function(){
this.transform.position = this.transform.position.add(this.transform.position.lerp(this.transform.position, this.target.position, Time.deltaTime));
}

fps.onUpdate = function(){
this.text = Time.fps + " fps";
}
fps.onUpdate = () => {
this.text = `${Time.fps} fps`;
}
2 changes: 1 addition & 1 deletion src/lib/Util/GUIWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
*/


module.exports = {};
module.exports default {};

0 comments on commit c61cd10

Please sign in to comment.