Olivier Prat
8b6a2eeb24
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-10 10:19:32 +01:00
samcake
af1180255e
fixes from code review
2017-11-08 11:45:40 -08:00
samcake
75ce61c3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-08 11:30:53 -08:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix
...
Haze mask fix
2017-11-07 17:37:24 -08:00
samcake
0718763ed1
Adjust syntax
2017-11-07 17:31:15 -08:00
samcake
6481e0f713
Address cauterized cluster matrices issue
2017-11-07 12:52:23 -08:00
samcake
053052a95d
removing warnings
2017-11-03 13:28:20 -07:00
Olivier Prat
79c2da3dcb
Removed cull functor from shadow render task as it is inadapted for the shadow's orthographic projection
2017-11-03 16:52:29 +01:00
Olivier Prat
fbcb2924e8
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-03 15:08:15 +01:00
Sam Gateau
390f5b53ca
cleaning more code
2017-11-02 23:55:44 -07:00
Sam Gateau
c11f46a8d3
cleaning more code
2017-11-02 23:35:18 -07:00
Sam Gateau
421aacd8eb
Yes
2017-11-02 22:45:19 -07:00
Sam Gateau
70134d67eb
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-02 19:49:22 -07:00
Sam Gateau
f097d66721
YEp it s working
2017-11-02 19:49:01 -07:00
samcake
d33c75865e
Removing unecessary test
2017-11-02 18:11:13 -07:00
samcake
83bfa1c5f2
Progressing on the cluster updates
2017-11-02 17:57:46 -07:00
Nissim Hadar
d8191e3bd2
Fixed Mask test.
2017-11-02 12:45:18 -07:00
Andrew Meadows
db9c3cc103
make Model::scaleToFit() public not protected
2017-11-02 12:31:36 -07:00
Sam Gateau
56510abd1e
Trying to set the ClusterBuffer in the render loop instead of the game loop
2017-11-02 03:45:27 -07:00
Nissim Hadar
2e6c849b63
Added comment.
2017-11-01 20:31:44 -07:00
Nissim Hadar
67552d2b7d
Change stencil mask used with Haze.
2017-11-01 17:39:37 -07:00
Nissim Hadar
03d2ca19b9
Moving consts into mode::Haze namespace.
2017-10-31 13:46:58 -07:00
Nissim Hadar
f3147fc24f
Merge branch 'master' into hazeZone
2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3
Removed haze init variables from the model namespace.
2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3
Removed _degs and _m suffixes.
2017-10-30 19:45:08 -07:00
Nissim Hadar
b00db6a68f
Correction.
2017-10-30 19:20:49 -07:00
Nissim Hadar
1357877618
Replaced separate RGB components of colours with vec3's.
2017-10-30 12:41:09 -07:00
Nissim Hadar
5fc68cae0d
Converted Haze initialization values to static.
2017-10-30 11:51:19 -07:00
Nissim Hadar
420b0f321c
Merge branch 'master' into hazeZone
2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b
Refactoring of the haze
2017-10-27 09:08:58 -07:00
Olivier Prat
dc8c75f403
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-10-27 15:56:40 +02:00
Andrew Meadows
2710dca37c
fix rendering of Circles and Quads
2017-10-26 22:58:50 -07:00
Sam Gateau
6051a3913f
Merge pull request #11684 from NissimHadar/bugFix8610
...
Bug fix 8610
2017-10-26 10:55:29 -07:00
Olivier Prat
0044759196
Disabled broken PCF and reset back to previous bias
2017-10-26 18:29:29 +02:00
Olivier Prat
44393f12d9
Adjusted bias
2017-10-26 17:41:54 +02:00
Olivier Prat
186b531be6
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-10-26 15:12:09 +02:00
Olivier Prat
9eed69d7ef
Trying to pin point a zone bug
2017-10-26 15:11:42 +02:00
Olivier Prat
6cf689a385
First draft version of tighter shadow frustum
2017-10-26 12:42:36 +02:00
Nissim Hadar
2ec62ecc9b
Reduced haze background blend range to 27,000 metres.
2017-10-25 15:12:01 -07:00
Nissim Hadar
bfab466827
Bug 8610.
2017-10-25 14:13:53 -07:00
Nissim Hadar
8d11ace1a6
Bug 8610.
2017-10-25 13:46:59 -07:00
Andrew Meadows
2d0b94817c
Merge pull request #11336 from 1P-Cusack/21389_PR2
...
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Olivier Prat
ae8a9e68c8
Added debug tool to view shadow & view frustums
2017-10-25 11:58:16 +02:00
Brad Hefta-Gaub
ef78711b7b
Merge pull request #11663 from AndrewMeadows/shape-sharing
...
fix incorrect collision shape sharing for some ModelEntityItem configurations
2017-10-24 21:04:57 -07:00
Brad Hefta-Gaub
2a865f3a45
Merge pull request #11666 from SamGondelman/mirrorMode
...
Fix backwards HUD in mirror mode
2017-10-24 21:03:29 -07:00
SamGondelman
046e5ca716
fix backwards HUD in mirror mode
2017-10-24 13:24:09 -07:00
Andrew Meadows
27f4d182d9
fix scale of rendered collision geometry
2017-10-24 13:23:46 -07:00
Nissim Hadar
f81675e3b4
Changed blend range from 32,000 m to 30,000m
2017-10-24 13:17:09 -07:00
LaShonda Hopper
d1ab1c5e26
[WL21389] Fixes issue with the ShapeData vert buffer offset (details below).
...
When computing the buffer view offset for ShapeData the vertex vector
size should be scaled by a single vec3 size as opposed to 2.
This fix is taken from PR discussion:
https://github.com/1P-Cusack/hifi/pull/10
Proposed by: Andrew Meadows <andrew@highfidelity.io>
Changes Committed:
modified: libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:25 -04:00
LaShonda Hopper
226d51b8f5
[WL21389] Fix scaling issue when computing hull point list (details below).
...
The entity dimensions should be scaled by 1 as opposed to 0.5.
Changes Committed:
modified: interface/src/Util.cpp
modified: libraries/render-utils/src/GeometryCache.cpp
modified: libraries/render-utils/src/GeometryCache.h
2017-10-24 14:16:25 -04:00