Commit graph

114 commits

Author SHA1 Message Date
SamGondelman
24ce09f914 generalized pointer, laserpointermanager -> pointermanager 2017-10-20 11:28:48 -07:00
SamGondelman
d7745efc8e one global pickmanager 2017-10-19 16:55:24 -07:00
SamGondelman
3572f7f5db non-templated pickresult wip 2017-10-19 13:41:16 -07:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
SamGondelman
640ad514bc updates based on austin's comments 2017-10-17 17:53:10 -07:00
SamGondelman
05f4883104 get rid of valid 2017-10-17 16:15:54 -07:00
SamGondelman
6d6ede075f resolve conflicts 2017-10-17 15:26:32 -07:00
SamGondelman
8a5759df69 PickManager::addPick 2017-10-17 15:22:39 -07:00
SamGondelman
3ef7ebffba working generalized pickmanager 2017-10-17 15:09:41 -07:00
SamGondelman
596be8ec27 pickmanager wip 2017-10-17 13:16:37 -07:00
SamGondelman
ba4f41b59a fix warnings 2017-10-17 12:03:59 -07:00
Sam Gondelman
2e69d2b1ad missed one scripting interface reference 2017-10-17 11:13:02 -07:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
SamGondelman
6b02cbb911 move locking inside laserpointer and raypick 2017-10-05 13:17:57 -07:00
SamGondelman
97b09d680c fix and improve laser pointer locking 2017-10-02 13:17:53 -07:00
SamGondelman
0e3f1c5149 add setLaserLength, setLockEndUUID doesn't use defaultRenderStates 2017-09-22 16:11:24 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
SamGondelman
f21c99257e don't let scripts control visibility of laser pointers 2017-09-20 14:35:29 -07:00
Daniela
758f049f30 Correct offset for teleport pad. 2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0 Decrease offset for teleport pad. Add Bubble orientation and scale correction. 2017-09-08 12:45:29 +01:00
Daniela
9eb429b25a Fix offset for teleport pad. 2017-09-08 11:23:19 +01:00
Daniela
d11a749365 Refactor 1 line. Pad alignment is correct. 2017-09-07 19:28:36 +01:00
Daniela
94e26a554d Add 180 degrees rotation so that pad faces the avatar 2017-09-07 18:48:20 +01:00
Daniela
4c302b899d Fix teleport pad alignment 2017-09-07 17:52:09 +01:00
Daniela
3ff707f27e Add Avatar resize compatible teleport pad alignment 2017-09-07 13:31:41 +01:00
Daniela
37f959d749 Add Avatar resize compatible teleport pad alignment 2017-09-06 19:45:58 +01:00
Anthony J. Thibault
f0912987a3 Fix ray picks against HUD sphere at different sensor scale factors 2017-09-05 10:03:19 -07:00
Anthony J. Thibault
a1b94fd9d2 Bug fixes for laser offset and avatar hold action 2017-08-31 17:26:00 -07:00
SamGondelman
206862a90f fix flag bits 2017-08-23 12:20:30 -07:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
SamGondelman
b8a7fce201 boop 2017-08-22 11:54:55 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
SamGondelman
f058781f49 just kidding shared_mutexes are c++17 2017-08-11 10:07:20 -07:00
SamGondelman
d0d5ac8dd1 switch to stl wherever possible, use bitset instead of unsigned ints 2017-08-10 15:33:55 -07:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
SamGondelman
6d253fcc5f cleaning up 2017-08-07 18:37:55 -07:00
SamGondelman
42147640e2 remove LaserPointerManager as a dependency 2017-08-07 14:18:56 -07:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
SamGondelman
e3288a9004 fix flicker, scissor warning, and handControllerGrab sphere size 2017-07-27 11:17:30 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
SamGondelman
3a8ad8b631 switch to QUuids 2017-07-25 15:11:44 -07:00
SamGondelman
ee02a0bff4 fix build error 2017-07-24 12:44:54 -07:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
SamGondelman
912b417dd4 mouse ray pick 2017-07-19 13:56:18 -07:00
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -07:00
SamGondelman
55a025b827 initial code review 2017-07-18 12:43:34 -07:00
SamGondelman
298faa9f0f threading pass 2017-07-18 12:13:16 -07:00
SamGondelman
0c8c6ff5d6 silly me 2017-07-17 15:05:31 -07:00
SamGondelman
7084a0607a fix warnings 2017-07-17 14:26:22 -07:00
SamGondelman
ae99be0350 added faceAvatar and centerEndY, working on updating teleport.js, style fixes 2017-07-17 13:07:42 -07:00
SamGondelman
af12b5a4bf can create static laser pointers, fixed a bug with multiple render states 2017-07-14 18:35:27 -07:00
SamGondelman
8f533636f5 c++ side laserpointer rendering with renderstates 2017-07-14 11:13:40 -07:00
SamGondelman
3c719b26b1 working on renderstates 2017-07-13 17:43:44 -07:00
SamGondelman
3a35cd128f fix dirOffset, expose intersection type to JS 2017-07-13 16:09:21 -07:00
SamGondelman
783750a0bc update jointraypicks from joints, dirOffset needs work 2017-07-13 14:47:24 -07:00
SamGondelman
916a99c670 added JS/C++ RayPickResult, working on RayPickManager::update 2017-07-12 17:12:25 -07:00
SamGondelman
ea65a04f28 expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing) 2017-07-12 14:20:39 -07:00