#31 player hangar finalization

client/src/app/routes/hangar.js

@@ -36,16 +36,16 @@ export default class hangarRoute {
 
     loadHangar() {
       l.current_scene.scene.add(l.scenograph.objects.structures.hangar.mesh);
-      //this.targetStructure.visible = false;
+
       l.scenograph.objects.structures.hangar.mesh.visible = true;
-        console.log(this.targetStructure.userData.config.hangars[0].position);
+
       l.scenograph.objects.structures.hangar.mesh.position.x = this.targetStructure.userData.config.hangars[0].position.x;
       l.scenograph.objects.structures.hangar.mesh.position.y = this.targetStructure.userData.config.hangars[0].position.y;
       l.scenograph.objects.structures.hangar.mesh.position.z = this.targetStructure.userData.config.hangars[0].position.z;
 
-      l.scenograph.actors.player.vehicle.mesh.userData.object.position.x =  this.targetStructure.userData.config.hangars[0].position.x;
-      l.scenograph.actors.player.vehicle.mesh.userData.object.position.z = - 2.5 + this.targetStructure.userData.config.hangars[0].position.z;
-      l.scenograph.actors.player.vehicle.mesh.userData.object.position.y = l.scenograph.objects.structures.hangar.mesh.position.y - 7.5;
+      l.scenograph.actors.player.vehicle.game.components.Transform.position.position.x =  this.targetStructure.userData.config.hangars[0].position.x;
+      l.scenograph.actors.player.vehicle.game.components.Transform.position.position.z = - 2.5 + this.targetStructure.userData.config.hangars[0].position.z;
+      l.scenograph.actors.player.vehicle.game.components.Transform.position.position.y = l.scenograph.objects.structures.hangar.mesh.position.y - 7.5;
 
       l.scenograph.actors.player.actorInstance.object.position.x = this.targetStructure.userData.config.hangars[0].position.x;
       l.scenograph.actors.player.actorInstance.object.position.z = 10 + this.targetStructure.userData.config.hangars[0].position.z;

client/src/app/routes/singleplayer.js

@@ -25,7 +25,8 @@ export default class singlePlayerRoute {
         // Set client mode.
         l.mode = 'single_player';
 
-        l.scenograph.actors.map.get('Player One').setMode('vehicle');
+        l.scenograph.actors.player = l.scenograph.actors.get('Player One');
+        l.scenograph.actors.player.setMode('vehicle');
 
     }
 

client/src/app/scenograph/actors.js

@@ -23,11 +23,11 @@ export default class Actors {
         this.map = new Map();
     }
 
-    async registerActor(actorInstance) {
-        if ( actorInstance.config.class == 'player' ) {
-            let player = new Player( actorInstance );
+    async registerActor(actorEntity) {
+        if (actorEntity.config.components.PlayerInput) {
+            let player = new Player( actorEntity );
             await player.load();
-            this.map.set(actorInstance.config.name, player);
+            this.map.set(actorEntity.components.Name, player);
         }
     }
 

client/src/app/scenograph/actors/player.js

@@ -28,9 +28,9 @@ export default class Player {
     // Vehicle model.
     vehicle;
 
-    constructor( actorInstance ) {
+    constructor( actorEntity ) {
 
-        this.actorInstance = actorInstance;
+        this.actorEntity = actorEntity;
 
         this.ready = false;
 
@@ -53,7 +53,7 @@ export default class Player {
     async load() {
 
         // Setup aircraft, used for the intro sequence.
-        this.vehicle = new l.scenograph.objects.vehicles.valiant();
+        this.vehicle = new l.scenograph.objects.vehicles.valiant(this.actorEntity);
         await this.vehicle.load();
         l.current_scene.scene.add(
           this.vehicle.mesh
@@ -63,7 +63,7 @@ export default class Player {
         );
 
         // Setup person, used for the hangar scene.
-        this.person = new l.scenograph.objects.vehicles.person(this.actorInstance);
+        this.person = new l.scenograph.objects.vehicles.person(this.actorEntity);
         l.current_scene.scene.add(
             this.person.mesh
         );

client/src/app/scenograph/controls/touch/weapons.js

@@ -1,6 +1,6 @@
 /**
  * Touchscreen Weapon Controls
- * 
+ *
  */
 
 /**
@@ -9,24 +9,24 @@
 import l from '@/helpers/l.js';
 
 export default class WeaponControls {
-    
+
     /**
      * Switch indicating we are currently attacking.
-     * 
-     * @type {boolean} 
+     *
+     * @type {boolean}
      */
     attack;
 
     /**
      * Switch indicating auto attack is on.
-     * 
-     * @type {boolean} 
+     *
+     * @type {boolean}
      */
     autoAttack;
 
     /**
      * HTML Container
-     * 
+     *
      * @type {HTMLElement}
      */
     container;
@@ -39,7 +39,7 @@ export default class WeaponControls {
 
         this.container.querySelector('.switch input').onchange = ()=>{
             l.scenograph.controls.touch.weapons.autoAttack = l.scenograph.controls.touch.weapons.container.querySelector('.switch input').checked;
-        };        
+        };
 
         this.container.querySelector('button').onclick = ()=>{
             l.scenograph.controls.touch.weapons.attack = true;
@@ -53,10 +53,10 @@ export default class WeaponControls {
 
     /**
      * Update hook.
-     * 
+     *
      * This method is called within the UI setInterval updater, allowing
      * HTML content to be updated at different rate than the 3D frame rate.
-     * 
+     *
      * @method update
      * @memberof WeaponControls
      * @global
@@ -67,9 +67,9 @@ export default class WeaponControls {
 
         let timeRemaining = 0;
 
-        if ( parseInt(l.current_scene.stats.currentTime) < parseInt(l.scenograph.actors.player.vehicle.mesh.userData.actor.weapons.last) + parseInt(l.scenograph.actors.player.vehicle.mesh.userData.actor.weapons.timeout) ) {
-            timeRemaining = parseInt(l.scenograph.actors.player.vehicle.mesh.userData.actor.weapons.timeout) - (
-                parseInt(l.current_scene.stats.currentTime) - parseInt(l.scenograph.actors.player.vehicle.mesh.userData.actor.weapons.last)
+        if ( parseInt(l.current_scene.stats.currentTime) < parseInt(l.scenograph.actors.player.vehicle.game.components.Weapon.last) + parseInt(l.scenograph.actors.player.vehicle.game.components.Weapon.timeout) ) {
+            timeRemaining = parseInt(l.scenograph.actors.player.vehicle.game.components.Weapon.timeout) - (
+                parseInt(l.current_scene.stats.currentTime) - parseInt(l.scenograph.actors.player.vehicle.game.components.Weapon.last)
             );
         }
 

client/src/app/scenograph/director.js

@@ -17,7 +17,7 @@ import l from '@/helpers/l.js';
 /**
  * World Simulation
  */
-import World from '#/game/src/world';
+import World from '#/game/ecs/world';
 
 /**
  * Scene controllers
@@ -231,9 +231,9 @@ export default class Director {
 
     // Load world instance from game classes.
     load( sceneName ) {
-      this.world = new World( sceneName );
+        this.world = new World(sceneName);
 
-      return this;
+        return this;
     }
 
     // Load the objects in world instance to the current scene.
@@ -246,70 +246,67 @@ export default class Director {
     }
 
     async loadInstance() {
+        console.log(this.world);
+        await this.world.entities.forEach(async entity => {
 
-        await this.world.config.objects.forEach( async object_config => {
-            if ( object_config.model == 'extractor' ) {
+            if ( entity.config.components.Renderable.object == 'extractor' ) {
                 l.scenograph.director.loadObject(
-                object_config,
+                entity,
                 await l.scenograph.objects.structures.extractor.get()
                 );
             }
-            if ( object_config.model == 'platform' ) {
+            if ( entity.config.components.Renderable.object == 'platform' ) {
                 l.scenograph.director.loadObject(
-                object_config,
+                entity,
                 await l.scenograph.objects.structures.platform.get()
                 );
             }
-            if ( object_config.model == 'refinery' ) {
+            if ( entity.config.components.Renderable.object == 'refinery' ) {
                 l.scenograph.director.loadObject(
-                object_config,
+                entity,
                 await l.scenograph.objects.structures.refinery.get()
                 );
             }
-        } );
 
-        this.world.config.actors.forEach( async object_config => {
-            if ( object_config.class == 'cargoShip' ) {
+            if ( entity.config.components.Renderable.object == 'cargoShip' ) {
                 l.scenograph.director.loadObject(
-                object_config,
-                await l.scenograph.objects.vehicles.cargoShip.get()
+                entity,
+                await l.scenograph.objects.vehicles.cargoShip.get(entity)
                 );
             }
-            if ( object_config.class == 'pirate' ) {
+            if ( entity.config.components.Renderable.object == 'pirate' ) {
                 l.scenograph.director.loadObject(
-                object_config,
+                entity,
                 await l.scenograph.objects.vehicles.raven.get()
                 );
             }
 
-        } );
-
-        this.world.instance.actors.forEach(async actorInstance => {
-            if ( actorInstance.config.class == 'player' ) {
-                await l.scenograph.actors.registerActor( actorInstance );
+            if (entity.config.components.Renderable.object == 'valiant' || entity.config.components.Renderable.object == 'person') {
+                await l.scenograph.actors.registerActor( entity );
             }
         });
 
     }
 
-    async loadObject( config, object ) {
-      object.position.x = config.position.x;
-      object.position.y = config.position.y;
-      object.position.z = config.position.z;
+    async loadObject(entity, scenographObject) {
+        console.log(entity, scenographObject);
+      scenographObject.position.x = entity.components.Transform.position.x;
+      scenographObject.position.y = entity.components.Transform.position.y;
+      scenographObject.position.z = entity.components.Transform.position.z;
 
-      if ( config.rotation ) {
-        object.rotation.x = config.rotation.x;
-        object.rotation.y = config.rotation.y;
-        object.rotation.z = config.rotation.z;
+      if ( entity.rotation ) {
+        scenographObject.rotation.x = entity.components.Transform.rotation.x;
+        scenographObject.rotation.y = entity.components.Transform.rotation.y;
+        scenographObject.rotation.z = entity.components.Transform.rotation.z;
       }
 
-      object.name = config.name;
-      object.userData.config = config;
+      scenographObject.name = entity.components.Name;
+      scenographObject.userData.entity = entity;
 
-      // @todo: add to current_scene array relevant to object class.
+      // @todo: add to current_scene array relevant to scenographObject class.
 
       l.current_scene.scene.add(
-        object
+          scenographObject
       );
     }