Эх сурвалжийг харах

fix avatar creation promise

Nikolay Suslov 4 жил өмнө
parent
commit
3dd89cccb3

+ 2 - 1
public/app.js

@@ -38,7 +38,8 @@ class App {
 
     import('/lib/polyglot/language.js').then(res => {
       window._LangManager = new res.default;
-      return new Promise(r=>r(_LangManager.setLanguage())) }).then(res=>{
+      return new Promise(r=>r(_LangManager.setLanguage()))})
+      .then(res=>{
         window._l = _LangManager.language;
       })
     .then(res => {

+ 5 - 9
public/vwf/view/aframe.js

@@ -73,14 +73,10 @@ define(["module", "vwf/view"], function (module, view) {
 
 
                 let prepairAvatar = new Promise((resolve, reject) => {
-
-                    function cb() {
-                        resolve("ok");
-                    }
-                    createAvatarControl(scene, cb);
+                    let createAvatarPromise = new Promise(r=> r(createAvatarControl(scene)));
+                    return resolve(createAvatarPromise) 
                 });
 
-
                 prepairAvatar.then(res => {
 
                     if (this.gearvr == true) {
@@ -776,7 +772,7 @@ define(["module", "vwf/view"], function (module, view) {
         //el.object3D.rotation.set(val+rotation.x, rotation.y, rotation.z)
     }
 
-    function createAvatarControl(aScene, cb) {
+    async function createAvatarControl(aScene) {
 
         let avatarName = 'avatar-' + self.kernel.moniker();
 
@@ -844,8 +840,8 @@ define(["module", "vwf/view"], function (module, view) {
         // aScene.appendChild(arControl);
 
 
-
-        cb();
+        return "OK!"
+       // cb();
 
         // let gearVRControlsEl = document.createElement('a-entity');
         // gearVRControlsEl.setAttribute('id', 'gearvr-'+avatarName);