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

scripts/system/controllers/controllerModules/equipEntity.js +1 −2
scripts/system/controllers/controllerModules/nearActionGrabEntity.js +1 −2
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	414	this.cloneHotspot = function(props, controllerData) {
415	415	if (entityIsCloneable(props)) {
416		− var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
417		− var cloneID = cloneEntity(props, worldEntityProps);
	416	+ var cloneID = cloneEntity(props);
418	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	235	// switch to grabbing
236	236	var targetCloneable = entityIsCloneable(targetProps);
237	237	if (targetCloneable) {
238		− var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
239		− var cloneID = cloneEntity(targetProps, worldEntityProps);
	238	+ var cloneID = cloneEntity(targetProps);
240	239	var cloneProps = Entities.getEntityProperties(cloneID);
241	240	this.targetEntityID = cloneID;
242	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	342	var targetCloneable = entityIsCloneable(targetProps);
343	343
344	344	if (targetCloneable) {
345		− var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
346		− var cloneID = cloneEntity(targetProps, worldEntityProps);
	345	+ var cloneID = cloneEntity(targetProps);
347	346	var cloneProps = Entities.getEntityProperties(cloneID);
348	347	this.grabbing = true;
349	348	this.targetEntityID = cloneID;