Anthony J. Thibault
a91c181a89
MyAvatar: Recenter when the head turns away from the hips
...
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.
Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed. The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller.
A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure. This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Atlante45
db18d188b8
Fix wifi ping spikes
...
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
2016-01-21 15:05:32 -08:00
Leonardo Murillo
7e19110dd5
Merge pull request #6887 from birarda/migrate-ds-old-dev
...
migrate domain-server config from single org name
2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0
handle weird nested path on windows
2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0
migrate domain-server config from single org name
2016-01-21 13:57:24 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Andrew Meadows
58a7528b68
Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js
...
Access avatar parent information from js
2016-01-21 09:19:40 -08:00
samcake
0da4df93b8
Merge pull request #6860 from zzmp/refactor/cull-functor
...
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
2016-01-20 14:25:42 -08:00
Andrew Meadows
19d24293e1
Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent
...
don't persist entites with invalid parentIDs
2016-01-20 10:38:26 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
Seth Alves
09dd3e2a56
merge from upstream, respond to code review
2016-01-19 14:38:22 -08:00
Stephen Birarda
74b2a44050
merge the master and user configs after a settings change
2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e
complete handling of immediate temp name grab
2016-01-19 13:04:05 -08:00
Stephen Birarda
858adf383e
update comment for config migration
2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b
use mkpath to create new data directory
2016-01-19 11:37:49 -08:00
Stephen Birarda
74806d9d2b
migrate old DS config file to new path
2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc
Move ShoudRenderFunctor to render::CullFunctor
2016-01-19 11:24:11 -08:00
Ryan Huffman
de36f3eeb2
Update ServerPathUtils::getDataDirectory to use custom path lookup
2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Seth Alves
e365d93ed9
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
2016-01-18 16:50:26 -08:00
Seth Alves
3b3720781f
fix a place where parent's scale wasn't properly squashed
2016-01-18 11:15:53 -08:00
Ryan Huffman
0f2b9744d1
Merge branch 'console' of github.com:birarda/hifi into console-logging
2016-01-15 10:46:22 -08:00
Ryan Huffman
a43b9ba2c3
Add ServerPathUtils
2016-01-14 12:55:32 -08:00
Zach Pomerantz
2938829167
Add shadow items to stats
2016-01-13 17:49:37 -08:00
Andrew Meadows
c52c543ab8
use strings for JS collisionGroup API
2016-01-12 15:11:27 -08:00
Andrew Meadows
6c49d81475
collision mask bit reinterpretation
...
also cache sessionID in static methods inside PhysicsEngine
2016-01-12 15:08:52 -08:00
Andrew Meadows
502921e877
more consistency for collision group values
2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Zach Pomerantz
801dde7950
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-11 16:38:04 -08:00
Anthony J. Thibault
e4e4cb0110
Bug fix for Transform.postMult() with non-uniform scale.
...
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
2016-01-11 12:03:44 -08:00
Zach Pomerantz
c8d3342aca
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-08 17:04:02 -08:00
Philip Rosedale
d5c8689843
Merge pull request #6793 from sethalves/fix-get-query-aabox
...
fix queryAABox bug
2016-01-08 09:49:27 -08:00
Seth Alves
31bed934fe
fix bug caused by accidental reuse of variable -- queryAABox was often of size 1 rather than the correct dimensions
2016-01-07 16:27:14 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Zach Pomerantz
59a354ea8c
Change payload interface to return ShapeKey, not MaterialKey
2016-01-05 17:20:08 -08:00
Seth Alves
b59934573a
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-05 13:50:12 -08:00
Brad Hefta-Gaub
c2f2f950fb
Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
...
Make Avatar palm position/rotation accessors thread safe
2016-01-05 13:07:47 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Anthony J. Thibault
a21b604746
Simplified implementation of ThreadSafeValueCache
2016-01-05 11:08:08 -08:00
Anthony J. Thibault
9ea6079c64
Merge branch 'master' into tony/get-palm-thread-safe
2016-01-05 10:16:52 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-04 19:17:45 -08:00
Seth Alves
7f2e0cd103
expose a way to set translation and rotation of all model joints at once
2016-01-04 14:13:08 -08:00
Howard Stearns
9c8a04ce1e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2016-01-04 09:26:14 -08:00
Seth Alves
63293d5838
remove commented code
2016-01-03 08:07:31 -08:00
Seth Alves
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-30 12:45:32 -08:00
Andrew Meadows
ec27c75332
Merge pull request #6660 from hyperlogic/tony/anim-expressions
...
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -08:00
Anthony J. Thibault
feb63772f3
ThreadSafeValueCache added class and method descriptions
...
Also, changed callback prototype.
2015-12-29 17:08:17 -08:00
Anthony J. Thibault
17e6a04aa8
Renamed ThreadSafeValue to ThreadSafeValueCache
...
Also bug fixes where I was incorrectly swapping left and right hands.
2015-12-29 16:35:31 -08:00
Anthony J. Thibault
e7f3f549a5
Avatar getPalm* methods are thread-safe and non-blocking
...
Uses newly added ThreadSafeValue template class.
2015-12-29 15:10:38 -08:00
Zach Pomerantz
687eef37da
Move final blit into RenderDeferredTask
...
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
2015-12-23 18:21:08 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -08:00
samcake
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
Seth Alves
c84fa5f821
cleanups
2015-12-21 14:45:18 -08:00
Seth Alves
68cfda1af9
try again on AACube::operator +=
2015-12-21 11:34:53 -08:00
Seth Alves
00e0b26f05
fix thinko and whitespace
2015-12-21 11:15:54 -08:00
Seth Alves
3c2dac5cf8
parent query-cube should encompass child query-cube not child max-aa-cube
2015-12-21 11:05:07 -08:00
Seth Alves
abaa329984
parents AACube should encompass all children's
2015-12-21 10:55:07 -08:00
Seth Alves
3782c21b45
when a parent moves, check children vs their queryAACubes
2015-12-18 16:06:51 -08:00
Seth Alves
69bba4a182
queryAABox wasn't centered on object
2015-12-18 14:46:24 -08:00
Seth Alves
1a534ff645
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
2015-12-18 13:43:33 -08:00
Seth Alves
688448fe41
more queryAABox experimenting
2015-12-17 16:18:41 -08:00
Seth Alves
2dd2a49141
a non-set queryAACube is one with no volume
2015-12-17 15:02:07 -08:00
Seth Alves
473212e5b7
try to be more coherent about queryAABox meaning
2015-12-17 14:29:41 -08:00
Seth Alves
7693058e39
clear _queryAACubeSet flag in locationChanged
2015-12-17 10:49:24 -08:00
samcake
d8a71db929
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-17 10:11:03 -08:00
Seth Alves
d34e166b48
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 07:31:52 -08:00
Howard Stearns
da27cacdec
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-16 20:56:33 -08:00
samcake
7bc815448e
The material colors for diffuse and emissive are now gamma corrected by default
2015-12-16 18:14:43 -08:00
howard-stearns
e058057e3d
fix logging
2015-12-16 15:41:23 -08:00
Atlante45
a541fdd2df
Move OctreeSendThread to the OctreeServer
2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de
Forward QThread's finished signal in GenericThread
2015-12-16 14:27:26 -08:00
Seth Alves
1c0231c416
quiet some debugging prints
2015-12-15 16:46:16 -08:00
Seth Alves
b9f0a87a25
if a server can't get the queryAACube but received one from an interface, use the received one
2015-12-15 14:43:14 -08:00
Anthony J. Thibault
2b0ed55077
Merge branch 'master' into tony/anim-expressions
2015-12-15 10:35:19 -08:00
Seth Alves
165c41d843
add a way to remember which entities couldn't be properly placed in octree due to missing parents
2015-12-14 14:19:19 -08:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Seth Alves
f3acec5177
whitespace
2015-12-13 06:44:15 -08:00
Seth Alves
1492fd6090
merge from upstream
2015-12-12 12:37:57 -08:00
Seth Alves
24fb43e8cd
first steps toward a puffed-out query-box for child entities
2015-12-12 12:33:14 -08:00
Atlante45
d3224bfde3
More warning fixes
2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Seth Alves
6c033d9603
call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model
2015-12-11 11:35:42 -08:00
Bradley Austin Davis
ae1345bb13
Adding nsight instrumenting to the QML render thread
2015-12-11 11:00:33 -08:00
samcake
40bf721ac5
Fixing merging problem
2015-12-10 17:16:06 -08:00
samcake
3728a9c6f0
Merging with Master
2015-12-10 16:55:30 -08:00
Howard Stearns
f6cd04680d
Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix
...
Fix for sixense debug draw after migration to plugin.
2015-12-10 16:14:43 -08:00
Anthony J. Thibault
1af780a664
Fix for sixense debug draw after move to plugin.
...
static variables used to hold a Singleton cannot be shared across dll boundaries by default.
This uses the globalInstance template to store the instance as a property on the QApplication.
2015-12-10 15:05:27 -08:00
samcake
5805cc8f2b
Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry
2015-12-10 14:59:04 -08:00
Atlante45
03ee07c8b7
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:20 -08:00
Seth Alves
8ca6c7acc3
Merge pull request #6611 from Atlante45/attachments
...
Fix Attachments jitter
2015-12-10 11:46:19 -08:00
Atlante45
6f29d9e7b8
Use strongly typed enum instead of nested alias
2015-12-10 11:10:09 -08:00
