Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 07:15:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated grab script

Browse source
This commit is contained in:
ericrius1 2015-09-22 13:29:16 -07:00
parent a0bf7b6529
commit a28cf5ce8b
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/controllers/handControllerGrab.js
View file

@ -221,7 +221,7 @@ function controller(hand, triggerAction) {
var minDistance = GRAB_RADIUS;
var grabbedEntity = null;
for (var i = 0; i < nearbyEntities.length; i++) {
var props = Entities.getEntityProperties(nearbyEntities[i]);
var props = Entities.getEntityProperties(nearbyEntities[i], ["position", "name", "collisionsWillMove", "locked"]);
var distance = Vec3.distance(props.position, handPosition);
if (distance < minDistance && props.name !== "pointer") {
this.grabbedEntity = nearbyEntities[i];

1
examples/toybox/entityScripts/doll.js
View file

@ -37,7 +37,6 @@
startNearGrab: function() {
print("START GRAB")
Entities.editEntity(this.entityID, {
animationURL: "https://hifi-public.s3.amazonaws.com/models/Bboys/zombie_scream.fbx",
animationSettings: this.startAnimationSetting