Merge pull request #219 from VCityTeam/dev-unstable

Editor

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ud-viz",
-  "version": "2.32.7",
+  "version": "2.32.8",
   "description": "A collection of itowns plugins",
   "main": "src",
   "scripts": {

src/Components/SystemUtils/File.js

@@ -77,4 +77,15 @@ module.exports = {
       throw new Error(e);
     }
   },
+
+  downloadImageOnDisk(url, filename) {
+    const imgResult = document.createElement('img');
+    imgResult.src = url;
+    const link = document.createElement('a');
+    link.href = imgResult.src;
+    link.download = filename;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  },
 };

src/Game/Shared/GameObject/Components/Collider.js

@@ -110,6 +110,10 @@ const ColliderModule = class Collider {
       body: this.body,
     };
   }
+
+  getUUID() {
+    return this.uuid;
+  }
 };
 
 ColliderModule.TYPE = 'Collider';

src/Game/Shared/GameObject/Components/Render.js

@@ -129,6 +129,10 @@ const RenderModule = class Render {
 
     return this.object3D;
   }
+
+  getUUID() {
+    return this.uuid;
+  }
 };
 
 RenderModule.TYPE = 'Render';

src/Game/Shared/GameObject/Components/WorldScript.js

@@ -85,6 +85,10 @@ const WorldScriptModule = class WorldScript {
     return this.scripts;
   }
 
+  getUUID() {
+    return this.uuid;
+  }
+
   /**
    * This component can be run on the server side
    * @returns {Boolean}

src/Game/Shared/GameObject/GameObject.js

@@ -430,6 +430,15 @@ const GameObjectModule = class GameObject {
     return obj;
   }
 
+  getComponentByUUID(uuid) {
+    for (let key in this.components) {
+      const c = this.components[key];
+      if (c.getUUID() == uuid) return c;
+    }
+
+    return null;
+  }
+
   /**
    * Return a clone of this
    * @returns {GameObject}
@@ -704,4 +713,27 @@ GameObjectModule.deepCopy = function (gameObject) {
   return new GameObjectModule(cloneJSON);
 };
 
+GameObjectModule.findObject3D = function (uuid, obj, upSearch = true) {
+  let result;
+  if (upSearch) {
+    let current = obj;
+    while (current) {
+      if (current.userData.gameObjectUUID == uuid) {
+        result = current;
+        break;
+      }
+
+      current = current.parent;
+    }
+  } else {
+    obj.traverse(function (child) {
+      if (child.userData.gameObjectUUID == uuid) {
+        result = child;
+      }
+    });
+  }
+
+  return result;
+};
+
 module.exports = GameObjectModule;

src/Templates/LocalGame/LocalGame.js

@@ -10,33 +10,52 @@ import * as udviz from '../../index';
 export class LocalGame {
   constructor(fps) {
     this.fps = fps || 30;
+
+    this.gameView = null;
+  }
+
+  getGameView() {
+    return this.gameView;
+  }
+
+  dispose() {
+    this.gameView.dispose();
   }
 
-  start(world, configPath) {
+  start(world, configPath, options = {}) {
     const fps = this.fps;
 
-    Components.SystemUtils.File.loadJSON(configPath).then(function (config) {
-      const assetsManager = new AssetsManager();
+    const _this = this;
 
-      assetsManager.loadFromConfig(config.assetsManager).then(function () {
-        const worldStateComputer = new Shared.WorldStateComputer(
-          assetsManager,
-          fps,
-          { udviz: udviz, Shared: Shared }
-        );
+    return new Promise((resolve, reject) => {
+      Components.SystemUtils.File.loadJSON(configPath).then(function (config) {
+        const assetsManager = new AssetsManager();
 
-        worldStateComputer.load(world);
+        assetsManager.loadFromConfig(config.assetsManager).then(function () {
+          const worldStateComputer = new Shared.WorldStateComputer(
+            assetsManager,
+            fps,
+            { udviz: udviz, Shared: Shared }
+          );
 
-        const gameView = new Views.GameView({
-          htmlParent: document.body,
-          assetsManager: assetsManager,
-          stateComputer: worldStateComputer,
-          config: config,
-          itownsControls: false,
-        });
+          worldStateComputer.load(world);
+
+          _this.gameView = new Views.GameView({
+            htmlParent: options.htmlParent || document.body,
+            assetsManager: assetsManager,
+            stateComputer: worldStateComputer,
+            config: config,
+            itownsControls: false,
+          });
 
-        //start gameview tick
-        gameView.onFirstState(worldStateComputer.computeCurrentState(), null);
+          //start gameview tick
+          _this.gameView.start(
+            worldStateComputer.computeCurrentState(),
+            options.avatarUUID
+          );
+
+          resolve();
+        });
       });
     });
   }

src/Views/GameView/GameView.js

@@ -38,6 +38,8 @@ export class GameView extends View3D {
 
     //stop update of gameobject
     this.updateGameObject = true;
+    if (params.updateGameObject != undefined)
+      this.updateGameObject = params.updateGameObject;
 
     //TODO place these attributes in a userData object
     this.firstGameView = params.firstGameView || false; //first gameview of the application
@@ -85,7 +87,7 @@ export class GameView extends View3D {
    * @param {WorldState} state first state of this view
    * @param {uuid} avatarUUID uuid of the avatar GameObject
    */
-  onFirstState(state, avatarUUID) {
+  start(state, avatarUUID) {
     //ref it
     this.avatarUUID = avatarUUID;
 

src/Views/View3D/View3D.js

@@ -97,6 +97,8 @@ export class View3D {
       el.style.bottom = bottom + 'px';
       el.style.right = right + 'px';
     });
+
+    this.onResize();
   }
 
   /**
@@ -376,8 +378,8 @@ export class View3D {
    * Callback call on the resize event
    */
   onResize() {
-    const w = window.innerWidth - this.rootHtml.offsetLeft;
-    const h = window.innerHeight - this.rootHtml.offsetTop;
+    const w = window.innerWidth - parseInt(this.rootWebGL.style.left);
+    const h = window.innerHeight - parseInt(this.rootWebGL.style.top);
 
     //TODO remove this fonction
     if (this.itownsView) this.itownsView.debugResize(w, h);