Ver código fonte

update aframe lib and arjs fixes

Nikolay Suslov 4 anos atrás
pai
commit
5e3e6e122c

+ 12 - 5
public/app.js

@@ -1505,8 +1505,8 @@ class App {
       '/vwf/model/aframe/addon/BVHLoader.js',
       '/vwf/model/aframe/addon/TransformControls.js',
       '/vwf/model/aframe/addon/THREE.MeshLine.js',
-      '/vwf/model/aframe/addon/aframe-components.js',
-      '/vwf/view/arjs/aframe-ar.js'
+      '/vwf/model/aframe/addon/aframe-components.js'
+      //'/vwf/view/arjs/aframe-ar.js' //load in aframe-ar-driver
     ], {
       async: false,
       returnPromise: true
@@ -2352,7 +2352,8 @@ class App {
         db = _LCSDB.user();
     }
 
-
+    //let hasDocs = await (new Promise(res => db.get('documents').not(res(false)))).then(res=>{return res});
+    
     let list = await (new Promise(res => db.get('documents').load(res, { wait: 300 })))
       .then(r => {
         if (!worldName) {
@@ -2426,13 +2427,16 @@ class App {
               appInfo = worldDesc[root][langID]
             }
 
+            let settings = worldDesc[root]['settings'];
+
             doc = {
               'worldName': el.world + '/load/' + saveName,
               'created': res.created ? res.created : res.modified,
               'modified': res.modified,
               'type': 'saveState',
               'userAlias': userAlias,
-              'info': appInfo
+              'info': appInfo,
+              'settings': settings
             }
           }
         }
@@ -2524,6 +2528,8 @@ class App {
               appInfo = worldDesc[root][langID]
             }
 
+            let settings = worldDesc[root]['settings'];
+
             doc = {
               'worldName': index,
               'created': res.created ? res.created : res.modified,
@@ -2531,7 +2537,8 @@ class App {
               'proxy': proxy,
               'type': 'proto',
               'userAlias': userAlias,
-              'info': appInfo
+              'info': appInfo,
+              'settings': settings
             }
           }
         }

Diferenças do arquivo suprimidas por serem muito extensas
+ 79 - 59
public/vwf/model/aframe/aframe-master.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
public/vwf/model/aframe/aframe-master.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
public/vwf/model/aframe/aframe-master.min.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
public/vwf/model/aframe/aframe-master.min.js.map


+ 11 - 15
public/web/world-app.js

@@ -486,20 +486,6 @@ class WorldApp {
         document.querySelector("#aboutWorld")._refresh(worldCardGUI);
         //document.querySelector("#aboutWorld")._refreshWorldComps(info);
 
-        
-
-
-        if (!saveName) {
-            let statesData = await _app.getAllStateWorldsInfoForUser(user.user, space) //await _app.getSaveStates(user, space);
-            //let worldStates = this.createWorldStatesGUI();
-            let worldStates = document.querySelector("#worldStatesGUI");
-            worldStates._states = statesData;
-            worldStates._updateComps();
-            worldStatesComp.$components.push(worldStates);
-        }
-
-
-       
         let settings = worldCardGUI._worldInfo.settings;
         if (settings) {
             if (settings.ar) {
@@ -551,9 +537,19 @@ class WorldApp {
                 }
 
             document.querySelector("#aboutWorld")._runWorldGUI = runWorldGUI;
+            //document.querySelector("#aboutWorld")._refresh(worldCardGUI);
             }
 
-            
+
+        if (!saveName) {
+            let statesData = await _app.getAllStateWorldsInfoForUser(user.user, space) //await _app.getSaveStates(user, space);
+            //let worldStates = this.createWorldStatesGUI();
+            let worldStates = document.querySelector("#worldStatesGUI");
+            worldStates._states = statesData;
+            worldStates._updateComps();
+            worldStatesComp.$components.push(worldStates);
+        }
+ 
 
         }
 

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff