Use new lib components

[rbdr/sumo] / lib / sumo.js

diff --git a/lib/sumo.js b/lib/sumo.js
index 2b6f085bce02b488a70a4236a1cb4d1825656ea9..f353fe08432e38ded2da4c63a2038267effcd55e 100644 (file)
--- a/lib/sumo.js
+++ b/lib/sumo.js
@@ -1,14 +1,24 @@
 import 'babel-polyfill';
 
 import 'babel-polyfill';
 

+import Config from './config';
+

 // Systems
 // Systems

+

 import ApplyForceSystem from './systems/apply_force';
 import CreateCouplingLineSystem from './systems/create_coupling_line';
 import ControlMapperSystem from './systems/control_mapper';
 import DashSystem from './systems/dash';
 import ApplyForceSystem from './systems/apply_force';
 import CreateCouplingLineSystem from './systems/create_coupling_line';
 import ControlMapperSystem from './systems/control_mapper';
 import DashSystem from './systems/dash';

+import DetectPointsCollisionSystem from './systems/detect_points_collision';
+import DetectWinnerSystem from './systems/detect_winner';
+import DrawDashSystem from './systems/draw_dash';
+import DrawGrabSystem from './systems/draw_grab';

 import ElasticSystem from './systems/elastic';
 import ElasticSystem from './systems/elastic';

+import GrabSystem from './systems/grab';

 import PhysicsWorldControlSystem from './systems/physics_world_control';
 import PhysicsToAttributesSystem from './systems/physics_to_attributes';
 import PhysicsWorldControlSystem from './systems/physics_world_control';
 import PhysicsToAttributesSystem from './systems/physics_to_attributes';

+import RenderPointsSystem from './systems/render_points';

 import RenderSystem from './systems/render';
 import RenderSystem from './systems/render';

+import RenderWinnerSystem from './systems/render_winner';

 import AttributesToRenderableSystem from './systems/attributes_to_renderable';
 
 // Factories
 import AttributesToRenderableSystem from './systems/attributes_to_renderable';
 
 // Factories


@@ -21,8 +31,6 @@ import Serpentity from '@serpentity/serpentity';
 import { Application } from 'pixi.js';
 import { Engine } from 'matter-js';
 
 import { Application } from 'pixi.js';
 import { Engine } from 'matter-js';
 

