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
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
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
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Sam Gateau
20cb519c14
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
2015-06-30 08:19:00 -07:00
Sam Gateau
51eab1bd39
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-26 15:45:47 -07:00
Sam Gateau
c41ebcae78
Covering all the case for rendering the light passes
2015-06-26 15:40:08 -07:00
Ryan Huffman
35f9d49c06
Fix DrawOverlay3D::getOpaquePipeline invalid signature
2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gateau
fb42613344
Fixing transparency that i just broke
2015-06-18 20:25:51 +02:00
samcake
89fe1c47be
preping for debug the jobs
2015-06-18 13:02:06 +02:00
Sam Gateau
5c547037f2
Migrating the overaly 3d rendering in their own job and their own shader
2015-06-17 15:54:20 +02:00
Sam Gateau
d1ac3148f0
migrating the transparent pipeline
2015-06-16 17:33:53 +02:00
Sam Gateau
9be87758fd
Improving the design of the Jobs and varying
2015-06-16 15:00:47 +02:00
