Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Atlante45
40e802bae7
Get rid of global variable for sort
...
Fix rhs/lhs
2015-11-24 11:51:56 -08:00
Atlante45
9320623ff5
Add AABox functionalities
2015-11-24 11:51:56 -08:00
Brad Davis
bc84265e99
Additional checking when serializing transforms to json
2015-11-23 22:35:12 -08:00
Anthony J. Thibault
14189ac909
Move Y_180 flip rotation out of Rig
...
This Y_180 flip is defined in skeletonModel not in the rig.
This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip).
We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from
MyAvatar -> skeletalModel -> Rig.
Added Quaternions::Y_180 to GLMHelpers.
2015-11-23 19:31:27 -08:00
Howard Stearns
c94a5389a0
comments
2015-11-23 10:31:37 -08:00
Anthony J. Thibault
821264a031
Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states
2015-11-22 16:15:03 -08:00
Seth Alves
a0c1f9a1f9
progress toward having things be children of specific joints rather than just of other objects
2015-11-22 13:11:37 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Seth Alves
0b1fa4f60f
add interface for getters for specific joints
2015-11-21 08:21:10 -08:00
Anthony J. Thibault
54408a9c87
AnimVars are now in avatar/rig space
...
This makes it much simpler for code out side of the rig to manipulate AnimVars
* Removed mat4 type from AnimVars
* AnimVariantMap now has a _rigToGeometryTransform matrix
used to transform positions and rotations into the correct coordinate frame.
* Moved AnimPose code to extract a quat from a scaled matrix into GLMHelpers
2015-11-20 18:29:17 -08:00
howard-stearns
1ddcc62db9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2
2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb
final(?) cleanup
2015-11-20 13:51:12 -08:00
Anthony J. Thibault
ad4b8e0001
Avatar transmission fixes, moved JointData into shared
...
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
fixed point compression wont overflow, also, it's a
consistent wire format.
2015-11-20 10:24:24 -08:00
Howard Stearns
0f6a37f0f7
remainder->fmod!
2015-11-20 09:49:14 -08:00
Howard Stearns
431a8c9584
cleanup
2015-11-19 17:12:50 -08:00
Howard Stearns
f6286201f4
cleanup
2015-11-19 11:55:22 -08:00
Howard Stearns
7d30cd0159
checkpoint: it works!
2015-11-19 09:18:40 -08:00
Brad Davis
98cc7408b1
Fixing issues found in AC playback test
2015-11-18 17:17:20 -08:00
howard-stearns
42a1ee353e
checkpoint
2015-11-18 14:09:33 -08:00
Howard Stearns
97898a1ad1
forgot new files
2015-11-17 20:43:40 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Stephen Birarda
789290f540
Merge pull request #6370 from Atlante45/locker
...
QTryRead/WriteLocker
2015-11-16 10:22:45 -08:00
Stephen Birarda
e263453acb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-13 14:48:26 -08:00
Seth Alves
a78b1619be
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 14:20:23 -08:00
Brad Hefta-Gaub
66a2b38f50
switch various status to use thread safe atomics
2015-11-12 13:09:51 -08:00
samcake
da8270d50b
Merge pull request #6377 from jherico/rec3
...
Cleaning up clip and transform
2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
James B. Pollack
39f44115be
Merge pull request #6373 from Atlante45/rotationBetween
...
Rotation between
2015-11-12 09:25:56 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Atlante45
118d05d824
Use a clearer function
2015-11-11 17:24:50 -08:00
Atlante45
115b63a117
Simplify rotationBetween
2015-11-11 15:54:48 -08:00
Atlante45
65e9dc4be5
Fixup return types
2015-11-10 18:39:59 -08:00
Atlante45
d5c44466c4
Take Callables with rvalue ref
2015-11-10 18:27:14 -08:00
Atlante45
4d8fa58dd3
Coding standard
2015-11-10 18:23:23 -08:00
Atlante45
7cf2ad2215
Remove lockFor... and expand ReadWriteLockable
2015-11-10 18:19:12 -08:00
Atlante45
3557eacbd0
Add QTryRead/WriteLocker classes
2015-11-10 18:18:29 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf
attempt to fix render-collision hull feature
2015-11-10 09:49:31 -08:00
Atlante45
6a53021818
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:23:31 -08:00
Brad Davis
6122fa145d
More PR feedback
2015-11-06 17:17:26 -08:00
Brad Davis
37a9538f10
PR feedback, ensure destruction of shared objects
2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00
Seth Alves
4ab727c47c
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 13:57:59 -08:00
Atlante45
d9cd986db2
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-04 11:26:16 -08:00
U-GAPOS\andrew
f260c6b12b
fix bad time measurment in AtRestDetector
2015-11-04 10:47:39 -08:00
Seth Alves
9b3708ea66
use parentChanged to recalculate entity bounding boxes
2015-11-04 09:27:57 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
Seth Alves
dba9eb7046
merge from upstream
2015-11-03 13:35:17 -08:00
Ryan Huffman
6151e6125a
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-02 13:39:08 -08:00
Ryan Huffman
f4531759be
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-02 12:27:08 -08:00
Anthony J. Thibault
2236573a9d
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 12:18:11 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Anthony J. Thibault
e3e759248f
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 08:37:10 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Davis
99d8554cc8
Make zlib a true external on windows (linux and OSX should rely on system libraries)
2015-11-01 01:36:59 -07:00
Anthony J. Thibault
2eb62f2fd8
LogHandler: fix for linux build
2015-10-30 17:44:06 -07:00
Anthony J. Thibault
f50e1a0977
Fix for rare crash in LogHandler::flushRepeatedMessages()
...
This can happen when LogHandler::flushRepetedMessages is called on
the main thread, while the application is printing messages on
a separate thread. The access to the _lastRepeatedMessage QHash was
not guarded.
I've added two mutexes to guard access to both the repeatedMessage
hashes/regexes and the onlyOnceMessages/regexes. This will unfortunately
incur a performance hit for frequent debug logging, but that's better
then crashing.
Also, I've added the ability to print threadIDs as well as Process ids.
This is helpful when debugging multi-threaded access to shared variables.
2015-10-30 17:18:37 -07:00
Atlante45
bc552c772b
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-10-30 14:05:40 -07:00
Clément Brisset
d2c17bfdd4
DO NOT MERGE
2015-10-30 12:51:30 -07:00
Brad Hefta-Gaub
1f53e425eb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 12:28:28 -07:00
Anthony J. Thibault
f7b6fab0c3
Merge branch 'master' into tony/anim-sync-blend
2015-10-29 11:35:48 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
samcake
e4aab4bd97
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 15:32:13 -07:00
Brad Hefta-Gaub
61e35d7ada
Merge pull request #6203 from sethalves/fix-action-crash
...
adjust locking in EntityItem::getActionDataInternal
2015-10-28 14:02:28 -07:00
Seth Alves
22d6b6df34
make withWriteLock and withTryWriteLock const
2015-10-28 13:49:52 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Brad Hefta-Gaub
731fab6ffc
Merge pull request #6196 from jherico/gl
...
Move GL utilities to their own library
2015-10-28 12:10:52 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Atlante45
c8c9118d4d
Improve script engine error logging + some cleanup
2015-10-27 12:11:27 -07:00
samcake
990764d855
Really fixing the MovingAverage class...
2015-10-26 13:29:13 -07:00
samcake
8e2c269cc0
doing the correct conversion for byte to normalize float...
2015-10-26 12:24:20 -07:00
samcake
a8872d065b
MOve the movingAverage class to shared next to SimpleMovingAverage
2015-10-26 11:23:13 -07:00
samcake
ff57b73bd6
Creating the COlorUTils in shared to deal with all the standard color conversions
2015-10-26 10:53:21 -07:00
Seth Alves
f3c61a823e
try harder to get children flags right when something moves. added worldToLocal methods
2015-10-23 16:58:09 -07:00
Seth Alves
61269c3ce8
fix up entity constructors so that setProperties isn't called during the constructor
2015-10-23 13:52:50 -07:00
Seth Alves
22af5b27ab
avoid shared_from_this while constructing
2015-10-23 12:55:48 -07:00
Seth Alves
7f6ac0207d
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-22 19:35:27 -07:00
Seth Alves
7b08d047b1
when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity
2015-10-22 16:59:56 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Seth Alves
f6fe503c51
pass avatar parent information through avatar-mixer
2015-10-22 13:44:04 -07:00
Seth Alves
778dc8dc15
add parentID and parentJointIndex EntityItemProperties
2015-10-22 11:52:56 -07:00
Anthony J. Thibault
a9ed033b20
Merge branch 'master' into tony/anim-sync-blend
2015-10-22 11:18:30 -07:00
Seth Alves
264b658132
hook up entities and avatars to SpatialParentFinder
2015-10-22 11:05:48 -07:00
Brad Hefta-Gaub
856af8c764
fix EntityItemID dependency
2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub
ffd277d4d5
fix EntityItemID dependency
2015-10-21 14:31:17 -07:00
Brad Davis
21a3079a39
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-21 10:05:32 -07:00
Seth Alves
7d8dca4edb
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-21 09:55:21 -07:00
Anthony J. Thibault
5cd2786c1d
First pass at Rig timeScaling and blending between slow, walk and run.
2015-10-20 16:37:05 -07:00
Brad Davis
eacd6af032
Get conditional routes working
2015-10-20 16:32:00 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
Seth Alves
37923e81bb
make SpatiallyNestable::_transform private
2015-10-18 08:18:10 -07:00
Seth Alves
7977f4640d
new class: SpatiallyNestable
2015-10-18 07:27:22 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
David Rowe
8c22db17cc
Fix reading of QVector<float> from models files - polyline strokeWidths
2015-10-16 15:43:23 -07:00
