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
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
Cristian Luis Duarte
b38eae3731
Only add RenderShadowTask if isDeferred
2018-06-05 18:54:48 -03:00
samcake
386c0f9ab2
Re review adjustments
2018-05-31 12:16:57 -07:00
luiscuenca
60758dec8d
Check for null pointer
2018-05-31 11:32:45 -07:00
Sam Gateau
513acc529e
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
2018-05-30 23:31:54 -07:00
samcake
2e9076c71e
Clean up and trying to get ready for merge
2018-05-30 11:14:49 -07:00
samcake
873cabe284
Cleaning the code
2018-05-29 17:46:25 -07:00
Sam Gateau
2f94c43968
Removing the getLayer from the meshPArtPayload and check that it s working
2018-05-28 23:20:04 -07:00
Sam Gateau
678effdb48
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
2018-05-26 23:28:59 -07:00
samcake
221b513b19
Oh boy
2018-05-25 16:33:34 -07:00
samcake
44a8d880fa
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-24 14:31:53 -07:00
John Conklin II
36d2baab60
Merge pull request #13214 from SamGondelman/primCrash
...
Fix crash in GL45Backend::do_drawIndexedInstanced
2018-05-24 13:33:06 -07:00
SamGondelman
9dfc61a452
possible fix for gl crash
2018-05-22 12:51:32 -07:00
samcake
f536f7b6c9
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-21 15:52:51 -07:00
samcake
2dc28a504c
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-21 15:52:42 -07:00
Sam Gateau
87989268bf
Merge pull request #13182 from jherico/feature/batch_pooling
...
Use pooled gpu batches
2018-05-21 15:47:55 -07:00
Brad Davis
9c26b2c1d3
Use pooled gpu batches
2018-05-21 13:53:44 -07:00
Sam Gateau
e1690a28e1
Merging with master
2018-05-20 23:04:11 -07:00
samcake
3aaa01788c
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-18 17:42:30 -07:00
Cristian Luis Duarte
c7edf72f71
Check isHazeEnabled() vs 0.0 to compile on GLES
2018-05-18 15:59:24 -03:00
samcake
0cf87748cd
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-17 14:20:44 -07:00
Clement
da08d747dc
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-05-17 12:10:08 -07:00
samcake
735db27919
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-16 17:18:23 -07:00
samcake
adc8a07d3c
Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn
2018-05-16 13:14:14 -07:00
samcake
21e069c90c
Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa
2018-05-16 13:09:55 -07:00
samcake
179801dab6
FIxing the transparent ambient lighting bug
2018-05-15 17:22:28 -07:00
John Conklin II
ce1231910c
Merge pull request #13140 from Cristo86/android_avatar_name
...
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
2018-05-15 13:22:15 -07:00
Olivier Prat
d10b5a16f2
Turned off jitter with FXAA
2018-05-15 15:09:02 +02:00
Olivier Prat
bed7752a1a
Fixed bug with highlighting and TAA
2018-05-15 12:27:04 +02:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow
...
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
2018-05-14 13:00:15 -07:00
Cristian Luis Duarte
9e9e1092d6
Add Opaques tasks into RenderForwardTask
2018-05-11 21:37:28 -03:00
Cristian Luis Duarte
e3d7d65186
Merge remote-tracking branch 'origin/master' into android_avatar_name
2018-05-11 18:48:34 -03:00
Olivier Prat
ec439086a2
Extended to other shaders
...
(cherry picked from commit 328f1dec9b
2018-05-10 15:41:34 -07:00
Olivier Prat
29355ba8fb
Fixed procedural shaders
...
(cherry picked from commit eab7dd6006
2018-05-10 15:41:04 -07:00
samcake
652c754373
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-09 15:16:48 -07:00
Cristian Luis Duarte
936a319e62
Android - First version of showing up avatars names upon touch. Brought back (transparent) overlays into render forward task.
2018-05-09 17:15:57 -03:00
SamGondelman
c2004debd5
test using highp floats everywhere for android
2018-05-07 11:41:19 -07:00
Sam Gateau
9b65e0771b
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-05 12:17:20 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
John Conklin II
7699a19267
Merge pull request #12992 from Zvork/procedural
...
Fixed procedural shaders
2018-05-04 15:35:57 -07:00
Sam Gateau
61c855a97b
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-03 20:15:07 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
samcake
6d251c4cd3
Bringing the work and refinment done in workload branch to master branch
2018-05-03 17:46:50 -07:00
Sam Gateau
361fe75dc3
Merge pull request #13078 from jherico/fix/14638
...
Make resource swapchains immutable
2018-05-02 17:21:45 -07:00
Anthony J. Thibault
4fa9af5534
Added items to the developer menu for debugging physics
...
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:
* Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
* Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
* Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
* Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
* Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
Bradley Austin Davis
80f87f7a62
Make resource swapchains immutable, fix for 14638
2018-05-02 10:32:34 -07:00
Bradley Austin Davis
7bad849e67
Make resource swapchains immutable, fix for 14638
2018-05-02 10:29:40 -07:00
