Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 05:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71914 commits 25 branches 0 tags 1.1 GiB
Commit graph

105 commits

Author SHA1 Message Date
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
samcake
1b54a29491 small improvments adn exploring the jittering bug for reflections 2016-03-31 11:34:27 -07:00
samcake
10ddecd536 Debuggingh the reflection jittering 2016-03-31 01:51:26 -07: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
99ba011996 Post merge with Zach work for environment map 2016-02-26 16:04:50 -08:00
Zach Pomerantz
1fbcaea4b4 Fix evalSkyboxGlobalColor 2016-02-26 14:20:21 -08:00
samcake
a0d7ce145e Adding support for emissive and occlusion maps, on to pr land 2016-02-24 17:30:29 -08:00
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
samcake
903824809c trying to have better support for the materials 2016-02-18 18:33:32 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
samcake
71863a1550 Fixing the material names 2016-02-16 09:33:24 -08:00
samcake
4559e75f90 Trying to solve the ambient issue 2016-02-12 18:22:01 -08:00
samcake
584d50b594 Experimenting with AO on the lightmaped surface 2016-01-19 17:56:07 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
c1e8fe88e4 Fix shader typo (ambien->ambient) 2016-01-08 20:14:31 -08:00
samcake
c31b943b88 APplying the AO to both direct lighting and ambient 2016-01-04 23:02:30 -04:00
samcake
32bb8f020c FIxing the diffuse contribution bug maybe 2015-12-17 17:40:35 -08:00
samcake
64cf8590eb fix typos 2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf fix typos 2015-09-18 11:51:28 -07:00
samcake
767407af9c Merging and cleaning shaders 2015-09-18 11:46:44 -07:00
samcake
d4fd2ea4c6 merging 2015-09-18 11:31:53 -07:00
Sam Gateau
dc8756e465 Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation 2015-09-15 14:40:23 -07:00
Sam Gateau
00688172dd work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes 2015-09-14 15:49:05 -07:00
Sam Gateau
3c9eed6e01 merging 2015-08-06 11:38:50 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
samcake
1dba28860a Merge master 2015-07-31 10:29:51 -07:00
Brad Davis
fbf3a0cbe6 Working on GL 4 2015-06-23 09:48:16 -07:00
Sam Cake
65e83df214 Generating the SH from the cube map! 2015-05-13 11:08:18 -07:00
samcake
67b9dd248d Fix glsl failed compilation on Mac 2015-05-11 14:25:05 -07:00
Sam Gateau
f2c4e04a5a clean up for pr 2015-05-11 14:06:10 -07:00
Sam Gateau
45e70c98f8 Fixed the cube map loading issue 2015-05-11 13:43:15 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
Sam Gateau
4aa695d5f3 fixed an issue with skinned normaled map models not doing the correct transformation 2015-04-06 12:24:01 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
samcake
4b66b1e6ca Merge branch 'master' of https://github.com/highfidelity/hifi 2015-04-02 14:15:56 -07:00
Sam Gateau
7c3257009c Merge with upstream 2015-03-10 12:24:56 -07:00
Sam Gateau
da16baf0ca removing the atmosphere effect from the directional lighting 2015-03-10 10:24:16 -07:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
Sam Gateau
c7eeebe52c and fixing a bug with shadowing of lightmapped surface 2015-02-26 18:07:43 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
d8aa0e0138 replacing the glTransform pipeline for model rendering 2015-02-17 09:44:03 -08:00
Sam Gateau
23354da828 replacing the glTransform pipeline for model rendering 2015-02-16 22:08:21 -08:00
Sam Gateau
ef20c3234f merging 2015-02-13 14:41:39 -08:00
Sam Gateau
e2e61c64b1 Support include path to shaders from the hifi libraries to cmake 2015-02-13 01:30:04 -08:00
Sam Gateau
c2761ac887 CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:26:14 -08:00
Sam Gateau
48fca4c11d introducing PBR shading 2015-02-08 23:22:14 -08:00
Sam Gateau
bdf9164c7b debugging the new global light pass 2015-02-06 16:30:07 -08:00
Sam Gateau
1b22a3ef36 connecting the globalLight info to the DeferredLightingEffect 2015-02-05 17:30:57 -08:00
Sam Gateau
9b0036d010 adding Light and replace glLights also for the first deferred pass 2015-02-05 14:10:06 -08:00