Răsfoiți Sursa

update aframe

Nikolay Suslov 6 ani în urmă
părinte
comite
fb6785465e

+ 6 - 2
support/client/lib/vwf/model/aframe.js

@@ -268,7 +268,9 @@ define(["module", "vwf/model", "vwf/utility"], function (module, model, utility)
 
                 if (methodName == 'worldRotation') {
 
-                    let worldQuat = node.aframeObj.object3D.getWorldQuaternion(); 
+                    var worldQuat =  new THREE.Quaternion();
+                    node.aframeObj.object3D.getWorldQuaternion(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) ));
@@ -278,7 +280,9 @@ define(["module", "vwf/model", "vwf/utility"], function (module, model, utility)
 
                 if (methodName == 'worldPosition') {
 
-                    let position = node.aframeObj.object3D.getWorldPosition();
+                    var position = new THREE.Vector3();
+
+                    node.aframeObj.object3D.getWorldPosition(position);
                     return position
 
                 }

Fișier diff suprimat deoarece este prea mare
+ 679 - 856
support/client/lib/vwf/model/aframe/aframe-master.js


Fișier diff suprimat deoarece este prea mare
+ 1 - 0
support/client/lib/vwf/model/aframe/aframe-master.js.map


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
support/client/lib/vwf/model/aframe/aframe-master.min.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
support/client/lib/vwf/model/aframe/aframe-master.min.js.map


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

@@ -444,7 +444,10 @@ define(["module", "vwf/view"], function (module, view) {
 
     function getWorldRotation(el) {
 
-        let worldQuat = el.object3D.getWorldQuaternion(); 
+
+        var worldQuat =  new THREE.Quaternion();
+        el.object3D.getWorldQuaternion(worldQuat);
+         
         //console.log(worldQuat);
         let angle = (new THREE.Euler()).setFromQuaternion(worldQuat, 'YXZ');
         let rotation = (new THREE.Vector3(THREE.Math.radToDeg(angle.x),
@@ -464,7 +467,11 @@ define(["module", "vwf/view"], function (module, view) {
 
         let el = document.querySelector('#avatarControl');
         if (el) {
-            let position = el.object3D.getWorldPosition(); //el.getAttribute('position');
+            //let position = el.object3D.getWorldPosition(); //el.getAttribute('position');
+
+            let position = new THREE.Vector3();
+            el.object3D.getWorldPosition(position);
+
             let rotation = getWorldRotation(el);
            
            // console.log(rotation);
@@ -501,7 +508,11 @@ define(["module", "vwf/view"], function (module, view) {
 
         let el = document.querySelector(aSelector);
         if (el) {
-            let position = el.object3D.getWorldPosition() //el.getAttribute('position');
+            //let position = el.object3D.getWorldPosition() //el.getAttribute('position');
+            
+            let position = new THREE.Vector3();
+            el.object3D.getWorldPosition(position);
+
             let rotation = getWorldRotation(el);
 
             //let rotation = el.getAttribute('rotation');

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff