Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
samcake
fbf21cb089
FIxed the problem on Mac, by removing all of the gpuConfig includesgit status
...
q
:q
wq
2015-07-30 18:27:47 -07:00
Anthony J. Thibault
e52bf2e12d
Fix for head cauterization.
...
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
2015-07-30 15:51:34 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9
Clear translation on root joint.
...
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
2015-07-30 15:04:27 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
96fdb32edc
Merge pull request #5461 from venkatn93/avatar
...
HBAO implementation
2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Niraj Venkat
291e0e21ae
HBAO final implementation
2015-07-29 18:47:27 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -07:00
Niraj Venkat
4f2630c561
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-29 16:54:37 -07:00
Howard Stearns
d73f133daa
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 15:45:00 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
ericrius1
65e04337bf
removed synccache line
2015-07-29 11:15:20 -07:00
Niraj Venkat
d76cda396f
HBAO implementation ported from NVidia HLSL
2015-07-29 11:05:19 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
ericrius1
469bace7ca
removed unnessary computations from hit effect fragment shader
2015-07-28 15:15:34 -07:00
Howard Stearns
4754615159
Fix NPC animations.
2015-07-28 12:34:10 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Sam Gateau
22e70ee691
merged master
2015-07-28 10:13:05 -07:00
Sam Gateau
baf7873ce1
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-27 17:40:19 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4
add some javascript callable stuff back to MyAvatar
2015-07-27 16:42:54 -07:00
Howard Stearns
1bb734aec0
Kill warnings.
2015-07-27 15:26:03 -07:00
Sam Gateau
a5ad40bee9
INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked
2015-07-27 14:07:28 -07:00
Howard Stearns
ef52c0703f
Merge pull request #8 from AndrewMeadows/cadmium
...
remove unused legacy Shapes from Model and friends
2015-07-27 13:20:41 -07:00
Howard Stearns
990f0d6d07
Pass correct position/velocity/orientation to Rig simulation.
2015-07-27 12:57:39 -07:00
Niraj Venkat
d2ee74f7c7
Shader code indentation
2015-07-27 12:20:41 -07:00
Niraj Venkat
1193b89918
Coding standard and tab fixes
2015-07-27 12:14:29 -07:00
Niraj Venkat
92595583ec
Coding standard and building
2015-07-27 11:55:17 -07:00
Andrew Meadows
73ac941230
remove unused legacy Shapes from Model and friends
2015-07-27 11:15:33 -07:00
Howard Stearns
dac6667ee6
Start of state.
2015-07-27 09:21:24 -07:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Niraj Venkat
83e0856279
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-27 09:20:19 -07:00
Bradley Austin Davis
7be33dcb58
Limit the amount of time consumed by rendering QML
2015-07-25 11:40:58 -04:00
Niraj Venkat
6bc3d65bf4
Fixing build errors
2015-07-24 16:16:18 -07:00
Niraj Venkat
5dd16d9f80
Blend function applied to reduce one FBO
2015-07-24 16:07:30 -07:00
Howard Stearns
1663d095a1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-24 14:08:51 -07:00
Niraj Venkat
fc612ab8cd
Merge conflict fix
2015-07-24 11:29:52 -07:00
Niraj Venkat
e036602726
Fixing merge conflicts
2015-07-24 11:08:40 -07:00
Howard Stearns
f9f8b0ffc1
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-24 10:40:19 -07:00
Andrew Meadows
1bf49d72f1
Merge branch 'rig' of github.com:howard-stearns/hifi into bromine
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-07-24 10:06:02 -07:00
samcake
52ac5b3ef6
On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize
2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece
FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler
2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66
REmove the crappy solution for drawing transparent texture into overlay by a proper shader
2015-07-23 23:09:40 -07:00
Niraj Venkat
216c499d14
HAO (Horrendous Ambient Occlusion)
2015-07-23 18:53:43 -07:00
