Browse Source

fix editor

Nikolay Suslov 7 years ago
parent
commit
2fd9a11eb5

+ 2 - 0
support/client/lib/vwf.js

@@ -2839,6 +2839,8 @@ if ( ! childComponent.source ) {
                                         //document.querySelector('body').removeChild(progressbar);
                                         progressbar.classList.remove( "visible" );
                                         progressbar.classList.add( "not-visible" );
+                                        progressbar.classList.add( "mdc-linear-progress--closed" );
+                                        
                                     }   
                                     // var spinner = document.getElementById( "vwf-loading-spinner" );
                                     // spinner && spinner.classList.remove( "pace-active" );

+ 16 - 14
support/client/lib/vwf/view/aframe.js

@@ -331,7 +331,8 @@ define(["module", "vwf/view"], function (module, view) {
                         "remoteUrl": '',
                         "displayName": 'Avatar '+ randId(),
                         "sharing": { audio: true, video: true },
-                        "selectMode": false
+                        "selectMode": false,
+                        "position": "0 1.6 0"
                     }
                 }
 
@@ -441,6 +442,17 @@ define(["module", "vwf/view"], function (module, view) {
 
     }
 
+    function getWorldRotation(el) {
+
+        let worldQuat = el.object3D.getWorldQuaternion(); 
+        //console.log(worldQuat);
+        let angle = (new THREE.Euler()).setFromQuaternion(worldQuat, 'YXZ');
+        let rotation = (new THREE.Vector3(THREE.Math.radToDeg(angle.x),
+        THREE.Math.radToDeg(angle.y), THREE.Math.radToDeg(angle.z) ));
+
+        return rotation
+    }
+
     function updateAvatarPosition() {
 
         let delta = 0.0001;
@@ -453,13 +465,8 @@ define(["module", "vwf/view"], function (module, view) {
         let el = document.querySelector('#avatarControl');
         if (el) {
             let position = el.object3D.getWorldPosition(); //el.getAttribute('position');
-
-            let worldQuat = el.object3D.getWorldQuaternion(); 
-            //console.log(worldQuat);
-            let angle = (new THREE.Euler()).setFromQuaternion(worldQuat, 'YXZ');
-            var rotation = (new THREE.Vector3(THREE.Math.radToDeg(angle.x),
-            THREE.Math.radToDeg(angle.y), THREE.Math.radToDeg(angle.z) ));
-
+            let rotation = getWorldRotation(el);
+           
            // console.log(rotation);
             //let rotation = el.getAttribute('rotation');
 
@@ -495,12 +502,7 @@ define(["module", "vwf/view"], function (module, view) {
         let el = document.querySelector(aSelector);
         if (el) {
             let position = el.object3D.getWorldPosition() //el.getAttribute('position');
-
-            let worldQuat = el.object3D.getWorldQuaternion(); 
-            //console.log(worldQuat);
-            let angle = (new THREE.Euler()).setFromQuaternion(worldQuat, 'YXZ');
-            var rotation = (new THREE.Vector3(THREE.Math.radToDeg(angle.x),
-            THREE.Math.radToDeg(angle.y), THREE.Math.radToDeg(angle.z) ));
+            let rotation = getWorldRotation(el);
 
             //let rotation = el.getAttribute('rotation');
 

File diff suppressed because it is too large
+ 107 - 139
support/client/lib/vwf/view/editor-new.js


+ 6 - 0
support/client/lib/vwf/view/lib/editorLive.css

@@ -60,6 +60,12 @@
 
 }
 
+:root {
+  --mdc-theme-primary: #3f51b5;
+  --mdc-theme-secondary: #c62828;
+}
+
+
 .draggable {
   top: 200px;
   left: 400px;

File diff suppressed because it is too large
+ 678 - 355
support/client/lib/vwf/view/lib/mdc/dist/material-components-web.css


File diff suppressed because it is too large
+ 311 - 151
support/client/lib/vwf/view/lib/mdc/dist/material-components-web.js


File diff suppressed because it is too large
+ 0 - 0
support/client/lib/vwf/view/lib/mdc/dist/material-components-web.min.css


File diff suppressed because it is too large
+ 0 - 0
support/client/lib/vwf/view/lib/mdc/dist/material-components-web.min.js


Some files were not shown because too many files changed in this diff