samcake
|
8d1ab01018
|
exposing one more parameter
|
2016-01-20 18:32:44 -08:00 |
|
samcake
|
4e5869b247
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-01-20 16:30:24 -08:00 |
|
Zach Pomerantz
|
0c798c06a9
|
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
|
2016-01-20 14:51:42 -08:00 |
|
samcake
|
07c630bcda
|
And cleaning again hopping to have the pr build
|
2016-01-20 11:44:01 -08:00 |
|
samcake
|
35ea04ae7c
|
fixing the bug that kept AO when ao is off...
|
2016-01-20 11:13:50 -08:00 |
|
samcake
|
379c882834
|
Debugging the darkness and pointing out bugs
|
2016-01-20 02:03:09 -08:00 |
|
samcake
|
c5c51f2af2
|
Make sure the resolution level for ao is correct
|
2016-01-19 18:57:03 -08:00 |
|
Zach Pomerantz
|
3445b7fd2c
|
Fix orientation aligned with Y
|
2016-01-19 18:39:34 -08:00 |
|
samcake
|
584d50b594
|
Experimenting with AO on the lightmaped surface
|
2016-01-19 17:56:07 -08:00 |
|
Zach Pomerantz
|
c794ae8da2
|
Avoid shadow attenuation outside of mapped area
|
2016-01-19 15:48:20 -08:00 |
|
Zach Pomerantz
|
27967f6064
|
Use 4-sample PCF for shadowMap sampling
|
2016-01-19 15:48:20 -08:00 |
|
samcake
|
6f93fb3114
|
Can now process the AO at lower resolution in orer to gsave performances
|
2016-01-19 12:12:51 -08:00 |
|
Zach Pomerantz
|
387a14b6b1
|
Fix shadowMap vertical keylight edge case
|
2016-01-19 12:01:40 -08:00 |
|
Zach Pomerantz
|
398f83be3f
|
Change shadow debug buffer to reuse shadowMap tex
|
2016-01-19 12:01:18 -08:00 |
|
Zach Pomerantz
|
568ae2e7bc
|
Move ShoudRenderFunctor to render::CullFunctor
|
2016-01-19 11:24:11 -08:00 |
|
Zach Pomerantz
|
7a5562abce
|
Do not cauterize bones in SHADOW_RENDER_MODE
|
2016-01-18 20:51:28 -08:00 |
|
Zach Pomerantz
|
3c80002dfe
|
Fix keylight frustum culling by calc internal state before use
|
2016-01-18 20:10:52 -08:00 |
|
Zach Pomerantz
|
1b36d56b7a
|
Add shadowmap as a debug feature
|
2016-01-18 17:12:42 -08:00 |
|
samcake
|
df496b065c
|
Merging with master
|
2016-01-18 16:40:34 -08:00 |
|
samcake
|
29945bba92
|
Merge pull request #6837 from zzmp/feat/render-shadow
Add RenderShadowTask
|
2016-01-18 15:45:51 -08:00 |
|
samcake
|
93c7c182b3
|
Exposing the gpu RangeTimer counter for the AO effect
|
2016-01-18 14:10:59 -08:00 |
|
Brad Hefta-Gaub
|
d10e1cc39d
|
CR feedback, dead code cleanup
|
2016-01-18 12:09:21 -08:00 |
|
Zach Pomerantz
|
6434d98365
|
Separate directional shaders with(out) shadowmaps
|
2016-01-18 11:11:28 -08:00 |
|
samcake
|
bc579f2605
|
Clening up the gpu::Timer behavior, now need a way to show it
|
2016-01-18 09:53:41 -08:00 |
|
samcake
|
39f1649cdf
|
refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing
|
2016-01-16 22:16:07 -08:00 |
|
samcake
|
483c28dc2d
|
Adding gpu timer feature to actually the GPU cost of rendering
|
2016-01-15 19:00:18 -08:00 |
|
Zach Pomerantz
|
7f3e102b5e
|
Rename renderLights to renderItems
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
7fd20bb036
|
Set shadow pipelines manually to avoid duplication
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
625eee2b9c
|
Clean RenderShadowTask ctor
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
f3a5be9ec0
|
Decrease shadowMap res to 1024
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
562c909ad8
|
Update shadow shaders
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
b2c9cf7452
|
Fit shadowmap to viewFrustum better
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
2b27e48bf9
|
Update shadow shaders
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
bc379e920b
|
Update shadow programs
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
fad38c0bfb
|
Add uniform buffer to LightStage
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
5c1c1e3a3b
|
Change LightStage setFrustum signature to near/farDepth
|
2016-01-15 12:57:31 -08:00 |
|
Zach Pomerantz
|
d6e5e2de81
|
Fix orientation of shadow frustum
|
2016-01-15 12:43:45 -08:00 |
|
samcake
|
2494623bc7
|
Cleaning the code for review
|
2016-01-15 10:55:43 -08:00 |
|
Zach Pomerantz
|
986af50b71
|
Remove unneccessary const
|
2016-01-15 10:50:42 -08:00 |
|
Zach Pomerantz
|
b423bc38ba
|
Remove magic numbers
|
2016-01-15 10:46:01 -08:00 |
|
Zach Pomerantz
|
e914f02445
|
Use near/far in LightStage setFrustum
|
2016-01-15 10:28:52 -08:00 |
|
Zach Pomerantz
|
710fb5df53
|
Fix shadowed orientation in LightStage
|
2016-01-15 10:18:29 -08:00 |
|
samcake
|
ae18bb8ef7
|
FIxed the stereo rendering
|
2016-01-14 19:23:29 -08:00 |
|
samcake
|
577666da6e
|
Merging upstream master
|
2016-01-14 15:10:54 -08:00 |
|
Zach Pomerantz
|
ec496f1907
|
Return copy of Light from LightStage
|
2016-01-14 14:06:32 -08:00 |
|
Zach Pomerantz
|
c704a8d8c5
|
Add RenderShadowTask
|
2016-01-14 13:53:11 -08:00 |
|
Zach Pomerantz
|
7744b89ba5
|
Prepare shadowMap pipeline to debug in color
|
2016-01-14 12:56:28 -08:00 |
|
Zach Pomerantz
|
b9b407fea0
|
Remove static shadowMap
|
2016-01-14 12:49:43 -08:00 |
|
Zach Pomerantz
|
0776ae7e72
|
Add LightStage for rendering lights
|
2016-01-14 12:49:42 -08:00 |
|
Zach Pomerantz
|
82f7ea515d
|
Clean up task construction
|
2016-01-14 12:49:42 -08:00 |
|
samcake
|
0285d48de3
|
Exposing many more controls of the AO in order to adjust the effect
|
2016-01-13 18:57:47 -08:00 |
|
Zach Pomerantz
|
1436b4f6b1
|
Guard against unspecified deferredDebugMode
|
2016-01-13 18:17:40 -08:00 |
|
Zach Pomerantz
|
5c9c34377e
|
Move GL context sync to render Engine (from Task)
|
2016-01-13 17:53:15 -08:00 |
|
Zach Pomerantz
|
70cc7d87e4
|
Expose global light through DeferredLighting singleton
|
2016-01-13 17:52:02 -08:00 |
|
Atlante45
|
741c22c0ac
|
Move SimpleProgramKey to cpp
|
2016-01-13 11:47:43 -08:00 |
|
Atlante45
|
1789878be1
|
Remove dead code
|
2016-01-13 11:47:43 -08:00 |
|
Atlante45
|
c30569cd55
|
Naming coding standard
|
2016-01-13 11:47:43 -08:00 |
|
Atlante45
|
205c14eb43
|
Remove unused headers
|
2016-01-13 11:47:43 -08:00 |
|
Atlante45
|
11dc3cd261
|
Move primitive rendering out of DeferredLightingEffect
|
2016-01-13 11:47:43 -08:00 |
|
Atlante45
|
12f9091dc1
|
Fix doInBatch lambdas
|
2016-01-13 11:47:43 -08:00 |
|
samcake
|
89d2d102f6
|
exposing the ditheringEnable field
|
2016-01-12 18:51:30 -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
|
016a14d3d5
|
Init the shapePlumber
|
2016-01-11 20:19:54 -08:00 |
|
samcake
|
f5854641f9
|
Trying to improve the ao
|
2016-01-11 18:33:39 -08:00 |
|
Zach Pomerantz
|
db91b12203
|
Refine addPipeline signature to be more explicit
|
2016-01-11 17:31:19 -08:00 |
|
Zach Pomerantz
|
801dde7950
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
|
2016-01-11 16:38:04 -08:00 |
|
Zach Pomerantz
|
4ff2b85e1a
|
Replace ShapePipelineLib abstract with ShapePlumber instanced class
|
2016-01-11 16:00:08 -08:00 |
|
samcake
|
38e9d2281d
|
Merging with master
|
2016-01-11 15:49:16 -08:00 |
|
Zach Pomerantz
|
c1e8fe88e4
|
Fix shader typo (ambien->ambient)
|
2016-01-08 20:14:31 -08:00 |
|
Zach Pomerantz
|
ea8bdd5728
|
Change pipeline initialization to depend on class, not global pipelineLib state
|
2016-01-08 20:14:08 -08:00 |
|
Zach Pomerantz
|
bf68f2f2fa
|
Templatize item culling
|
2016-01-08 20:11:52 -08:00 |
|
Zach Pomerantz
|
56aba41299
|
Rename ShapeRender to DeferredPipelineLib
|
2016-01-08 14:02:49 -08:00 |
|
Zach Pomerantz
|
d8a3ae70a7
|
Conform to coding standard
|
2016-01-07 17:02:15 -08:00 |
|
Zach Pomerantz
|
1b3e144395
|
Rename Shape to ShapePipelineLib, Shape.h to ShapePipeline.h
|
2016-01-07 13:29:35 -08:00 |
|
Zach Pomerantz
|
7f0781f6e8
|
Move model update next to bindTransform
|
2016-01-07 11:49:02 -08:00 |
|
Zach Pomerantz
|
39269f12ec
|
Clean and fix Wreorder
|
2016-01-07 11:40:01 -08:00 |
|
Zach Pomerantz
|
0f6d9a4db6
|
Use variadic for addJob for cleaner construction
|
2016-01-07 11:40:00 -08:00 |
|
Zach Pomerantz
|
f902c4078d
|
Clean old DrawSceneTask
|
2016-01-06 18:55:14 -08:00 |
|
Zach Pomerantz
|
9b4a395f6b
|
Promote render::Job to render::Task::Job
|
2016-01-06 18:55:13 -08:00 |
|
Zach Pomerantz
|
9bc661adc8
|
Cleanup for style/dead code
|
2016-01-06 11:42:58 -08:00 |
|
samcake
|
7e2cf741c0
|
Clen up, exposingthe level of obscurance
|
2016-01-06 13:16:16 -04:00 |
|
samcake
|
12ad08560f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-01-06 09:50:58 -04:00 |
|
Zach Pomerantz
|
d8ff133cc6
|
Fix include in gpu-test
|
2016-01-05 18:11:24 -08:00 |
|
Zach Pomerantz
|
da50eacaad
|
Resolve Hash const function and include per Jenkins
|
2016-01-05 18:08:28 -08:00 |
|
Zach Pomerantz
|
4eff377258
|
Change Slots->Slot to be congruous with gpu
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
63444aac72
|
Back to shapeContext, compiling
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
cf35974f02
|
Move shapeContext to jobContext
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
dfcb74c3be
|
Split renderItems to Lights/Shapes
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
7913ca7f3b
|
Render using ShapeRender, pickPipeline in renderItems
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
c725fd1520
|
Add specialized ShapeRender for deferred
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
59a354ea8c
|
Change payload interface to return ShapeKey, not MaterialKey
|
2016-01-05 17:20:08 -08:00 |
|
Seth Alves
|
ce1b8ae6f0
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2016-01-04 19:35:36 -08:00 |
|
samcake
|
c31b943b88
|
APplying the AO to both direct lighting and ambient
|
2016-01-04 23:02:30 -04:00 |
|
samcake
|
f92235b032
|
maybe fixes the compilation bug on windows/nvidia ?
|
2016-01-04 21:20:42 -04:00 |
|
samcake
|
78ff43bed2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-01-04 18:57:13 -04:00 |
|
Andrew Meadows
|
d2b757d6ad
|
Merge pull request #6755 from zzmp/fix/optimize-gpu-stream-copy
Optimize getVertexStream() by using a const&
|
2016-01-04 14:31:21 -08:00 |
|
samcake
|
2486d94b03
|
A working prototype of ao...
|
2016-01-04 14:36:46 -04:00 |
|
Seth Alves
|
bfa8cc1969
|
merge from upstream
|
2016-01-03 06:47:25 -08:00 |
|
samcake
|
52f3c7e2cb
|
Introducing the sl files and the blurring stages
|
2016-01-02 11:27:50 -04:00 |
|
Zach Pomerantz
|
c6e6aceb85
|
Optimize getVertexStream() by using a const&
|
2015-12-31 11:51:05 -08:00 |
|