Sam Gateau
|
d1e2e9ce71
|
Merge pull request #12921 from SamGondelman/precisionq
Fix AMD shader compilation
|
2018-04-23 10:17:35 -07:00 |
|
samcake
|
990ee83f04
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-23 10:07:58 -07:00 |
|
Sam Gateau
|
97934fe563
|
Adjusting the regulators and moving task to use chrono nad interesting tests
|
2018-04-23 00:07:00 -07:00 |
|
SamGondelman
|
ac7e8623bf
|
quiet shader warnings
|
2018-04-20 18:25:30 -07:00 |
|
Simon Walton
|
4973605bf7
|
Restore two makePrograms from previous commit
|
2018-04-20 17:52:40 -07:00 |
|
SamGondelman
|
d59f368ad6
|
hide menu, fix shaders
|
2018-04-20 17:38:38 -07:00 |
|
samcake
|
0f4aa7e27e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-20 09:31:36 -07:00 |
|
Olivier Prat
|
46a1ff4dd2
|
Set jitter to O on RenderableWebEntityItems
|
2018-04-20 12:02:17 +02:00 |
|
Olivier Prat
|
c6d598cc88
|
Jitter is now set through a batch command
|
2018-04-20 10:52:50 +02:00 |
|
Olivier Prat
|
440e2b8452
|
Merged with master
|
2018-04-20 08:13:25 +02:00 |
|
Simon Walton
|
999e5beba1
|
Move linear pass down sample shader to deferred compile
|
2018-04-19 15:30:16 -07:00 |
|
Simon Walton
|
529d5517e5
|
Move antialiasing and velocity buffer makeProgram to deferred scheme
|
2018-04-19 15:30:16 -07:00 |
|
John Conklin II
|
11f509e57a
|
Merge pull request #12873 from Zvork/haze
Fix for weird color shifting of teleportation target in Rust domain
|
2018-04-19 14:11:47 -07:00 |
|
samcake
|
a6bd589f4f
|
Merging upstream
|
2018-04-19 12:20:10 -07:00 |
|
Olivier Prat
|
c8bef8651f
|
Fixed weird specular on hair an teleportation target! Was a stupid mistake...
|
2018-04-19 10:04:38 +02:00 |
|
samcake
|
52a4224442
|
Arg get me the feedback working!!!!
|
2018-04-18 18:16:06 -07:00 |
|
Stephen Birarda
|
c4ad93bafb
|
Merge pull request #12782 from SimonWalton-HiFi/qregexp
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
|
2018-04-18 17:28:48 -07:00 |
|
Olivier Prat
|
1c9d1f6c48
|
Merge branch 'master' of http://github.com/highfidelity/hifi into haze
|
2018-04-18 09:06:23 +02:00 |
|
John Conklin II
|
86c9b8c61d
|
Merge pull request #12892 from SimonWalton-HiFi/batch-compile-shaders
Batch compile shaders
|
2018-04-17 15:47:32 -07:00 |
|
SamGondelman
|
901301485b
|
reorganizing shader defines to fix compilation errors
|
2018-04-17 15:11:56 -07:00 |
|
Olivier Prat
|
0800c5eeb9
|
Removed TAA from web shaders. With reduced jittering, jittering on these objects is less noticeable
|
2018-04-17 16:36:52 +02:00 |
|
Olivier Prat
|
6ec9378739
|
Used unjittered projection matrix for a sharper and more stable TAA
|
2018-04-17 15:13:03 +02:00 |
|
Olivier Prat
|
d0d974d4f5
|
Bizarelly the jitter was 2 pixel wide...?
|
2018-04-17 12:24:12 +02:00 |
|
Olivier Prat
|
08146a7618
|
Used previous projection matrix to limit overblur
|
2018-04-17 11:28:59 +02:00 |
|
Olivier Prat
|
89669b326b
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
|
2018-04-17 09:24:35 +02:00 |
|
samcake
|
b32be91bb1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-16 13:22:58 -07:00 |
|
Simon Walton
|
b2e736da70
|
Remove commented-out code
|
2018-04-16 11:57:14 -07:00 |
|
Sam Gateau
|
19aa49832b
|
Merge pull request #12750 from SamGondelman/androidPrimitives
Forward pipelines for primitives
|
2018-04-16 11:18:56 -07:00 |
|
Olivier Prat
|
f9cc4994df
|
Merge branch 'master' of http://github.com/highfidelity/hifi into haze
|
2018-04-16 14:00:33 +02:00 |
|
Olivier Prat
|
9ad9c070f8
|
Some small shader optimizations
|
2018-04-16 08:50:18 +02:00 |
|
Simon Walton
|
b469cdfda2
|
More shaders to deferred compile scheme
|
2018-04-13 17:52:33 -07:00 |
|
SamGondelman
|
c8afaf27e5
|
Merge remote-tracking branch 'upstream/master' into scaleAssert
|
2018-04-13 17:30:03 -07:00 |
|
Simon Walton
|
1ab31d9116
|
Defer some shader compilation to a batch job - WIP
|
2018-04-13 15:38:48 -07:00 |
|
Olivier Prat
|
8ef25301cb
|
Fixed some shader program link errors
|
2018-04-13 17:14:19 +02:00 |
|
Olivier Prat
|
190e9313c7
|
Sorted out the mix between eye space and world space vectors in translucent object shading
|
2018-04-13 15:38:55 +02:00 |
|
samcake
|
bfdde6513f
|
Mergin with master
|
2018-04-12 15:45:27 -07:00 |
|
John Conklin II
|
9123c05eb3
|
Merge pull request #12859 from samcake/one
Fix a bug when switching shadow on/off in front of mirror
|
2018-04-12 15:25:05 -07:00 |
|
SamGondelman
|
284364683d
|
Merge remote-tracking branch 'upstream/master' into scaleAssert
|
2018-04-12 14:46:40 -07:00 |
|
SamGondelman
|
9f3a431c5d
|
minimum entity dimension
|
2018-04-12 14:12:52 -07:00 |
|
samcake
|
e2f9eef5e2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-12 12:27:27 -07:00 |
|
Sam Gateau
|
20ae247185
|
Merge pull request #12784 from Zvork/zeye
Potential bug correction when constructing eye position from Z-buffer depths in shaders
|
2018-04-12 11:10:09 -07:00 |
|
Olivier Prat
|
2adac241d0
|
Fixed incorrect fragment to eye dir computation in haze
|
2018-04-12 15:11:10 +02:00 |
|
SamGondelman
|
e0b2c076ef
|
cleanup and fix forward procedural rendering
|
2018-04-11 13:03:57 -07:00 |
|
Olivier Prat
|
9ca0b39f74
|
Adjusted TAA blend to find the antialiasing and bloom stability sweet spot
|
2018-04-11 11:12:22 +02:00 |
|
Olivier Prat
|
cfacd80e08
|
Moved not in front overlays and highlight before TAA and Bloom
|
2018-04-11 10:56:27 +02:00 |
|
Sam Gateau
|
167db14bdb
|
restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off
|
2018-04-11 00:00:11 -07:00 |
|
Olivier Prat
|
182febe3e9
|
Switched to 9 tap gaussian blur to try to limit visible mach bands on larg glows
|
2018-04-11 08:44:02 +02:00 |
|
SamGondelman
|
d841eeb6e9
|
Merge remote-tracking branch 'upstream/master' into androidPrimitives
|
2018-04-10 16:52:08 -07:00 |
|
SamGondelman
|
0c069574c5
|
forward pipelines for primitives
|
2018-04-10 15:56:08 -07:00 |
|
Olivier Prat
|
e2f442d7c1
|
Adjusted default bloom size
|
2018-04-10 18:06:36 +02:00 |
|
Olivier Prat
|
0085a6cfc0
|
TAA now operates on tonemapped input and performs inverse tone map before bloom
|
2018-04-10 17:33:33 +02:00 |
|
Olivier Prat
|
6dd6218b77
|
Reduced blur taps for better performance and limited normal attenuation distance
|
2018-04-10 14:30:36 +02:00 |
|
Olivier Prat
|
f6ffbef60d
|
Final intensity adjustments
|
2018-04-10 12:36:36 +02:00 |
|
Olivier Prat
|
2974e05cf2
|
Tweaked bloom intensity mix
|
2018-04-10 11:13:37 +02:00 |
|
Olivier Prat
|
3c4409c5e1
|
Merge with master
|
2018-04-10 09:16:08 +02:00 |
|
Sam Gateau
|
6acda83f5c
|
Bringing the test to the workload ui
|
2018-04-09 23:13:39 -07:00 |
|
Andrew Meadows
|
a9f5b57681
|
merge 'master' into 'workload-010'
|
2018-04-06 11:11:06 -07:00 |
|
Stephen Birarda
|
1d76dea9f6
|
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
|
2018-04-06 10:43:01 -07:00 |
|
Olivier Prat
|
573f399023
|
Fixed incorrect shadow frustum far clip computation due to not taking into account shadow receivers
|
2018-04-06 14:45:16 +02:00 |
|
Olivier Prat
|
7e111e89c4
|
Merge branch 'master' of http://github.com/highfidelity/hifi into shadow
|
2018-04-06 11:43:48 +02:00 |
|
Andrew Meadows
|
299f2a92e0
|
merge 'master' into 'workload'
|
2018-04-05 12:01:19 -07:00 |
|
samcake
|
78053b8b48
|
Refix the normal map case foro translucents
|
2018-04-04 18:33:27 -07:00 |
|
John Conklin II
|
2e37b4a312
|
Merge pull request #12747 from Zvork/fade
Update to Transitions debugging / editing script
|
2018-04-04 14:31:59 -07:00 |
|
Olivier Prat
|
fc86525863
|
Cleaned up a bit shadow map clear
|
2018-04-04 12:00:06 +02:00 |
|
Olivier Prat
|
e3908662fe
|
Merge branch 'master' of http://github.com/highfidelity/hifi into zeye
|
2018-04-04 09:50:37 +02:00 |
|
samcake
|
fa35d659dc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
|
2018-04-03 17:56:41 -07:00 |
|
Simon Walton
|
7d16ca9c1c
|
Remove uses of addRepeatedMessageRegex() and its implementation
Change to new log-message ID scheme.
|
2018-04-03 17:54:01 -07:00 |
|
Clément Brisset
|
3d4490f3fd
|
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
|
2018-04-03 15:39:16 -07:00 |
|
samcake
|
59a081bcdb
|
merge with upstream
|
2018-03-30 18:08:38 -07:00 |
|
Sam Gateau
|
d5496d68fd
|
FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly
|
2018-03-30 16:58:41 -07:00 |
|
Olivier Prat
|
02cf15d115
|
Lightclusters no unpack position from zdb
|
2018-03-30 10:06:27 -04:00 |
|
Olivier Prat
|
6f7a1eaefa
|
Fixed correct inverse projection matrix when computing from Zeye
|
2018-03-29 18:05:43 -04:00 |
|
Olivier Prat
|
bd0e13463d
|
Fix on unpackDeferredPosition
|
2018-03-29 17:06:23 -04:00 |
|
Olivier Prat
|
e4416db06f
|
Added save/file dialog for transition configurations in transition editor
|
2018-03-28 16:54:53 -04:00 |
|
Olivier Prat
|
7fa5e384b9
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-28 11:21:07 -04:00 |
|
Brad Davis
|
0e7ee95c95
|
Merge remote-tracking branch 'upstream/master' into bindless
|
2018-03-21 19:16:55 -07:00 |
|
Brad Davis
|
ae8df7e24e
|
Merge remote-tracking branch 'origin/gl_common' into HEAD
|
2018-03-21 12:35:17 -07:00 |
|
John Conklin II
|
2d63afbe28
|
Merge pull request #12588 from SamGondelman/shapeTex
Materials on primitives
|
2018-03-21 12:08:24 -07:00 |
|
John Conklin II
|
283aff71ec
|
Merge pull request #12612 from jherico/gl_common
Break out common GL and GLES code into a single shared library
|
2018-03-21 11:28:24 -07:00 |
|
Olivier Prat
|
6b44d79f90
|
Proposal to improve fade editing with some extra visual cues
|
2018-03-20 17:48:41 -07:00 |
|
Olivier Prat
|
143a315f1d
|
Fade edited objects are now selected with ray picking
|
2018-03-20 15:29:50 -07:00 |
|
Olivier Prat
|
f0a7a9b21c
|
Merged with master
|
2018-03-20 10:24:41 -07:00 |
|
Brad Davis
|
f77228bbfe
|
Fixing missing m_pi define
|
2018-03-20 09:58:47 -07:00 |
|
SamGondelman
|
444534f4ff
|
model behaves correctly if missing material
(cherry picked from commit 1e89debc4e )
|
2018-03-16 15:51:37 -07:00 |
|
SamGondelman
|
984a48316d
|
CR
|
2018-03-16 13:51:29 -07:00 |
|
samcake
|
2fc23d799a
|
adding the correct flag maybe?
|
2018-03-15 18:05:58 -07:00 |
|
SamGondelman
|
e59af8892a
|
make same changes to gles backend from taa pr
|
2018-03-14 12:09:59 -07:00 |
|
SamGondelman
|
3b877db992
|
fix hud sphere
|
2018-03-13 14:58:29 -07:00 |
|
samcake
|
2af88c11f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
|
2018-03-13 13:35:31 -07:00 |
|
SamGondelman
|
4adc357534
|
apply taa to text and web entities/overlays
|
2018-03-13 11:57:14 -07:00 |
|
samcake
|
f8acca76e2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
|
2018-03-13 09:31:50 -07:00 |
|
John Conklin II
|
5be2f0acc7
|
Merge pull request #12490 from Zvork/taa
Temporal Anti-Aliasing
|
2018-03-13 09:03:50 -07:00 |
|
samcake
|
69fe1ace0b
|
THe View rings are rendering corectly, let s ship it
|
2018-03-12 11:59:03 -07:00 |
|
Brad Davis
|
9056ee0f14
|
Merge branch 'gl_common' into bindless
|
2018-03-12 11:27:30 -07:00 |
|
Sam Gateau
|
9e7260839c
|
Better rendering of the view circles
|
2018-03-12 01:05:07 -07:00 |
|
samcake
|
4a7d3e8e0e
|
REndering the view rings better
|
2018-03-09 17:49:50 -08:00 |
|
samcake
|
e8b5a875d6
|
REndering the view rings better
|
2018-03-09 17:40:58 -08:00 |
|
Sam Gateau
|
f087bb7623
|
Adjust the freeze view and start drawing the views better
|
2018-03-09 01:38:00 -08:00 |
|
Olivier Prat
|
da6bd92ff6
|
Merged with master
|
2018-03-09 10:07:25 +01:00 |
|
David Rowe
|
b461a422c6
|
Merge branch 'master' into 21709
|
2018-03-09 14:18:42 +13:00 |
|
Brad Davis
|
09996e0b65
|
Bindless texture work cleanup
|
2018-03-08 16:01:18 -08:00 |
|
samcake
|
a0db5c6135
|
Merge with master
|
2018-03-08 15:35:58 -08:00 |
|
NissimHadar
|
fda32e4aa4
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-08 12:16:36 -08:00 |
|
NissimHadar
|
a703b5a3b5
|
Added check to correct crashing when selecting ambient occlusion from menu.
|
2018-03-08 12:15:26 -08:00 |
|
Brad Hefta-Gaub
|
d2e264ab32
|
Merge pull request #12583 from samcake/punk
Fix Local lights not showing anymore
|
2018-03-08 10:31:58 -08:00 |
|
Sam Gondelman
|
1e9cfe29f2
|
Merge pull request #12388 from highfidelity/android
Android Tip
|
2018-03-08 10:18:35 -08:00 |
|
Sam Gateau
|
ceb38dbc97
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-07 18:54:21 -08:00 |
|
Sam Gateau
|
dc122b4ce8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-07 18:14:44 -08:00 |
|
Brad Davis
|
d858d34523
|
Update material binding
|
2018-03-07 17:27:47 -08:00 |
|
Brad Davis
|
ddd60ded03
|
Merge remote-tracking branch 'upstream/master' into bindless_master
|
2018-03-07 16:04:35 -08:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
SamGondelman
|
96e48a0162
|
warnings
|
2018-03-07 13:50:51 -08:00 |
|
SamGondelman
|
19e4fb2355
|
materials on primitives
|
2018-03-07 12:22:17 -08:00 |
|
David Rowe
|
a62b6b7150
|
Merge branch 'master' into 21709
|
2018-03-07 17:34:53 +13:00 |
|
samcake
|
4a91ac11c9
|
Adding controls of the regions
|
2018-03-06 18:19:02 -08:00 |
|
samcake
|
923c81ae28
|
Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights
|
2018-03-06 17:38:27 -08:00 |
|
Cristian Luis Duarte
|
bde2ba9272
|
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
|
2018-03-06 22:02:23 -03:00 |
|
Brad Davis
|
f9605cffb1
|
Target available mip
|
2018-03-06 11:20:54 -08:00 |
|
Sam Gateau
|
7e96608699
|
introducing the first stage of the workload engine to setup view and expand the view definition
|
2018-03-06 01:35:16 -08:00 |
|
Brad Davis
|
8bfc610cfb
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-05 11:48:58 -08:00 |
|
NissimHadar
|
1eb0dde3d2
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-05 11:36:39 -08:00 |
|
samcake
|
660c4c30e9
|
Representing the view spheres
|
2018-03-02 18:22:51 -08:00 |
|
samcake
|
7179a31d17
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-02 17:51:19 -08:00 |
|
samcake
|
cc392944b5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-02 17:49:10 -08:00 |
|
samcake
|
fc8f1c1e65
|
Resolving conflicts
|
2018-03-02 14:20:33 -08:00 |
|
Cristian Luis Duarte
|
76e4a5bef2
|
Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1().
|
2018-03-02 18:46:14 -03:00 |
|
samcake
|
b8fb97c824
|
Resolving conflicts
|
2018-03-02 10:36:55 -08:00 |
|
samcake
|
a40f8cefa2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-03-02 09:01:16 -08:00 |
|
samcake
|
d4d5f3a7f0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-02 08:50:47 -08:00 |
|
NissimHadar
|
000b08f7c0
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-02 08:07:01 -08:00 |
|
samcake
|
5b8e18f15d
|
Adding the pipeline to render the view spheres
|
2018-03-01 17:57:44 -08:00 |
|
NissimHadar
|
0f2cf8ea85
|
Re-implemented shadow controls.
|
2018-03-01 14:24:20 -08:00 |
|
samcake
|
a227cf1edb
|
Fixing bad key/pipeline pair
|
2018-03-01 10:49:58 -08:00 |
|
samcake
|
94fa2ef6a0
|
Adding debug color of the region
|
2018-02-28 17:59:59 -08:00 |
|
samcake
|
b1b539e07a
|
Adding debug color of the region
|
2018-02-28 17:56:37 -08:00 |
|
samcake
|
dc286544c5
|
Merging with nissim's pr
|
2018-02-28 17:54:54 -08:00 |
|
samcake
|
a7542d5b90
|
fixing the shadow
|
2018-02-28 17:46:22 -08:00 |
|
samcake
|
d91fb543f3
|
Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api
|
2018-02-28 17:15:40 -08:00 |
|
NissimHadar
|
5d7e6651a7
|
Use correct pixel shader.
|
2018-02-28 11:05:02 -08:00 |
|
samcake
|
e6d5f90847
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-02-28 10:30:14 -08:00 |
|
Andrew Meadows
|
3ca21dda67
|
Merge hifi/master of into hifi/workload
|
2018-02-28 10:28:31 -08:00 |
|
samcake
|
31462a87c3
|
now identifying the issue with ResourceBUffer
|
2018-02-28 10:13:13 -08:00 |
|
NissimHadar
|
faad930e35
|
WIP.
|
2018-02-28 08:44:01 -08:00 |
|
NissimHadar
|
5764a21c4a
|
WIP.
|
2018-02-28 08:12:48 -08:00 |
|
Olivier Prat
|
bf70e1d4ee
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
|
2018-02-28 09:16:31 +01:00 |
|
samcake
|
3360c5a968
|
Debugging the ssbo bug
|
2018-02-27 18:46:12 -08:00 |
|
NissimHadar
|
7cae04883e
|
WIP.
|
2018-02-27 17:19:02 -08:00 |
|
NissimHadar
|
f52f146db5
|
WIP.
|
2018-02-27 16:28:46 -08:00 |
|
David Rowe
|
a782b6779a
|
Merge branch 'master' into 21709
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
|
2018-02-28 12:42:05 +13:00 |
|
NissimHadar
|
00f3682bbe
|
NOT WORKING YET.
|
2018-02-27 14:09:31 -08:00 |
|
Brad Davis
|
136ced98c3
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-27 13:44:00 -08:00 |
|
SamGondelman
|
cc53b338db
|
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
|
2018-02-27 13:30:03 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21 , reversing
changes made to c0f20900a0 .
|
2018-02-27 11:33:05 -08:00 |
|
SamGondelman
|
a4b04d9d43
|
merge
|
2018-02-27 10:08:30 -08:00 |
|
Brad Davis
|
6254e2b569
|
PR feedback
|
2018-02-27 09:11:40 -08:00 |
|
Brad Davis
|
f01c42dcc9
|
Fixing merged dual-quat pipelines
|
2018-02-27 08:54:46 -08:00 |
|
John Conklin II
|
48f0cded05
|
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
|
2018-02-27 07:53:25 -08:00 |
|
Olivier Prat
|
f356d9d9ee
|
Merge branch 'taa' into taapre
|
2018-02-27 10:17:26 +01:00 |
|
Olivier Prat
|
2eb7be26cf
|
Merged with master and fixed tablet NoAA flag
|
2018-02-27 10:16:25 +01:00 |
|
Olivier Prat
|
2d71d7da9f
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
|
2018-02-27 09:11:43 +01:00 |
|
humbletim
|
d3bae87066
|
* remove unneeded Q_DECLARE_METATYPEs
* CR feedback
|
2018-02-26 19:07:55 -05:00 |
|
Brad Davis
|
b9387f2a21
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-26 13:18:14 -08:00 |
|
SamGondelman
|
6fe2d46d7c
|
merge
|
2018-02-26 12:40:14 -08:00 |
|
Sam Gondelman
|
d1d6adf447
|
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1
fix osx shadows
|
2018-02-26 11:46:43 -08:00 |
|
Anthony J. Thibault
|
f5fcaae283
|
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
|
2018-02-26 10:55:44 -08:00 |
|
Anthony J. Thibault
|
0404b722e4
|
Code review feedback
|
2018-02-26 10:00:32 -08:00 |
|
Brad Davis
|
3e552e5739
|
Fix warnings
|
2018-02-26 09:53:35 -08:00 |
|
Olivier Prat
|
12d7e89d7e
|
Switched back velocity buffer job to original place while I try to get more info on how/where that tablet is rendered
|
2018-02-26 18:13:41 +01:00 |
|
Olivier Prat
|
d288ebe79e
|
Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased
|
2018-02-26 18:07:44 +01:00 |
|
Olivier Prat
|
c04bf095ec
|
Limited sharpen range
|
2018-02-26 16:48:10 +01:00 |
|
Olivier Prat
|
16cd1e3fd5
|
Adjusted bloom effect to work with antialiasing
|
2018-02-26 15:26:12 +01:00 |
|
Olivier Prat
|
419e064e65
|
Moved antialiasing before tonemapping
|
2018-02-26 14:57:59 +01:00 |
|
humbletim
|
3dbe5d79bb
|
fix windows punctilious warnings
|
2018-02-26 06:01:16 -05:00 |
|
humbletim
|
f824edd04e
|
* remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
|
2018-02-26 04:58:22 -05:00 |
|
SamGondelman
|
b56f755034
|
material reflection
|
2018-02-23 17:58:46 -08:00 |
|
Brad Davis
|
0550138609
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-23 12:48:10 -08:00 |
|
Olivier Prat
|
37fdf81f1b
|
Fix warnings on mac and ubuntu
|
2018-02-23 19:37:12 +01:00 |
|
Seth Alves
|
59bd05aa55
|
make shadow-related shader compile on osx
|
2018-02-23 09:22:34 -08:00 |
|
humbletim
|
058e4d1926
|
CR feedback; whitespace / remove unnecessary diffs
|
2018-02-23 09:12:33 -05:00 |
|
humbletim
|
f8fe06213d
|
CR feedback; whitespace / remove unnecessary diffs
|
2018-02-23 09:11:23 -05:00 |
|
Olivier Prat
|
6a550e983f
|
Disable sharpen with FXAA
|
2018-02-23 14:46:37 +01:00 |
|
Olivier Prat
|
095f426f31
|
Adjusted default sharpen
|
2018-02-23 14:43:22 +01:00 |
|
humbletim
|
6ea4b660b7
|
CR feedback; remove ok bool pointer and all metadata; cleanup
|
2018-02-23 07:47:39 -05:00 |
|
Olivier Prat
|
c9a6d6bf14
|
Added adjustable post sharpen filter
|
2018-02-23 11:53:05 +01:00 |
|
Olivier Prat
|
4636f43728
|
Simplified camera view history and TAA is now working in all circumstances.
|
2018-02-23 10:19:05 +01:00 |
|
Anthony J. Thibault
|
0469eafbe4
|
Switch between dualQuats and matrix skinning based on model entity scale factor.
|
2018-02-22 18:35:16 -08:00 |
|
Bradley Austin Davis
|
12d1885dff
|
Merge pull request #12428 from gcalero/android_ui_fixes
Android ui fixes
|
2018-02-22 18:28:18 -08:00 |
|
Brad Davis
|
e0e7fb04f2
|
Fix merge issues
|
2018-02-22 18:08:56 -08:00 |
|
Brad Davis
|
aeb29db37d
|
Merge remote-tracking branch 'upstream/stable' into android_stable
|
2018-02-22 17:35:00 -08:00 |
|
samcake
|
101872abce
|
Still marinating how to represent the proxy values...
|
2018-02-22 16:44:35 -08:00 |
|
NissimHadar
|
3150b963c0
|
Implemented call to abortTask().
|
2018-02-22 16:29:58 -08:00 |
|
Brad Davis
|
4e2d3f23a6
|
Fix tonemapping on forward render pipeline / GLES
|
2018-02-22 15:38:15 -08:00 |
|
Olivier Prat
|
ebe05d1f6f
|
Still have to fix TAA when GPU is slower than game
|
2018-02-22 18:59:25 +01:00 |
|
Anthony J. Thibault
|
86351f19a9
|
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
|
2018-02-22 08:44:21 -08:00 |
|
humbletim
|
010c714abc
|
restore original Entities.getMeshes
|
2018-02-22 08:51:54 -05:00 |
|
humbletim
|
4d43e54346
|
use shared buffer_helpers::clone
|
2018-02-22 08:41:15 -05:00 |
|
humbletim
|
e4a2a589a5
|
CR fedback and cleanup
|
2018-02-22 07:56:09 -05:00 |
|
humbletim
|
72fca7e57e
|
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
|
2018-02-22 05:18:05 -05:00 |
|
humbletim
|
be8d79f53f
|
CR fedback and cleanup
|
2018-02-22 05:15:01 -05:00 |
|
Olivier Prat
|
aa46d16699
|
A bit of cleanup in TAA shaders
|
2018-02-22 10:09:03 +01:00 |
|
samcake
|
9c136e7dac
|
Trying to render the proxies without success
|
2018-02-21 17:31:53 -08:00 |
|
Nissim Hadar
|
bf4ba07b72
|
Added parameters to canCastShadow - still sucks.
|
2018-02-21 12:36:34 -08:00 |
|
Olivier Prat
|
dca7b7aaba
|
TAA is working on HMD! Still some issues when game rate is low
|
2018-02-21 17:34:51 +01:00 |
|
Olivier Prat
|
093a1491cd
|
Renamed resourcering to resourceswapchain
|
2018-02-21 15:43:19 +01:00 |
|
Olivier Prat
|
f53c2f41a5
|
Merge branch 'master' of http://github.com/highfidelity/hifi into prev
|
2018-02-21 09:46:38 +01:00 |
|
Nissim Hadar
|
6f84e4c977
|
Moved shadows and ambient occlusion to menu checkboxes.
|
2018-02-20 23:45:07 -08:00 |
|
samcake
|
f1dcfeb25e
|
Adding shaders and means to render the proxies contained in the workload SPace
|
2018-02-20 18:20:12 -08:00 |
|
SamGondelman
|
4c6169ec78
|
merge and a little cleanup
|
2018-02-20 15:45:34 -08:00 |
|
humbletim
|
5791ca4c51
|
interim checkin
|
2018-02-20 12:22:04 -05:00 |
|
Nissim Hadar
|
b2a06cdb98
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
|
2018-02-19 13:05:57 -08:00 |
|
Nissim Hadar
|
6a9bbaf0a5
|
WIP - clean-up.
|
2018-02-19 12:00:30 -08:00 |
|
Gabriel Calero
|
779e45aae7
|
Restore avatar overlays
|
2018-02-19 16:12:41 -03:00 |
|
Sam Gateau
|
fd49c0d100
|
Merge pull request #12401 from SamGondelman/decals
Material Entities
|
2018-02-19 10:58:02 -08:00 |
|
Olivier Prat
|
18af60f3eb
|
Added RingBuffer mechanism to gpu lib
|
2018-02-19 18:48:58 +01:00 |
|
Olivier Prat
|
9cfe53be3e
|
Merged from orgin taa
|
2018-02-19 17:50:10 +01:00 |
|
Olivier Prat
|
f5a2557a2e
|
Merged with master
|
2018-02-19 17:28:39 +01:00 |
|
David Rowe
|
67cfe783be
|
Entity properties JSDoc
|
2018-02-19 12:17:31 +13:00 |
|
Nissim Hadar
|
7ba8a9935a
|
No extraneous shadows.
|
2018-02-16 19:23:31 -08:00 |
|
Nissim Hadar
|
a2cc78b200
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-16 14:01:57 -08:00 |
|
Nissim Hadar
|
4c1f22f84e
|
Models and Avatar cast shadows (box doesn't, yet).
|
2018-02-16 14:01:33 -08:00 |
|
Nissim Hadar
|
194c7f4101
|
WIP - for review.
|
2018-02-16 09:28:15 -08:00 |
|
SamGondelman
|
b189433855
|
merge
|
2018-02-15 15:50:36 -08:00 |
|
SamGondelman
|
2d754edf74
|
CR
|
2018-02-15 15:48:41 -08:00 |
|
Nissim Hadar
|
df7a8389b3
|
Fixed possible crash.
|
2018-02-15 11:51:06 -08:00 |
|
samcake
|
b21b98c810
|
Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work
|
2018-02-15 11:24:20 -08:00 |
|
Nissim Hadar
|
26e7a85a95
|
Fixed possible crash.
|
2018-02-14 21:15:29 -08:00 |
|
Nissim Hadar
|
a679b6f828
|
Fixed possible crash.
|
2018-02-14 18:55:04 -08:00 |
|
samcake
|
246ac25d0a
|
Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight
|
2018-02-14 17:36:46 -08:00 |
|
Sam Gondelman
|
15cdfef16a
|
Merge branch 'master' into decals
|
2018-02-14 17:33:01 -08:00 |
|
Nissim Hadar
|
054b2bf3e2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# scripts/system/html/js/entityProperties.js
|
2018-02-14 17:10:07 -08:00 |
|
SamGondelman
|
324eefc914
|
remove fresnel, add unlit, fix overlays, cleanup
|
2018-02-14 17:02:07 -08:00 |
|
samcake
|
6357f36a97
|
Fixing names
|
2018-02-14 10:39:14 -08:00 |
|
Nissim Hadar
|
1632ab9782
|
Changed flag to "cast shadow" instead of "don't cast shadow".
|
2018-02-13 18:27:36 -08:00 |
|
samcake
|
1d3ae1b187
|
Work in progress to get the render items beeing tagged correctly for groupCulled
|
2018-02-13 17:50:01 -08:00 |
|
Anthony J. Thibault
|
d2c199104e
|
Avatars use Dual Quaternion Skinning and Model Entities do not.
|
2018-02-13 17:47:49 -08:00 |
|
Nissim Hadar
|
23a29b8d4b
|
Added don't castr shadow flag to entity and shape classes.
|
2018-02-13 16:16:04 -08:00 |
|
SamGondelman
|
4500ed17e7
|
merge from master
|
2018-02-13 13:58:39 -08:00 |
|
SamGondelman
|
38290064c1
|
replace materials by name, hide material mode for now
|
2018-02-13 13:24:08 -08:00 |
|
Andrew Meadows
|
20c2a4470e
|
merge 'findByID' into 'workload-001'
|
2018-02-13 11:47:02 -08:00 |
|
Anthony J. Thibault
|
7f5f48bca9
|
Models can now switch between dual quats and matrix palette skinning.
but not dynamically, because we still only compile one version of the shader.
|
2018-02-13 11:37:14 -08:00 |
|
Gabriel Calero
|
99f6c80b2a
|
Temporary remove ToneMappingDeferred
|
2018-02-13 10:00:31 -08:00 |
|
Sam Gateau
|
040710807d
|
Merge pull request #12346 from Zvork/scripts
Fix transition (ex-fade) debugging scripts
|
2018-02-13 09:08:35 -08:00 |
|
Andrew Meadows
|
8231a56b22
|
pull task out of render and into its own lib
|
2018-02-13 08:56:11 -08:00 |
|
Anthony J. Thibault
|
cf5452313a
|
WIP check in of making the use of dq or mat dynamic per model
|
2018-02-12 18:44:24 -08:00 |
|
Nissim Hadar
|
34aab4a9c8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
|
2018-02-12 17:50:39 -08:00 |
|
John Conklin II
|
51bf3c1466
|
Merge pull request #12323 from Zvork/shadow
Shadow performance / acnee improvements
|
2018-02-12 14:41:13 -08:00 |
|
John Conklin II
|
d084e58f48
|
Merge pull request #12328 from Atlante45/fix/misc-bugs
Misc bug fixes
|
2018-02-12 14:31:38 -08:00 |
|
Nissim Hadar
|
4acd0a34f5
|
Seems OK. Before adding flag to entity.
|
2018-02-12 12:55:14 -08:00 |
|
SamGondelman
|
9e8aa1898c
|
warnings, load material from URL, shapeID -> parentMaterialID
|
2018-02-12 12:50:09 -08:00 |
|
SamGondelman
|
5337377ef5
|
Merge remote-tracking branch 'upstream/master' into decals
|
2018-02-09 14:40:20 -08:00 |
|