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

4554 commits

Author SHA1 Message Date
John Conklin II
512b847684
Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash 
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
 2018-11-12 10:47:01 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo 
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
 2018-11-12 10:45:52 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg 
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
 2018-11-12 09:52:02 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
SamGondelman
b3abd97707 projected materials and repeat property 2018-11-09 10:47:07 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Olivier Prat
be7806644a Removed ternary operators with mix (try to limit branching) 2018-11-08 17:29:00 +01:00
Olivier Prat
d64127aa9c Android shader compilation fix 2018-11-08 13:48:19 +01:00
Olivier Prat
829e5ff44f Same android problem fix, but elsewhere 2018-11-08 13:37:22 +01:00
Olivier Prat
09b26db650 Shader fix for android... <sigh> 2018-11-08 13:19:42 +01:00
Olivier Prat
40b7b42f5b Bis 2018-11-08 12:29:01 +01:00
Olivier Prat
cd89ce5388 Another stupid android shader compilation error fix 2018-11-08 12:07:17 +01:00
Olivier Prat
de2f1c52cc Another android shader compilation fix 2018-11-08 11:44:47 +01:00
Olivier Prat
05ac2fccb6 Still android fixes 2018-11-08 11:24:46 +01:00
Olivier Prat
851cfff960 Again, android shader compilatio fix 2018-11-08 11:06:28 +01:00
Olivier Prat
c79c403a52 More android shader compilation fixes 2018-11-08 10:47:24 +01:00
Olivier Prat
7e93d91bfa Fixed android shader compilation 2018-11-08 09:29:02 +01:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix 
Case 19686: Possibly fix mac debug deferred issue
 2018-11-07 10:33:41 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
Anthony Thibault
dc43d1bf8f AnimDebugDraw: Prevent multi-threaded access to shared map collection. 
It was possible for the render thread to iterate over a map while the main thread mutates the same map.
This could have led to memory corruption and crashes.

To fix this we make a copy of the collection and pass the copy to the lambda that executes on the render thread.
 2018-11-02 17:53:07 -07:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
Sam Gondelman
e534e09801 Update LightClusterGrid_shared.slh 2018-11-01 15:35:48 -07:00
SamGondelman
c4c4d2c98d possibly fix mac issues 2018-10-31 13:28:07 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Cristian Luis Duarte
bc7e49482a Add Android for the condition of _meshBlendshapeBuffer usage 2018-10-30 19:44:39 -03:00
SamGondelman
dc9405775f more branching removal 2018-10-29 16:42:46 -07:00
SamGondelman
7dff015585 maybe? 2018-10-25 14:40:58 -07:00
SamGondelman
e8c5324e39 start removing branching 2018-10-25 11:59:04 -07:00
Olivier Prat
aa64e51281 Fixed shaders for GLSL 4.1 2018-10-24 11:04:32 +02:00
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
SamGondelman
0efbdc1ab5 merge with master 2018-10-23 14:33:57 -07:00
SamGondelman
d254db02dc small cleanup 2018-10-23 11:27:17 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -07:00
SamGondelman
5652fa0b1e merge with master 2018-10-22 10:18:52 -07:00
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
Sam Gateau
388b31acf7
Merge pull request #14169 from SamGondelman/highlight 
Fix highlight not working after HMD switch
 2018-10-19 11:58:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape 
Move blendshape buffers to render thread
 2018-10-19 11:55:44 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
SamGondelman
de4dff5202 fix highlight weirdness 2018-10-17 16:18:55 -07:00
SamGondelman
cce0981d6c Merge remote-tracking branch 'upstream/master' into police 2018-10-17 11:40:01 -07:00
John Conklin II
72c9f697ab
Merge pull request #14119 from SamGondelman/varying 
Move stage frames to Varyings
 2018-10-17 11:16:28 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox 
Rebake default skybox for all platforms
 2018-10-17 09:50:00 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
