Commit graph

3066 commits

Author SHA1 Message Date
Nissim Hadar
79f0124244 Protect against use of null HazePointer. 2017-12-13 15:02:03 -08:00
Nissim Hadar
b4df115507 Protect against use of null HazePointer. 2017-12-13 12:53:01 -08:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm
Cascaded Shadow Maps and bug fix
2017-12-14 00:32:43 +07:00
Olivier Prat
19e240460d Slightly optimized matrix operations in LightStage as samcake's remark 2017-12-13 15:30:57 +01:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
samcake
1008175a92 Removing commented code 2017-12-11 09:28:33 -08:00
samcake
b4f7433042 removing .f for a float in shader 2017-12-11 09:26:43 -08:00
Olivier Prat
b9d49318e7 Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection 2017-12-11 12:19:10 +01:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01:00
samcake
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Sam Gateau
d07cde3ecb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 19:20:25 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling.
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Olivier Prat
dc55a16834 Fixed warnings on Mac and Ubuntu 2017-12-06 18:37:27 +01:00
Olivier Prat
8d710c8f73 Factorised out some computation needed for all cascades 2017-12-06 18:08:27 +01:00
Olivier Prat
014e81b2f4 Added normal based adaptive depth bias 2017-12-06 17:06:48 +01:00
Olivier Prat
c9c93370da Fixed weird bug with objects suddenly poping out of the shadow map. Was due to objects with own pipeline corrupting the render state. Don't know why though 2017-12-06 15:26:44 +01:00
Olivier Prat
89b1ef2e19 Tweaked bias once more 2017-12-06 12:07:30 +01:00
Olivier Prat
ff39558d27 Automatic shadow bias computation from cascade texel density 2017-12-06 11:22:15 +01:00
Olivier Prat
f9641afcd0 Modified cascade distance distribution to blend between a desired resolution and an automatic logarithm distribution 2017-12-06 10:48:04 +01:00
Olivier Prat
1d8d8335c5 Moved shadow cascade distances computation to shadow, not shadow task 2017-12-06 10:05:39 +01:00
Olivier Prat
e16b427ab6 Switched to 4 cascades for key light and working on a better distribution 2017-12-05 18:57:04 +01:00
Olivier Prat
c0ca7a129d Fixed issue with far distance of cascades being underestimated, especially first cascade 2017-12-05 17:33:11 +01:00
Olivier Prat
0b6dcb2717 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-05 09:18:26 +01:00
samcake
9fceaad38b Merging with master 2017-12-04 14:20:10 -08:00
Bradley Austin Davis
e4220aa44e Fixing warnings in android build 2017-11-28 14:32:30 -08:00
Bradley Austin Davis
d6072f2bf2 Add bullet and draco to precompiled libraries 2017-11-28 11:32:34 -08:00
David Rowe
91671722a5 Add Shape API types JSDoc 2017-11-25 16:09:54 +13:00
samcake
1514cdfb2f extend the set of interface for multi highlight 2017-11-21 17:59:45 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
samcake
e0740b323d keep debuging the seelction highlight 2017-11-17 18:11:18 -08:00
Olivier Prat
d98dfff0a8 Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage) 2017-11-17 19:25:21 +01:00
Olivier Prat
b246c479e3 Much better cascade blend 2017-11-17 11:25:15 +01:00
Olivier Prat
917ce7165c Working shadow cascade debugging view in Luci app 2017-11-16 15:36:48 +01:00
Olivier Prat
f8c241c429 Merged disappearing shadow bug fix from pcf branch 2017-11-16 12:19:19 +01:00
Olivier Prat
d2c28c3c21 Fixed disappearing shadow bug each time a domain was automatically reloaded 2017-11-16 10:49:59 +01:00
Olivier Prat
e574be7855 Fixed potential mismatch between push/popViewFrustum in shadow task 2017-11-16 10:00:32 +01:00
Sam Gateau
6889c9d6d1 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 18:49:30 -08:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom
Bloom
2017-11-15 15:11:31 -08:00
samcake
932089115e Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 12:51:01 -08:00
Sam Gateau
2c51e516eb
Merge pull request #11744 from Zvork/shadow
Shadow caster culling fix
2017-11-15 09:49:39 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
samcake
78ac609752 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-11-15 09:12:18 -08:00
Olivier Prat
e4818f1b4f Merged request changes from shadow 2017-11-15 17:51:06 +01:00
Olivier Prat
14275b1cf3 Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded 2017-11-15 15:42:04 +01:00
Olivier Prat
f47a3e7d2c Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake 2017-11-15 09:42:57 +01:00
Olivier Prat
bf46ccefaf Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-15 08:59:36 +01:00
Olivier Prat
5102c8e1b1 Merged with master 2017-11-14 21:56:00 +01:00
Olivier Prat
c5bd86a4bf Disabled bloom by default 2017-11-14 21:54:40 +01:00