MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
samcake
1fd4c5c1a4
Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information
2018-01-29 12:20:51 -08:00
John Conklin II
92b9290294
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization
...
RC63: Bug fix for avatar neck cauterization
2018-01-29 10:52:10 -08:00
Olivier Prat
0324f41565
Trying to improve adaptive shadow bias
2018-01-29 17:23:35 +01:00
Olivier Prat
70a7ecc5f0
Fixed merge with remote trnormalmap
2018-01-29 10:50:17 +01:00
Olivier Prat
4cbfef55ef
Merged with master. Had to add back shaders and code
2018-01-29 10:33:16 +01:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
Sam Gateau
221475d7d9
FIxing the dark ambient lighting on scattering surface
2018-01-27 10:37:32 -08:00
Sam Gateau
3d9985fa67
FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering
2018-01-27 08:48:19 -08:00
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Anthony J. Thibault
3be857567b
updated Skinning.slh comment and constant.
...
(cherry picked from commit 43eaa02ef0
2018-01-26 14:02:18 -08:00
Olivier Prat
6b0b17ff63
Working on better adaptive bias algorithm for shadow
2018-01-26 17:57:20 +01:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-25 18:33:37 -08:00
Anthony J. Thibault
1ad65b8da5
Bug fix for twisted knees on some avatars.
...
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix. The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale. If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity. To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
(cherry picked from commit 991ba7f195
2018-01-25 18:31:41 -08:00
Anthony J. Thibault
21c1e32490
Bug fix for avatar neck cauterization
...
The basic dual-quaternion skinning algorithm does not handle non-rigid transformations like scale well.
Because we only use scaling for head cauterization, we special case this by passing in a cauterization factor,
as well as a cauterization position to the vertex shader. If a vertex is flagged as cauterized, we slam it to equal the cauterization position.
Although, not as smooth as the previous method, it seems to work well enough on the avatar's I've tested.
(cherry picked from commit faf8350369
2018-01-25 17:47:39 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
Olivier Prat
95882e0cde
Merged with master
2018-01-24 10:51:54 +01:00
Olivier Prat
d0f2138e87
Merged with master
2018-01-24 10:00:41 +01:00
Olivier Prat
c92a9975ba
Merged with master
2018-01-24 09:53:38 +01:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Olivier Prat
55abaf33fb
Added shaders to support normal maps on translucent objects
2018-01-23 17:35:01 +01:00
Olivier Prat
24692f13fd
Added separate scribe function to evalGlobalLightingAlphaBlendedWithHaze to shorten shader C string
2018-01-23 14:19:39 +01:00
Olivier Prat
43f7bb5f56
Fixed compilation error due to really long shader
2018-01-22 16:50:03 +01:00
Olivier Prat
a807e41ff4
Merge branch 'master' of http://github.com/highfidelity/hifi into locallights
2018-01-22 16:05:54 +01:00
Brad Davis
d2fe9e2710
PR feedback
2018-01-19 20:24:34 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
Seth Alves
9be2c67f00
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 11:46:34 -08:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Olivier Prat
12c48a38f7
Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials.
2018-01-19 13:58:35 +01:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
Seth Alves
0ad4cdc41b
works now
2018-01-18 13:15:47 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
Olivier Prat
902bfac380
Merged with master
2018-01-18 18:31:04 +01:00
Seth Alves
1c819c8422
formatting
2018-01-18 09:12:37 -08:00
Sam Gateau
dd436229c1
Merge pull request #12193 from SamGondelman/transparent
...
Fix black flashing on transparent objects
2018-01-18 09:11:46 -08:00
Sam Gateau
7a9740d258
visible-perview
2018-01-18 02:18:46 -08:00
Sam Gateau
c1b7bc3ff8
Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview
2018-01-17 18:50:56 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
SamGondelman
a44c965f56
fix black flashing on transparent objects
2018-01-17 15:59:07 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor
...
Remove dangerous "Use Anim Pre and Post Rotations" menu item
2018-01-17 13:41:51 -08:00
Bradley Austin Davis
25b778be1d
Tracking down remaining SOX crashes
2018-01-17 12:18:39 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
samcake
ecb7c622be
Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview
2018-01-17 10:51:37 -08:00
Sam Gateau
0e72197a37
Merge pull request #12179 from Zvork/specular
...
Fixed error in Specular shader which gave low key specular highlights
2018-01-17 10:51:25 -08:00
samcake
51ed878683
Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview
2018-01-17 09:32:03 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Olivier Prat
e6caa83d73
Merged with master
2018-01-17 16:35:31 +01:00
Olivier Prat
efa6a8c0b5
Merged with master
2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17
Fixed compilation with new shader system
2018-01-17 10:52:58 +01:00
Brad Davis
795a3b8407
Fix merge errors
2018-01-16 19:27:35 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Anthony J. Thibault
bc587bf6d8
Removal of legacy Rig methods
2018-01-16 18:19:35 -08:00
Anthony J. Thibault
576273efe3
Remove Rig::restoreJointPosition and references to it.
2018-01-16 18:01:58 -08:00
Olivier Prat
3911ce59cc
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
2018-01-16 19:02:12 +01:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Olivier Prat
cdb94d0832
Merge branch 'master' of git://github.com/highfidelity/hifi into scribe
2018-01-16 16:43:50 +01:00
Olivier Prat
8fb863e98c
Added SurfaceData mechanism to evalGlobalLight
2018-01-16 15:57:05 +01:00
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
Olivier Prat
6686b328c7
Fixed error in Specular shader which gave low key specular highlights
2018-01-16 10:47:46 +01:00
Brad Davis
17e9c3d00c
Don't try to set invalid uniforms
2018-01-15 13:43:19 -08:00
samcake
1baa2a242a
Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview
2018-01-15 11:12:28 -08: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
Dante Ruiz
645f608814
fixing merge conflict
2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f
adding scale
2018-01-15 10:43:26 -08:00
Brad Davis
db30e9c45f
Fixing PR builds
2018-01-15 09:47:31 -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
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Brad Davis
acb95d1355
GLAD polish
2018-01-14 00:10:05 -08:00
Brad Davis
24b83aa0f1
Merge remote-tracking branch 'sam/android-gles' into windows_gles
2018-01-13 11:36:31 -08:00
Brad Davis
3d69ceea71
Re-enable HUD compositing
2018-01-13 11:34:56 -08:00
Sam Gateau
d6e771f01d
Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid
2018-01-13 10:02:53 -08:00
Sam Gateau
57f1ba2412
Merging with master to be able connect to dev domains and it works. fixing shaders for gles compile errors and disabling material textures by default
2018-01-13 02:00:34 -08:00
Sam Gateau
df0660f823
Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles
2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094
fixing the stencil not clearing correctly and shaders not compiled correctly in main thread
2018-01-13 01:00:10 -08:00
Sam Gateau
628731ed19
Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles
2018-01-12 19:37:07 -08:00
Brad Davis
ab7aa52a10
GLES emulaton on windows
2018-01-12 19:17:35 -08:00
samcake
836b69ab1b
exposing several visibility flags
2018-01-12 17:42:18 -08:00
Dante Ruiz
283b9a8003
fix softEntity edge cases
2018-01-12 15:31:54 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2
Pass model offset from avatar skeletonModel to attached entity
2018-01-12 10:26:02 -08:00
Olivier Prat
814de4ab81
Scribe now outputs shaders as cpp files.
2018-01-12 11:59:19 +01:00
Brad Davis
7579451c24
Merge remote-tracking branch 'upstream/master' into android
2018-01-11 23:31:45 -08:00
Sam Gateau
e3faec838c
Adding colors to the world
2018-01-11 23:22:51 -08:00
Sam Gateau
6f6aedbf4f
Merge branch 'master' of https://github.com/highfidelity/hifi into android-fixes
2018-01-11 19:56:52 -08:00
Sam Gateau
8142b207af
Making the forward model normal lighted
2018-01-11 19:56:08 -08:00
samcake
f22429d098
Working on the shaders
2018-01-11 18:03:11 -08:00
Anthony J. Thibault
7753b8a0b5
Merge branch 'master' into feature/dual-quat
2018-01-11 17:31:29 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
samcake
4dd925f025
Fixing forward render task to draw entities and avatars shapes
2018-01-10 17:51:03 -08:00
SamGondelman
e9d751fd23
try to avoid reusing uniform buffer locations
2018-01-10 17:01:01 -08:00
Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -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
Brad Davis
105dffebaf
Fixing UI
2018-01-09 18:36:42 -08: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
Brad Davis
d6dd29b952
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -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
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr
2018-01-08 12:49:52 -05: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
Gabriel Calero
597114afea
Prepare forward pipeline for android
2018-01-03 16:42:19 -03:00
Gabriel Calero
468fc89c3e
Use forward pipeline for android
2018-01-03 16:38:23 -03:00
Gabriel Calero
dad526d22b
Make Fade.slh compatible with Open GLES SL
2018-01-03 16:36:11 -03:00
humbletim
513a69cdcd
changes per CR feedback
2018-01-03 04:08:43 -05: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
