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
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
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
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
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
Seth Alves
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -08: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
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
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
Seth Alves
5e4a165b4d
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-22 11:23:09 -08:00
Zach Pomerantz
4df8fa4ac3
Create Render/Scene unique_ptr without C++14 make_unique
2015-12-21 15:39:49 -08:00
Zach Pomerantz
d8022aa5b0
Add back deferred debugging and combine context init
2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d
Nest JS props in RenderScriptingInterface
2015-12-21 14:32:06 -08:00
Seth Alves
76df582a6c
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-21 14:29:32 -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
Seth Alves
154bf5978b
Merge pull request #6697 from samcake/hdr
...
Graphics: Adding gamma correction to color vertex attribute
2015-12-18 14:11:14 -08:00
Seth Alves
b9a7ed8560
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
2015-12-18 14:02:51 -08:00
samcake
19769ddd8f
Merge pull request #6691 from zzmp/refactor/scene-render
...
Split JS global Scene into Scene and Render
2015-12-18 13:57:25 -08:00
samcake
0492bb1c6d
Final cleans and tests using R11G11B10 for lighting buffer
2015-12-18 13:50:28 -08:00