Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling
2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e
Make template specialization of BaseNestableTransformNode explicit
2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a
Add override qualifier to BaseNestableTransformNode::getTransform
2018-09-06 17:44:06 -07:00
sabrina-shanman
f40f40e135
Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value
2018-09-06 17:35:12 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca
Update jsdocs to reflect new collision pick scaling behavior
2018-09-06 16:47:09 -07:00
sabrina-shanman
836f810c41
Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code
2018-09-06 16:33:29 -07:00
amantley
90a51e6181
added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area
2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1
Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc
2018-09-06 12:14:50 -07:00
Simon Walton
adf0a9a414
Convert priority age from microseconds to seconds
2018-09-05 17:41:00 -07:00
Simon Walton
d2650f7ede
Modified priority function from Andrew
2018-09-05 17:22:07 -07:00
amantley
73e628bb8d
merge with master fixes
2018-09-05 14:42:49 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
...
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
...
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
SamGondelman
9b75c7e07f
trying to separate colors and vectors
2018-09-04 17:20:05 -07:00
SamGondelman
9e76c164ac
fix aabox operator+=
2018-09-04 16:25:47 -07:00
Simon Walton
262dbaf5ed
Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling
2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5
Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling
2018-09-04 15:27:18 -07:00
Simon Walton
6ae2ca1576
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
...
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -07:00
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils
...
Create correct folder.
2018-09-04 14:20:20 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Simon Walton
c2ea05b026
Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling
2018-09-04 09:31:05 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting
...
Collision Pick Parenting
2018-08-31 14:43:55 -07:00
SamGondelman
d01b438cb3
CR
2018-08-31 11:25:17 -07:00
sabrina-shanman
b5862aca2a
Use bracket initialization for CollisionRegion.loaded
2018-08-31 10:53:20 -07:00
David Rowe
c41d74621e
Merge branch 'master' into M17217-b
...
# Conflicts:
# interface/src/raypick/PathPointer.cpp
2018-08-31 14:26:24 +12:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback
...
Filter timings used in feedback logic for workload region sizes
2018-08-30 19:11:49 -07:00
Simon Walton
33db1394e6
Use system_clock in usecTimestampNow for cross-platform goodness
2018-08-30 17:12:42 -07:00
SamGondelman
5f08ed5027
misc perf improvements
2018-08-30 16:55:15 -07:00
NissimHadar
4b7ca76ebd
Create correct folder.
2018-08-30 14:15:57 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange
...
Hand Azimuth Controls Shoulder Rotation
2018-08-30 13:59:00 -07:00
Simon Walton
c2ac2b9ab0
Various tweaks; fix clang warning
2018-08-30 10:59:55 -07:00
Simon Walton
a186be014d
Use std::chrono for usecTimestampNow()
2018-08-29 17:35:28 -07:00
sabrina-shanman
0926968e2b
Do not have depth as a parameter in getTransform(..) when called in NestableTransformNode
2018-08-29 16:30:06 -07:00
sabrina-shanman
686f9fb18a
Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean
2018-08-29 16:29:59 -07:00
sabrina-shanman
78a438d89a
Correct CollisionRegion jsdoc for 'joint' parameter
2018-08-29 14:55:14 -07:00
Andrew Meadows
f9d14e1351
filter time-cost drivers for region regulation
2018-08-29 11:17:59 -07:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
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
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3
2018-08-27 10:43:52 -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
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -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
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -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
David Rowe
7e46a99400
Merge branch 'master' into M17217-b
2018-08-17 10:35:52 +12: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
David Rowe
a08bcd325d
Merge branch 'master' into M17217-b
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-08-10 11:25:39 +12: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
David Rowe
96767c1103
Merge branch 'master' into M17217-b
...
# Conflicts:
# plugins/openvr/src/OpenVrDisplayPlugin.cpp
2018-08-08 10:43:58 +12:00
SamGondelman
9427de1a50
Merge branch 'scriptvec3' of github.com:SamGondelman/hifi into scriptvec3
2018-08-06 12:38:44 -07:00
SamGondelman
3c805df3cc
try to get rid of qobject vecs
2018-08-06 12:38:01 -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
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
David Rowe
11b85e30db
Merge branch 'master' into M17217-a
2018-08-04 09:44:39 +12: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
