Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 10:43:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40962 commits 76 branches 59 tags 1.2 GiB
Commit graph

1799 commits

Author SHA1 Message Date
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
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2 Render point/spot lights with surface radii 2016-02-22 15:07:08 -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
Zach Pomerantz
7ccb7e1c79 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-17 13:57:42 -08:00
Zach Pomerantz
bab29a0d3e Compare fragLightVec square to LightCutoffSquareRadius 2016-02-17 12:49:41 -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
samcake
b94c2c9b7f Introducing a cleaner filtering pipeline, normally it s good to go 2016-02-11 18:40:36 -08:00
Zach Pomerantz
d0f3ad75b8 Nest Persistent in Config to compile on nix 2016-02-11 10:27:32 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
86412c1890 Fix default debug buffer size 2016-02-11 08:47:59 -08:00
Zach Pomerantz
399861087d Reimplement lighting model 2016-02-10 20:02:44 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00
Zach Pomerantz
9e5df79279 Add tone-mapping to overlay emissive shader 2016-02-08 13:31:12 -08:00
Zach Pomerantz
1d2acbe47e Bring GeometryCache render*Instance up to standard 2016-02-08 13:28:14 -08:00
samcake
76d8135fdc Trying to introduce the Filtering step after the full scene culling 2016-02-05 18:21:21 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
Zach Pomerantz
d9132f3973 Clean up geometry instanced calls 2016-02-05 11:22:45 -08:00
Zach Pomerantz
b0a9c299ed Add tone mapping to overlay shaders 2016-02-05 11:18:42 -08:00
Zach Pomerantz
a1ed29e6f8 Rename setupTransparent->setupBatch 2016-02-05 10:53:01 -08:00
Zach Pomerantz
aa50d1e98e Add factor and shading to overlay/translucent light shaders 2016-02-05 10:27:07 -08:00
Zach Pomerantz
a4cea0a307 Conform model/overlay shaders 2016-02-04 16:21:56 -08:00
Zach Pomerantz
44d297e7e2 Differentiate named calls by pipeline 2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0 Move instanced pipeline setup to lambda from batch 2016-02-04 15:32:28 -08:00
Zach Pomerantz
cb06d4a9e4 Fix -Wunused-variable for geometry solid stream formats 2016-02-04 10:13:35 -08:00
Zach Pomerantz
9e7e6be549 Fix -Wunused-variable for MeshPart ShapeKeys 2016-02-04 10:06:07 -08:00
Zach Pomerantz
0c31c072a3 Fix -Wreorder for DrawOverlay3D ctor 2016-02-04 10:03:35 -08:00
samcake
513561ba2d Using an angle for the LOD test 2016-02-04 09:31:21 -08:00
Zach Pomerantz
65ddb944d2 Add defaults/light/shaders to plumber 2016-02-03 19:18:56 -08:00
Zach Pomerantz
666213b7a8 Add CULL, DEPTH_BIAS to ShapeKey 2016-02-03 19:18:56 -08:00
Zach Pomerantz
8d0f82fa6a Split DrawOverlay3D to Transparent/Opaque 2016-02-03 19:18:56 -08:00
Zach Pomerantz
399fe95dc9 Update overlay/emissive shaders 2016-02-03 19:18:56 -08:00
Zach Pomerantz
9af7dc9c3e Add layering to text renderer 2016-02-03 19:18:56 -08:00
Zach Pomerantz
a790b09892 Supply normals to GeometryCache draw calls 2016-02-03 19:18:56 -08:00
Zach Pomerantz
d14ce8a9fe Pass an explicit pipeline to render.*Instance calls 2016-02-03 19:18:56 -08:00
samcake
0478450205 Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection 2016-02-03 18:38:57 -08:00
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
samcake
940ef40b69 Merge pull request #6999 from zzmp/refactor/render-init-file 
Migrate stencil and overlay jobs to use plumbers
 2016-02-02 17:45:17 -08:00
Zach Pomerantz
aa10af2851 Revert "Move DrawStencil to use ShapePlumber" 
This reverts commit 671f27e5bc.
 2016-02-02 17:10:21 -08:00
samcake
7cb0108457 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-01 15:17:58 -08:00
samcake
1b52d700a0 Merge pull request #6871 from Atlante45/feat/draw-call-info 
Unify normal and named draw paths
 2016-02-01 14:19:15 -08:00
Zach Pomerantz
5d49eacf83 Move pipeline init to separate file 2016-02-01 11:12:11 -08:00
Zach Pomerantz
df894d364a Move DrawOverlay3D to use ShapePlumber 2016-02-01 10:30:14 -08:00
Zach Pomerantz
671f27e5bc Move DrawStencil to use ShapePlumber 2016-02-01 10:30:08 -08:00
Atlante45
a5603140de Fix for mac 2016-02-01 18:50:01 +01:00
Atlante45
38a223b270 Split declareStandardTransform 2016-02-01 18:50:01 +01:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518 Unify Named/Normal calls 2016-02-01 18:50:01 +01:00
howard-stearns
9601b65269 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-29 11:40:13 -08:00
samcake
9c5670fc0f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 15:31:56 -08:00
samcake
5863e340af Cleaner... 2016-01-28 12:46:18 -08:00
samcake
ef451d40df Cleaner... 2016-01-28 12:39:52 -08:00
samcake
62d5a45829 Cleaner init 2016-01-28 12:20:09 -08:00