NissimHadar
|
7b56cfbeae
|
Clear the frame buffer in all cases.
|
2018-07-12 11:40:53 -07:00 |
|
John Conklin II
|
b59e9f9899
|
Merge pull request #13582 from Zvork/scale
Render Scale Resolution applied only to 3D rendering not HUD
|
2018-07-12 10:56:03 -07:00 |
|
John Conklin II
|
d1280bc464
|
Merge pull request #13572 from Zvork/fade
Repair Transition effect
|
2018-07-12 10:54:20 -07:00 |
|
Sam Gateau
|
54d2f42fa4
|
Merge pull request #13544 from Zvork/haze
Fix haze on Mac (bug #15515)
|
2018-07-11 20:04:22 +02:00 |
|
Sam Gateau
|
377c072e6d
|
Merge pull request #13557 from Zvork/bloom
Fix Bloom on Mac and hopefully Windows AMD (bug #15434)
|
2018-07-11 19:29:44 +02:00 |
|
Olivier Prat
|
22420dbf78
|
Fixed render resolution scale with TAA
|
2018-07-11 12:28:46 +02:00 |
|
Olivier Prat
|
703fc20856
|
Separate scale between 3D rendering and HUD
|
2018-07-11 12:17:36 +02:00 |
|
Wayne Chen
|
8f23fb01a4
|
removing unused variables
|
2018-07-10 07:30:02 -07:00 |
|
Olivier Prat
|
6814c487ec
|
Fixed slot collision between fade map and material texture table
|
2018-07-10 16:16:51 +02:00 |
|
Olivier Prat
|
50d16eca80
|
Added object fade parameters to shape pipeline locations
|
2018-07-10 12:26:51 +02:00 |
|
Olivier Prat
|
777ca7e010
|
Using shader locations directly in ShapePipeline
|
2018-07-10 12:11:30 +02:00 |
|
Olivier Prat
|
dfe51b57e8
|
Fade object params are now passed through uniform buffer
|
2018-07-10 10:53:38 +02:00 |
|
Wayne Chen
|
bf5cdb0e5f
|
removing unused variables from lambda capture expressions
|
2018-07-09 22:31:49 -07:00 |
|
Olivier Prat
|
a75b4a2410
|
Switched to uniform buffer for Highlight
|
2018-07-06 13:56:04 +02:00 |
|
Olivier Prat
|
74a6c25b86
|
Used shape pipeline slots in haze
|
2018-07-06 12:35:48 +02:00 |
|
Olivier Prat
|
0cc6471c7f
|
Merge branch 'master' of http://github.com/highfidelity/hifi into haze
|
2018-07-06 12:35:26 +02:00 |
|
Olivier Prat
|
63c03e79d3
|
BloomApply now uses uniform buffer
|
2018-07-06 11:52:24 +02:00 |
|
Olivier Prat
|
1097e666d6
|
Using uniform buffer for bloom threshold
|
2018-07-06 11:13:42 +02:00 |
|
Sam Gateau
|
c7c1cdd8c3
|
Merge pull request #13529 from Zvork/transparent
Fix number of rendering issues with some transparent objects on Mac and AMD GPUs
|
2018-07-05 17:20:24 +02:00 |
|
Olivier Prat
|
d2763841be
|
Working background blend on haze
|
2018-07-05 17:15:39 +02:00 |
|
Olivier Prat
|
4b7b14f4d3
|
Added lighting model to haze to be able to turn it on/off
|
2018-07-05 16:25:40 +02:00 |
|
Olivier Prat
|
4a25090a23
|
Fixing haze bug on Mac, and potentially AMD
|
2018-07-05 15:48:33 +02:00 |
|
Olivier Prat
|
bda0c0a89f
|
Discard fragments all the time if opacity is under threshold
|
2018-07-03 16:51:56 +02:00 |
|
Olivier Prat
|
74a9b03a5e
|
Merge branch 'master' of http://github.com/highfidelity/hifi into transparent
|
2018-07-03 09:26:29 +02:00 |
|
SamGondelman
|
773efe8cf0
|
fix blurry tablet if overlay is drawing
|
2018-07-02 13:32:25 -07:00 |
|
Olivier Prat
|
51fe60ec45
|
Fixed android compilation error and removed _glUniformi call
|
2018-07-02 14:59:09 +02:00 |
|
Olivier Prat
|
d2a612580c
|
Fixed NaN with specular on transparent objects
|
2018-07-02 12:20:55 +02:00 |
|
Sam
|
1f90e86b87
|
fix shader shadow bug on mac
|
2018-07-02 11:08:14 +02:00 |
|
Sam
|
a6cbc44885
|
Merged with zvork fix
|
2018-07-02 10:50:37 +02:00 |
|
Sam
|
c1856a5e36
|
Make shadows work with one cascade
|
2018-07-02 10:46:53 +02:00 |
|
Olivier Prat
|
de831ffea9
|
Switched shadow maps to sampler2DArrayShadow to try to fix on Mac
|
2018-06-29 16:55:33 +02:00 |
|
Sam Gondelman
|
7fb2e535ff
|
Merge pull request #13468 from SamGondelman/secondaryShadows
Disable shadows in secondary camera
|
2018-06-26 15:45:44 -07:00 |
|
SamGondelman
|
97ee02811c
|
disable shadows in secondary camera
|
2018-06-26 12:27:59 -07:00 |
|
Sam Gondelman
|
fbe54437b8
|
Merge pull request #13409 from humbletim/add-raypick-shapeID
Include shapeID in RayPick results
|
2018-06-26 10:25:39 -07:00 |
|
Andrew Meadows
|
4424a8df11
|
Merge pull request #13303 from highfidelity/workload
workload project part 1
|
2018-06-20 15:39:01 -07:00 |
|
Andrew Meadows
|
44c3620b6e
|
remove cruft
|
2018-06-18 17:45:58 -07:00 |
|
humbletim
|
dc5c5c20df
|
raypick partIndex commit
include shapeID for accessing proper material index
add raypick shapeID test script
|
2018-06-18 18:22:30 -04:00 |
|
Sam Gateau
|
56a1137f7b
|
Merge pull request #13312 from SamGondelman/overlayPipelines
Fix layered overlay rendering and highlight
|
2018-06-18 14:35:03 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
sabrina-shanman
|
79fd3cb181
|
Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class
|
2018-06-14 15:49:40 -07:00 |
|
sabrina-shanman
|
3c4050884e
|
Remove straggler ifdef in Model class
|
2018-06-14 14:40:22 -07:00 |
|
sabrina-shanman
|
82fddfc31f
|
Remove unused constant in Model.cpp
|
2018-06-13 13:03:07 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
sabrina-shanman
|
440c77905a
|
Remove functionality for rendering collision meshes directly in the Model class
|
2018-06-11 11:03:57 -07:00 |
|
Sam Gondelman
|
c7f05d96b4
|
Merge pull request #13309 from Cristo86/android_crashes_domains
Android - Double Click crash and dev-mobile crash with Pixel XL
|
2018-06-08 13:36:53 -07:00 |
|
howard-stearns
|
df0ecb44a8
|
fix crash setting model texture
(cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)
|
2018-06-07 13:21:45 -07:00 |
|
John Conklin II
|
277758cd03
|
Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials
Check for null material pointer in CauterizedModel
|
2018-06-07 09:41:03 -07:00 |
|
SamGondelman
|
d2f8ee327d
|
properly reset highlight framebuffer
|
2018-06-05 18:18:24 -07:00 |
|
Cristian Luis Duarte
|
b38eae3731
|
Only add RenderShadowTask if isDeferred
|
2018-06-05 18:54:48 -03:00 |
|