Geenz
a80f47e550
Merge remote-tracking branch 'highfidelity/master' into 20901
2016-05-20 21:12:42 -04:00
Brad Hefta-Gaub
95f7ea5609
Merge pull request #7922 from samcake/red
...
improve performance of Light volume pass
2016-05-20 09:33:55 -07: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
2d7118dacc
clening up the code
2016-05-19 10:21:00 -07:00
Zach Pomerantz
e1971f5ed3
Fix shadow bounds checking
2016-05-18 18:58:28 -07:00
samcake
185f069441
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-05-18 13:16:14 -07:00
samcake
89f18aee3b
Simplifying the deferredbuffer clear and enableing z test for lighting pass
2016-05-18 13:14:42 -07:00
samcake
8ec280535b
FIx bad roughness value read from the deferred buffer
2016-05-17 11:13:34 -07:00
Brad Hefta-Gaub
1f800294c6
Merge pull request #7880 from jherico/gpu_smart_buffers
...
Support partial CPU->GPU buffer transfers
2016-05-14 17:44:26 -07:00
Brad Davis
1e136ed71f
Fix procedural rendering on primitives
2016-05-14 10:59:59 -07:00
Brad Davis
9509e32928
PR feedback
2016-05-14 08:28:51 -07:00
Brad Hefta-Gaub
e754b9e19c
Merge pull request #7871 from samcake/hdr
...
Defaulting the color formats used in the rendering pipeline to sRGB
2016-05-13 17:35:48 -07:00
Brad Davis
85272a87ba
Merge pull request #7859 from samcake/lemon
...
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
samcake
d5a9d39edf
Defaulting the color formats used in the rendering pipeline to sRGB
2016-05-11 18:01:19 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
samcake
303cade547
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-10 09:56:05 -07:00
samcake
00f2e34aa9
Changing emissive to unlit
2016-05-09 17:18:07 -07:00
samcake
615f4028c4
fixing the web enitites lighting, still need to solve the sRGB for it, starting to introduce the unlit feature to the overlays
2016-05-09 17:17:16 -07:00
Anthony J. Thibault
641e152699
Eye tracking bug fix and debug rendering improvement
...
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
2016-05-08 16:20:32 -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
Andrew Meadows
71b2d647e8
add locks and explicitly copy ViewFrustums
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
samcake
e306a24a1b
INtroducing the unlit mode for fragments
2016-05-05 17:08:52 -07:00
samcake
f1b236f3be
adding the DeferredBUfferRead.slh
2016-05-04 18:51:35 -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
samcake
88f816fab4
Adding reflection of the ambient map for translucent
2016-04-28 18:18:18 -07:00
samcake
4202e60ac3
trying to add the skymap on translucents
2016-04-26 18:20:15 -07:00
Geenz
bf31fc728a
And another.
2016-04-26 18:54:02 -04:00
Geenz
ef7098b39a
Missed a few.
2016-04-26 17:12:04 -04:00
samcake
5cb346330b
Merging with master
2016-04-25 18:48:58 -07:00
Chris Collins
9bd9de5710
Merge pull request #7636 from samcake/red
...
Stereo drawcall amplification
2016-04-22 15:46:18 -07:00
samcake
43caca901f
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-04-22 10:57:14 -07:00
samcake
fd3efa37e3
Cleanup the shaders to avoid any uniform in genral, fixed a bug woith the emissive params applied twice for model_lightmap.slf
2016-04-22 10:56:21 -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
Ryan Huffman
f90e1aaa23
Remove #line from starsGrid.slf
...
Fails to compile with certain drivers.
2016-04-20 15:04:10 -07:00
Brad Davis
882267e08f
Merge pull request #7709 from samcake/blue
...
Introduce Shader Compilation versions
2016-04-19 11:14:22 -07:00
samcake
21b0341e50
REmoving extra cruff
2016-04-19 10:51:44 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd
Merge pull request #7697 from samcake/orange
...
Introduce a simple state sort for drawing opaque items
2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
c41b320d40
Merge pull request #7706 from zzmp/fix/text3d-font
...
Fix text3d to allow transparent text
2016-04-19 07:50:36 -07:00
samcake
85fd1dcb5b
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2016-04-18 18:25:16 -07:00
samcake
cadb53b703
Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more
2016-04-18 18:24:27 -07:00
Zach Pomerantz
2d9dcc8595
Fix text3d to allow transparent text
2016-04-18 16:02:45 -07:00
samcake
ca720efce6
Exposing the timing of the jobs by default
2016-04-18 14:53:06 -07:00