Sam Gondelman
39c828fad8
please 2018-10-10 19:07:49 -07:00
Sam Gondelman
2421f9388c
FIX BUILD ERRORS? 2018-10-10 17:09:35 -07:00
Sam Gondelman
6ed38ea333
fix build errors 2018-10-10 16:16:56 -07:00
Sam Gondelman
296bd65c9b
fix build errors 2018-10-10 16:05:14 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Olivier Prat
cfcf6f05a2 Merge with master 2018-10-09 14:18:02 +02:00
SamGondelman
c10bb7d525 pointers 2018-10-08 18:05:09 -07:00
Sam
87efeb1a70 make sure that we compile, dah 2018-10-03 16:15:07 -07:00
sam gateau
81e0d5ced0 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-03 16:03:33 -07:00
sam gateau
702d26d2bd Addressing the bug on Mac AMD 2018-10-03 16:03:09 -07:00
Sam Gateau
c194e795ac Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 12:12:15 -07:00
Olivier Prat
1322302b6b Default parameter tweaking 2018-10-03 14:17:24 +02:00
Olivier Prat
fe15063459 Another compilation fix 2018-10-03 09:34:31 +02:00
Olivier Prat
7124474b0e Fix ubuntu compilation 2018-10-03 09:33:40 +02:00
Olivier Prat
b131de9e51 Added some comments 2018-10-03 08:43:51 +02:00
Olivier Prat
8ad58754da Fixed compilation on Mac, Ubuntu and Android 2018-10-03 08:41:03 +02:00
sam gateau
5d0f2e3035 And more changes for better syntax and less useless stuff 2018-10-02 13:09:04 -07:00
sam gateau
ff24a99032 Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform 2018-10-02 11:18:20 -07:00
Olivier Prat
72d0693252 Clean up for stereo 2018-10-02 18:46:01 +02:00
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Olivier Prat
dfe9deb154 Two group of config settings for SSAO and HBAO 2018-10-02 17:47:33 +02:00
Olivier Prat
6fcd63ed64 Improved acnee issues 2018-10-02 15:08:39 +02:00
Olivier Prat
1ed0bd68b9 Small bilateral blur optim 2018-10-02 12:25:00 +02:00
Olivier Prat
6420d96149 Tried to limit banding effect 2018-10-02 11:16:23 +02:00
Olivier Prat
454531e3c3 Switched back to cos HBAO 2018-10-02 10:26:55 +02:00
Sam Gateau
c95c736b1f FOUnd a working path for gl41 2018-10-01 22:50:29 -07:00
Sam Gateau
d1d4920c35 Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport 2018-10-01 21:35:18 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
David Rowe
2f3a9412f3 Make highlight occlusion match overlay occlusion 2018-10-02 15:36:18 +13:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
sam gateau
392e2ff535 trying and failing andad trying and rince and repeat 2018-10-01 17:45:16 -07:00
John Conklin II
0ef407a45c
Merge pull request #14116 from sethalves/fix-bad-render-downcasts 
get asan to not complain about invalid downcasts during transaction.updateItem
 2018-10-01 16:57:03 -07:00
