Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 21:59:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge from james/removeHighFreqMsg

Browse source
This commit is contained in:
Seth Alves 2016-02-01 10:01:50 -08:00
commit aa6742a844
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/controllers/handControllerGrab.js
View file

@ -783,8 +783,6 @@ function MyController(hand) {
direction: pickRay.direction
};
// Messages.sendMessage('Hifi-Light-Overlay-Ray-Check', JSON.stringify(pickRayBacked));
var intersection;
if (USE_BLACKLIST === true && blacklist.length !== 0) {
@ -1388,11 +1386,6 @@ function MyController(hand) {
}
}
// Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
// action: 'update',
// grabbedEntity: this.grabbedEntity
// }))
if (this.actionID && this.actionTimeout - now < ACTION_TTL_REFRESH * MSEC_PER_SEC) {
// if less than a 5 seconds left, refresh the actions ttl
var success = Entities.updateAction(this.grabbedEntity, this.actionID, {

2
examples/light_modifier/README.md
View file

@ -1,3 +1,5 @@
*Temporarily Deprecated - needs a better way to know when 'grab beams' intersect with 'light overlays'. Sending messages containing the ray from the hand grab script to the overlay intersection test doesn't seem to be sustainable. *
This PR demonstrates one way in-world editing of objects might work.
Running this script will show light overlay icons in-world. Enter edit mode by running your distance beam through a light overlay. Exit using the red X.