samcake
46e9c463fc
Merge pull request #5885 from ZappoMan/batchOptimizations
...
Batch optimizations
2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
9a0e5b9870
address Sam's concerns
2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53
fix mac build
2015-09-23 16:48:34 -07:00
Anthony J. Thibault
6b47373bcb
Fix for precision error in AnimPose(glm::mat4) constructor.
...
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
2015-09-23 15:38:56 -07:00
Brad Hefta-Gaub
ef25876c9a
implement vector caching for gpu::Batch
2015-09-23 14:46:47 -07:00
Anthony J. Thibault
0d7eae2d64
Fix slight translation error when rendering debug animation skeleton.
2015-09-23 11:42:55 -07:00
Anthony J. Thibault
90a551214e
Fix for AnimDebugDraw crash on shutdown.
2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a454584496
Updated default avatar-animation.json
2015-09-23 10:59:52 -07:00
Anthony J. Thibault
a9848cd157
Merge branch 'master' into tony/lean-threshold
2015-09-23 10:54:12 -07:00
Brad Hefta-Gaub
ec9bf0791b
Merge pull request #5875 from ctrlaltdavid/20689
...
Don't run Script Editor scripts from the cache
2015-09-23 08:52:30 -07:00
Brad Hefta-Gaub
8d8035a418
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning
...
Conflicts:
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/Model.h
2015-09-22 20:54:25 -07:00
Anthony J. Thibault
9ce43a57f1
Better head IK when in an HMD.
...
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
2015-09-22 19:58:21 -07:00
Anthony J. Thibault
d04f4d4b2b
Added shared DebugDraw singleton.
2015-09-22 19:57:23 -07:00
Howard Stearns
a9460b9b41
Merge pull request #5881 from AndrewMeadows/ik-repairs-004
...
remove underpose attenuation from IK relaxation step
2015-09-22 19:45:40 -07:00
Brad Hefta-Gaub
e99ad75a28
more warnings fixes
2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Andrew Meadows
2edffaf91a
remove unused variables
2015-09-22 17:20:13 -07:00
David Rowe
eda12fd3af
Don't look straight ahead in fullscreen mirror
2015-09-22 16:15:54 -07:00
Brad Hefta-Gaub
5bcce50b98
Merge pull request #5846 from bob-long/master
...
Display the face blend coefficients and update the value in real time.
2015-09-22 14:56:56 -07:00
Andrew Meadows
3af1329be2
Merge pull request #5825 from thoys/20655
...
CR for Job #20655 - Add ability to close one script from another script
2015-09-22 14:52:39 -07:00
David Rowe
fed5e8e573
Don't run Script Editor scripts from the cache
2015-09-22 11:35:34 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
Philip Rosedale
c09ac51d75
Merge pull request #5871 from ctrlaltdavid/20688
...
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
2015-09-22 10:17:28 -07:00
Thijs Wenker
f38bb77d0a
less calls to QHash
2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45
Merge branch 'master' of https://github.com/worklist/hifi into 20655
2015-09-22 18:44:25 +02:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621
Code tidying
2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098
Fix HMD 3rd person view
2015-09-21 21:08:13 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Brad Davis
7b5cbbf758
Merge pull request #5868 from ctrlaltdavid/20687
...
Fix HMD fullscreen mirror view
2015-09-21 17:07:31 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
samcake
a485d3d6de
Fixing the rendering of ProceduralSkybox
2015-09-21 15:21:48 -07:00
Howard Stearns
4dd95be8c4
Forgot to actually persist.
2015-09-21 15:06:11 -07:00
David Rowe
46524632fe
Fix eyeball directions in fullscreen HMD view
2015-09-21 14:18:33 -07:00
Bradley Austin Davis
0c0af812c2
CR comments
2015-09-21 14:16:56 -07:00
David Rowe
7ffde27224
Fix HMD fullscreen mirror view
2015-09-21 14:04:32 -07:00
Bradley Austin Davis
e12e4ece34
Fixing lighting and atmosphere
2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
samcake
43d96afc89
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-21 13:23:54 -07:00
samcake
d3b1bcb86d
Redistributing the files to create the model-networking lib and separate that from the redner-utils
2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
Howard Stearns
237628e4cd
Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph
2015-09-21 11:24:25 -07:00
Howard Stearns
8b701b8a5b
Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec.
...
Takes effect when you save (if you have enabled the anim graph under developer->avatar).
An empty string gives you the default behavior.
2015-09-21 10:26:04 -07:00
Stephen Birarda
5ebc8d6036
fix for file upload to ATP on Windows
2015-09-21 10:24:11 -07:00
samcake
d6d95ff86b
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-20 14:33:23 -07:00
samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -07:00
samcake
8941741508
Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap
2015-09-18 18:47:18 -07:00
Anthony J. Thibault
eadf212418
Updated avatar.json with talking idle animation.
2015-09-18 18:31:53 -07:00
Anthony J. Thibault
44eb448cbe
Hooked up isTalking flag to Rig and AnimGraph.
2015-09-18 18:05:51 -07:00
Brad Hefta-Gaub
416acb1d4a
remove call to _entities.render() in displaySide()
2015-09-18 12:03:58 -07:00