SamGondelman
49553e0285 bake default skybox 2018-10-01 14:05:15 -07:00
sam gateau
c12115bfda Addressing the 4.1 pass and make sure it works on windows pc and mac 2018-10-01 11:51:46 -07:00
SamGondelman
de90ce5f2b move stage frames to varyings 2018-10-01 11:26:02 -07:00
Olivier Prat
7f6c9a6cc1 Switched to sin based HBAO 2018-10-01 19:22:54 +02:00
Sam Gateau
5842416ae6 Exploring the possible packing schemes and trying to debug the tangent 2018-09-30 23:11:36 -07:00
Seth Alves
90d9af35b5 minimize diff 2018-09-30 16:05:08 -07:00
Seth Alves
e30497595c static_cast can be used here rather than dynamic 2018-09-30 15:49:42 -07:00
Seth Alves
749b02cfb8 get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor 2018-09-30 15:12:49 -07:00
sam gateau
1ff4c54c1c Packing normal and tangents 2018-09-28 17:49:52 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Olivier Prat
abc415c5ad Put back temporal jitter of SSAO (but without filtering) 2018-09-28 19:33:34 +02:00
Olivier Prat
9f9fe909b0 Fixed bugs in stereo 2018-09-28 19:22:20 +02:00
Olivier Prat
086ba998c8 Some small cleanups 2018-09-28 16:41:18 +02:00
Olivier Prat
fbd158938b Put some bilateral blur computation on CPU 2018-09-28 11:31:09 +02:00
Sam Gateau
faf489855c Packing the offsets and catching up performances 2018-09-28 02:13:08 -07:00
Olivier Prat
6240454c55 Switched back to half res depth when resolutionLevel>1 2018-09-28 10:33:47 +02:00
Olivier Prat
8e914fa565 Bilateral blur shader cleanup and quad split normal at occlusion resolution 2018-09-28 10:25:57 +02:00
sam gateau
215818e313 adjusting page size but still seeing a perf drop 2018-09-27 17:18:43 -07:00
SamGondelman
e069817978 more fixes 2018-09-27 14:18:43 -07:00
Olivier Prat
135e10eaa2 Packed occlusion depth for faster bilateral filtering 2018-09-27 19:51:01 +02:00
Olivier Prat
1998096630 On single bilateral blur shader 2018-09-27 17:03:14 +02:00
Olivier Prat
349a8b39ad Added config parameter to switch between HBAO / SSAO 2018-09-27 16:39:42 +02:00
Olivier Prat
94a162893a Finally, a clean HBAO! 2018-09-27 10:44:06 +02:00
Sam Gateau
8923055e91 Exploring the bad peroformances 2018-09-27 00:15:34 -07:00
sam gateau
4078be3df5 Better naming and simpler template maybe 2018-09-26 17:58:06 -07:00
sam gateau
34203c67b0 Addressing the merge with master 2018-09-26 15:42:13 -07:00
John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes 
Improve ModelBlender queuing
 2018-09-26 15:10:02 -07:00
SamGondelman
0f24c18de5 slightly fix forward pipelines 2018-09-26 15:01:46 -07:00
sam gateau
1e112d3c84 bringing back a bug fix from samuel 2018-09-26 14:15:42 -07:00
sam gateau
b5a47b2e76 Finalizing the renaming from Skinned to Deformed 2018-09-26 14:11:22 -07:00
SamGondelman
09a6053044 cleaning up fragment shaders 2018-09-26 14:10:47 -07:00
sam gateau
09dae5aee3 Addressing merge conflict in HighlightEffect.cpp 2018-09-26 13:24:21 -07:00
Olivier Prat
dee0a6afa2 Found bug with low res depth fetch in occlusion 2018-09-26 16:59:01 +02:00
sam gateau
efa1dd0274 rename the files from skin to deformed 2018-09-25 17:32:04 -07:00
sam gateau
cc0019479a fixing review comments 2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1 Cleaning up the pipeline and checking that it is working for all cases 2018-09-25 13:57:50 -07:00
SamGondelman
21cd3948ae improve blender queuing 2018-09-25 12:07:05 -07:00
Olivier Prat
9899eb6d3f Concentrating on resolution level 1 2018-09-25 15:46:07 +02:00
Olivier Prat
60f5913002 Bilateral blur taps are evaluated in shader 2018-09-25 11:06:05 +02:00
Olivier Prat
0c586edeeb Fixed for stereo 2018-09-25 10:31:24 +02:00
Olivier Prat
190996e670 Switched to full screen depth and normals 2018-09-25 10:01:30 +02:00
Sam Gateau
69734ce21b Getting better' 2018-09-24 22:34:43 -07:00
sam gateau
7cf7eaa7c8 Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape 2018-09-24 17:34:42 -07:00
SamGondelman
ad73cb3996 fix avatar highlighting 2018-09-24 14:02:35 -07:00
SamGondelman
d772cdb34a please 2018-09-24 10:16:35 -07:00
Olivier Prat
9cebdbd507 Separate frame buffers for each AO split 2018-09-24 19:08:37 +02:00
Olivier Prat
6704a27b12 Back to one batch 2018-09-24 14:59:57 +02:00
Olivier Prat
2e40a5f3ff Using UVs for buildNormals 2018-09-24 14:38:03 +02:00
Sam Gateau
4210ce46aa bringing the tex corrd transform in the Material struct and shaving one ubo 2018-09-23 23:10:56 -07:00
sam gateau
d8984dafa0 ui allows to enable/disable the deformer componenets 2018-09-21 16:45:21 -07:00
sam gateau
aa02dcb087 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-21 08:19:50 -07:00
Olivier Prat
9f0201878d Some work to try to find the odd resolution bug 2018-09-21 17:14:39 +02:00
sam gateau
d3ff4b8630 Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:26:26 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight 
Fix AMD highlighting effect
 2018-09-20 16:17:10 -07:00
