History

rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete

David Back committed 8 years ago

Commit f74e2191 parent 623410a14 files · +192 −114Browse files

Showing the changes to scripts/system/controllers/controllerModules (3 of 14 files). Show all

Unified · Split

3 files
  1. scripts/system/controllers/controllerModules/equipEntity.js +1 −2
  2. scripts/system/controllers/controllerModules/nearActionGrabEntity.js +1 −2
  3. scripts/system/controllers/controllerModules/nearParentGrabEntity.js +1 −2
scripts/system/controllers/controllerModules/equipEntity.js+1−2
@@ -413,8 +413,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa · 412 unmodified lines
413 413
414 this.cloneHotspot = function(props, controllerData) {414 this.cloneHotspot = function(props, controllerData) {
415 if (entityIsCloneable(props)) {415 if (entityIsCloneable(props)) {
416 var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];416 var cloneID = cloneEntity(props);
417 var cloneID = cloneEntity(props, worldEntityProps);
418 return cloneID;417 return cloneID;
419 }418 }
420 419
scripts/system/controllers/controllerModules/nearActionGrabEntity.js+1−2
@@ -235,8 +235,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); · 234 unmodified lines
235 // switch to grabbing235 // switch to grabbing
236 var targetCloneable = entityIsCloneable(targetProps);236 var targetCloneable = entityIsCloneable(targetProps);
237 if (targetCloneable) {237 if (targetCloneable) {
238 var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];238 var cloneID = cloneEntity(targetProps);
239 var cloneID = cloneEntity(targetProps, worldEntityProps);
240 var cloneProps = Entities.getEntityProperties(cloneID);239 var cloneProps = Entities.getEntityProperties(cloneID);
241 this.targetEntityID = cloneID;240 this.targetEntityID = cloneID;
242 this.startNearGrabAction(controllerData, cloneProps);241 this.startNearGrabAction(controllerData, cloneProps);
scripts/system/controllers/controllerModules/nearParentGrabEntity.js+1−2
@@ -342,8 +342,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); · 341 unmodified lines
342 var targetCloneable = entityIsCloneable(targetProps);342 var targetCloneable = entityIsCloneable(targetProps);
343 343
344 if (targetCloneable) {344 if (targetCloneable) {
345 var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];345 var cloneID = cloneEntity(targetProps);
346 var cloneID = cloneEntity(targetProps, worldEntityProps);
347 var cloneProps = Entities.getEntityProperties(cloneID);346 var cloneProps = Entities.getEntityProperties(cloneID);
348 this.grabbing = true;347 this.grabbing = true;
349 this.targetEntityID = cloneID;348 this.targetEntityID = cloneID;