Commit graph

3897 commits

Author SHA1 Message Date
Simon Walton
4b7f6a346f Use AvatarData::getClientGlobalPosition() for position in priority queue
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
2018-08-28 16:21:47 -07:00
sabrina-shanman
6f6e70a470 Re-order variable initialization in CollisionRegion copy contructor 2018-08-28 08:45:47 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
amantley
055f03878e made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now 2018-08-27 14:44:27 -07:00
sabrina-shanman
397b03d5d5 Add threshold parameter to collision pick with minimum of 0 2018-08-27 14:12:24 -07:00
sabrina-shanman
51683b0b53 Remove storage of parenting information from CollisionRegion 2018-08-27 10:16:09 -07:00
amantley
8406fb2359 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-24 16:48:26 -07:00
amantley
dd8a00983c Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-24 16:29:20 -07:00
sabrina-shanman
6e160ad22f Add TransformNode-based parenting and implement for CollisionPicks 2018-08-24 15:47:52 -07:00
sabrina-shanman
68b86963d4 Add CollisionRegion copy constructor 2018-08-24 15:47:52 -07:00
sabrina-shanman
3167d3c0c7 Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head 2018-08-24 15:47:52 -07:00
SamGondelman
1c0c17cecb faster triangle intersection 2018-08-24 11:20:10 -07:00
Andrew Meadows
1c87d7b109 reorder initialization to remove compile warning 2018-08-23 12:59:28 -07:00
Andrew Meadows
55b1a6762c explicit delete default ctor, make _nestableType private 2018-08-23 12:59:28 -07:00
SamGondelman
c474f38860 force coarse picking, sort avatars 2018-08-22 18:07:16 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
amantley
2dd812935f Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-22 12:57:16 -07:00
amantley
1e3ca6f902 added quicker follow code and added head to rotate calculation 2018-08-22 12:57:06 -07:00
amantley
1fabc77244 latest update to stop lurching, and allow leaning, and stop perma leans 2018-08-21 12:34:05 -07:00
amantley
1e2ca579c7 widened base of support and put head angular and hand angular back to normal 2018-08-20 18:06:34 -07:00
amantley
2dcdd60750 added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes 2018-08-20 17:32:52 -07:00
amantley
471bb28545 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-20 09:50:45 -07:00
sabrina-shanman
2933038d04 Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum 2018-08-17 14:22:42 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
2018-08-14 15:40:07 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
sabrina-shanman
e5cb078133 Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target 2018-08-13 14:51:37 -07:00
amantley
c2612af7a8 changed the spine stretch limit, will check the scale implications next 2018-08-10 17:10:33 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow
Fixing PR13731 shader error on Mac
2018-08-10 14:10:47 -07:00
sabrina-shanman
e5e1a72598 Use 'orientation' for Collision Pick API, not 'rotation' 2018-08-10 10:52:21 -07:00
amantley
74186b0162 changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27 2018-08-10 09:56:24 -07:00
sabrina-shanman
f902552309 Finalize on using 'rotation' in Collision Pick API and add missing jsdoc for CollisionRegion 2018-08-10 08:55:29 -07:00
amantley
c8a31bc59f created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3 2018-08-09 17:38:57 -07:00
John Conklin II
2d9cbe91bb
Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption
Fix memory corruption in PerformanceTimer when Stats are active
2018-08-09 17:16:03 -07:00
sabrina-shanman
5b6916177c Add support for rotation as CollisionRegion parameter and make it the default 2018-08-08 10:47:13 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
Stack tester changes
2018-08-08 13:40:05 -04:00
Anthony J. Thibault
c4c3581285 Fix memory corruption in PerformanceTimer when Stats are active
PerformanceTimer was neither thread safe nor re-entrant.  Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
2018-08-08 09:53:26 -07:00
sabrina-shanman
4ffe164569 Address Mac/Linux build warnings 2018-08-08 08:56:35 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
Clément Brisset
e9f23a43f6
Merge pull request #13726 from Atlante45/fix/angle-between
Fix angleBetween potential NaN return value
2018-08-07 18:31:57 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
Olivier Prat
c56bb9a855 Small optimization by using squared distance and not distance in depth sort 2018-08-06 08:20:21 +02:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
sabrina-shanman
cf34a2cffd Do not const cast CollisionRegion 2018-08-03 17:55:54 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
sabrina-shanman
b7d5804edb Format if..else statements 2018-08-03 12:55:11 -07:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics
reduce physics simulation cost of other-avatars
2018-08-03 09:33:59 -07:00
Brad Davis
3c7f1a0c4b Merge remote-tracking branch 'upstream/master' into destroy 2018-08-02 15:34:19 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Clement
2dd70f1fcd Warn against zero-length vectors 2018-08-01 11:39:14 -07:00
Andrew Meadows
0d92e2de0a remove bits from other-avatar collision mask 2018-08-01 11:21:54 -07:00
Clement
3a140145ae Fix angleBetween potential NaN return value 2018-07-31 13:30:13 -07:00
Clement
f8e98d2c6a Remove 2 year old migration code 2018-07-30 17:18:32 -07:00
Clement
333cbc99ad Remove static logging 2018-07-30 17:18:32 -07:00
sabrina-shanman
6be5ac8dee Add missing equality operator to CollisionRegion to fix false cache collisions leading to false negatives 2018-07-30 13:58:14 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
Simon Walton
7cb917f735 Angles aren't boolean! 2018-07-25 14:45:26 -07:00
amantley
85b7a9b67c added the changes committed to the hot fix rc70.1 in AvatarConstants.h 2018-07-25 11:31:02 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
2018-07-24 16:50:37 -07:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
sabrina-shanman
4ca9899000 Use SHAPE_TYPE_NONE instead of (ShapeType)0 in ShapeInfo.cpp 2018-07-24 11:37:52 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
sabrina-shanman
7f743de150 Fix CollisionRegion serialization/deserialization issues and CollisionPick implicit cast warning 2018-07-23 12:59:23 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
564578aac6 parabola aabox fixes, refactoring some intersection math 2018-07-19 14:54:49 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
Seth Alves
4cf706dd96
Merge pull request #13574 from AndrewMeadows/grab-kinematic-children
more correct kinematic motion of grabbed things
2018-07-11 10:34:44 -07:00
Andrew Meadows
dd6be374fa cleanup and optimization rotational integration 2018-07-10 11:18:38 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping
Step Detection From Head and Hands Tracking
2018-07-10 09:59:22 -07:00
SamGondelman
ca5ce888f4 parabola triangle intersection 2018-07-09 18:11:57 -07:00
SamGondelman
fcc523fbef parabola sphere intersection 2018-07-09 15:15:36 -07:00
amantley
a2f8e024fb added avatar constants changed for posterior and head velocity 2018-07-09 13:59:56 -07:00
amantley
55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-09 13:55:59 -07:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
SamGondelman
bbe9a0005d parabola vs. web and text 2018-07-05 17:02:55 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
SamGondelman
7130b5aa7f fixing findRayIntersection bugs 2018-07-05 10:27:12 -07:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix
Fix closed eyelids when head is tilted down
2018-07-05 08:50:22 -07:00
SamGondelman
bfcf4f7865 add parabola test, performance optimization 2018-07-03 15:14:43 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
luiscuenca
97a0edf026 spaces 2018-06-29 14:38:43 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892
Fix entity detaching from head joint not becoming visible
2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup
Always roll hifi-log.txt when starting
2018-06-27 12:32:20 -07:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID
Include shapeID in RayPick results
2018-06-26 10:25:39 -07:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
8f411ad6c8 CR 2018-06-20 16:13:10 -07:00
SamGondelman
12a5d8b550 quiet ubuntu warnings, particle properties show radians 2018-06-19 12:51:35 -07:00
humbletim
dc5c5c20df raypick partIndex commit
include shapeID for accessing proper material index

add raypick shapeID test script
2018-06-18 18:22:30 -04:00