Nikolay Suslov 3 лет назад
Родитель
Сommit
642d1abd75

+ 38 - 13
public/defaults/worlds/rubik/cubeModel.js

@@ -329,23 +329,48 @@ this.doButtonTriggerdownAction = function(buttonID){
 
 this.editRubik = function(){
 
-    if(!this.gizmo && this.editCube){
+    let clientThatCallThis = vwf.client();
+    let me = vwf.moniker();
+    if(clientThatCallThis == me) {
+        console.log('EDIT CUBE!!');
+
+        let viewNode = document.querySelector("[id='" + this.id + "']");
+        let gizmo = viewNode.getAttribute('gizmo');
+        if(!gizmo && this.editCube){
+            viewNode.setAttribute('gizmo', {mode: "rotate"});
+            let inter = viewNode.getAttribute('interpolation');
+            if (inter) {
+                viewNode.components.interpolation.node.viewEdit = true;
+            }
+        }
+
+        if(gizmo && !this.editCube){
+            viewNode.removeAttribute('gizmo');
+            let inter = viewNode.getAttribute('interpolation');
+            if (inter) {
+                viewNode.components.interpolation.node.viewEdit = false;
+            }
 
-        let gizmoNode =
-    {
-        "extends": "proxy/aframe/gizmoComponent.vwf",
-        "type": "component",
-        "properties":
-        {
-            "mode": "rotate"
         }
     }
-    this.children.create("gizmo", gizmoNode);
-} 
 
-    if(this.gizmo && !this.editCube){
-        this.children.delete(this.gizmo)
-    }
+//     if(!this.gizmo && this.editCube){
+
+//         let gizmoNode =
+//     {
+//         "extends": "proxy/aframe/gizmoComponent.vwf",
+//         "type": "component",
+//         "properties":
+//         {
+//             "mode": "rotate"
+//         }
+//     }
+//     this.children.create("gizmo", gizmoNode);
+// } 
+
+//     if(this.gizmo && !this.editCube){
+//         this.children.delete(this.gizmo)
+//     }
 
 
 }

+ 1 - 1
public/drivers/model/aframe/addon/aframe-interpolation.js

@@ -69,7 +69,7 @@ AFRAME.registerComponent('interpolation', {
       
     }
 
-    if (this.enabled && this.node && this.node.interpolate && this.driver.interpolateView && this.node.viewEdit) {
+    if (this.enabled && this.node && this.node.interpolate && this.driver.interpolateView && !this.node.viewEdit) {
       this.setInterpolatedTransforms(timepassed);
 
       // this.restoreTransforms();

+ 1 - 1
public/drivers/view/aframeComponent.js

@@ -100,7 +100,7 @@ class AFrameComponentView extends Fabric {
                         extends: childExtendsID,
                         entityID: this.state.nodes[childID].parentID,
                         liveBindings: {},
-                        viewEdit: true
+                        viewEdit: false
                     };
     
                     let entityID = this.state.nodes[childID].parentID;

+ 2 - 2
public/drivers/view/editor.js

@@ -2090,7 +2090,7 @@ class LCSEditor extends Fabric {
                                                                         if (inter) {
                                                                             // let viewDriver = vwf.views["/drivers/view/aframeComponent"];
                                                                             //viewDriver.interpolateView = false;
-                                                                            viewNode.components.interpolation.node.viewEdit = false;
+                                                                            viewNode.components.interpolation.node.viewEdit = true;
 
 
                                                                         }
@@ -2104,7 +2104,7 @@ class LCSEditor extends Fabric {
                                                                         if (inter) {
                                                                             // let viewDriver = vwf.views["/drivers/view/aframeComponent"];
                                                                             // viewDriver.interpolateView = true;
-                                                                            viewNode.components.interpolation.node.viewEdit = true;
+                                                                            viewNode.components.interpolation.node.viewEdit = false;
 
                                                                         }
                                                                     }