Olivier Prat
ace301945c
Added scale and duration debug parameters in debugFade.qml
2017-06-13 15:31:04 +02:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
samcake
c60bfe2b65
Adding a camera Jittering
2017-06-10 18:42:57 -07:00
Olivier Prat
7d58c9a741
Fixed fade for shadow job
2017-06-08 17:09:08 +02:00
Olivier Prat
de143d0ea2
Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class
2017-06-06 17:07:20 +02:00
Olivier Prat
a9ab9d2476
Renamed FadeManager to FadeEffect
2017-06-06 16:27:56 +02:00
Olivier Prat
8af2f75996
Added FadeManager to centralize some common fade effect data and functions
2017-06-06 16:11:12 +02:00
Olivier Prat
e7eca7728f
Debug fade management moved out of the inner render loop
2017-06-06 14:57:52 +02:00
Olivier Prat
08fcd6c357
Added new shaders
2017-06-05 16:32:36 +02:00
Olivier Prat
1433ae4b34
Merged from 21274
2017-06-05 11:12:57 +02:00
samcake
c5e9551bab
more cleanup
2017-06-01 18:05:18 -07:00
samcake
82d348a2ef
Stencil rejection is working, and more cleaning
2017-05-31 16:46:20 -07:00
Sam Cake
32c5dac66a
Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil
2017-05-31 00:55:28 -07:00
samcake
8559ed6260
Starting to add the stencil mask for hmd
2017-05-30 16:37:10 -07:00
samcake
c256893575
some clean up:
2017-05-23 18:00:22 -07:00
samcake
2cd2c95940
Adding more debugging tool
2017-05-16 16:12:31 -07:00
Sam Cake
4c3ddfbff9
Adding debuging of the ambient lighting
2017-05-16 01:01:19 -07:00
samcake
bc41be7ec1
Introucing the BackgroundStage to manage the background / skybox in one place
2017-05-09 17:10:05 -07:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07:00
samcake
64317f5fd0
Adding a light item per zone
2017-05-04 16:47:03 -07:00
Olivier Prat
111f0762ea
Added debug scripts and fade position is now stable
2017-04-30 14:42:27 +02:00
Olivier Prat
8071c04e98
Added fade effect prototype version
2017-04-27 10:31:06 +02:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
samcake
63fe579022
simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'
2017-04-18 17:05:40 -07:00
Sam Cake
a458828590
MOving forward with the TaskConcept and TaskModel, all working
2017-04-10 02:30:13 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
samcake
e6844f4294
Cleaning up the basic jobs of render
2017-04-07 18:35:27 -07:00
samcake
cb94e1009d
Adding a job...
2017-04-06 18:10:28 -07:00
samcake
6fc965072c
Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer
2017-04-06 15:19:55 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
samcake
0399249a03
Expeand the wireframe to the primitive entities and the polyvox
2017-03-15 16:58:31 -07:00
samcake
ea2f1359bc
Expose rendering in wireframe mode
2017-03-15 12:23:44 -07:00
Brad Davis
8782fe1d93
Merge branch 'master' into smarter_textures
...
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
Bradley Austin Davis
efad7da508
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-03 08:59:24 -08:00
Seth Alves
5f570c1ba8
fix up bounds handling in Line3DOverlay
2017-03-02 16:16:48 -08:00
sam
709c2e4240
Fixing the emissive on overlayfor models
2017-02-27 02:52:00 -08:00
sam
a53d5e8fbd
adjusted the PLumber shape keys to coever non material shapes in main pass
2017-02-25 13:00:37 -08:00
samcake
55611d2373
Backing up to master
2017-02-21 14:56:07 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -08:00
samcake
9261e81ba2
Cleaning up the interface
2017-02-10 17:47:56 -08:00
samcake
37541e4ed2
Start capping the time budget for draw opaque
2017-02-10 14:29:29 -08:00
Anthony J. Thibault
a9b478888c
First cut of Web3DOverlays without FXAA applied.
2017-01-30 11:24:58 -08:00
samcake
960f4f0ead
Move the drawBOunds job to DrawTasks
2017-01-16 18:33:42 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Zach Pomerantz
15656a0592
include spatialSelection in RenderFetchCullSortTask::Output
2016-12-30 15:08:16 -05:00
Zach Pomerantz
0e9da87549
FetchSortCull->FetchCullSort
2016-12-29 19:27:37 -05:00
Zach Pomerantz
ca1a14e5b0
add RenderFetchSortCull task
2016-12-23 15:54:22 -05:00
Zach Pomerantz
8d63067fa5
templatize graphics engine tasks' run method
2016-12-23 14:58:40 -05:00
Zach Pomerantz
9a37ccbf3c
chmod -x to render-utils src
2016-12-13 14:36:41 -05:00
samcake
efc4406b47
Debugging the grid content
2016-09-12 19:46:18 -07:00
samcake
7a7a60a5c4
INtroducing a true stage for updating the light cluster and ui to debug
2016-09-11 00:17:34 -07:00
samcake
a0d09e3316
Fixing the vizualisation shader for world to cluster space
2016-09-10 10:14:31 -07:00
samcake
108910052a
Adding the reverse transformation
2016-09-09 19:00:54 -07:00
samcake
61de063b29
Developping the Light Clusters, adding visualization
2016-09-08 18:02:35 -07:00
samcake
6a08c74463
Several experimetations without success
2016-09-07 18:39:07 -07:00
samcake
354cbbc927
Investigate why the disable depth Bclamp doesn't work
2016-08-31 19:14:35 -07:00
samcake
faef8a9930
Adding the timing for GPU support with a simpelr JobConfig
2016-08-30 12:22:21 -07:00
sam
db8bf78dd1
Good state
2016-08-08 02:28:25 -07:00
sam
e6c74b29c7
WTF...
2016-08-07 19:48:23 -07:00
samcake
b4e5b60656
fixing ao
2016-08-03 15:45:22 -07:00
samcake
3ca1cdd645
Merging with master
2016-08-01 12:42:33 -07:00
samcake
beb42332ef
save the current state of adding debug and evolving the ao job
2016-07-31 16:05:25 -07:00
samcake
afb1ebf42e
Revolutionizing ao
2016-07-26 23:19:41 -07:00
Bradley Austin Davis
fa20898285
Remove last direct use of gpu::Context::render()
2016-07-26 16:13:22 -07:00
samcake
36d58a2b82
Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui
2016-07-19 10:34:06 -07:00
samcake
a8dd06ad38
Better groupint of the diffuseion of the curvature for easier fix for mini mirror
2016-07-18 19:24:43 -07:00
samcake
a4ad4659c4
Fixing build warnings
2016-07-18 11:17:06 -07:00
samcake
5a0ce81516
Performing the curvature generation and diffusion at half the resolution
2016-07-18 03:54:05 -07:00
samcake
cfa51ae1f5
REmoving problematic timers for mac
2016-07-17 18:32:43 -07:00
samcake
9332f82d54
Carrefully improving the curvature generation performances
2016-07-17 17:13:07 -07:00
samcake
076b8cd297
Instrumenting the GPU git status
2016-07-15 17:47:54 -07:00
samcake
22ac95d463
REvisiting the RangeTimer to measure the real gpu duration
2016-07-15 09:12:16 -07:00
samcake
a42f9a5d0e
FIxing the mini mirror perf issue and the gamma correction
2016-07-14 10:53:13 -07:00
samcake
219b41e813
Fix the mini mirror perf issue and improve the debugDeferredLighting script
2016-07-13 17:37:35 -07:00
samcake
307243da8b
cleaning compilation warnings and tuning the FBX material mapping pass
2016-07-13 11:04:53 -07:00
samcake
9f91dd5bfc
Cleaning the gpu-test app to work with the new deferred pipeline
2016-07-13 10:19:42 -07:00
samcake
51594fefa2
more clean up
2016-07-12 18:21:31 -07:00
samcake
cde17ecaab
Clenaing the rendering and the framebuffer allocations
2016-07-12 14:34:54 -07:00
samcake
504e9f154c
Less comments
2016-07-12 09:18:02 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
samcake
1eb4acf815
Unifying the lighting pass for scaterring and not
2016-07-07 15:41:00 -07:00
samcake
2a52f1db7f
Adding the lighting model class to configure accross the jobs the lighting
2016-07-01 18:36:51 -07:00
samcake
ab21a5a5d5
FIxing the bad brdf and adding better debug tool and better Pipeline architecture
2016-06-29 18:59:06 -07:00
samcake
197d49fc03
introducing the depth aware blur
2016-06-27 17:04:37 -07:00
samcake
e95a31f760
CLeaning up and debugging the splotch
2016-06-24 09:18:04 -07:00
samcake
884b9211c6
Curvature is looking correct now without artefact, moving on to the lighting
2016-06-23 17:13:48 -07:00
samcake
3ec14fd746
MErging and still trying to understand the curvature isssue
2016-06-22 18:06:55 -07:00
samcake
350f06465d
Introducing the deferredFRameTransform to DeferredLighting Effect and simplifying the rendering!
2016-06-16 18:28:08 -07:00
samcake
42eaaf742d
Protoype done
2016-06-14 18:29:06 -07:00
samcake
414c43c012
Current state
2016-06-13 19:10:50 -07:00
samcake
f69c72f984
Fixing the VaryingPair problem
2016-06-13 10:44:31 -07:00
samcake
6a5dff06c4
Pushing a shitty state where the pairs of Varyings don;t get copied correctly
2016-06-13 09:46:24 -07:00
samcake
c325cc50dd
Adding the depth aware blur
2016-06-11 18:54:22 -07:00
samcake
28886f6ec3
Many improvments
2016-06-10 17:18:12 -07:00
samcake
e69022285e
A lot more stuff to try to see the skin scattering
2016-06-08 18:58:50 -07:00
samcake
75a5f6bd89
Intoducing the bluring as a separate Job reusable and the first version of curvature
2016-06-07 18:13:40 -07:00
samcake
0ea1e7c6b5
Adding acleaner way to do all the deferred frame transform manipulation
2016-06-03 19:29:48 -07:00
Andrew Meadows
71b2d647e8
add locks and explicitly copy ViewFrustums
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd
Merge pull request #7697 from samcake/orange
...
Introduce a simple state sort for drawing opaque items
2016-04-19 08:41:49 -07:00
samcake
ca720efce6
Exposing the timing of the jobs by default
2016-04-18 14:53:06 -07:00
samcake
88c58cc276
Adding the simple state sort to draw opaque deferred
2016-04-18 10:51:31 -07:00
samcake
0531f90675
Adding state sorting for free
2016-04-18 00:22:05 -07:00
samcake
ab9f41f5eb
Trying something a bit more radical for timing
2016-04-12 15:29:31 -07:00
samcake
042a419669
Adding counters, not sure they are really useful or that this is the best way to do this...
2016-04-12 02:44:10 -07:00
samcake
816a35099a
Adding tcpu timer on some jobs
2016-04-11 18:34:52 -07:00
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