Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 11:33:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39596 commits 25 branches 0 tags 1.1 GiB
Commit graph

1793 commits

Author SHA1 Message Date
samcake
96fb9c4466 cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures 2016-02-25 14:13:35 -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
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
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
samcake
377ee5a486 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-22 09:23:14 -08:00
samcake
c7f43386e5 Compressing the g-buffer better 2016-02-22 09:23:16 -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
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
Zach Pomerantz
791d295578 Move paint shader functions to Paint.slh 2016-02-19 11:48:44 -08:00
Zach Pomerantz
9daefbdb94 Fix grid antialiasing 2016-02-19 11:39:11 -08:00
Seth Alves
fea60499d4 rename poorly named variable 2016-02-19 11:32:59 -08:00
Zach Pomerantz
07a5c7bd16 Update grid shader for major/minor lines 2016-02-19 11:22:01 -08:00
Seth Alves
ee5a82f9b8 call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible 2016-02-19 10:05:22 -08:00
samcake
e103fd364e USing metallic and not gloss map 2016-02-19 09:24:22 -08:00
samcake
903824809c trying to have better support for the materials 2016-02-18 18:33:32 -08:00
Zach Pomerantz
2d1c676a8b Add qHash for Vec2FloatPair 2016-02-18 16:17:24 -08:00
Zach Pomerantz
2bfbf1b5fd Reimplement renderGrid to use frag shader 2016-02-18 11:30:03 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
Brad Hefta-Gaub
d5c349abec Merge pull request #7114 from samcake/hdr 
Adding Ambient lighting to transparent surfaces
 2016-02-17 09:08:38 -08:00
samcake
b03f639e2c Renaming and rearranging the material fields to support PBR fbx materials 2016-02-16 17:20:23 -08:00
samcake
71863a1550 Fixing the material names 2016-02-16 09:33:24 -08:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
samcake
29bacd23df Fixing the rendering of the avatar skeleton 2016-02-15 18:56:46 -08:00
samcake
a740f4a6de Removing unecessary code 2016-02-15 17:41:20 -08:00
samcake
b9d14b74ee Adding the GLobalKeyLighting to transparents, the ambient lighting 2016-02-15 17:27:28 -08:00
samcake
0639b2ace0 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-15 13:27:55 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
samcake
e6d15c3d56 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-12 18:22:30 -08:00
samcake
4559e75f90 Trying to solve the ambient issue 2016-02-12 18:22:01 -08:00
Brad Hefta-Gaub
e003fe5f4b Merge pull request #7081 from zzmp/fix/mini-mirror-ao 
Disable AO in mini mirror
 2016-02-12 17:37:45 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
c248732bc7 Getting the array initialization right ? 2016-02-12 10:27:08 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
40455af7fc LEss warning 2016-02-12 10:16:20 -08:00
Zach Pomerantz
d516e9da78 Only run AO in DEFAULT_RENDER_MODE 2016-02-12 09:01:54 -08:00