sam gateau
5d80a89094 Apply fix to gl41 backend needed for proper Resource BUffer on gl41 2018-09-20 16:09:08 -07:00
Olivier Prat
cf739db3a5 Added AO normal to Luci 2018-09-20 18:01:02 +02:00
Olivier Prat
1c2da13309 Much better face normal reconstruction 2018-09-20 15:34:28 +02:00
Olivier Prat
64b72e3538 Removed normal from bilateral blur... again 2018-09-20 11:27:00 +02:00
Olivier Prat
d5d0f056a9 Fixed for any resolution level in stereo 2018-09-20 11:15:25 +02:00
Olivier Prat
b1db7ab403 Fixed for stereo rendering with resolution level 0 2018-09-20 10:18:06 +02:00
Sam Gateau
377464f5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-19 19:00:30 -07:00
sam gateau
6b6551c8bd the missing file 2018-09-19 17:29:10 -07:00
sam gateau
4fc6466250 update shaders 2018-09-19 17:27:58 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola 
Correct transparent parabola shader
 2018-09-19 11:46:24 -07:00
Brad Davis
783ea21951 Fix AMD highlighting effect 2018-09-19 11:21:12 -07:00
sam gateau
c05cbf065b fixing the texcoord1 input in skined vertex shader 2018-09-19 10:13:14 -07:00
Sam Gateau
61644c48f0 Update the slp tp reflect the chanes in the vertex shaders 2018-09-19 09:18:09 -07:00
Olivier Prat
6921e71a9a Added normal distance to bilateral filtering 2018-09-19 17:49:01 +02:00
Olivier Prat
8a11d18f0d Quarter resolution with split rendering 2018-09-19 17:24:31 +02:00
Olivier Prat
3493d40fd7 Added gather to split AO 2018-09-19 10:37:27 +02:00
sam gateau
ec6117e9bb bringing the blendshape in skin shader only work in master 2018-09-18 17:40:29 -07:00
Olivier Prat
03814e7653 Preparing for split rendering of HBAO directions 2018-09-18 18:33:28 +02:00
Olivier Prat
3d096d0644 Added shared header 2018-09-18 16:10:39 +02:00
Olivier Prat
9141be9124 Shader compile fix 2018-09-18 15:29:27 +02:00
Olivier Prat
60418b36d7 Preparing for halton taps 2018-09-18 15:18:06 +02:00
Olivier Prat
fb7a8bdd4d Mip depth sampling in HBAO now works 2018-09-18 12:13:49 +02:00
Olivier Prat
f7379dfcc9 Switched AO buffer to single R8 component 2018-09-18 11:54:39 +02:00
Olivier Prat
a2abf33669 Removed falloff distance as we're directly using the radius 2018-09-18 11:45:58 +02:00
Olivier Prat
acc6d0b79e Fixed wrong AO with far objects! 2018-09-18 10:22:35 +02:00
Olivier Prat
c27f3dcafe Some cleanup, still trying to solve the problem 2018-09-18 08:45:04 +02:00
Olivier Prat
0f467ceeb9 Border clamping for linear depth texture 2018-09-17 17:19:07 +02:00
Olivier Prat
d0eef1b8d0 Some cleanup 2018-09-17 16:12:54 +02:00
Olivier Prat
d9e2c8df69 Fixed uniform buffer slot index in DebugAmbientOcclusion 2018-09-17 15:06:00 +02:00
Olivier Prat
ad5064b045 Removed falloff distance from shader 2018-09-17 14:33:48 +02:00
Olivier Prat
acab748f57 Merge with master 2018-09-17 14:29:54 +02:00
Olivier Prat
6b8f47c75a Added some tweaking parameters to try to limit silhouette AO 2018-09-13 18:39:02 +02:00
Olivier Prat
8006d7c052 Blur is now at occlusion resolution and added some bias to prevent AO on silhouettes 2018-09-13 15:33:44 +02:00
SamGondelman
2b2091290e fix everything 2018-09-12 15:32:35 -07:00
Olivier Prat
45b4881edc Bilateral blur 2018-09-12 17:59:57 +02:00
SamGondelman
1a36693161 I hate blendshapes 2018-09-11 16:58:38 -07:00
Olivier Prat
6c0309402f Some fixes for HBAO. Need performance improvements 2018-09-11 16:14:54 +02:00
Olivier Prat
fd9d05bdbf First 'working' version of HBAO 2018-09-11 15:30:18 +02:00
Olivier Prat
f12cd2e55a Merged with master 2018-09-11 10:19:40 +02:00
SamGondelman
0e079e78e6 correct transparent parabola shader 2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms 
Remove all uniforms from our shaders
 2018-09-10 15:42:01 -07:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
