Zach Pomerantz
|
f0797d8ea0
|
Move instanced pipeline setup to lambda from batch
|
2016-02-04 15:32:28 -08:00 |
|
samcake
|
513561ba2d
|
Using an angle for the LOD test
|
2016-02-04 09:31:21 -08:00 |
|
Zach Pomerantz
|
666213b7a8
|
Add CULL, DEPTH_BIAS to ShapeKey
|
2016-02-03 19:18:56 -08:00 |
|
Zach Pomerantz
|
127f9694f6
|
Fix ordering of batchSetter in pickPipeline
|
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
|
78b21c3f4d
|
Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection
|
2016-02-03 18:39:40 -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
|
a29831bdf4
|
Fancy selection of the brick and cells
|
2016-02-01 18:16:23 -08:00 |
|
Zach Pomerantz
|
0b6cfbe50a
|
Only connect render config if dirty signal present
|
2016-02-01 17:48:31 -08:00 |
|
samcake
|
ee7ca35c0c
|
Adding the selectBranch
|
2016-02-01 16:48:23 -08:00 |
|
samcake
|
6d4744ed47
|
Trying to see what s going on
|
2016-02-01 15:17:32 -08:00 |
|
samcake
|
668378481b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-01 13:48:20 -08:00 |
|
samcake
|
18d8a2fb42
|
Implementing the octree selection from frustum
|
2016-02-01 13:47:38 -08:00 |
|
samcake
|
f551ea9f76
|
fixing compilation on mac and a glsl error on mac
|
2016-01-31 17:19:47 -08:00 |
|
samcake
|
59434e1ea9
|
DDisplay of the octree cells is working, added the Brick empty / full per cell
|
2016-01-29 18:16:45 -08:00 |
|
samcake
|
7b50a4d05f
|
clening up the BRick insert item interface and the shaders
|
2016-01-29 14:30:53 -08:00 |
|
samcake
|
71e6c6e443
|
Starting to add the Items on the Octree
|
2016-01-28 17:57:21 -08:00 |
|
samcake
|
972d4cda77
|
Adding better octree visualization
|
2016-01-28 15:31:24 -08:00 |
|
Zach Pomerantz
|
5cbb5000d2
|
Render the correct maxDrawnItems
|
2016-01-28 11:42:54 -08:00 |
|
samcake
|
a2a9227d28
|
Merging with master
|
2016-01-28 11:37:24 -08:00 |
|
samcake
|
0c50903030
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-01-28 11:19:37 -08:00 |
|
samcake
|
54b9c1ac0d
|
Merge pull request #6962 from zzmp/feat/task-io
Reduce code duplication for render::Job::Model
|
2016-01-28 09:31:26 -08:00 |
|
samcake
|
23f2c98834
|
fixing the addressing issue
|
2016-01-28 09:23:45 -08:00 |
|
samcake
|
6d8c33b996
|
Merging with upstream and still debugging the cell navigation math
|
2016-01-27 18:59:45 -08:00 |
|
samcake
|
20e1270e92
|
Merging with upstream and still debugging the cell navigation math
|
2016-01-27 18:59:18 -08:00 |
|
samcake
|
ce5c115787
|
Debugging some of the computations in the OCtree::Location
|
2016-01-27 14:26:17 -08:00 |
|
samcake
|
b53f6b2e03
|
late night octree traversal
|
2016-01-27 10:03:31 -08:00 |
|
Zach Pomerantz
|
e770d7b679
|
Add PhysicsShowOwned back to Menu
|
2016-01-26 18:56:52 -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
|
5d157b059f
|
Collapse all Job/Task Models to one, including TaskIO
|
2016-01-26 17:40:32 -08:00 |
|
Zach Pomerantz
|
5009e8702e
|
Cleanup new render settings
|
2016-01-26 15:58:50 -08:00 |
|
Zach Pomerantz
|
5b1834d7be
|
Fix Wreorder for Job::Models
|
2016-01-26 12:44:37 -08:00 |
|
samcake
|
903c7dde5a
|
Drafting the octree, allocating the first cells
|
2016-01-26 01:59:00 -08:00 |
|
samcake
|
a847a16788
|
Drafting the Octree and a debugging job
|
2016-01-25 18:15:07 -08:00 |
|
samcake
|
b96bbab22f
|
Drafting the Octree and a debugging job
|
2016-01-25 18:14:05 -08:00 |
|
Zach Pomerantz
|
59ac93485e
|
Propogate configuration changes through tasks
|
2016-01-25 15:18:13 -08:00 |
|
Zach Pomerantz
|
46c937325e
|
Make Job MEMBER enabled explicit
|
2016-01-25 15:18:11 -08:00 |
|
Zach Pomerantz
|
14d907206e
|
Clean out job enable logic from Job
|
2016-01-25 15:17:44 -08:00 |
|
Zach Pomerantz
|
bed325d675
|
Add Graphics to general settings
|
2016-01-25 15:17:43 -08:00 |
|
Zach Pomerantz
|
b42ab2179e
|
Call QConfig QConfigPointer
|
2016-01-25 15:17:39 -08:00 |
|
Zach Pomerantz
|
e4af8d89f1
|
Only refresh engine settings on own thread
|
2016-01-25 12:14:58 -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
|
ccbec54f2d
|
Add Job::Config to DebugDeferredBuffer
|
2016-01-25 12:14:58 -08:00 |
|
Zach Pomerantz
|
f5a408d82a
|
Notes for later
|
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
|
c903fc4739
|
Pass JobConfig to jobs
|
2016-01-25 12:13:55 -08:00 |
|
Zach Pomerantz
|
5698be5435
|
It works
|
2016-01-25 12:13:55 -08:00 |
|
Zach Pomerantz
|
75cddec647
|
Add alwaysEnabled render::Job::Config
|
2016-01-25 12:13:55 -08:00 |
|
Zach Pomerantz
|
b70108bb9a
|
Working demo
|
2016-01-25 12:13:55 -08:00 |
|
Zach Pomerantz
|
0188a9384a
|
Add enabled to Job::Config
|
2016-01-25 12:13:55 -08:00 |
|
Zach Pomerantz
|
fa2782e113
|
Add Task implementation
|
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 |
|
Zach Pomerantz
|
8b68d5922c
|
Make Engine a Task
|
2016-01-25 12:13:55 -08:00 |
|
Zach Pomerantz
|
3dab1571a5
|
Make Task a Job
|
2016-01-25 12:13:55 -08:00 |
|
samcake
|
3ebcb705ab
|
defining the octree
|
2016-01-25 09:44:01 -08:00 |
|
samcake
|
6fdf1e6cf0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-01-22 18:30:48 -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
|
b415558f30
|
FIrst draft of an octree for rendering
|
2016-01-22 03:23:43 -08:00 |
|
samcake
|
8eddd52731
|
Fixing coding guidelines
|
2016-01-21 16:54:37 -08:00 |
|
samcake
|
402809fe2f
|
FIxing coding standards
|
2016-01-21 16:44:35 -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 |
|
Zach Pomerantz
|
0a34ee9138
|
Externalize list sizing for render::cullItems
|
2016-01-20 12:39:27 -08:00 |
|
samcake
|
dc40337dc1
|
Adjusting default settings
|
2016-01-19 18:02:47 -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
|
ff425f40ae
|
Fix shadow leaking scene items
|
2016-01-18 18:43:01 -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 |
|
Zach Pomerantz
|
7f3e102b5e
|
Rename renderLights to renderItems
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
331d32ef78
|
Add render Jobs for Shape sorting
|
2016-01-15 17:55:07 -08:00 |
|
Zach Pomerantz
|
4bbf206f64
|
Clean up DrawTask
|
2016-01-15 17:55:07 -08:00 |
|
samcake
|
577666da6e
|
Merging upstream master
|
2016-01-14 15:10:54 -08:00 |
|
Zach Pomerantz
|
c704a8d8c5
|
Add RenderShadowTask
|
2016-01-14 13:53:11 -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 |
|
Zach Pomerantz
|
ee69d8f817
|
Fix bitsetters for ShapeKey::Builder
|
2016-01-13 17:44:01 -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
|
c9e1d8f5f4
|
Set up pipelinelib correctly (use filters insig bits)
|
2016-01-11 20:17:52 -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
|
407c1bc626
|
Handle out-of-range in render::FetchItems
|
2016-01-08 20:16:08 -08:00 |
|
Zach Pomerantz
|
bf68f2f2fa
|
Templatize item culling
|
2016-01-08 20:11:52 -08:00 |
|
Zach Pomerantz
|
695c69fd34
|
Conform to coding standards
|
2016-01-07 14:26:59 -08:00 |
|