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

Merge pull request #10550 from sethalves/fix-grab-raypick-props-crash

Browse source 
fix code that was using old raypickInfo.properties field
This commit is contained in:
Seth Alves 2017-05-25 13:27:19 -07:00 committed by GitHub
commit a062c964a9
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scripts/system/controllers/handControllerGrab.js
View file

@ -1036,8 +1036,8 @@ function getControllerJointIndex(hand) {
"_CONTROLLER_RIGHTHAND" : "_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND"); "_CONTROLLER_LEFTHAND");
} }
return MyAvatar.getJointIndex("Head"); return MyAvatar.getJointIndex("Head");
} }
// global EquipHotspotBuddy instance // global EquipHotspotBuddy instance
@ -1331,7 +1331,7 @@ function MyController(hand) {
if (this.stylus) { if (this.stylus) {
return; return;
} }
var stylusProperties = { var stylusProperties = {
name: "stylus", name: "stylus",
url: Script.resourcesPath() + "meshes/tablet-stylus-fat.fbx", url: Script.resourcesPath() + "meshes/tablet-stylus-fat.fbx",
@ -2134,7 +2134,7 @@ function MyController(hand) {
return null; return null;
} }
}; };
this.chooseNearEquipHotspotsForFarToNearEquip = function(candidateEntities, distance) { this.chooseNearEquipHotspotsForFarToNearEquip = function(candidateEntities, distance) {
var equippableHotspots = flatten(candidateEntities.map(function(entityID) { var equippableHotspots = flatten(candidateEntities.map(function(entityID) {
return _this.collectEquipHotspots(entityID); return _this.collectEquipHotspots(entityID);
@ -2291,7 +2291,7 @@ function MyController(hand) {
return; return;
} }
} }
if (isInEditMode()) { if (isInEditMode()) {
this.searchIndicatorOn(rayPickInfo.searchRay); this.searchIndicatorOn(rayPickInfo.searchRay);
if (this.triggerSmoothedGrab()) { if (this.triggerSmoothedGrab()) {
@ -2347,10 +2347,11 @@ function MyController(hand) {
var avatar = AvatarList.getAvatar(this.otherGrabbingUUID); var avatar = AvatarList.getAvatar(this.otherGrabbingUUID);
var IN_FRONT_OF_AVATAR = { x: 0, y: 0.2, z: 0.4 }; // Up from hips and in front of avatar. var IN_FRONT_OF_AVATAR = { x: 0, y: 0.2, z: 0.4 }; // Up from hips and in front of avatar.
var startPosition = Vec3.sum(avatar.position, Vec3.multiplyQbyV(avatar.rotation, IN_FRONT_OF_AVATAR)); var startPosition = Vec3.sum(avatar.position, Vec3.multiplyQbyV(avatar.rotation, IN_FRONT_OF_AVATAR));
var finishPisition = Vec3.sum(rayPickInfo.properties.position, // Entity's centroid. var rayHitProps = entityPropertiesCache.getProps(rayPickInfo.entityID);
Vec3.multiplyQbyV(rayPickInfo.properties.rotation , var finishPisition = Vec3.sum(rayHitProps.position, // Entity's centroid.
Vec3.multiplyVbyV(rayPickInfo.properties.dimensions, Vec3.multiplyQbyV(rayHitProps.rotation,
Vec3.subtract(DEFAULT_REGISTRATION_POINT, rayPickInfo.properties.registrationPoint)))); Vec3.multiplyVbyV(rayHitProps.dimensions,
Vec3.subtract(DEFAULT_REGISTRATION_POINT, rayHitProps.registrationPoint))));
this.otherGrabbingLineOn(startPosition, finishPisition, COLORS_GRAB_DISTANCE_HOLD); this.otherGrabbingLineOn(startPosition, finishPisition, COLORS_GRAB_DISTANCE_HOLD);
} else { } else {
this.otherGrabbingLineOff(); this.otherGrabbingLineOff();
@ -3442,14 +3443,14 @@ function MyController(hand) {
}; };
this.offEnter = function() { this.offEnter = function() {
// Reuse the existing search distance if lasers were active since // Reuse the existing search distance if lasers were active since
// they will be shown in OFF state while in edit mode. // they will be shown in OFF state while in edit mode.
var existingSearchDistance = this.searchSphereDistance; var existingSearchDistance = this.searchSphereDistance;
this.release(); this.release();
if (isInEditMode()) { if (isInEditMode()) {
this.searchSphereDistance = existingSearchDistance; this.searchSphereDistance = existingSearchDistance;
} }
}; };
this.entityLaserTouchingEnter = function() { this.entityLaserTouchingEnter = function() {
@ -4154,7 +4155,7 @@ var updateWrapper = function () {
} }
Script.setTimeout(updateWrapper, UPDATE_SLEEP_MS); Script.setTimeout(updateWrapper, UPDATE_SLEEP_MS);
} };
Script.setTimeout(updateWrapper, UPDATE_SLEEP_MS); Script.setTimeout(updateWrapper, UPDATE_SLEEP_MS);
function cleanup() { function cleanup() {