Olivier Prat
fec59e8b95 WIP HBAO 2018-09-07 16:12:03 +02:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf 
Fix blendshapes crash one last time, one last time
 2018-09-06 14:21:18 -07:00
Bradley Austin Davis
fade3a8de0 Fixing shader implicit type conversions 2018-09-06 09:08:36 -07:00
Brad Davis
650f112f16 Fix keyword in shader layout 2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
2df2bbef46 Adding missing locations 2018-09-06 08:59:07 -07:00
Brad Davis
730cdb4257 Remove uniforms from unused shaders 2018-09-06 08:59:06 -07:00
Brad Davis
f704ddc11c Remove uniform from SDF text rendering 2018-09-06 08:59:06 -07:00
Brad Davis
a4cd56532e Removing uniforms from antialiasing 2018-09-06 08:59:06 -07:00
Brad Davis
cafd981744 Remove uniforms from bloom debug effect 2018-09-06 08:59:06 -07:00
Brad Davis
ac84a498b3 Cleanup dead declarations 2018-09-06 08:59:05 -07:00
Olivier Prat
7a736043a6 Small changes 2018-09-06 17:08:10 +02:00
Olivier Prat
c167a71129 Switched back to normal SSAO and fixed broken ambient occlusion Luci visualization 2018-09-06 13:56:58 +02:00
Olivier Prat
64a57047ac Merged with master 2018-09-06 12:01:10 +02:00
Sam Gateau
03f51352aa
Merge pull request #13932 from SamGondelman/framebuffer 
Fix framebuffer debugging
 2018-09-05 17:38:21 -07:00
SamGondelman
cde2dc2eaa please work 2018-09-05 17:04:05 -07:00
SamGondelman
dff8292216 fix framebuffer debug 2018-09-04 12:50:25 -07:00
Sam Gateau
bd9136812d Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-31 17:53:49 -07:00
SamGondelman
028092f803 fix blendshapes one last time 2018-08-31 13:33:45 -07:00
Sam Gateau
dc852bf906 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:00:56 -07:00
Sam Gondelman
067d7b280d
Merge pull request #13900 from SamGondelman/blendshapeCrash 
Fix blendshape crash
 2018-08-30 17:10:24 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
Sam Gateau
a6f7135ad8 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-27 10:54:23 -07:00
John Conklin II
467fe56103
Merge pull request #13845 from SamGondelman/perf 
Move blendshape packing to worker thread
 2018-08-27 09:40:03 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
