Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 12:40:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70106 commits 25 branches 0 tags 1.1 GiB
Commit graph

3770 commits

Author SHA1 Message Date
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
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
samcake
b3408ae4c0 Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-05-01 11:39:54 -07:00
John Conklin II
37f4a2d3a8
Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background 
Debug Draw rendering now is visible on background skybox
 2018-04-27 15:56:44 -07:00
John Conklin II
1f4a9b6bcc
Merge pull request #12950 from SimonWalton-HiFi/batch-compile-shaders2 
Batch compile more shaders
 2018-04-27 14:55:57 -07:00
Bradley Austin Davis
acb21cc96a Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-27 10:50:47 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
Olivier Prat
328f1dec9b Extended to other shaders 2018-04-25 18:56:18 +02:00
Olivier Prat
e37b18336a Improved anti-aliasing on text 2018-04-25 12:08:08 +02:00
Olivier Prat
eab7dd6006 Fixed procedural shaders 2018-04-25 10:25:34 +02:00
Anthony J. Thibault
2136134ed0 Debug Draw rendering now is visible on background skybox 2018-04-24 14:28:08 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Sam Gateau
b342b16857 Fixing the crash on mac 2018-04-24 11:25:40 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash 
Attempt to shutdown web surfaces more consistently
 2018-04-24 10:15:25 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert 
Minimum entity dimension (1mm)
 2018-04-23 13:40:53 -07:00
samcake
35bbc6e61f Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:20:22 -07:00
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
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -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
Stephen Birarda
2158acecf4 tell cmake we are fine ignoring generated for CMP0071 2018-03-08 12:39:40 -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