SamGondelman
8b9fcd43b1
merge with master
2019-07-03 17:58:23 -07:00
SamGondelman
72f52b069e
cleanup, fix shadow qml
2019-07-03 16:21:47 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit
...
BUGZ-661: Add unlit property to text entities
2019-07-03 18:43:26 +02:00
SamGondelman
fa416adaf6
adding unlit property to text, fixing transparency, normals, other cleanup
2019-07-02 10:28:36 -07:00
Anna
f44bc52d58
implemented requested changes, fixed math error in filmic curve
2019-07-01 17:05:13 -07:00
Anna
787359fdfb
fixed ui flipping issue
2019-07-01 10:52:03 -07:00
Anna
9b85c7f1ac
Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification
2019-06-28 09:47:17 -07:00
raveenajain
3a60bc6a13
clang braces fix
2019-06-27 11:52:43 -07:00
raveenajain
d6fb7f8a6f
arrays for bias calcs
2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b
Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows
2019-06-27 09:42:03 -07:00
raveenajain
04afbde188
cascade loop, fine tune calc
2019-06-27 09:41:39 -07:00
Anna
6b79b275a9
fixed reinhard and filmic curves
2019-06-26 18:00:49 -07:00
Anna
24b6d64e34
removed extraneous code for hmd
2019-06-26 17:27:53 -07:00
Anna
6f5b37ec87
removed extraneous conversion to SRGB and back during deferred rendering
2019-06-26 16:36:04 -07:00
raveenajain
534794d7ff
move bias init from config to run
2019-06-26 15:42:11 -07:00
Sam Gondelman
7573c1207b
remove extra alpha check in deferred sdf_text3D.slf
2019-06-26 11:21:52 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow
...
BUGZ-664: Introduce scaling of rendering for forward renderer
2019-06-25 14:27:17 -07:00
Ken Cooke
4c5c61231d
Only use QVector resize when actually needed
2019-06-25 12:57:55 -07:00
Ken Cooke
0a34745ff9
Use QVector resize() instead of reserve() to silence Debug builds about size not being set.
...
Causes unneeded default initialization, but no obvious way to avoid.
2019-06-25 12:53:07 -07:00
Sam Gateau
9470467c31
Ad the check for nsight to avoid the COmpositeHUD pass
2019-06-25 11:28:01 -07:00
Sam Gateau
4dcfa59997
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-25 11:14:09 -07:00
raveenajain
bb5896c174
const fix
2019-06-24 17:24:37 -07:00
Sam Gateau
cb1bf57bd1
Address pr review comments
2019-06-24 16:54:06 -07:00
raveenajain
f68bb957ff
clamp and initialize values
2019-06-24 16:42:38 -07:00
Ken Cooke
541d45012a
Move BlendshapePacking_avx2.cpp to shared
2019-06-24 12:54:58 -07:00
Ken Cooke
75aea88f20
CR feedback
2019-06-24 11:51:03 -07:00
raveenajain
f0660ba381
modify shadow config via single bias
2019-06-24 11:03:10 -07:00
Ken Cooke
87e0f5b2bb
Runtime dispatch for AVX2
2019-06-23 10:40:15 -07:00
Ken Cooke
8653118b6c
Full SIMD implementation of packBlendshapeOffsets() using AVX2.
...
6x speedup over the existing (partial SIMD) version.
60x speedup over the original (pure GLM) version.
2019-06-23 10:32:57 -07:00
Ken Cooke
cceff21cd0
Pull packBlendshapeOffsets() into separate function
2019-06-23 08:57:56 -07:00
Ken Cooke
87c680382f
Strip-mining optimization to improve cache utilization.
...
For each mesh: init, accumulate, and pack using a recycled offset buffer.
2019-06-23 08:42:38 -07:00
Ken Cooke
9e309b095d
Fix bug that was packing zero offsets that were never used
2019-06-23 08:00:13 -07:00
Sam Gateau
a278e6c52c
REmoving unecessary job introduced dureing development
2019-06-21 17:24:21 -07:00
Sam Gateau
b5e4a47375
Proper allocation of the resource in forward and starting to remove the ui as we have it
2019-06-19 17:33:26 -07:00
SamGondelman
f2e3218ec0
possible fix for do_setPipeline crash and other mac fixes
2019-06-19 16:34:38 -07:00
Sam Gateau
fdf06ea819
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-19 09:41:45 -07:00
SamGondelman
3ff81607ab
fix deferred rendering on macbook air
2019-06-18 17:17:21 -07:00
Sam Gateau
251faf2171
Trying to clean up the solution...
2019-06-18 17:08:08 -07:00
raveenajain
44caf67527
init change, bias triggered via script
2019-06-18 10:02:22 -07:00
Sam Gateau
e5a772a9b8
Introducing the HUD layer rendering pass into it s own task and file
2019-06-14 17:54:15 -07:00
Sam Gateau
12f8c7486b
getting rescaling to work for forward yop
2019-06-14 00:48:07 -07:00
Sam Gateau
5288314d02
Drafting ways to rescale in forward
2019-06-13 17:42:32 -07:00
Seth Alves
67995a8677
don't divide by zero if a grid entity-item has a zero dimension
2019-06-10 14:25:44 -07:00
Sam Gondelman
53e6e00773
Merge branch 'master' into uber
2019-06-10 10:36:54 -07:00
SamGondelman
129d96a997
get rid of lightmapMap
2019-06-07 14:53:31 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state
...
(BUGZ-559) Improve transition debugging and transition clean-up
2019-06-06 16:35:04 -07:00
sabrina-shanman
833946ceb3
Clean up transition naming
2019-06-06 13:25:06 -07:00
Seth Alves
8018a84e8b
avoid div by zero
2019-06-04 13:00:26 -07:00
SamGondelman
476f0ed012
cleanup and fixing some issues
2019-06-03 20:45:46 -07:00
SamGondelman
6111c8a108
initial work on combining shader variants
2019-06-03 19:36:01 -07:00
SamGondelman
3f42d083f5
fix some transparency issues on amd
2019-06-03 16:14:09 -07:00
SamGondelman
b92e26722c
rebake default skybox
2019-05-21 15:58:46 -07:00
SamGondelman
43874fbfb3
fix AA toggle
2019-05-20 17:21:10 -07:00
SamGondelman
2e666836c7
add more options to render scripting interface
2019-05-20 13:42:53 -07:00
SamGondelman
0039fb2f54
attempt to fix material crash
2019-05-17 14:51:42 -07:00
Shannon Romano
b09247d191
Merge pull request #15572 from hyperlogic/bug-fix/blender-run-crash-fix
...
Fix blender::run crash
2019-05-16 22:09:18 -04:00
Anthony J. Thibault
3ae33353d9
Fixed unused variables warnings
2019-05-16 16:38:47 -07:00
SamGondelman
fee20d9e46
render scripting interface + renderMethod control
2019-05-16 16:01:21 -07:00
Anthony J. Thibault
98fe059d97
Fix blender::run crash
...
Pass a shared_ptr of the HFMModel to the Blender. This will prevent the HFMModel
from being destroyed on the main thread if an Avatar changes their skeletonModelURL.
Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and
was also a source of data races.
The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.
2019-05-16 13:12:16 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246
...
Case 22246: Picks, PickType, RayPick JSDoc update
2019-05-13 16:16:17 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch
...
Case 22379: Run-time switch for deferred/forward rendering
2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080
fix runtime switch
2019-05-13 09:58:55 -07:00
Shannon Romano
5c58cec5af
Merge pull request #15522 from SaracenOne/forward_lightmapping
...
Case 22494, BUGZ-127: Render lightmaps in the forward renderer
2019-05-13 09:13:34 -07:00
SamGondelman
59e7db2d6b
Merge remote-tracking branch 'upstream/master' into switch
2019-05-09 11:42:05 -07:00
Shannon Romano
4bd41a1aa3
Merge pull request #15523 from SamGondelman/zone
...
Case 22466, BUGZ-102: Fix zone rendering issues
2019-05-08 14:52:33 -07:00
SamGondelman
04198c6bfc
use weak ptrs, add comment about SelectSortItems performance
2019-05-08 13:13:05 -07:00
SamGondelman
da092cc5f0
fix zone issues
2019-05-08 11:04:54 -07:00
Saracen
410679b9b7
Render lightmaps in the forward renderer
2019-05-08 00:56:34 +01:00
Brad Davis
17632e3c50
PR feedback
2019-05-07 10:36:14 -07:00
Brad Davis
2b1267ffeb
Disable the use of tbb::parallel_for in Blender
2019-05-06 16:53:37 -07:00
Shannon Romano
29e415a104
Merge pull request #15498 from SamGondelman/crash
...
Case 22444: Try to fix materialMapping crash
2019-05-02 16:29:39 -07:00
SamGondelman
50e538a73c
try to fix materialMapping crash
2019-05-01 17:23:19 -07:00
SamGondelman
5a184bd584
fix model bounds
2019-04-30 13:38:11 -07:00
SamGondelman
4a02ab4fe2
move switch logic around
2019-04-29 14:07:49 -07:00
SamGondelman
ca5c7e3904
runtime switch for deferred/forward rendering
2019-04-26 14:37:27 -07:00
David Rowe
73fd61dcf0
Picks, PickType, RayPick JSDoc update
2019-04-25 13:19:07 +12:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2
...
Case 20060: Grab correct stencil masks from display plugins
2019-04-24 09:52:12 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow
...
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
2019-04-23 09:32:53 -07:00
SamGondelman
06fbc8440e
Merge remote-tracking branch 'upstream/master' into stencil2
2019-04-22 13:28:30 -07:00
Olivier Prat
8dabcb76b8
Taking into account comments
2019-04-22 21:30:57 +02:00
Olivier Prat
7d412f9109
Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.
2019-04-19 11:03:43 +02:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2
...
Case 22244: Fix oven crash (RC83)
2019-04-18 20:22:36 -07:00
Olivier Prat
39d03ce87a
Removed magic number
2019-04-18 19:19:38 +02:00
Olivier Prat
9d0706ec8b
Merge branch 'master' of https://github.com/highfidelity/hifi into shadow
2019-04-18 11:06:35 +02:00
Olivier Prat
3cb9c518ea
Exposed max shadow distance and a shadow bias scale parameter in graphics::Light
2019-04-18 11:06:12 +02:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
...
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
Olivier Prat
3fc711dba2
Added opacity mask to shadow casters
2019-04-17 12:35:24 +02:00
Olivier Prat
5d7b149a9e
Switched to clamped tangent for shadow slope bias
2019-04-17 11:12:59 +02:00
Olivier Prat
ae20a5d439
Fixed crash in debugShadow.js
2019-04-17 09:47:33 +02:00
SamGondelman
2d5cfbf4f5
fix oven crash
2019-04-16 15:16:26 -07:00
SamGondelman
c730e51d1e
wip redo stencil work
2019-04-11 13:22:51 -07:00
David Rowe
38e21dcaa2
Doc review
2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f
Merge branch 'master' into M21989
2019-04-11 10:37:34 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize
...
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
2019-04-10 12:29:40 -07:00
SamGondelman
a50cca006e
use # instead of ? for material URL name selection
2019-04-08 23:45:47 -07:00
SamGondelman
27338c3639
fix cauterization of entities that are children of MyAvatar's head
2019-04-08 19:48:11 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker
...
Case 21764: Oven bakes model materials directly to separate material description
2019-04-05 17:08:22 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 11:59:46 -07:00
Olivier Prat
89ca7ac415
Fixed compilation errors
2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be
Merge branch 'master' of https://github.com/highfidelity/hifi into amc
2019-04-05 09:01:03 +02:00