Nikolay Suslov 4 жил өмнө
parent
commit
605315eec7

+ 2 - 2
public/vwf/model/aframe/addon/aframe-components.js

@@ -26,7 +26,7 @@ AFRAME.registerComponent('scene-utils', {
 
             driver.hmd = true;
 
-            if (driver.threeDoFMobile|| _app.config.d3DoF ) {
+            if (driver.threeDoFMobile || _app.config.d3DoF ) {
                 driver.threeDoF = true;
 
                  vwf_view.kernel.callMethod(avatarID, "updateYPositionForXR", [0.0]);
@@ -58,7 +58,7 @@ AFRAME.registerComponent('scene-utils', {
 
             driver.hmd = false;
 
-            if (driver.threeDoFMobile|| _app.config.d3DoF ) {
+            if (driver.threeDoFMobile || _app.config.d3DoF ) {
                 driver.threeDoF = false;
                 //avatarEl.setAttribute('position', '0 0 0');
 

+ 15 - 11
public/vwf/view/aframe.js

@@ -672,15 +672,16 @@ define(["module", "vwf/view"], function (module, view) {
         if (el) {
             //let position = el.object3D.getWorldPosition(); //el.getAttribute('position');
 
-            var position;
-
-            if((self.hmd && self.sixDoF) || _app.config.d6DoF){
-                position = el.getAttribute('position');
-            } else {
-                position = new THREE.Vector3();
-                el.object3D.getWorldPosition(position);
-            }
+            //var position;
+            // if((self.hmd && self.sixDoF) || _app.config.d6DoF){
+            //     position = el.getAttribute('position');
+            // } else {
+            //     position = new THREE.Vector3();
+            //     el.object3D.getWorldPosition(position);
+            // }
             //let position = el.getAttribute('position');
+
+            let position = el.getAttribute('position');
             let rotation = el.getAttribute('rotation'); //getWorldRotation(el, 'YXZ');
 
             let lastRotation = self.nodes[avatarName].selfTickRotation;
@@ -716,10 +717,13 @@ define(["module", "vwf/view"], function (module, view) {
         if (el) {
             //let position = el.object3D.getWorldPosition() //el.getAttribute('position');
 
-            let position = new THREE.Vector3();
-            el.object3D.getWorldPosition(position);
+            // let position = new THREE.Vector3();
+            // el.object3D.getWorldPosition(position);
+            // let rotation = getWorldRotation(el, 'XYZ');
 
-            let rotation = getWorldRotation(el, 'XYZ');
+            let position = el.getAttribute('position');
+            let rotation = el.getAttribute('rotation');
+           
 
             //let rotation = el.getAttribute('rotation');