SamGondelman
ff6020e0ef fix compile errors, maybe 2018-08-24 15:41:25 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
Sam Gateau
054f30b0de Merging with master 2018-08-22 13:30:44 -07:00
John Conklin II
04d72ea39d
Merge pull request #13850 from samcake/punk 
Adjust Workload Region to be bigger
 2018-08-22 10:21:14 -07:00
Sam Gateau
3aa47a6695 Merging with master after a bunch ofchanges 2018-08-22 08:46:40 -07:00
Sam Gateau
0f6f465e7f Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-21 19:23:33 -07:00
Brad Davis
e9683011f8 Fix parabola rendering on AMD GPUs 2018-08-21 16:58:38 -07:00
Bradley Austin Davis
d3fd2132ce
Merge pull request #13851 from samcake/black 
Fix the local lights not working on AMD
 2018-08-21 15:36:12 -07:00
sam gateau
30c0c44822 Completely remove the texcoord frame transform as we don;t use it at all 2018-08-21 14:52:42 -07:00
sam gateau
6b994ba39a Completely remove the texcoord frame transform as we don;t use it at all 2018-08-21 14:51:54 -07:00
sam gateau
b7d8b92fb5 Add comment in shader and fix bad cull mode 2018-08-21 12:25:27 -07:00
sam gateau
5ae604f341 REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD 2018-08-21 12:14:32 -07:00
John Conklin II
ad835597e6
Merge pull request #13779 from amantley/perspectiveBug 
Perspective bug
 2018-08-21 11:31:14 -07:00
SamGondelman
9ab1fc0500 Merge remote-tracking branch 'upstream/master' into perf 2018-08-20 17:04:42 -07:00
Sam Gateau
e60756cfe6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-20 15:54:23 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs 
Migrating to scribe program descriptors
 2018-08-20 14:48:54 -07:00
SamGondelman
05ff99a1d2 working on blendshapes 2018-08-20 11:40:25 -07:00
Sam Gateau
60765902fb Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-18 15:04:43 -07:00
Sabrina Shanman
99374c099a
Merge pull request #13816 from SamGondelman/fading 
Fix parabola shader
 2018-08-13 14:45:31 -07:00
SamGondelman
86ba8c3d81 fix parabola shader 2018-08-13 10:08:19 -07:00
Sam Gateau
d5cfe95a0a merging with master 2018-08-10 15:03:33 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow 
Fixing PR13731 shader error on Mac
 2018-08-10 14:10:47 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Sam
cd7ca96c3a Remove the separate depth buffer for in front overlay, only useful for debug and it breaks in mac 2018-08-10 02:42:45 +02:00
Sam
5fd3862c94 FIx shader error on mac in shadow.slh 2018-08-10 00:45:25 +02:00
SamGondelman
bba806f78c merge with master, fix uniform slots, use varyings for sigma 2018-08-08 22:27:22 -07:00
SamGondelman
a0c3c09b05 Merge remote-tracking branch 'upstream/master' into bloom 2018-08-08 14:44:02 -07:00
Sam Gateau
16bf46ea34 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 14:22:52 -07:00
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders 
Miscellaneous shader fixes
 2018-08-08 11:34:36 -07:00
Sam Gateau
7efd5964bd Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 09:28:14 -07:00
Sam Gateau
9295007d99 fixing the ui script and trying to get shadow 2018-08-08 09:22:31 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
SamGondelman
2959a406d7 working on enabling bloom 2018-08-07 21:52:05 -07:00
amantley
274bf33318 fix for the avatar scale reset when we re-enter hmd mode 2018-08-07 18:29:51 -07:00
Sam Gondelman
9ec0b05fe4
Merge pull request #13776 from samcake/black 
Fix bug with texel opaque and transparent cut off shader function
 2018-08-07 15:52:18 -07:00
