make targets ungrabbable

This commit is contained in:
James B. Pollack 2015-10-12 16:59:42 -07:00
parent bc4200d8d7
commit 02620c4b0d
3 changed files with 1233 additions and 1222 deletions

View file

@ -111,7 +111,7 @@ function testTargetDistanceFromStart() {
lastPositions[index] = currentPosition;
if (length > RESET_DISTANCE && moving<MINIMUM_MOVE_LENGTH) {
if (length > RESET_DISTANCE && moving < MINIMUM_MOVE_LENGTH) {
Entities.deleteEntity(target);
@ -125,7 +125,12 @@ function testTargetDistanceFromStart() {
compoundShapeURL: COLLISION_HULL_URL,
position: originalPositions[index],
rotation: rotation,
script: scriptURL
script: scriptURL,
userData: JSON.stringify({
grabbableKey: {
grabbable: false
}
})
};
targets[index] = Entities.addEntity(targetProperties);

View file

@ -413,6 +413,9 @@
userData: JSON.stringify({
resetMe: {
resetMe: true
},
grabbableKey: {
grabbable: false
}
})
});
@ -438,9 +441,9 @@
var position = Vec3.sum(startPosition, multiplier);
position.y = startPosition.y - (row * VERTICAL_SPACING);
originalPositions.push(position);
lastPositions.push(position);
originalPositions.push(position);
lastPositions.push(position);
var targetProperties = {
name: 'Target',
type: 'Model',
@ -455,7 +458,7 @@
userData: JSON.stringify({
resetMe: {
resetMe: true
}
},
})
};
var target = Entities.addEntity(targetProperties);

File diff suppressed because it is too large Load diff