Use new lib components

[rbdr/sumo] / lib / systems / control_mapper.js

diff --git a/lib/systems/control_mapper.js b/lib/systems/control_mapper.js
index e91ecc6c05bc4dba532fb675c4b12623587b7380..c0ab05ec1de4362260bb18201199a911b1facfce 100644 (file)
--- a/lib/systems/control_mapper.js
+++ b/lib/systems/control_mapper.js
@@ -2,9 +2,9 @@ import { System } from '@serpentity/serpentity';
 
 import ControllableNode from '../nodes/controllable';
 
 
 import ControllableNode from '../nodes/controllable';
 

-/* global window */
-

 const internals = {
 const internals = {

+  gamepadState: {
+  },

   keyboardState: {
   }
 };
   keyboardState: {
   }
 };


@@ -32,6 +32,7 @@ export default class ControlMapperSystem extends System {
     this.controllables = null;
 
     this._initializeKeyboard();
     this.controllables = null;
 
     this._initializeKeyboard();

+    this._initializeGamepad();

   }
 
   /**
   }
 
   /**


@@ -71,11 +72,21 @@ export default class ControlMapperSystem extends System {
    */
   update(currentFrameDuration) {
 
    */
   update(currentFrameDuration) {
 

+    this._updateGamepads();
+

     for (const controllable of this.controllables) {
       for (const map of controllable.controlMap.map) {
         if (map.source.type === 'keyboard') {
           this._setValue(controllable.entity, map.target, !!internals.keyboardState[map.source.index]);
         }
     for (const controllable of this.controllables) {
       for (const map of controllable.controlMap.map) {
         if (map.source.type === 'keyboard') {
           this._setValue(controllable.entity, map.target, !!internals.keyboardState[map.source.index]);
         }

+
+        if (map.source.type === 'gamepad') {
+          const gamepad = internals.gamepadState[map.source.gamepadNumber];
+          if (gamepad) {
+            const source = gamepad[map.source.gamepadInputSource];
+            source && this._setValue(controllable.entity, map.target, source[map.source.index]);
+          }
+        }

       }
     }
   }
       }
     }
   }


@@ -95,6 +106,32 @@ export default class ControlMapperSystem extends System {
     });
   }
 
     });
   }
 

+  // Requests gamepad access and binds to the events
+
+  _initializeGamepad() {
+
+    window.addEventListener('gamepadconnected', (event) => {
+
+      internals.gamepadState[event.gamepad.index] = event.gamepad;
+      window.gamepad = event.gamepad;
+    });
+
+    window.addEventListener('gamepaddisconnected', (event) => {
+
+      delete internals.gamepadState[event.gamepad.index];
+    });
+  }
+
+  // Update Gamepad
+
+  _updateGamepads() {
+
+    const gamepads = navigator.getGamepads();
+    for (const index of Object.keys(internals.gamepadState)) {
+      internals.gamepadState[index] = gamepads[index];
+    }
+  }
+

   // Sets the value to a target
 
   _setValue(entity, target, value) {
   // Sets the value to a target
 
   _setValue(entity, target, value) {


@@ -114,5 +151,5 @@ export default class ControlMapperSystem extends System {
       currentObject[finalProperty] += finalValue;
     }
   }
       currentObject[finalProperty] += finalValue;
     }
   }

-};
+}