Move grab pseudo-properties (userData) into first-class EntityItemProperties.

Seth Alves committed 8 years ago

Commit 834699f1 parent 7c9464564 files · +1528 −739Browse files

Showing the changes to scripts/tutorials/entity_scripts (4 of 64 files). Show all

Unified · Split

4 files

         range: DEFAULT_RANGE,
         maxVolume: DEFAULT_VOLUME,
         disabled: true,
-        grabbableKey: { wantsTrigger: true },
+        grab: { triggerable: true }
     };
     var soundURL = "";
         entity = entityID;
         _this = this;
-        var props = Entities.getEntityProperties(entity, [ "userData" ]);
+        var props = Entities.getEntityProperties(entity, [ "userData", "grab.triggerable" ]);
         var data = {};
         if (props.userData) {
             data = JSON.parse(props.userData);
                 changed = true;
             }
         }
-        if (!data.grabbableKey.wantsTrigger) {
-            data.grabbableKey.wantsTrigger = true;
-            changed = true;
-        }
         if (changed) {
             debugPrint("applying default values to userData");
             Entities.editEntity(entity, { userData: JSON.stringify(data) });
         }
+        if (!props.grab.triggerable) {
+            Entities.editEntity(entity, { grab: { triggerable: true } });
+        }
         this._updateColor(data.disabled);
         this.updateSettings();

@@ -52,32 +52,8 @@ · 51 unmodified lines
52	It will behave as the constructor	52	It will behave as the constructor
53	*/	53	*/
54	preload: function(id) {	54	preload: function(id) {
55	/*
56	We will now override any existing userdata with the grabbable property.
57	Only retrieving userData
58	*/
59	var entityProperties = Entities.getEntityProperties(id, ['userData']);
60	var userData = {
61	grabbableKey: {}
62	};
63	// Check if existing userData field exists.
64	if (entityProperties.userData && entityProperties.userData.length > 0) {
65	try {
66	userData = JSON.parse(entityProperties.userData);
67	if (!userData.grabbableKey) {
68	userData.grabbableKey = {}; // If by random change there is no grabbableKey in the userData.
69	}
70	} catch (e) {
71	// if user data is not valid json, we will simply overwrite it.
72	}
73	}
74	// Object must be triggerable inorder to bind releaseGrabEvent
75	userData.grabbableKey.grabbable = true;
76
77	// Apply the new properties to entity of id	55	// Apply the new properties to entity of id
78	Entities.editEntity(id, {	56	Entities.editEntity(id, { grab: { grabbable: true } });
79	userData: JSON.stringify(userData)
80	});
81	Script.scriptEnding.connect(function() {	57	Script.scriptEnding.connect(function() {
82	Script.removeEventHandler(id, "releaseGrab", this.releaseGrab);	58	Script.removeEventHandler(id, "releaseGrab", this.releaseGrab);
83	});	59	});

             position: originalProps.position,
             shapeType: originalProps.shapeType,
             visible: true,
-            userData:JSON.stringify({
+            grab: { grabbable: false }
-                grabbableKey:{
-                    grabbable:false
-                }
-            })
         };
         _this.copy = Entities.addEntity(props);
     }

             position: originalProps.position,
             shapeType: originalProps.shapeType,
             visible: true,
-            userData:JSON.stringify({
+            grab: { grabbable: false }
-                grabbableKey:{
-                    grabbable:false
-                }
-            })
         };
         _this.copy = Entities.addEntity(props);
     }

Keyboard shortcuts