Olivier Prat
f3aac2a7b5
Merged with samcake/black
2018-01-25 09:27:48 +01:00
Sam Gateau
3fd319abec
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-08 21:11:17 -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
SamGondelman
97c0b33975
fix avatar texture loading
2018-01-08 12:50:05 -08:00
Sam Gateau
a9f1e4102b
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-07 22:19:38 -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
samcake
abc029fd41
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-05 12:28:12 -08:00
samcake
50c97ede2b
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-05 11:55:43 -08:00
SamGondelman
a9d5dda976
always push default haze to current frame
2018-01-04 17:54:23 -08:00
David Back
6b9658f8cf
merge
2018-01-04 16:41:58 -08:00
Sam Gondelman
2898fa557e
typo
2017-12-23 00:53:11 -08:00
Sam Gateau
6032ce39e9
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2017-12-22 20:20:10 -08:00
David Back
01fcd453b8
Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes
2017-12-22 16:41:17 -08:00
SamGondelman
c38ef77b26
fix model overlays visibility change
2017-12-22 15:04:06 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor
...
Removed glColor reset hack in MeshPartPayload
2017-12-22 14:25:51 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3
...
Remove _model from ModelMeshPartPayload
2017-12-22 13:50:06 -08:00
David Back
f800a6d6fc
scale change
2017-12-21 17:00:27 -08:00
SamGondelman
69c1c65eb8
get rid of _model completely
2017-12-21 14:08:21 -08:00
David Back
fd297f1c03
convert negative relative indices to absolute indices
2017-12-21 10:36:41 -08:00
samcake
403e77b023
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2017-12-21 09:17:23 -08:00
SamGondelman
2ba3e337db
cleanup
2017-12-20 14:18:01 -08:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
Nissim Hadar
2c6868b03e
Pass keylight direction as parameter to the shader.
2017-12-19 11:12:27 -08:00
Olivier Prat
bd666406f4
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
2017-12-19 14:17:17 +01:00
samcake
df3b4421f4
Merging
2017-12-18 12:20:56 -08:00
Olivier Prat
0fc496d44c
Fixed merge conflicts with master
2017-12-18 15:23:11 +01:00
Nissim Hadar
d69297c02e
Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders.
2017-12-16 00:22:26 -08:00
Nissim Hadar
82b94eaacd
Reduced size of parameters in (shader) function call.
2017-12-14 18:50:41 -08:00
Nissim Hadar
76af59e331
Merge branch 'master' into hazeOnTransparent
2017-12-14 16:31:13 -08:00
Nissim Hadar
c352d5fc23
Passed light direction instead of light object into computeHazeColorKeyLightAttenuation.
2017-12-14 16:23:14 -08:00
Nissim Hadar
026b19d770
Set 4th position component from 0.0 to 1.0
2017-12-14 16:17:50 -08:00
Nissim Hadar
05e47ae668
Removed unneeded 'mix'.
...
Defined EPSILON.
2017-12-14 16:14:08 -08:00
Nissim Hadar
d5d4c22a3d
Removed dual calls to getViewInverse().
2017-12-14 15:55:31 -08:00
Nissim Hadar
409eade006
Merge branch 'master' into hazeOnTransparent
2017-12-14 11:41:53 -08:00
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
Olivier Prat
92e1fe8e5c
Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug
2017-12-08 18:02:27 +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
samcake
1c3b4b0c9b
Merging and adding Olivier's fixes to taa
2017-12-07 17:54:58 -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
