Fix positioning and lessen friction (#8)

[rbdr/sumo] / lib / sumo.js

diff --git a/lib/sumo.js b/lib/sumo.js
index da72991982c6ea6831699ac23d3eb005c686d8f4..47850871092b3bc5b1d777001ff40098dcba8f49 100644 (file)
--- a/lib/sumo.js
+++ b/lib/sumo.js
@@ -1,21 +1,47 @@
+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 RenderSystem from './systems/render';
+import AttributesToRenderableSystem from './systems/attributes_to_renderable';
+
+// Factories
+
+import SumoFactory from './factories/sumo';
+
+// External Dependencies
+

 import Serpentity from '@serpentity/serpentity';
 import Serpentity from '@serpentity/serpentity';

+import { Application } from 'pixi.js';
+import { Engine } from 'matter-js';

 
 /* global window document */
 
 const internals = {
 
 /* global window document */
 
 const internals = {

+  kBackgroundColor: 0xd8c590,

   kNoElementError: 'No element found. Cannot render.',
 
   // Handler for the window load event. Initializes and runs the app.
 
   onLoad() {
 
   kNoElementError: 'No element found. Cannot render.',
 
   // Handler for the window load event. Initializes and runs the app.
 
   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;

   }
 };
 
   }
 };
 


@@ -39,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;


@@ -56,6 +83,8 @@ internals.Sumo = class Sumo {
 
     // Initialization functions
     this._initializeCanvas();
 
     // Initialization functions
     this._initializeCanvas();

+    this._initializeMatter();
+    this._initializePixi();

     this._initializeSystems();
     this._initializeEntities();
   }
     this._initializeSystems();
     this._initializeEntities();
   }


@@ -104,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;
     }
   }


@@ -119,6 +148,27 @@ internals.Sumo = class Sumo {
     window.addEventListener('resize', this._resizeCanvas.bind(this));
   }
 
     window.addEventListener('resize', this._resizeCanvas.bind(this));
   }
 

+  // Initialize MatterJs
+
+  _initializeMatter() {
+
+    this._matterJs = Engine.create();
+
+    this._matterJs.world.gravity.y = 0;
+  }
+
+  // Initialize Pixi
+
+  _initializePixi() {
+
+    this._pixi = new Application({
+      backgroundColor: internals.kBackgroundColor,
+      view: this._canvas,
+      width: this._canvas.width,
+      height: this._canvas.height
+    });
+  }
+

   // Resizes the canvas to a square the size of the smallest magnitude
   // of the window.
 
   // Resizes the canvas to a square the size of the smallest magnitude
   // of the window.
 


@@ -143,12 +193,96 @@ 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 ElasticSystem());
+
+    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
+    }));

   }
 
   // Initializes the serpentity entities
 
   _initializeEntities() {
 
   }
 
   // Initializes the serpentity entities
 
   _initializeEntities() {
 

+    SumoFactory.createArena(this._engine, {
+      position: {
+        x: this.horizontalResolution / 2,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    const sumoA = SumoFactory.createSumo(null, {
+      position: {
+        x: this.horizontalResolution / 2 - 100,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    const sumoB = SumoFactory.createControllableSumo(null, {
+      position: {
+        x: this.horizontalResolution / 2 + 100,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    const harness = SumoFactory.createHarness(null, {
+      position: {
+        x: this.horizontalResolution / 2,
+        y: this.verticalResolution / 2
+      }
+    });
+
+    SumoFactory.createRubberBand(this._engine, {
+      entityA: sumoA,
+      entityB: harness
+    });
+
+    SumoFactory.createRubberBand(this._engine, {
+      entityA: sumoB,
+      entityB: harness
+    });
+
+    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
+      }
+    });
+
+    // To keep the coupling behind, we'll manually add the sumos later
+
+    this._engine.addEntity(sumoA);
+    this._engine.addEntity(sumoB);
+    this._engine.addEntity(harness);

   }
 };
 
   }
 };