Olivier Prat
|
705b475d0c
|
Merged with master
|
2018-01-16 15:07:20 +01:00 |
|
Olivier Prat
|
3382a35c3f
|
Fixed bug due to incorrect discard of fragments with no local lights
|
2018-01-16 12:13:45 +01:00 |
|
Sam Gateau
|
2f5d2bef49
|
Merge pull request #12028 from Zvork/roughness_metal
Lighting model update for better specular
|
2018-01-15 10:51:18 -08:00 |
|
Olivier Prat
|
32445a5660
|
Updated pipelines
|
2018-01-15 18:18:13 +01:00 |
|
Olivier Prat
|
54eab1c878
|
First working local lights on transparent objects
|
2018-01-15 17:49:55 +01:00 |
|
Olivier Prat
|
a3e50689cb
|
Modified light outline shader to use some factorized code
|
2018-01-15 12:18:22 +01:00 |
|
Olivier Prat
|
6af6b5fe41
|
evalLocalLighting function created in LightLocal.slh
|
2018-01-15 12:02:29 +01:00 |
|
Olivier Prat
|
ca776fb9b4
|
Added LightLocal.slh to centralize shading with local lights
|
2018-01-15 11:36:52 +01:00 |
|
Anthony J. Thibault
|
7753b8a0b5
|
Merge branch 'master' into feature/dual-quat
|
2018-01-11 17:31:29 -08:00 |
|
SamGondelman
|
e9d751fd23
|
try to avoid reusing uniform buffer locations
|
2018-01-10 17:01:01 -08:00 |
|
Sam Gateau
|
539ee82937
|
Merge pull request #12033 from Zvork/compactvb
More compact representation of meshes on GPU
|
2018-01-10 09:11:33 -08:00 |
|
Olivier Prat
|
2960ad845c
|
Fixed weird rendering bug.
|
2018-01-10 10:55:45 +01:00 |
|
Olivier Prat
|
cc8a717a81
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-10 10:07:32 +01:00 |
|
Nissim Hadar
|
5b1f8e83d4
|
Removed gcc warning.
|
2018-01-09 15:46:15 -08:00 |
|
Nissim Hadar
|
b53e411184
|
Corrected pushing of default lights.
|
2018-01-09 15:24:46 -08:00 |
|
Nissim Hadar
|
c3f6faed00
|
Deal correctly with inheritance at top-most level.
|
2018-01-09 13:27:57 -08:00 |
|
Olivier Prat
|
db9e5fdae8
|
Merged from master but rendering seems broken
|
2018-01-09 11:05:34 +01:00 |
|
Anthony J. Thibault
|
fbea22e0f0
|
Renamed imag component to dual, using the correct nomenclature
Also removed incomplete test from unit tests.
|
2018-01-08 18:21:23 -08:00 |
|
Nissim Hadar
|
7811ddb904
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-08 15:39:09 -08:00 |
|
Nissim Hadar
|
b2b1807490
|
Changes per code review.
|
2018-01-08 15:37:06 -08:00 |
|
John Conklin II
|
fab28e7d44
|
Merge pull request #12106 from SamGondelman/overlayFix
Fix avatar texture loading
|
2018-01-08 14:01:15 -08:00 |
|
Anthony J. Thibault
|
59b843781e
|
Merge branch 'master' into feature/dual-quat
|
2018-01-08 13:18:42 -08:00 |
|
SamGondelman
|
97c0b33975
|
fix avatar texture loading
|
2018-01-08 12:50:05 -08:00 |
|
Olivier Prat
|
c904302057
|
Added back multiplication of specular for point / directional / spot lighting by PI as Naty Hoffman recommends. Limited texture LOD of ambient map by LOD computed for filtering to prevent aliasing
|
2018-01-08 15:23:39 +01:00 |
|
Olivier Prat
|
10b39751e1
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-08 14:50:05 +01:00 |
|
Olivier Prat
|
b296b96e5e
|
Merged with master
|
2018-01-06 10:01:00 +01:00 |
|
Nissim Hadar
|
9e5eba4d3a
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-05 23:11:40 -08:00 |
|
Brad Hefta-Gaub
|
6a3609093d
|
Merge pull request #12051 from dback2/polyobjimportfixes
Poly obj import fixes
|
2018-01-05 13:33:29 -08:00 |
|
SamGondelman
|
a9d5dda976
|
always push default haze to current frame
|
2018-01-04 17:54:23 -08:00 |
|
Anthony J. Thibault
|
51ab38f484
|
warning fix
|
2018-01-04 17:32:22 -08:00 |
|
David Back
|
6b9658f8cf
|
merge
|
2018-01-04 16:41:58 -08:00 |
|
Anthony J. Thibault
|
fac0982c67
|
need to use sizeof(TransformType), not sizeof(mat4)
|
2018-01-04 16:37:12 -08:00 |
|
Anthony J. Thibault
|
b8c88fca3b
|
Dual Quaternion skinning optimization
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
|
2018-01-04 16:17:23 -08:00 |
|
Anthony J. Thibault
|
aacf2d489f
|
removed comments
|
2018-01-04 16:17:21 -08:00 |
|
Anthony J. Thibault
|
bcd813ac62
|
Optimizations and cleanup
|
2018-01-04 16:15:44 -08:00 |
|
Anthony J. Thibault
|
e86fd4f992
|
Removed SKIN_COMP define, re-enabled cauterization
|
2018-01-04 16:15:42 -08:00 |
|
Anthony J. Thibault
|
b69edceb4f
|
Fixed rotation polarity and weights are now 16 bit.
|
2018-01-04 16:15:41 -08:00 |
|
Anthony J. Thibault
|
5bb0b06061
|
WIP: Dual Quaternion compensation for spinning the right way.
|
2018-01-04 16:15:39 -08:00 |
|
Anthony J. Thibault
|
8bdddf7211
|
Full Dual Quaternion support
|
2018-01-04 16:15:38 -08:00 |
|
Anthony J. Thibault
|
18113d824c
|
Created Model::TransformComponents class
|
2018-01-04 16:13:44 -08:00 |
|
Anthony J. Thibault
|
515d13a4c1
|
WIP checkpoint
|
2018-01-04 16:09:08 -08:00 |
|
Anthony J. Thibault
|
23affb570b
|
WIP checkpoint, root transforms for shapes and non-animated fbx files are working.
|
2018-01-04 16:09:06 -08:00 |
|
Anthony J. Thibault
|
565875e823
|
WIP first attempt at dual quat skinning
|
2018-01-04 16:09:02 -08:00 |
|
Nissim Hadar
|
e797a77262
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
# interface/resources/qml/js/Utils.jsc
|
2018-01-04 15:58:08 -08:00 |
|
Olivier Prat
|
9f04e8597f
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-04 08:47:15 +01:00 |
|
Olivier Prat
|
dcfeed9b2c
|
Switched to using getFresnelF0 function in overlay3D model shaders
|
2017-12-27 15:52:17 +01:00 |
|
Olivier Prat
|
93ba9ad3b1
|
Adjusted roughness aspect on specular reflection of sky box to more closely match Unity's PBR look especially on high roughness values
|
2017-12-26 15:43:23 +01:00 |
|
Olivier Prat
|
d6b70d459f
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2017-12-26 14:15:24 +01:00 |
|
Sam Gondelman
|
2898fa557e
|
typo
|
2017-12-23 00:53:11 -08:00 |
|
David Back
|
01fcd453b8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes
|
2017-12-22 16:41:17 -08:00 |
|