Commit graph

316 commits

Author SHA1 Message Date
Brad Davis
ce627eeea1 Updated metrics 2016-10-25 17:49:51 -07:00
Brad Davis
a9bf2a5cd3 Limit max texture size, don't force cubemaps to sparse page size 2016-10-25 17:47:42 -07:00
Brad Davis
f26dc4dcb9 Don't rectify skybox textures 2016-10-25 17:47:40 -07:00
Brad Davis
4bb8d4e78e Force all loaded textures to sparse compatible sizes 2016-10-25 17:47:39 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
Brad Davis
6711b9c417 Restore proper mip handling to skybox 2016-09-23 12:05:04 -07:00
Brad Davis
fa23fa7b2d Working on cubemap mip bug 2016-09-23 12:04:55 -07:00
Brad Davis
1ff91219a8 Fix strange artifacts in skybox 2016-09-23 12:04:52 -07:00
Brad Davis
bc6b43b7be Add debug option to lower texture resolution 2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats
add support for renderInfo properties to model entities
2016-09-02 09:04:56 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Zach Pomerantz
1e7c00c0c8 fix Skybox::clear to set _empty 2016-08-29 13:40:56 -07:00
Zach Pomerantz
5f699072d9 allow black skybox 2016-08-29 10:58:09 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color
fix skybox default
2016-08-26 15:14:44 -07:00
Zach Pomerantz
5e82093e69 set skybox clear color to empty color 2016-08-25 18:08:03 -07:00
Zach Pomerantz
24162f0f3d set skybox default color to empty color 2016-08-25 12:37:23 -07:00
Andrew Meadows
d59c997e64 remove stubbery, make physics lib depend on model 2016-08-24 22:25:45 -07:00
Zach Pomerantz
c740b263a8 detect unset skybox 2016-08-23 15:16:26 -07:00
Zach Pomerantz
8c559bc65d use lights from nontextured skyboxes 2016-08-16 13:27:22 -07:00
Brad Davis
f776b10b58 Enable flag driven CPU generation of mipmaps 2016-08-12 22:28:49 -07:00
Brad Hefta-Gaub
ea1e090053 Merge pull request #8383 from AndrewMeadows/faster-is-better
faster image processing on load
2016-08-11 13:10:44 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Andrew Meadows
4e23ecfb2c count the _translucent_ pixels and fix break logic 2016-08-07 10:50:25 -07:00
Andrew Meadows
f759fd1033 early exit when determining if alpha mask possible
also don't bother scanning for alpha for cube maps
2016-08-07 08:54:20 -07:00
Andrew Meadows
4f2c00af46 faster TextureUsage::process2DImageColor() 2016-08-05 23:38:45 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
samcake
8f2bf2b423 Integrating the scattering to the local lights 2016-07-06 17:13:16 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
samcake
25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
Geenz
ff3fca3dc3 Remove no longer necessary light vector parameter. 2016-05-22 21:50:48 -04:00
Geenz
180f4ba4f5 Tweaked light attenuation formula some more.
Keeping the ulightvec parameter for now - I want to revisit this later.
2016-05-22 21:02:28 -04:00
Geenz
75532cda08 Document evalLightAttenuation's parameters. 2016-05-19 20:52:28 -04:00
Geenz
a54e8206fa Switch back to using the light's radius + spacing 2016-05-19 20:10:49 -04:00
Geenz
6ecbdc6b9a Modify evalLightAttenuation to "fade" edges of lights.
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.

This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
2016-05-19 20:03:05 -04:00
samcake
c1fa096e78 adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map 2016-05-16 15:42:48 -07:00
samcake
cdb9cb6519 Fixing the metallic simple material rendering black from obj 2016-05-13 16:33:14 -07:00
samcake
37f16e9c86 Merging with master 2016-05-09 12:01:58 -07:00
Brad Hefta-Gaub
39a4e38485 Merge pull request #7837 from samcake/hdr
Fixing the bad color format for skymaps
2016-05-09 11:47:02 -07:00
samcake
0bfad4a549 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-09 11:33:47 -07:00
samcake
1fec984ead fixing the linear COlor FOrmat flag 2016-05-06 19:07:07 -07:00
samcake
da75c27188 fixing bad color format assignment code and bad color format for the cubemaps 2016-05-06 18:57:19 -07:00
samcake
a8347cac6e Getting the unlit to work from the pipeline, and found the isLinear for texture bug! 2016-05-06 18:36:55 -07:00
Zach Pomerantz
6a6d6dd20f Defer mipmap gen to gpu 2016-05-05 16:34:02 -07:00
samcake
2d573963bb Introducing the unlit material 2016-05-04 18:50:52 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue
Improve Translucent shapes global lighting with support for the ambient map reflection
2016-05-03 11:14:06 -07:00
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
samcake
257c8c94c3 clean up the lighting function and put the global specular lighting in a separate function 2016-04-29 10:58:55 -07:00
Andrew Meadows
93f4bc759d Merge pull request #7743 from samcake/color
group several separate glUniform parameters into a single Uniform Buffer
2016-04-27 10:02:56 -07:00