samcake
75e858cd13
Putting together the stencil buffer for opaque vs background and using it for the backgroud render items
2015-09-30 15:54:03 -07:00
Sam Gateau
e78f1521ab
getting the stencil buffer in place
2015-09-30 09:24:36 -07:00
samcake
dc3c9b48ea
MOving forward on the background beeing drawn last
2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -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
Brad Hefta-Gaub
ef25876c9a
implement vector caching for gpu::Batch
2015-09-23 14:46:47 -07:00
Raffi Bedikian
ff2a58b3eb
Add FXAA effect class, modeled after AO effect
2015-08-30 20:49:03 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Sam Gateau
fc0ee28b84
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
2015-08-04 16:31:20 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -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
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
Sam Gateau
22e70ee691
merged master
2015-07-28 10:13:05 -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
Niraj Venkat
e036602726
Fixing merge conflicts
2015-07-24 11:08:40 -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
Niraj Venkat
adf7a1098d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-22 10:27:39 -07:00
Niraj Venkat
e0634de403
Turn on/off debug AO from menu item
2015-07-21 12:14:09 -07:00
ericrius1
9fc54a6040
getting closer to texturing properly
2015-07-20 15:33:21 -07:00
Niraj Venkat
eaf75c01b9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
...
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
libraries/render-utils/src/AmbientOcclusionEffect.h
2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
...
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
2015-07-20 14:53:19 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
ericrius1
e75a6feafe
can toggle hit effect on and off from a script
2015-07-20 11:58:26 -07:00
ericrius1
3439d45e0e
adding hit effect logic
2015-07-20 11:02:15 -07:00
ericrius1
1e34de1c51
adding in screen space effect for getting hit
2015-07-20 10:44:38 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
052c3c987b
Fix some more smart pointer
2015-07-17 18:10:34 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Niraj Venkat
022529f03f
Render depth buffer to quad
...
Useful for graphics debugging
2015-07-16 09:46:28 -07:00
Niraj Venkat
0ee916fb6f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-15 14:10:42 -07:00
Niraj Venkat
1b13f837bd
Porting AO to new pipeline
2015-07-15 14:10:17 -07:00
samcake
a6148ab73d
Remove naked gl call
2015-07-14 22:59:55 -07:00
Seth Alves
fb23eb0faf
Merge pull request #5301 from samcake/yellow
...
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
samcake
014802fd45
Merge pull request #5277 from venkatn93/gpuquery
...
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
samcake
9c744dcc46
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 11:21:38 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Niraj Venkat
1894b42773
Added EXT support for Mac GL Query calls
2015-07-08 16:11:36 -07:00
Niraj Venkat
7e59be6196
First take oon the query for the gpu
2015-07-08 10:00:58 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
samcake
76e661f88d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-05 12:08:56 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
