diff --git a/.gitignore b/.gitignore
index 2f94b93..dde891f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
node_modules
package-lock.json
+.cache
\ No newline at end of file
diff --git a/package.json b/package.json
deleted file mode 100644
index 400da33..0000000
--- a/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "cabin_server",
- "version": "1.0.0",
- "description": "",
- "main": "server.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1",
- "start": "node server.js"
- },
- "repository": {
- "type": "git",
- "url": "git+ssh://git@gitlab.com/totallyRonja/cabingame.git"
- },
- "author": "",
- "license": "ISC",
- "bugs": {
- "url": "https://gitlab.com/totallyRonja/cabingame/issues"
- },
- "homepage": "https://gitlab.com/totallyRonja/cabingame#readme",
- "dependencies": {
- "express": "^4.17.1"
- }
-}
diff --git a/server.js b/server.js
deleted file mode 100644
index afd2bed..0000000
--- a/server.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const express = require('express');
-var path = require("path");
-const app = express();
-
-express.static.mime.define({'application/javascript': ['js']});
-
-app.use(express.static('src'))
-
-app.listen(8080, () => console.log('Listening on port 8080!'));
diff --git a/src/assets/Background.png b/src/assets/Background.png
index 5709f13..6b6d494 100644
Binary files a/src/assets/Background.png and b/src/assets/Background.png differ
diff --git a/src/src/demo.js b/src/game.ts
similarity index 78%
rename from src/src/demo.js
rename to src/game.ts
index 2fb531e..7746f2e 100644
--- a/src/src/demo.js
+++ b/src/game.ts
@@ -1,3 +1,7 @@
+import * as PIXI from "pixi.js"
+import * as ECSY from "ecsy"
+import { Entity } from "ecsy";
+
const NUM_ELEMENTS = 60;
const SPEED_MULTIPLIER = 1;
const SHAPE_SIZE = 10;
@@ -24,7 +28,7 @@ window.addEventListener( 'resize', recalculateSize, false );
function recalculateSize(){
let multiplier = Math.min(0, 0);
- app.view.style.width = canvasWidth * "px";
+ app.view.style.width = canvasWidth + "px";
app.view.style.height = "720px";
}
@@ -37,23 +41,20 @@ app.stage.addChild(bgTex);
// Velocity component
class Velocity {
- constructor() {
- this.x = this.y = 0;
- }
+ x = 0;
+ y = 0;
}
// Position component
class Position {
- constructor() {
- this.x = this.y = 0;
- }
+ x = 0;
+ y = 0;
}
// Shape component
class Shape {
- constructor() {
- this.shape = null;
- }
+ onStage = false
+ shape: PIXI.Graphics
}
// Renderable component
@@ -66,9 +67,9 @@ class Renderable extends ECSY.TagComponent {}
// MovableSystem
class MovableSystem extends ECSY.System {
// This method will get called on every frame by default
- execute(delta) {
+ execute(delta : number) {
// Iterate through all the entities on the query
- this.queries.moving.results.forEach(entity => {
+ MovableSystem.queries.moving.results.forEach((entity: Entity) => {
var velocity = entity.getComponent(Velocity);
var position = entity.getMutableComponent(Position);
position.x += velocity.x * delta;
@@ -80,22 +81,23 @@ class MovableSystem extends ECSY.System {
if (position.y < - SHAPE_HALF_SIZE) position.y = canvasHeight + SHAPE_HALF_SIZE;
});
}
-}
-// Define a query of entities that have "Velocity" and "Position" components
-MovableSystem.queries = {
- moving: {
- components: [Velocity, Position]
+ static queries = {
+ moving: {
+ components: [Velocity, Position],
+ results: []
+ }
}
}
+
// RendererSystem
class RendererSystem extends ECSY.System {
// This method will get called on every frame by default
- execute(delta) {
+ execute(delta : number) {
// Iterate through all the entities on the query
- this.queries.renderables.results.forEach(entity => {
+ RendererSystem.queries.renderables.results.forEach((entity: Entity) => {
var shape = entity.getComponent(Shape);
var position = entity.getComponent(Position);
this.drawShape(position, shape);
@@ -104,7 +106,7 @@ class RendererSystem extends ECSY.System {
//app.renderer.render(app.stage);
}
- drawShape(position, shape) {
+ drawShape(position : Position, shape : Shape) {
if(!shape.onStage){
app.stage.addChild(shape.shape);
shape.onStage = true;
@@ -113,12 +115,15 @@ class RendererSystem extends ECSY.System {
shape.shape.x = position.x;
shape.shape.y = position.y;
}
+
+ static queries = {
+ renderables: {
+ components: [Renderable, Shape],
+ results: []
+ }
+ }
}
-// Define a query of entities that have "Renderable" and "Shape" components
-RendererSystem.queries = {
- renderables: { components: [Renderable, Shape] }
-}
// Create world and register the systems on it
var world = new ECSY.World();
@@ -167,9 +172,11 @@ for (let i = 0; i < NUM_ELEMENTS; i++) {
.addComponent(Position, getRandomPosition())
.addComponent(Renderable)
}
-
+
+let time = 0
// Run!
-app.ticker.add((delta) => {
+PIXI.Ticker.shared.add((delta : number) => {
+ time += delta;
// Run all the systems
- world.execute(delta);
+ world.execute(delta, time);
});
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index ccd432e..a77ae77 100644
--- a/src/index.html
+++ b/src/index.html
@@ -18,11 +18,9 @@
image-rendering: crisp-edges;
}
-
-
-
-
+
+
-
+