samcake
|
577666da6e
|
Merging upstream master
|
2016-01-14 15:10:54 -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 |
|
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 |
|
Anthony J. Thibault
|
c2dd00375d
|
Merge branch 'master' into tony/soft-attachments
|
2015-12-29 13:21:37 -08:00 |
|
samcake
|
50b3610bce
|
Working on the ao
|
2015-12-24 14:48:01 -08:00 |
|