Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
samcake
902b6b8ea1
Merge pull request #6506 from jherico/maggie
...
OpenGL class cleanup
2015-12-03 13:55:29 -08:00
howard-stearns
f5b25791f4
When throttling starts, we won't have noticed, so change test.
2015-12-03 13:39:41 -08:00
Brad Davis
cc80dfb9e1
Fixing case on gl surface format helper
2015-12-03 13:08:26 -08:00
Howard Stearns
30bbc82c24
Restore throttling interval code.
2015-12-03 13:00:07 -08:00
Brad Hefta-Gaub
1a5bc5d111
removing optional compression
2015-12-03 12:40:24 -08:00
Howard Stearns
a989b926b0
isVSynchronized, and proper override declarations.
2015-12-03 11:28:26 -08:00
Seth Alves
e5b1cfa920
fix windows build
2015-12-03 11:15:04 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Seth Alves
6f79b381f9
working toward making children of avatar joints work
2015-12-03 11:00:06 -08:00
Brad Hefta-Gaub
0c05ffe9ce
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 10:20:04 -08:00
Ryan Huffman
667d2b728e
Fix uninitialized xColor value when converting script value
2015-12-03 09:52:56 -08:00
Brad Davis
3854523787
Fixing 32 bit build breakage
2015-12-03 09:17:41 -08:00
Seth Alves
2d804555de
minor cleanups
2015-12-03 08:59:15 -08:00
Howard Stearns
ed86a88083
Make various forms of throttling more consistent and give it a chance of actually reaching target.
2015-12-02 21:48:06 -08:00
Brad Davis
7a05a664f4
Updating GPU for 64 bit
2015-12-02 21:34:11 -08:00
Anthony J. Thibault
b56cf58e33
Fix for mirrored transforms in FBX models
...
extractScale will now return negative scale for left-handed matrices.
2015-12-02 16:55:04 -08:00
Howard Stearns
8ae05d8490
Plugins target frame rate and period.
2015-12-02 16:40:41 -08:00
Andrew Meadows
744da64c50
Merge pull request #6527 from ZappoMan/debugEntitiesSending
...
Add some debugging stats to entity server
2015-12-02 15:51:47 -08:00
Brad Hefta-Gaub
1e51a90204
add edit times and entity ids to the viewer stats
2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28
merge from upstream
2015-12-02 14:38:26 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Brad Hefta-Gaub
08ba535c38
add some basic send tracking
2015-12-02 13:43:05 -08:00
Ryan Huffman
d9eddbe738
Remove unnecessary ptr get() in PacketList
2015-12-02 13:32:56 -08:00
Brad Hefta-Gaub
33b859df33
Merge pull request #6416 from kencooke/audio-reverb
...
New reverb
2015-12-02 11:22:12 -08:00
Ken Cooke
fbd7549430
Better reverb script defaults
2015-12-02 11:05:06 -08:00
Brad Hefta-Gaub
112cdaf028
Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
...
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8
Merge pull request #6500 from Atlante45/octree_crash
...
Octree crash fix
2015-12-02 09:59:56 -08:00
Ken Cooke
f005afd7c0
Fix stdint.h includes
2015-12-02 09:33:47 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Brad Davis
9b6ec34f09
Fixing avatar orientation in recordings
2015-12-01 20:51:07 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b
Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball
2015-12-01 15:16:05 -08:00
Atlante45
f06b5b05b3
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-01 15:14:58 -08:00
Seth Alves
b8d800f5b8
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-01 11:59:10 -08:00
Howard Stearns
ef32853d46
When AvatarData parses the .fst, store the (merged) .fbx filename.
...
(Interface gets the .fbx by a separate path, but agents don't have that chance.)
2015-12-01 11:51:22 -08:00
Atlante45
70dd8ec19a
Remove left/right relative pos/rot from c++
2015-12-01 11:44:42 -08:00
Ryan Huffman
4d84362757
Fix ScriptEngine setting _isFinished when it shouldn't
2015-12-01 11:30:56 -08:00
Andrew Meadows
ab6367ff4e
remove debug option for disabling physics updates
2015-12-01 11:13:01 -08:00
Stephen Birarda
7dbf29821a
don't persist the octree if it never loaded
2015-12-01 10:00:25 -08:00
Ken Cooke
a725c8b12e
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-12-01 09:12:24 -08:00
Brad Davis
0023c034c4
Fixing naming of GL classes
2015-11-30 18:27:03 -08:00
Atlante45
d0e1ec3a86
Fix merge error
2015-11-30 18:26:04 -08:00
Atlante45
083205916f
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 18:25:53 -08:00
Brad Davis
a94b6667b1
Moving most of GLCanvas to gl library
2015-11-30 17:19:42 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Seth Alves
3402585d1a
fix a crash from previous commit
2015-11-30 16:54:29 -08:00
Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Seth Alves
9b54924524
edit.js can now manipulate children without flipping the table
2015-11-30 16:21:14 -08:00
Stephen Birarda
c3f3639374
more spacing adjustments in ScriptEngine.cpp
2015-11-30 15:57:10 -08:00
Stephen Birarda
b1a69bb2cf
cleanup spacing in ScriptEngine
2015-11-30 15:52:10 -08:00
Stephen Birarda
2acfbd0f8f
revert accidental CCD change
2015-11-30 15:52:03 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Atlante45
4aaa9ca02f
Make OctreeElementBag safer to use
2015-11-30 15:23:49 -08:00
Seth Alves
02c4730388
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-30 14:09:31 -08:00
Anthony J. Thibault
e2d9e37eb8
Fix for head offset for models with no eyes
...
This was causing in correct body poses while wearing an HMD.
2015-11-30 14:08:21 -08:00
Seth Alves
5c327edd5a
keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts
2015-11-30 14:08:07 -08:00
Seth Alves
89b78986d5
remove some more stray const
2015-11-30 14:01:17 -08:00
Stephen Birarda
f07314f4ef
resolve conflicts on merge with huffman/baseball
2015-11-30 13:34:36 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Seth Alves
941dfe5bd2
initialize _parentJointIndex
2015-11-30 13:30:47 -08:00
Seth Alves
4b87e09848
clean up some unneeded consts. get edit.js closer to working on parented entities
2015-11-30 13:23:55 -08:00
Ryan Huffman
5849befb3d
Add caching back to AssetRequest
2015-11-30 11:53:53 -08:00
Ryan Huffman
304b105dac
Add proper message failure handling to Connection
2015-11-30 11:53:08 -08:00
Ryan Huffman
2e76f0e0d8
Update ReceivedMessage progress to only trigger every 100 packets
2015-11-30 11:52:49 -08:00
Ryan Huffman
5e27af5076
Remove old comment in PacketReceiver
2015-11-30 11:52:21 -08:00
Ryan Huffman
242167ebf2
Remove debug messages
2015-11-30 11:52:07 -08:00
Atlante45
5019f79947
Fix header name
2015-11-30 11:48:34 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Ryan Huffman
1b0413f8e3
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:23:40 -08:00
Ryan Huffman
99dd9646bc
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:20:13 -08:00
Seth Alves
081174fe69
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-30 10:18:01 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
Seth Alves
4add3e2e91
rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space
2015-11-30 09:41:15 -08:00
Ryan Huffman
bb6bb85d12
Update comment in ReceivedMessage
2015-11-30 09:16:57 -08:00
Ryan Huffman
dc48b9a266
Limit progress signal in ReceivedMessage to once every 50 packets
2015-11-30 09:15:25 -08:00
Ryan Huffman
4220d7a3cc
Add atp hash checking back in
2015-11-30 09:13:59 -08:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
David Rowe
d6b13ef42c
Fix crash when try to remove invalid menu item in JavaScript
2015-11-30 08:33:38 +13:00
Seth Alves
204c3d839e
added localToWorld calls, put locks around access to _children hashtable
2015-11-29 10:17:21 -08:00
Seth Alves
eb50c9de5f
aabox delivered to scripts in properties should be in world space
2015-11-29 10:16:56 -08:00
Seth Alves
4b5fec4b00
clean up, minimize diff
2015-11-26 08:36:41 -08:00
Seth Alves
4ab2bfa854
clean up, minimize diff
2015-11-26 08:35:28 -08:00
Seth Alves
c96a09976e
Merge branch 'master' of github.com:highfidelity/hifi into update-model-during-simulate
2015-11-26 08:32:17 -08:00
Seth Alves
facf91faac
minimize diff vs master
2015-11-26 07:13:43 -08:00
Seth Alves
6062691c2a
minimize diff vs master
2015-11-26 07:04:27 -08:00
Seth Alves
10cf85bad9
fix some rotation handling in EntityItem, minimize diff vs master
2015-11-26 07:02:53 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Atlante45
a364e85e1d
Remove DeleteHooks
2015-11-25 17:21:56 -08:00
Ken Cooke
a5b64473af
Fix bugs
2015-11-25 16:15:04 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
Andrew Meadows
527408c7c1
Merge pull request #6292 from huffman/physics-continuous-collision-detection
...
Physics continuous collision detection
2015-11-25 15:45:18 -08:00
Atlante45
cd2e610e17
Remove OctreeElement's UpdateHooks
2015-11-25 15:35:15 -08:00
Anthony J. Thibault
5072339a22
Warning fix
2015-11-25 14:04:01 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Anthony J. Thibault
2a9adafc09
Bumped avatar packet version number
2015-11-25 12:13:40 -08:00
Anthony J. Thibault
97a2eb62d4
Fix for incorrect avatar bounds after changing avatars
2015-11-25 12:06:50 -08:00
Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Anthony J. Thibault
868cf83b48
Fix for attachments and MyAvatar::getDefaultEyePosition()
2015-11-25 10:07:29 -08:00
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 Thibault
527199bc69
Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
...
compute bounding capsule of avatars
2015-11-25 09:39:18 -08:00
Andrew Meadows
2cc1dfe819
getRootAbsoluteBindPoseByChildName() is deprecated
2015-11-24 20:39:26 -08:00
Andrew Meadows
3ae082f09c
compute bounding capsule of avatars
2015-11-24 20:28:39 -08:00
Anthony J. Thibault
386dad7aff
Fixes hand IK for some avatars
...
Specifically:
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst
These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
2015-11-24 18:57:35 -08:00
Anthony J. Thibault
76034d62d5
Eye tracking fixes
2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Howard Stearns
b12bc96fb7
Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix
...
Fix for avatar eye tracking
2015-11-24 14:38:28 -08:00
Anthony J. Thibault
e07e1c5c92
Fix for avatar eye tracking
...
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
2015-11-24 14:01:01 -08:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Atlante45
2dd494b5df
Remove additive blending option (force it)
2015-11-24 11:51:56 -08:00
Atlante45
4827a96bfa
Fix vertex shader (nested struct unsupported)
2015-11-24 11:51:56 -08:00
Atlante45
d08a4d77dc
Shader cleanup
2015-11-24 11:51:56 -08:00
Atlante45
28c8cf26f5
Fix shader transform errors
2015-11-24 11:51:56 -08:00
Atlante45
9adc437553
Make Particle's Payload/PendingChanges *almost* pointer free
2015-11-24 11:51:56 -08:00
Atlante45
0f316e6ae1
Remove particles emiter bounds compute
2015-11-24 11:51:56 -08:00
Atlante45
2cb2ca29e6
More particle shader work
2015-11-24 11:51:56 -08:00
Atlante45
74278cad40
Fix particle texturing
2015-11-24 11:51:56 -08:00
Atlante45
e25ea122d8
Start moving update to shader
2015-11-24 11:51:56 -08:00
Atlante45
61511d57bb
Rename struct/Add type aliases
2015-11-24 11:51:56 -08:00
Atlante45
ca17c75631
Save one array traversal
2015-11-24 11:51:56 -08:00
Atlante45
cb14fbf4a1
Instance particle draw calls
2015-11-24 11:51:56 -08:00
Atlante45
230a413ec1
First pass at new particle shader
2015-11-24 11:51:56 -08:00
Atlante45
7d0a5677fa
More code cleanup
2015-11-24 11:51:56 -08:00
Atlante45
964ac5bad6
More cleanup
2015-11-24 11:51:56 -08:00
Atlante45
c33b6205a8
Some cleanup
2015-11-24 11:51:56 -08:00
Atlante45
40e802bae7
Get rid of global variable for sort
...
Fix rhs/lhs
2015-11-24 11:51:56 -08:00
Atlante45
395822c6cd
Use make_shared
2015-11-24 11:51:56 -08:00
Atlante45
a71ed7b166
Implement particle bounds with Extents
2015-11-24 11:51:56 -08:00
Atlante45
9320623ff5
Add AABox functionalities
2015-11-24 11:51:56 -08:00
Philip Rosedale
dde01b2071
Merge pull request #6476 from AndrewMeadows/arrow
...
fix for objects suffering from very small updates to physics properties
2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub
fd7a704753
Merge pull request #6471 from birarda/url-cmp
...
fix unnecessary model URL updating thanks to URL encoding
2015-11-24 10:56:21 -08:00
Andrew Meadows
e26081e981
always update physics properties when they change
...
and move activation check logic to MotionState
2015-11-24 10:20:19 -08:00
Andrew Meadows
5135c9dded
whitespace cleanup
2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Ryan Huffman
dac491ef41
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-24 09:59:22 -08:00
Stephen Birarda
5a7b0dd1ad
put the parsed model URL in ModelEntityItem
2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448
cleanup printing of updated model URL
2015-11-24 11:22:30 -06:00
Stephen Birarda
0e19e50047
cleaner handling for QString/QUrl conversion/comparison
2015-11-24 11:17:46 -06:00
Stephen Birarda
ab7cbc0b76
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid
2015-11-24 10:45:00 -06:00
Stephen Birarda
762709748d
Merge pull request #6473 from ZappoMan/waitForScriptThreads
...
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-24 10:39:22 -06:00
Brad Davis
5c2b980a45
Fixing avatar facial blendshapes and attachments in recordings
2015-11-23 22:36:07 -08:00
Brad Davis
bc84265e99
Additional checking when serializing transforms to json
2015-11-23 22:35:12 -08:00
Brad Davis
3738f21936
Fix occasional deadlock in loading recordings
2015-11-23 22:34:17 -08:00
samcake
a1668cdc73
Let the AssertClient JS interface use global vars
2015-11-23 22:28:59 -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
Brad Hefta-Gaub
5f88d958ab
CR feedback
2015-11-23 18:26:15 -08:00
Seth Alves
09f14bc9a5
guard against nullptr deferenece
2015-11-23 16:51:17 -08:00
Seth Alves
5cd047da15
move some more code over
2015-11-23 16:49:36 -08:00
Seth Alves
cfcff42004
missed a line
2015-11-23 16:41:16 -08:00
Seth Alves
283ad7ffd9
try, try again
2015-11-23 16:39:19 -08:00
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08:00
Seth Alves
89e5b11f9e
do this from update rather than simulate
2015-11-23 16:17:22 -08:00
Anthony J. Thibault
8f46b8a765
Added USE_PRE_ROT_FROM_ANIM option to AnimClip
...
This will allow us in the future to pull preRotations from
animations instead of the model skeleton. It is disabled
by default because our current animations preRotations are
not correct for the left hand.
2015-11-23 15:58:18 -08:00
Seth Alves
7b70562a1b
update RenderableModelEntityItem::_model during simulate rather than during render
2015-11-23 15:51:43 -08:00
Stephen Birarda
6339c2c48f
fix for unnecessary model URL updating
2015-11-23 17:25:31 -06:00
Stephen Birarda
0997d3dcae
resolve conflicts on merge with upstream/master
2015-11-23 16:15:15 -06:00
Seth Alves
ba30e01664
include global position in avatar-mixer protocol so server knows where avatars are in world-space
2015-11-23 14:12:49 -08:00
Anthony J. Thibault
8252bbed9b
AnimSkeleton: added pre rotation accessor methods
2015-11-23 13:50:14 -08:00
Seth Alves
a08bad8cbd
for models, relay getJointRotation and getJointTranslation to the model
2015-11-23 13:46:32 -08:00
ericrius1
1409ed2d18
moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes
2015-11-23 12:28:44 -08:00
Seth Alves
d4937071e1
rather than activating rigid body and forcing non-static on deserialize, just force non-static
2015-11-23 12:17:15 -08:00
Anthony J. Thibault
dd3f43705c
Fix for Model Entity animations.
...
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
2015-11-23 11:06:11 -08:00
Howard Stearns
c94a5389a0
comments
2015-11-23 10:31:37 -08:00
Seth Alves
6f19093cb9
if an entity with an action has a motion-type of static, flag it so it gets updated in bullet
2015-11-23 10:03:35 -08:00
Brad Davis
64ba5b4f14
Cleaning up old recording files
2015-11-23 09:42:34 -08:00
Anthony J. Thibault
db21db3cbc
Rig.h: more coordinate space comments
2015-11-22 16:34:06 -08:00
Anthony J. Thibault
dc169dc0aa
Rig.h: updated comments with coordinate spaces
2015-11-22 16:21:22 -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
abfc3e994a
AvatarData::toFrame expects a scaled transform
2015-11-22 07:18:12 -08:00
Anthony J. Thibault
e2f031e77f
AnimDebugDraw Removed unused drawing code.
2015-11-21 10:57:39 -08:00
Anthony J. Thibault
fe683edb66
Avatar Debug Draw Default Pose now works
2015-11-21 10:53:24 -08:00
Seth Alves
4646c0c103
unmangle merge
2015-11-21 10:49:31 -08:00
Anthony J. Thibault
6cfd831a5a
Menu: Added Developer > Avatar > Debug Draw Position
...
Also renamed "Debug Draw Bind Pose" to "Debug Draw Default Pose"
2015-11-21 09:50:56 -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
995958a8f0
Rig: normalized index bounds checking.
2015-11-20 18:45:53 -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
EdgarPironti
ebbed7c525
Save clip to asset - removing last fix
2015-11-20 18:23:36 -08:00
samcake
de56f698aa
Merge pull request #6444 from EdgarPironti/asset_branch
...
Save clip to asset
2015-11-20 16:28:55 -08:00
Brad Davis
336562b894
Merge pull request #6452 from ctrlaltdavid/20732
...
Make multiline strings from JavaScript's print() readably in log file
2015-11-20 16:25:17 -08:00
EdgarPironti
df2153186d
Fixes
2015-11-20 16:07:31 -08:00
EdgarPironti
e70f6855aa
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
35365f9157
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
1db6d0e3c1
Upload QByteArray
2015-11-20 16:07:29 -08:00
EdgarPironti
1b18d3656f
Save clip to asset
2015-11-20 16:07:29 -08:00
Stephen Birarda
c8b5f6f737
fix for top on deque when empty
2015-11-20 16:03:18 -08:00
Brad Davis
f45eff3df9
Merge pull request #6455 from samcake/controllers
...
Recording playback the skeleton animation correctly for agents
2015-11-20 15:35:53 -08:00
Stephen Birarda
9ddebc8d13
resolve conflicts on merge with upstream/master
2015-11-20 15:29:44 -08:00
samcake
0dc551409d
Fixing a comment
2015-11-20 15:22:01 -08:00
Anthony J. Thibault
4f8cd6930d
Rig: Fixes for initializing _absolutePoses during initJointStates
2015-11-20 15:13:16 -08:00
samcake
e97e864de7
Getting the animation playback to work
2015-11-20 15:05:17 -08:00
Clément Brisset
5d75fcbfce
Merge pull request #6430 from birarda/unique_linked_data
...
use a unique_ptr for linkedData in Node
2015-11-20 15:01:41 -08:00
Anthony J. Thibault
2f37335d77
Warning fixes
2015-11-20 14:50:42 -08:00
Anthony J. Thibault
30087ef0bd
Removed dead code
2015-11-20 14:37:53 -08:00
Anthony J. Thibault
cb89f09635
Removed EntityRig and AvatarRig. One Rig to rule them all.
2015-11-20 14:27:01 -08:00
Anthony J. Thibault
a77ea8da43
Removed JointStates! You won't be missed.
2015-11-20 14:15:37 -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
David Rowe
c72c6a0a47
Make multiline strings from JavaScript's print() readably in log file
...
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
c7673aad4a
Merge pull request #6447 from huffman/polyline-texture
...
Add texture property to polyline entity type
2015-11-20 13:31:34 -08:00
Brad Hefta-Gaub
879c42c269
Merge pull request #6451 from jherico/rec5
...
Force synchronous loading of clips in JS
2015-11-20 13:13:34 -08:00
Brad Davis
eef01f8a13
Merge pull request #6443 from ZappoMan/assetJS
...
fix crash with no asset server
2015-11-20 12:58:16 -08:00
Stephen Birarda
b34934b849
resolve conflicts on merge with upstream/master
2015-11-20 11:52:53 -08:00
Brad Davis
cc2a7cbda8
Force synchronous loading of clips in JS
2015-11-20 11:51:08 -08:00
Brad Hefta-Gaub
c22d632c3a
Merge pull request #6446 from jherico/rec4
...
Support writing a clip to a qbytearray
2015-11-20 11:45:39 -08:00
Brad Hefta-Gaub
f1badc017b
CR feedback
2015-11-20 11:43:50 -08:00
Brad Davis
a356f96a7b
Merge pull request #6448 from ZappoMan/messaging
...
fix senderID in messages, dry up code
2015-11-20 11:42:30 -08:00
Clément Brisset
f4b0492b33
Merge pull request #6436 from birarda/ghost-avatar
...
fix for ghosted avatars thanks to check/add race
2015-11-20 11:41:20 -08:00
Brad Hefta-Gaub
7e9190d0e1
Merge branch 'master' of https://github.com/highfidelity/hifi into assetJS
2015-11-20 11:39:50 -08:00
Anthony J. Thibault
a4116e633a
Removed last consumer of JointState class
...
Removed option to render IK constraints used by old animation system
2015-11-20 11:26:54 -08:00
Brad Hefta-Gaub
caa8b0b5b6
fix unix build
2015-11-20 11:07:01 -08:00
Stephen Birarda
19d3d80ff9
fixes for some incorrect assumptions
2015-11-20 11:03:52 -08:00
Anthony J. Thibault
df7ca3bc38
Rig: getJointRotation and getJointTranslation use _relativePoses
2015-11-20 10:36:40 -08:00
Brad Hefta-Gaub
4bbfcb6092
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-20 10:30:38 -08:00
Anthony J. Thibault
923d60e452
Rig: Bug fix for copyJointsIntoJointData
2015-11-20 10:30: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
Ryan Huffman
0d6279da17
Merge remote-tracking branch 'origin/polyline-texture' into baseball
2015-11-20 10:19:30 -08:00
Brad Hefta-Gaub
0e5e33446e
handle old protocol case
2015-11-20 09:57:30 -08:00
Howard Stearns
0f6a37f0f7
remainder->fmod!
2015-11-20 09:49:14 -08:00
Anthony J. Thibault
27685e0425
Bug fixes for other Avatar root translation
2015-11-20 09:33:57 -08:00
Brad Hefta-Gaub
8ba6dfe721
add deprication warning about binary SVOs
2015-11-20 09:29:36 -08:00
Anthony J. Thibault
c2ae6f0c8e
Fix for remote Avatar
...
Make sure to copy the correct data to and from AvatarData::JointData
2015-11-20 09:20:41 -08:00
Brad Hefta-Gaub
abf169ebd9
fix senderID in messages, dry up code
2015-11-20 09:03:21 -08:00
Brad Davis
5adcbcaf5f
Support writing a clip to a qbytearray
2015-11-19 20:23:50 -08:00
Brad Hefta-Gaub
5c6cd9b06c
fix thread safety and crash with no asset server
2015-11-19 18:53:12 -08:00
Anthony J. Thibault
302b6f7e26
Mac and Debug build fixes
2015-11-19 18:28:15 -08:00
Anthony J. Thibault
9e36a79155
Rig: hooked up script overridePoses
2015-11-19 18:14:04 -08:00
samcake
732c911fd7
Merge pull request #6439 from ZappoMan/assetJS
...
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:56:10 -08:00
Stephen Birarda
5f9c3eea76
use a priority queue to ensure ordering of injectors
2015-11-19 17:42:14 -08:00
Anthony J. Thibault
46d23a9f38
head IK and controller IK work again!
2015-11-19 17:30:56 -08:00
Stephen Birarda
adf41fce19
use alias for unique_lock and mutex
2015-11-19 17:29:20 -08:00
Brad Hefta-Gaub
f80a765a29
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:28:20 -08:00
Stephen Birarda
3b56df6e99
use deleteLater immediately not that finish is right thread
2015-11-19 17:27:18 -08:00
Howard Stearns
431a8c9584
cleanup
2015-11-19 17:12:50 -08:00
Stephen Birarda
22f5d4df6d
change signature of copy return
2015-11-19 16:25:33 -08:00
Stephen Birarda
430cb7876d
remove a couple of read lockers for AvatarHashMap
2015-11-19 16:22:56 -08:00
Stephen Birarda
40397add43
fix for extra adds in AvatarManager
2015-11-19 16:15:21 -08:00
Brad Davis
e187aaedcb
Load recorded clips from URLs, not file paths
2015-11-19 15:56:37 -08:00
Stephen Birarda
6398a922c6
leverage COW for AvatarHash
2015-11-19 15:43:29 -08:00
Ryan Huffman
9e31614fce
Fix textures property not being sent for polyline
2015-11-19 15:16:46 -08:00
Stephen Birarda
2a05ec650b
fix locking in AvatarHashMap/AvatarManager
2015-11-19 14:17:48 -08:00
Anthony J. Thibault
982e2c06a9
Rig: Switched over to use AnimPoses instead of JointStates
...
* fixed debug rendering
* improved jointState/animPose diff detection code.
2015-11-19 12:14:04 -08:00
Howard Stearns
f6286201f4
cleanup
2015-11-19 11:55:22 -08:00
Ryan Huffman
07d21514c5
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-19 10:47:37 -08:00
Seth Alves
2938f0d835
Merge pull request #6421 from ZappoMan/outOfOrderDelete
...
Possible fix to abandoned lines/entities
2015-11-19 10:26:14 -08:00
Brad Hefta-Gaub
e318537af4
Merge pull request #6425 from birarda/handshake-ds-settings
...
fix case where servers could run without settings
2015-11-19 10:10:28 -08:00
Ken Cooke
2c98976ef2
Fix bug from implicit cast
2015-11-19 10:05:10 -08:00
Seth Alves
98073de0b8
Merge pull request #6426 from ZappoMan/entitiesFileDownload
...
implement support to download the persist file from entity server status page
2015-11-19 09:47:10 -08:00
Brad Hefta-Gaub
45e8ebbe8c
Merge pull request #6432 from huffman/lod-range
...
Increase available range in LOD Tools
2015-11-19 09:40:10 -08:00
Ken Cooke
3060aa960d
Fix the case when local-echo and self-reverb both active
2015-11-19 09:23:58 -08:00
Howard Stearns
7d30cd0159
checkpoint: it works!
2015-11-19 09:18:40 -08:00
Ryan Huffman
8adf456b91
Update range of LOD to go up to 20:2
2015-11-19 08:52:57 -08:00
Ken Cooke
998f6e099f
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-11-19 08:39:55 -08:00
Ken Cooke
2489eaa30e
Changed the audio pipeline to allow stereo reverberation, using separate source (loopback audio) and listener (received audio) reverbs.
2015-11-19 08:32:13 -08:00
Anthony J. Thibault
721da29432
WIP checkpoint
...
* No longer normalizing scale in AnimSkeleton and AnimClip
This means graph is animating in 'geometry' coordinates
before unit scale is even applied. This is necessary to
properly work with both Avatar based models and ModelEntity
based models
Many things are broken.
* debug rendering (translations are x100)
* IK hand targets
* follow cam
* I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
Stephen Birarda
271387f96e
use a unique_ptr for linkedData in Node
2015-11-18 18:03:31 -08:00
samcake
74beeefe06
Merge pull request #6420 from jherico/dargo
...
Make recording and playback work in interface, playback in agent
2015-11-18 17:52:09 -08:00
Brad Hefta-Gaub
456da661ff
implement support to download the persist file from entity server status page
2015-11-18 17:30:07 -08:00
Brad Davis
98cc7408b1
Fixing issues found in AC playback test
2015-11-18 17:17:20 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Anthony J. Thibault
b054ef1488
Rig: fixes for rigs used for ModelEntities.
2015-11-18 16:04:34 -08:00
Anthony J. Thibault
3a74d188b0
AnimSkeleton: Added default poses
2015-11-18 16:03:28 -08:00
Anthony J. Thibault
5ffef7f41a
AnimPose: bug fix for extracting rotations from matrices with large scale
2015-11-18 16:02:30 -08:00
Stephen Birarda
08e6b63090
cleanup debug of received domain-server settings
2015-11-18 15:43:31 -08:00
Stephen Birarda
cb708859fb
resolve conflicts on merge with upstream master
2015-11-18 15:34:56 -08:00
Ryan Huffman
c2648fd6dd
Remove _packetListenerMap
2015-11-18 15:30:43 -08:00
Ryan Huffman
f0ad7f85dc
Add readHead* to ReceivedMessage
2015-11-18 15:30:30 -08:00
Stephen Birarda
3ba0c9d042
resolve conflicts on merge with upstream master
2015-11-18 15:29:39 -08:00
Stephen Birarda
f2ecce6043
use safer domain settings request in audio-mixer
2015-11-18 15:13:29 -08:00
Stephen Birarda
1a066abb26
fix some indentation for UDT_CONNECTION_DEBUG lines
2015-11-18 14:43:56 -08:00
Brad Davis
fd3599acc5
PR comments
2015-11-18 14:32:56 -08:00
Brad Hefta-Gaub
2f3cf82202
don't apply out of order edits to entities that have been deleted
2015-11-18 14:26:18 -08:00
Stephen Birarda
65142a3963
clean up agent comment for domain settings request
2015-11-18 14:20:56 -08:00
howard-stearns
42a1ee353e
checkpoint
2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
Ryan Huffman
3d0afc3c5f
Update entities version number for polyline change
2015-11-18 14:00:00 -08:00
Ryan Huffman
2fe9af54d4
Add textures property to polyline
2015-11-18 13:59:32 -08:00
Anthony Thibault
d3d3ddfaf1
Merge pull request #6417 from AndrewMeadows/avatar-capsule
...
fix bounding capusule calculations for new avatars
2015-11-18 13:02:48 -08:00
Ken Cooke
cc90662bf0
PR feedback
2015-11-18 12:17:27 -08:00
Brad Hefta-Gaub
35677d3a48
Merge pull request #6418 from birarda/test-ds-settings-fail
...
move keepalive pings transparently to NL
2015-11-18 11:12:16 -08:00
Andrew Meadows
5c6df734c5
initialize vector of vec3's
2015-11-18 10:47:53 -08:00
Stephen Birarda
c54dffac12
fix entity-server avg ping, remove debug
2015-11-18 10:32:35 -08:00
Ken Cooke
1a7f06dc95
Removed the commented-out Gverb code
2015-11-18 10:26:06 -08:00
Andrew Meadows
ae88057ad9
remove dangling whitespace
2015-11-18 10:24:10 -08:00
Stephen Birarda
0e3d3451d7
make keep alive pings the responsibility of NL
2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab
Merge pull request #6413 from samcake/controllers
...
Recording: Moving the Recording js interface to the Script engine
2015-11-18 10:22:55 -08:00
Ken Cooke
8ae3fa61c5
Fix compiler issues
2015-11-18 10:06:40 -08:00
Anthony J. Thibault
b481d7c73d
Merge branch 'master' into tony/remove-joint-states
2015-11-18 09:38:21 -08:00
Andrew Meadows
ee751ed1b9
use kDop volume of avatar mesh parts for capsule
2015-11-18 09:22:40 -08:00
Ken Cooke
c61dad108c
Replace Gverb with new reverb
2015-11-18 09:16:18 -08:00
Ken Cooke
0f214555c1
New algorithmic stereo reverb
2015-11-18 09:13:03 -08:00
Howard Stearns
97898a1ad1
forgot new files
2015-11-17 20:43:40 -08:00
Philip Rosedale
5b853ddf57
Merge pull request #6402 from sethalves/grab-equip
...
grab script bumper is an equip toggle
2015-11-17 20:15:26 -08:00
Philip Rosedale
450608bf5b
Merge pull request #6390 from sethalves/average-near-holds
...
Average near holds
2015-11-17 20:01:46 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
Anthony J. Thibault
9a39da9050
new absolutePoses work for avatars, but not for model entities.
2015-11-17 18:53:38 -08:00
Brad Hefta-Gaub
ba922290a4
Merge pull request #6407 from jherico/dargo
...
Exclude avatar scales out of the permissable range
2015-11-17 18:41:15 -08:00
Brad Hefta-Gaub
733d93039f
Merge pull request #6403 from jherico/rec3
...
Recording fixes
2015-11-17 17:52:15 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Stephen Birarda
2aa56b5384
include memory header for unique_ptr
2015-11-17 17:26:45 -08:00
Stephen Birarda
35dd5fb564
include NLPacket in AudioInjector for unique_ptr
2015-11-17 17:26:07 -08:00
Brad Davis
4e57c9114c
Avatar has no dependency on audio or recording anymore
2015-11-17 17:13:53 -08:00
Stephen Birarda
1c485bacff
include the condition_variable header in AIM
2015-11-17 17:11:40 -08:00
Stephen Birarda
d20fd6d7e7
cap max to 40, clarify comment
2015-11-17 17:08:48 -08:00
Stephen Birarda
cf2ad9a877
remove atomic include from AudioInjector
2015-11-17 17:07:29 -08:00
Stephen Birarda
62b218632d
don't use unneeded atomic for AudioInjector State
2015-11-17 17:06:21 -08:00
Stephen Birarda
5dc48dc9dc
resolve conflicts on merge with upstream/master
2015-11-17 17:04:12 -08:00
Stephen Birarda
8e4d7c69ce
handle AudioInjectorManager for scripted ACs
2015-11-17 17:01:11 -08:00
Brad Davis
0ad1d08041
Exclude avatar scales out of the permissable range
2015-11-17 16:46:25 -08:00
Stephen Birarda
935c0cc137
handle AudioInjectorManager cleanup in Application
2015-11-17 16:39:23 -08:00
Brad Hefta-Gaub
293914b84f
added NodeActivated signal to make it easier for users to know when a recently added node has an active socket
2015-11-17 16:31:34 -08:00
Stephen Birarda
ab5c8e072f
handle blocked AudioInjectorManager for restart
2015-11-17 16:31:18 -08:00
Brad Hefta-Gaub
073215d067
handle socketActivated
2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub
9c4286b6ca
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-17 15:50:54 -08:00
Stephen Birarda
f5ec458a5e
make activeSocket checks more consistent
2015-11-17 15:38:03 -08:00
Stephen Birarda
3906a747b8
fix a couple of bad checks
2015-11-17 15:33:57 -08:00
Brad Davis
48b0465e56
Fixing race condition on seek, correcting some issues with frame timing
2015-11-17 15:18:32 -08:00
Brad Davis
900f425f35
Recording fixes
2015-11-17 15:18:31 -08:00
Stephen Birarda
d764ff2e87
remove static variables in AudioInjector.cpp
2015-11-17 15:12:04 -08:00
Ryan Huffman
510189dfbc
Update CCD motion threshold
2015-11-17 15:08:05 -08:00
Stephen Birarda
34b8fca83b
add socketActivated signal to NetworkPeer for punch success
2015-11-17 15:04:31 -08:00
Stephen Birarda
7dfdb3c72e
protect LNL packet sending without active socket
2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub
3efbcb7062
debug the late connect case
2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub
d8a3927311
debug the late connect case
2015-11-17 14:43:06 -08:00
Andrew Meadows
2b07daa976
Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes
...
Bug fixes for avatars with no eyes
2015-11-17 14:29:20 -08:00
Brad Hefta-Gaub
85aa3b3f83
handle subscribe when messages mixer is not available
2015-11-17 14:28:51 -08:00
Stephen Birarda
7da6ec46c4
more handling of various AudioInjector states
2015-11-17 14:20:59 -08:00
Brad Hefta-Gaub
8112b3b57e
add senderUUID to the messageReceived signal
2015-11-17 14:16:22 -08:00
Brad Davis
6664d8d919
Merge pull request #6398 from ZappoMan/messaging
...
messages-mixer
2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838
Bug fixes for avatars with no eyes
...
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.
Also, prevent array access with negative indices when eye bones are missing.
ಠ_ಠ
2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
2f142eb088
add a receiver example
2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
2d3fe497e4
fix typo
2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
5b9791d800
add message received signal
2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
60ae1259fa
more cleanup work
2015-11-17 11:06:27 -08:00
Seth Alves
1d4e1eabcb
Merge branch 'master' of github.com:highfidelity/hifi into grab-equip
2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub
034debc483
cleanup
2015-11-17 10:59:53 -08:00
Clément Brisset
198f1452cf
Merge pull request #6396 from ctrlaltdavid/20738
...
Fix particle aging
2015-11-17 10:47:41 -08:00
Brad Hefta-Gaub
f9a674bca5
implement subscribe/unsubscribe in MessagesClient
2015-11-17 10:01:31 -08:00
Seth Alves
b062d23f61
bumper is now an equip toggle
2015-11-17 09:51:52 -08:00
Brad Hefta-Gaub
6b61ec569c
more work on channels
2015-11-17 09:47:50 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
ZappoMan
f712fae4d2
more hacking
2015-11-17 08:56:21 -08:00
Stephen Birarda
4fa934dccf
make sure AudioInjectorManager process is on AI thread
2015-11-16 18:54:16 -08:00
Stephen Birarda
80115d38e9
tweak the AudioInjectorManager for injector threading
2015-11-16 18:53:09 -08:00
Anthony J. Thibault
80eb247b9c
WIP checkin
...
* AnimManipulator: added absolute and relative position and translation support
* Rig: added _overrideFlags and _overridePoses for script overrides.
2015-11-16 18:49:47 -08:00
