Brad Hefta-Gaub
6f7e13b3c1
more warning fixes
2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Brad Hefta-Gaub
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -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
084ba8abc0
Merge pull request #5874 from howard-stearns/AndrewMeadows-ik-repairs-003
...
cleanup IK implementation plusplus
2015-09-22 14:51:41 -07:00
Brad Hefta-Gaub
5bb908f081
remove dead code and fix warning
2015-09-22 12:34:47 -07:00
Howard Stearns
7e52d38870
Don't include the root rot, because it seems that this is already accounted for in the head params.
...
Restore the hmd conditional on setting head position. This had been removed when failing to pin it cause lean.
I believe that lean was being caused by coordinate system issues that are now addressed by the above and Andrew's big cleanup.
2015-09-22 10:12:59 -07:00
Howard Stearns
8f1dde69cc
Always keep targets, even when both position and rotation are unset. (Get from underpose.)
...
Filtering these was necessary before when the underpose coordinate was wrong, but now that we have that working, there shouldn't be any need to filter.
2015-09-22 10:10:29 -07:00
Howard Stearns
0ccf2346fa
Merge branch 'ik-repairs-003' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-ik-repairs-003
2015-09-22 09:45:22 -07:00
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
BOB LONG
a23a90bf5f
Code simplification
...
Simplify the code a bit as suggested:
1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation
Correct the js sample file header.
testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
2015-09-21 19:11:13 -07:00
samcake
91b9940fe9
Merging and a fix for the diffuse map floating around
2015-09-21 18:09:25 -07:00
Andrew Meadows
3869887610
splitting AnimNode implementation into two files
2015-09-21 17:53:59 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Andrew Meadows
e6776ef5eb
split AnimIK::evaluate() into sub-functions
...
also IK targets now in model-frame instead of root-frame
2015-09-21 17:29:39 -07:00
samcake
21f53f1bbd
debugging the lighting issue on the craps table
2015-09-21 16:57:55 -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
Brad Davis
483884196c
Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles
...
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 16:48:29 -07:00
Bradley Austin Davis
0401672c82
Fixing lighting again
2015-09-21 16:24:55 -07:00
samcake
dfe17e5708
Fix issues from review
2015-09-21 16:12:17 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
samcake
a485d3d6de
Fixing the rendering of ProceduralSkybox
2015-09-21 15:21:48 -07:00
Bradley Austin Davis
84cea1ffd4
More CR comments
2015-09-21 14:33:32 -07:00
samcake
fa9b0930d2
Bring back the procedural skybox
2015-09-21 14:25:32 -07:00
Bradley Austin Davis
0c0af812c2
CR comments
2015-09-21 14:16:56 -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
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
Brad Hefta-Gaub
b88c8e507b
fix a couple of properties
2015-09-21 11:35:26 -07:00
samcake
2875cb99bb
Fixing the compilation issue
2015-09-21 09:47:00 -07:00
samcake
6a714f405c
Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map
2015-09-21 00:53:48 -07:00
samcake
3614812681
MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce
2015-09-20 23:31:59 -07:00
samcake
6914caac9d
Renaming TextureStorage.x to TextureMap.x
2015-09-20 18:14:03 -07:00
samcake
d6d95ff86b
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-20 14:33:23 -07:00
samcake
a41c20a1b7
Fixing buggy hash map look up and cleaning of name
2015-09-20 14:17:55 -07:00
Brad Hefta-Gaub
ba5109c458
Merge pull request #5858 from howard-stearns/see-other-default-avatars
...
Let other users see your default avatar.
2015-09-20 13:57:29 -07:00
Howard Stearns
4fadf986e4
Merge pull request #5857 from hyperlogic/tony/look-whos-talking
...
Talking idle animation support
2015-09-20 13:46:40 -07:00
Howard Stearns
4d2048c6f6
Let other users see your default avatar.
...
Fixes https://app.asana.com/0/26225263936266/51001490412567
2015-09-20 13:12:13 -07:00
samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d
Fix compilation issues on mac
2015-09-19 08:59:47 -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
Brad Hefta-Gaub
ec87502f49
Merge pull request #5840 from jherico/bart
...
Instanced rendering for Box entities
2015-09-18 18:06:25 -07:00
Anthony J. Thibault
44eb448cbe
Hooked up isTalking flag to Rig and AnimGraph.
2015-09-18 18:05:51 -07:00
Philip Rosedale
5e64420ea1
Merge pull request #5850 from jherico/dargo
...
Remove overcalling of glVertexAttrib4f
2015-09-18 16:38:22 -07:00
Brad Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
Andrew Meadows
269e3d7f23
Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance
...
Entities.getEntityProperty() performance improvements
2015-09-18 15:19:06 -07:00
Bradley Austin Davis
f851c6204f
Remove overcalling of glVertexAttrib4f
2015-09-18 15:14:04 -07:00
