Brad Davis
|
aad2aaa764
|
Fix link problem with shaders that use transparency and normal maps
|
2016-03-09 20:01:18 -08:00 |
|
Zach Pomerantz
|
d1324b2e7a
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree
|
2016-03-08 10:22:25 -08:00 |
|
samcake
|
193b98f24f
|
Gamma correct the text color
|
2016-03-05 10:59:03 -08:00 |
|
samcake
|
d3b84311c5
|
FIxing the color
|
2016-03-05 10:36:45 -08:00 |
|
samcake
|
2d3f0b12f5
|
Simple fix to the text bug
|
2016-03-05 10:18:50 -08:00 |
|
samcake
|
e3d11560eb
|
With a shader compiling
|
2016-03-04 19:08:48 -08:00 |
|
samcake
|
3278b76eef
|
Starting investigating the text rendering bug
|
2016-03-04 18:24:36 -08:00 |
|
samcake
|
aed2ad72d1
|
Using another formula for the specularDistribution giving much better results
|
2016-03-01 17:09:57 -08:00 |
|
samcake
|
16ac69315f
|
Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture
|
2016-03-01 16:38:02 -08:00 |
|
Zach Pomerantz
|
5c64115b26
|
Use keyLight in DLE instead of _skyboxTexture
|
2016-03-01 14:44:34 -08:00 |
|
samcake
|
9fb318570b
|
Ajusting the pure Ambient SH lighting pass and more review issues
|
2016-03-01 12:24:44 -08:00 |
|
samcake
|
89920370db
|
A bunch of typo fixes after review
|
2016-03-01 10:53:08 -08:00 |
|
samcake
|
630c61e61d
|
Reflection is working correctly with the PBR property, ship t
|
2016-02-29 18:54:43 -08:00 |
|
samcake
|
cfcde5032c
|
Post merge with Zach work for environment map
|
2016-02-26 16:32:29 -08:00 |
|
Zach Pomerantz
|
32807012e8
|
Rm redundant texture reset in overlay draw
|
2016-02-26 16:26:16 -08:00 |
|
samcake
|
99ba011996
|
Post merge with Zach work for environment map
|
2016-02-26 16:04:50 -08:00 |
|
Zach Pomerantz
|
30fbd99d11
|
Factor out SortTask to fix shadows
|
2016-02-26 16:04:15 -08:00 |
|
Zach Pomerantz
|
2cd6706a6a
|
Update fetch to use nonspatialSet
|
2016-02-26 14:46:42 -08:00 |
|
Zach Pomerantz
|
6c3dd027a7
|
Use spatial tree for shadow fetch
|
2016-02-26 14:46:41 -08:00 |
|
Zach Pomerantz
|
1fbcaea4b4
|
Fix evalSkyboxGlobalColor
|
2016-02-26 14:20:21 -08:00 |
|
Zach Pomerantz
|
fdffd8b6e0
|
Track skybox mipmap levels in DeferredTransform
|
2016-02-26 13:51:55 -08:00 |
|
Zach Pomerantz
|
712cf911b1
|
Differentiate global sun and skyStage sun
|
2016-02-26 11:06:02 -08:00 |
|
samcake
|
3ee6f9d6f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-25 23:48:53 -08:00 |
|
Andrew Meadows
|
f964df6c97
|
final names for ViewFrustum intersection tests
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
dfdf375853
|
use shapeInFrustum() names again
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
|
2016-02-25 18:09:35 -08:00 |
|
Brad Hefta-Gaub
|
202a456e1a
|
Merge pull request #7126 from AndrewMeadows/cleanup
cleanup ViewFrustum method names
|
2016-02-25 16:12:25 -08:00 |
|
Brad Hefta-Gaub
|
82cbf19bca
|
Merge pull request #7078 from zzmp/fix/light-intensity
Reimplement light attenuation for spot and point lights
|
2016-02-25 16:08:28 -08:00 |
|
samcake
|
96fb9c4466
|
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
|
2016-02-25 14:13:35 -08:00 |
|
Zach Pomerantz
|
32ce7c6eab
|
Rename light surfaceRadius->falloffRadius
|
2016-02-25 10:02:33 -08:00 |
|
Andrew Meadows
|
9c927ea36b
|
ViewFrustum method renames and whitespace cleanup
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
|
2016-02-25 09:11:28 -08:00 |
|
Brad Hefta-Gaub
|
91f6b7e80d
|
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
Wire up zone ambientURL
|
2016-02-25 09:05:25 -08:00 |
|
samcake
|
287bfeddda
|
Fixing the way the Obscurance is used with the ssao map
|
2016-02-24 18:31:08 -08:00 |
|
samcake
|
ae6e625894
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-24 17:30:40 -08:00 |
|
samcake
|
a0d7ce145e
|
Adding support for emissive and occlusion maps, on to pr land
|
2016-02-24 17:30:29 -08:00 |
|
Zach Pomerantz
|
c2ed5e5474
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
|
2016-02-24 16:24:09 -08:00 |
|
Zach Pomerantz
|
20bfdba14b
|
Avoid light prop copies when setting globalLight
|
2016-02-24 16:20:59 -08:00 |
|
Zach Pomerantz
|
1817b8ef2f
|
Use only skyboxTexture in DeferredLightingEffect
|
2016-02-24 16:07:28 -08:00 |
|
Zach Pomerantz
|
95d98e3ed7
|
Wire up zone ambientURL
|
2016-02-24 16:07:04 -08:00 |
|
Zach Pomerantz
|
124c84c8b9
|
Fix fxaa shader to use texture
|
2016-02-24 13:36:08 -08:00 |
|
Brad Hefta-Gaub
|
3df5d0abad
|
Merge pull request #7161 from zzmp/fix/overlay-model-scale
Use proper getter for model overlay scaling
|
2016-02-24 09:31:47 -08:00 |
|
Chris Collins
|
7f679af186
|
Merge pull request #7176 from zzmp/menu/graphics
Update graphics menus
|
2016-02-24 08:18:58 -08:00 |
|
samcake
|
2f5800a4cc
|
IMproving the shading model and the loading, added the roughness, needt to clean up
|
2016-02-23 18:31:38 -08:00 |
|
Zach Pomerantz
|
ea8edb3744
|
Remove antialiasing from menus, default to on
|
2016-02-23 16:24:44 -08:00 |
|
Zach Pomerantz
|
7804ee22d4
|
Consolidate stats for opaque/transparent/other
|
2016-02-23 12:14:00 -08:00 |
|
Zach Pomerantz
|
7c9022fb3e
|
Fix model overlay scaling
|
2016-02-23 10:40:47 -08:00 |
|
samcake
|
9d0803e6b8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-23 09:33:54 -08:00 |
|
samcake
|
9cb8bd0808
|
Adding one more feature for NULL_VAR in scribe function parameters and unifying the MAterialTexture shader code
|
2016-02-23 02:41:26 -08:00 |
|
samcake
|
00782b0e76
|
GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures
|
2016-02-22 18:19:36 -08:00 |
|
Zach Pomerantz
|
77ad4039bc
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
|
2016-02-22 15:11:12 -08:00 |
|
Zach Pomerantz
|
8ac84b3fc2
|
Render point/spot lights with surface radii
|
2016-02-22 15:07:08 -08:00 |
|