Brad Davis
cbb8bee962
Trying to fix ScriptEngine location property
2015-09-16 15:00:24 -07:00
Brad Davis
f35ffd2ab7
Merge pull request #5814 from samcake/HMDLightingBug
...
Fixing HMD and stereo lighting bug
2015-09-15 18:10:26 -07:00
Sam Gateau
80d25a68b6
Bringing back the eyeView per side to the deferred transform stack
2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945
FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix
2015-09-15 17:48:55 -07:00
Brad Hefta-Gaub
54972515dc
make sure timer is owned
2015-09-15 17:04:40 -07:00
Sam Gateau
8ab96fe907
Bringin back full screen for stereo mode
2015-09-15 17:02:30 -07:00
Sam Gateau
f00e3829f1
Cleaning for PR
2015-09-15 16:54:04 -07:00
Howard Stearns
848bb4fccb
Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines
...
Added point and grab support to the AnimGraph
2015-09-15 15:47:19 -07:00
Ryan Huffman
8c3d8bc7de
Merge pull request #5809 from birarda/phrc
...
timing fixes for default time_point on windows
2015-09-15 15:29:30 -07:00
Sam Gateau
7b8e11e01c
Debugging, looking good, no ready for final lighting
2015-09-15 15:22:45 -07:00
Stephen Birarda
8454cb916c
avoid branching by using %= operator
2015-09-15 15:15:26 -07:00
Anthony J. Thibault
1948829ca8
Improved state machine for right hand.
...
The hand state machine has the following features
* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.
Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
2015-09-15 15:09:08 -07:00
Sam Gateau
dc8756e465
Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation
2015-09-15 14:40:23 -07:00
Brad Davis
4c0a21f3d2
Merge pull request #5811 from ZappoMan/scriptEngineCleanup
...
Rework the ScriptEngine shutdown process, Fix crash in AC Scripts
2015-09-15 13:23:40 -07:00
Brad Hefta-Gaub
016a5e5f0a
cleanup comments
2015-09-15 11:52:07 -07:00
Brad Hefta-Gaub
41caa36038
removed some debug code
2015-09-15 11:50:10 -07:00
Brad Hefta-Gaub
6521de8163
rework ScriptEngine and worker thread shutdown
2015-09-15 11:00:05 -07:00
Ken Cooke
ffe3fcf4ce
Replace repeated division with multiply by inverse
2015-09-15 10:18:53 -07:00
Stephen Birarda
6756d5364b
sensible defaults for other time_point uses
2015-09-15 10:11:05 -07:00
Ken Cooke
5045f8558e
Fix incorrect scale factor for converting int16_t to/from float
2015-09-15 10:08:24 -07:00
Stephen Birarda
6a186ad1fe
ensure a handshake goes out the first time
2015-09-15 09:48:17 -07:00
Clément Brisset
cb1b70820a
Merge pull request #5801 from AndrewMeadows/fix-animation-tests
...
fix animation unit tests
2015-09-15 17:53:06 +02:00
Brad Davis
4ce1db16f4
Merge pull request #5804 from ZappoMan/scriptEngineCleanup
...
ScriptEngine Threading Repairs
2015-09-15 08:47:11 -07:00
Sam Gateau
9f8d6a78cc
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-15 08:35:42 -07:00
Sam Gateau
400f90aea4
Introducing a stereo loop that should do the right thing but doesn't yet
2015-09-15 08:34:46 -07:00
Brad Hefta-Gaub
70d2288407
CR feedback
2015-09-15 08:04:26 -07:00
Brad Davis
f4818c17cf
Fix avatar and other model animations
2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3
Don't do an O(N^2) operation on cluster matrices
2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
70fcdbf2fd
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:20:11 -07:00
Brad Hefta-Gaub
e92d195030
tweak
2015-09-14 21:18:36 -07:00
Brad Hefta-Gaub
54a45f3173
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029
more work on script engine
2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae
more work on proper threading of ScriptEngine
2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
096a6cb4b9
Merge pull request #5800 from jherico/marge
...
Fix over-calculation of cluster matrices
2015-09-14 19:38:01 -07:00
Brad Davis
7a843b3610
Merge pull request #5798 from AndrewMeadows/minor-ik-tuning
...
minor tuning of IK behavior
2015-09-14 18:55:31 -07:00
Anthony J. Thibault
90f46ba2c8
Added hand state machines to AnimGraph.
...
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
2015-09-14 18:54:12 -07:00
Sam Gateau
45dc5be53d
DeferredTransform buffer working for the deferred rendering in mono
2015-09-14 17:48:15 -07:00
Stephen Birarda
a27e0e7cc7
remove an unused alias
2015-09-14 17:18:22 -07:00
Stephen Birarda
84ab4fd585
force minimum for p_hrc time_point values
2015-09-14 17:16:42 -07:00
Andrew Meadows
d74628720f
fix bug using unitialized std::vector elements
2015-09-14 17:14:04 -07:00
Andrew Meadows
75ec142827
fix animation-tests
2015-09-14 16:42:57 -07:00
Brad Davis
35e4440c4f
Don't do an O(N^2) operation on cluster matrices
2015-09-14 16:09:13 -07:00
Sam Gateau
00688172dd
work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes
2015-09-14 15:49:05 -07:00
Ryan Huffman
b0ffb50fdf
Move assertion in AssetRequest below error checking
...
If the request had an error then there is no reason the assertion should
be true.
2015-09-14 15:48:11 -07:00
Philip Rosedale
15e3678eab
Merge pull request #5793 from kencooke/master
...
bugfix for audio pops at startup
2015-09-14 15:31:23 -07:00
Brad Hefta-Gaub
18fbf896f1
first cut at moving entity scripts into ScriptEngine
2015-09-14 15:13:43 -07:00
Andrew Meadows
a72199a7df
minor IK tuning
2015-09-14 14:44:17 -07:00
Ryan Huffman
15b809bd16
Merge pull request #5795 from birarda/phrc
...
fix high resolution timing for VS2012 in networking
2015-09-14 13:49:20 -07:00
Stephen Birarda
d82fd9a6ed
Merge pull request #5797 from huffman/fix-assert
...
Fix assert in AssetResourceRequest
2015-09-14 13:40:13 -07:00
Ryan Huffman
f3b513866a
Fix assert in AssetResourceRequest
2015-09-14 13:39:14 -07:00
