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
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
