samcake
6033ad81db
Adding time counter
2016-03-30 16:09:33 -07:00
Zach Pomerantz
5ab21588f2
Add gpu timer to background
2016-03-14 17:53:39 -07:00
Zach Pomerantz
32807012e8
Rm redundant texture reset in overlay draw
2016-02-26 16:26:16 -08:00
Zach Pomerantz
30fbd99d11
Factor out SortTask to fix shadows
2016-02-26 16:04:15 -08:00
Zach Pomerantz
2cd6706a6a
Update fetch to use nonspatialSet
2016-02-26 14:46:42 -08:00
Zach Pomerantz
7804ee22d4
Consolidate stats for opaque/transparent/other
2016-02-23 12:14:00 -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
samcake
b94c2c9b7f
Introducing a cleaner filtering pipeline, normally it s good to go
2016-02-11 18:40:36 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
Zach Pomerantz
3bace3cdbb
Rework the qml for brevity
2016-02-11 08:48:01 -08:00
samcake
b1b08bf2f7
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-09 09:24:55 -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
samcake
513561ba2d
Using an angle for the LOD test
2016-02-04 09:31:21 -08:00
Zach Pomerantz
8d0f82fa6a
Split DrawOverlay3D to Transparent/Opaque
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
Zach Pomerantz
aa10af2851
Revert "Move DrawStencil to use ShapePlumber"
...
This reverts commit 671f27e5bc
.
2016-02-02 17:10:21 -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
samcake
9c5670fc0f
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-01-28 15:31:56 -08:00
samcake
bf3a09cd00
Fixing the default value for the TOneMapping curve and cleaning the code into the ToneMappingEffect file
2016-01-28 12:14:20 -08:00
samcake
0c50903030
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-01-28 11:19:37 -08:00
samcake
20e1270e92
Merging with upstream and still debugging the cell navigation math
2016-01-27 18:59:18 -08:00
samcake
1b1ffa494b
Making the octree more useful and cleaning up the interaction with the Scene
2016-01-26 18:46:57 -08:00
Zach Pomerantz
61f337b490
Hold Varying constant over task ctor
2016-01-26 17:43:41 -08:00
Zach Pomerantz
5009e8702e
Cleanup new render settings
2016-01-26 15:58:50 -08:00
samcake
b96bbab22f
Drafting the Octree and a debugging job
2016-01-25 18:14:05 -08:00
Zach Pomerantz
14d907206e
Clean out job enable logic from Job
2016-01-25 15:17:44 -08:00
Zach Pomerantz
56cc4dc223
Add Job::Config to RenderShadowTask
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298
Gut RenderContext
2016-01-25 12:14:58 -08:00
Zach Pomerantz
e8b8f4d535
Add Job::Config to HitEffect
2016-01-25 12:14:58 -08:00
Zach Pomerantz
772aedde91
Add Job::Config to AmbientOcclusion
2016-01-25 12:14:58 -08:00
Zach Pomerantz
ba61c1f865
Fix draw calls to use members
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f1b7807db7
Add Job::Config to Draw
2016-01-25 12:14:58 -08:00
Zach Pomerantz
adc9d2ea07
Add Job::Config to FetchItems
2016-01-25 12:13:55 -08:00
Zach Pomerantz
5698be5435
It works
2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad
Refine Configuration for render::Job
...
wip
wip
wip
wip
2016-01-25 12:13:55 -08:00
Zach Pomerantz
581003ec83
Use QObject-derived Configuration for render::Job
2016-01-25 12:13:55 -08:00
samcake
483d20d7a3
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-22 18:31:30 -08:00
samcake
9f87089c05
Fixing the Anitialising breaking the transparent rendering
2016-01-22 18:25:26 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
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
35ea04ae7c
fixing the bug that kept AO when ao is off...
2016-01-20 11:13:50 -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
568ae2e7bc
Move ShoudRenderFunctor to render::CullFunctor
2016-01-19 11:24:11 -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
93c7c182b3
Exposing the gpu RangeTimer counter for the AO effect
2016-01-18 14:10:59 -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
986af50b71
Remove unneccessary const
2016-01-15 10:50:42 -08:00
samcake
577666da6e
Merging upstream master
2016-01-14 15:10:54 -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
5c9c34377e
Move GL context sync to render Engine (from Task)
2016-01-13 17:53:15 -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
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
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
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
samcake
7e2cf741c0
Clen up, exposingthe level of obscurance
2016-01-06 13:16:16 -04: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
samcake
52f3c7e2cb
Introducing the sl files and the blurring stages
2016-01-02 11:27:50 -04:00
samcake
54e1c7c3a7
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2015-12-24 11:47:32 -08:00
Zach Pomerantz
dfa2b8d453
Remove redundant clearColorBuffer from Blit
2015-12-24 10:39:29 -08:00
Zach Pomerantz
687eef37da
Move final blit into RenderDeferredTask
...
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
2015-12-23 18:21:08 -08:00
samcake
0668fbc9e4
starting on ao
2015-12-22 18:39:44 -08:00
samcake
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
samcake
4f54b85c92
Remove warnings
2015-12-21 12:05:19 -08:00
samcake
ae124ebede
Tuning the proedural shader support to work with the current default: gamma corrected emissive
2015-12-21 12:00:30 -08:00
Zach Pomerantz
674bfa4f37
Replace RenderContext substructs with subclasses
2015-12-18 12:04:21 -08:00
Zach Pomerantz
d057239023
Rename RenderContext::ItemsMeta to ItemsConfig
2015-12-18 11:48:40 -08:00
Zach Pomerantz
919a4b6728
Split global JS Scene into Render
2015-12-18 10:33:41 -08:00
samcake
1b1365fd40
Exposing the tone curve in the js api
2015-12-16 16:32:53 -08:00
samcake
d2ebaef69e
Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template
2015-12-15 18:18:42 -08:00
samcake
2bbd5d86b8
cleaning indentation
2015-12-15 09:46:18 -08:00
samcake
a50b14dfae
Merging with upstream graphics
2015-12-14 18:18:39 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
samcake
5d207d0c9c
INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect
2015-12-07 13:19:43 -08:00
Sam Cake
01d48b29aa
cleaning code and removing cruft
2015-12-07 01:03:14 -08:00
Sam Cake
a018c51945
Drawing background first in the Lighting buffer then lighting passes with stencil test
2015-12-06 23:51:29 -08:00