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
samcake
91bed86b32
ANd one more warning
2016-04-25 19:04:02 -07:00
samcake
8f2435daf0
No more warnings ?
2016-04-25 18:39:37 -07:00
samcake
e8691c2f20
Fixing comments, code style and constnats
2016-04-25 18:15:52 -07:00
samcake
0e13b1623b
Adding support for Equirectangular skymaps
2016-04-25 15:55:12 -07:00
Geenz
ba5fa70b83
Convert sRGB values for materials.
2016-04-25 13:31:50 -04:00
samcake
f587398ca3
Adding support for plate carree
2016-04-22 18:00:22 -07:00
samcake
5a67411d75
Removing separate uniforms for the texcoord transforms and lightmap params, shader still failing
2016-04-21 18:35:37 -07:00
Brad Davis
3a969eed47
Manually generate image mip levels when loading textures
2016-04-17 10:22:24 -07:00
samcake
fc29397d91
Clening up from review comments
2016-04-15 10:10:04 -07:00
samcake
30d0bfcfd3
FIxing the bump map loading which got broken in the past PR, fixed a double call to the glTexSUbIMage function and fixed a texel.Format
2016-04-15 00:41:37 -07:00
samcake
a9fefcc802
Trying ti debug the bad normal maps
2016-04-14 18:16:14 -07:00
samcake
4374bd26ae
Disabling COmpression
2016-04-08 01:37:27 -07:00
samcake
76dd740578
Cleaning up to test before merge, not solved the stuttering happening when using compressed textures. cleaned up a bit of the TextureMap doanload callbacks
2016-04-07 20:05:05 -07:00
samcake
a6bac7ad92
Experimenting with a hidden gltexture object while beeing transfered
2016-04-06 18:30:18 -07:00
samcake
16174df0f3
POlishing the size evaluation and trying to debug the compression scheme
2016-04-06 16:33:45 -07:00
samcake
f3e6c490a4
merging with master, moving the TexelFOrmat function to a cpp
2016-04-04 12:03:37 -07:00
Triplelexx
a4775983a2
Merge branch 'master' into 20769
...
# Conflicts:
# interface/src/Application.cpp
conflicting line 2528 wheelEvent is now const
2016-04-04 19:19:55 +01:00
Lexx
0b313afd74
Rename Skybox.slv to skybox.slv
2016-04-04 00:32:20 +01:00
Lexx
bc0ea31534
Rename Skybox.slf to skybox.slf
2016-04-04 00:32:05 +01:00
Triplelexx
11af0a421b
Merge branch 'master' into 20769
2016-04-03 22:57:55 +01:00
samcake
be38de3239
Cleaning up the TextureMap loaders and cleaning for pr
2016-04-01 17:16:22 -07:00
