Draw the Arena (#7)

[rbdr/sumo] / lib / sumo.js

diff --git a/lib/sumo.js b/lib/sumo.js
index daa7e94cecb9fa9f3a91d4f9bf2d1475dd5d0c9d..eef80d759ef547ab807163a7a3b7fa50c403411c 100644 (file)
--- a/lib/sumo.js
+++ b/lib/sumo.js
@@ -1,10 +1,26 @@
 import 'babel-polyfill';
 import 'babel-polyfill';

+
+import Config from './config';
+
+// 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 DrawDashSystem from './systems/draw_dash';
+import ElasticSystem from './systems/elastic';

 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 CreateCouplingLineSystem from './systems/create_coupling_line';

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

+
+// Factories
+

 import SumoFactory from './factories/sumo';
 import SumoFactory from './factories/sumo';

+
+// External Dependencies
+

 import Serpentity from '@serpentity/serpentity';
 import { Application } from 'pixi.js';
 import { Engine } from 'matter-js';
 import Serpentity from '@serpentity/serpentity';
 import { Application } from 'pixi.js';
 import { Engine } from 'matter-js';


@@ -19,13 +35,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;

   }
 };
 
   }
 };
 


@@ -49,6 +65,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;


@@ -116,7 +133,7 @@ internals.Sumo = class Sumo {
 
       // We're sending the currentTime since it gives better results for
       // this type of renderer, though usually we expect the delta
 
       // We're sending the currentTime since it gives better results for
       // this type of renderer, though usually we expect the delta

-      this._engine.update(currentTime);
+      this._engine.update(currentFrameDuration);

       this._previousTime = currentTime;
     }
   }
       this._previousTime = currentTime;
     }
   }


@@ -176,16 +193,26 @@ internals.Sumo = class Sumo {
 
   _initializeSystems() {
 
 
   _initializeSystems() {
 

+    this._engine.addSystem(new ControlMapperSystem());
+
+    this._engine.addSystem(new DashSystem());
+
+    this._engine.addSystem(new ApplyForceSystem());
+

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

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

     this._engine.addSystem(new PhysicsToAttributesSystem());
 
     this._engine.addSystem(new AttributesToRenderableSystem());
 
     this._engine.addSystem(new CreateCouplingLineSystem());
 
     this._engine.addSystem(new PhysicsToAttributesSystem());
 
     this._engine.addSystem(new AttributesToRenderableSystem());
 
     this._engine.addSystem(new CreateCouplingLineSystem());
 

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

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


@@ -195,42 +222,49 @@ internals.Sumo = class Sumo {
 
   _initializeEntities() {
 
 
   _initializeEntities() {
 

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

       position: {
       position: {

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

       }
     });
 
       }
     });
 

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

       position: {
       position: {

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

       }
     });
 
       }
     });
 

-    const entityC = SumoFactory.createSumo(null, {
+    const harness = SumoFactory.createHarness(null, {

       position: {
       position: {

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

       }
     });
 
     SumoFactory.createRubberBand(this._engine, {
       }
     });
 
     SumoFactory.createRubberBand(this._engine, {

-      entityA,
-      entityB
+      entityA: sumoA,
+      entityB: harness

     });
 
     SumoFactory.createRubberBand(this._engine, {
     });
 
     SumoFactory.createRubberBand(this._engine, {

-      entityA: entityC,
-      entityB
+      entityA: sumoB,
+      entityB: harness

     });
 
     // To keep the coupling behind, we'll manually add the sumos later
 
     });
 
     // To keep the coupling behind, we'll manually add the sumos later
 

-    this._engine.addEntity(entityA);
-    this._engine.addEntity(entityB);
-    this._engine.addEntity(entityC);
+    this._engine.addEntity(sumoA);
+    this._engine.addEntity(sumoB);
+    this._engine.addEntity(harness);

   }
 };
 
   }
 };