-/* global window document */
-

 const internals = {
   kBackgroundColor: 0xd8c590,
   kNoElementError: 'No element found. Cannot render.',
 const internals = {
   kBackgroundColor: 0xd8c590,
   kNoElementError: 'No element found. Cannot render.',


@@ -31,13 +39,13 @@ const internals = {
 
   onLoad() {
 
 
   onLoad() {
 

-    const sumo = new internals.Sumo({
+    const sumo = new internals.Sumo(Object.assign({

       element: document.getElementById('sumo-app-entry-point')
       element: document.getElementById('sumo-app-entry-point')

-    });
+    }, Config));

 
     sumo.startLoop();
 
 
     sumo.startLoop();
 

-    internals.exports.sumo = sumo;
+    window.sumo = sumo;

   }
 };
 
   }
 };
 


@@ -61,6 +69,7 @@ internals.Sumo = class Sumo {
 
   constructor(config) {
 
 
   constructor(config) {
 

+    // These defaults can get overridden by config

     this.fps = 60;
     this.aspectRatio = [2.76, 1];
     this.verticalResolution = 224;
     this.fps = 60;
     this.aspectRatio = [2.76, 1];
     this.verticalResolution = 224;


@@ -192,12 +201,28 @@ internals.Sumo = class Sumo {
 
     this._engine.addSystem(new DashSystem());
 
 
     this._engine.addSystem(new DashSystem());
 

+    this._engine.addSystem(new GrabSystem({
+      engine: this._matterJs
+    }));
+

     this._engine.addSystem(new ApplyForceSystem());
 
     this._engine.addSystem(new PhysicsWorldControlSystem({
       engine: this._matterJs
     }));
 
     this._engine.addSystem(new ApplyForceSystem());
 
     this._engine.addSystem(new PhysicsWorldControlSystem({
       engine: this._matterJs
     }));
 

+    this._engine.addSystem(new DetectPointsCollisionSystem());
+
+    this._engine.addSystem(new DetectWinnerSystem());
+
+    this._engine.addSystem(new RenderPointsSystem({
+      application: this._pixi
+    }));
+
+    this._engine.addSystem(new RenderWinnerSystem({
+      application: this._pixi
+    }));
+

     this._engine.addSystem(new ElasticSystem());
 
     this._engine.addSystem(new PhysicsToAttributesSystem());
     this._engine.addSystem(new ElasticSystem());
 
     this._engine.addSystem(new PhysicsToAttributesSystem());


@@ -206,6 +231,10 @@ internals.Sumo = class Sumo {
 
     this._engine.addSystem(new CreateCouplingLineSystem());
 
 
     this._engine.addSystem(new CreateCouplingLineSystem());
 

+    this._engine.addSystem(new DrawDashSystem());
+
+    this._engine.addSystem(new DrawGrabSystem());
+

     this._engine.addSystem(new RenderSystem({
       application: this._pixi
     }));
     this._engine.addSystem(new RenderSystem({
       application: this._pixi
     }));


@@ -215,24 +244,31 @@ internals.Sumo = class Sumo {
 
   _initializeEntities() {
 
 
   _initializeEntities() {
 

-    const sumoA = SumoFactory.createSumo(null, {
+    SumoFactory.createArena(this._engine, {
+      position: {
+        x: this.horizontalResolution / 2,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    const sumoA = SumoFactory.createPlayer1Sumo(null, {

       position: {
       position: {

-        x: 50,
-        y: 50
+        x: this.horizontalResolution / 2 - 100,
+        y: this.verticalResolution / 2

       }
     });
 
       }
     });
 

-    const sumoB = SumoFactory.createControllableSumo(null, {
+    const sumoB = SumoFactory.createPlayer2Sumo(null, {

       position: {
       position: {

-        x: 500,
-        y: 78
+        x: this.horizontalResolution / 2 + 100,
+        y: this.verticalResolution / 2

       }
     });
 
     const harness = SumoFactory.createHarness(null, {
       position: {
       }
     });
 
     const harness = SumoFactory.createHarness(null, {
       position: {

-        x: 309,
-        y: 112
+        x: this.horizontalResolution / 2,
+        y: this.verticalResolution / 2

       }
     });
 
       }
     });
 


@@ -246,6 +282,53 @@ internals.Sumo = class Sumo {
       entityB: harness
     });
 
       entityB: harness
     });
 

+    // Walls
+
+    SumoFactory.createInvisibleBlock(this._engine, {
+      width: this.horizontalResolution * 2,
+      height: this.verticalResolution * 0.1,
+      position: {
+        x: this.horizontalResolution / 2,
+        y: -this.verticalResolution * 0.1
+      }
+    });
+
+    SumoFactory.createInvisibleBlock(this._engine, {
+      width: this.horizontalResolution * 2,
+      height: this.verticalResolution * 0.1,
+      position: {
+        x: this.horizontalResolution / 2,
+        y: this.verticalResolution + this.verticalResolution * 0.1
+      }
+    });
+
+    // Points Detector
+
+    SumoFactory.createPointsCollider(this._engine, {
+      collisionTarget: sumoA,
+      pointsTarget: 'red',
+      height: this.verticalResolution,
+      width: this.horizontalResolution,
+      position: {
+        x: this.horizontalResolution + this.horizontalResolution / 2,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    SumoFactory.createPointsCollider(this._engine, {
+      collisionTarget: sumoB,
+      pointsTarget: 'blue',
+      height: this.verticalResolution,
+      width: this.horizontalResolution,
+      position: {
+        x: -this.horizontalResolution / 2,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    // The game state
+    SumoFactory.createGameState(this._engine);
+

     // To keep the coupling behind, we'll manually add the sumos later
 
     this._engine.addEntity(sumoA);
     // To keep the coupling behind, we'll manually add the sumos later
 
     this._engine.addEntity(sumoA);