SamGondelman
de10dfb032 don't bind materials during shadow pass 2018-08-07 11:17:18 -07:00
Sam Gateau
07cb0db425 Fix bug with texel opaque and transparent cut off shader function 2018-08-07 11:16:50 -07:00
SamGondelman
82029b4cb0 fix v1 and transparent procedurals 2018-08-07 09:28:40 -07:00
Sam Gateau
aac49e901b merging with master (andthe big shader pr) 2018-08-07 09:16:30 -07:00
SamGondelman
a7dec8fb75 parabola and particle shader fixes 2018-08-06 15:49:52 -07:00
Sam Gateau
09d33177fc Adjust Workload and better representation of the workload debuging features 2018-08-06 15:36:25 -07:00
Brad Davis
dcdc3a323c Use defines for packed textures to satisfy both GLES and GL 4.1 2018-08-06 14:35:36 -07:00
Olivier Prat
8eb7ceb66a Fixed the bug with the thin dark lines at cascade shadow switches (hopefully) 2018-08-05 12:06:36 +02:00
Olivier Prat
d457cf45d5 Fixed bug with NaN shadow anti frustum leading to disappearing shadows on some occasions 2018-08-04 16:51:05 +02:00
Olivier Prat
92e64510ec Fixed draw frustum and draw aabb code 2018-08-04 15:58:24 +02:00
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
Brad Davis
a1cd39f4c2 Fix some explicit bindings that should be binding, not location 2018-08-03 14:58:12 -07:00
Brad Davis
6ed7512112 Fix build failures after parabola merge 2018-08-03 14:58:12 -07:00
Brad Davis
eca803503c Fix resolution scaling 2018-08-03 14:58:12 -07:00
Brad Davis
a1a1a03bbc Fixing crash on exit, deferred debugging tool 2018-08-03 14:58:11 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Olivier Prat
cb24046eea Reorder some functions 2018-08-03 18:51:31 +02:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
Olivier Prat
d1d6782381 Repaired Luci shadow cascade and depth visualisation 2018-08-01 17:02:52 +02:00
Olivier Prat
a3e1eb997d Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-08-01 15:24:26 +02:00
Olivier Prat
30600dff93 Non shadow casters now increase shadow scene bounds only in light direction 2018-07-31 15:23:27 +02:00
Olivier Prat
3f3f541a20 Fixed shadow map case when bounds of objects in cascade is null 2018-07-30 17:27:10 +02:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Sam Gateau
bff372a118 Merge with master 2018-07-13 13:00:00 +02:00
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
Sam Gateau
1b56653228 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-11 11:57:42 +02:00
Sam Gateau
66199e9aab Cleaning up the isENabled interface andthe qml 2018-07-11 11:57:18 +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
SamGondelman
ca5ce888f4 parabola triangle intersection 2018-07-09 18:11:57 -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
36eb4eafc6 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-06 10:53:39 +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
Sam Gateau
8fd6c1fea2 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-04 11:35:20 +02:00
Olivier Prat
bda0c0a89f Discard fragments all the time if opacity is under threshold 2018-07-03 16:51:56 +02:00
Sam Gateau
c231463fca Merge with master 2018-07-03 12:55:19 +02:00
Sam Gateau
0f3cb0fb84 INtroducing th eGraphics Engine to group al the graphics related (render and gpu) elements 2018-07-03 12:50:52 +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
SamGondelman
aec7206901 get rid of overlay pipelines and just use forward rendering 2018-06-05 14:44:44 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07: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
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -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
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -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
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07: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
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -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
Andrew Meadows
99a75c5a87 Merge 'master' into 'workload' 2018-05-02 17:28:36 -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
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
5e9355235c First step for HBAO. Not working of course 2018-04-19 17:34:28 +02:00
Olivier Prat
0316df4fae Working generateMipWithPipeline command in batch 2018-04-19 15:03:39 +02: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
7e78e79685 Created median shader for AO depth mip creation but generateMipWithPipeline not working 2018-04-18 17:20:16 +02:00
Olivier Prat
3548c55bd5 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-04-18 14:35:10 +02: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
644ef33730 First draft at batch generateTextureMipsWithPipeline 2018-04-12 17:58:05 +02: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
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