Zach Pomerantz
|
bcb01feb94
|
Merge branch 'render-shape' of http://github.com/Atlante45/hifi into feat/render-shape
|
2016-01-06 11:46:16 -08:00 |
|
Atlante45
|
b68572fdd0
|
Cleanup renderShapes render loop
|
2016-01-06 11:43:17 -08:00 |
|
Zach Pomerantz
|
9bc661adc8
|
Cleanup for style/dead code
|
2016-01-06 11:42:58 -08:00 |
|
Zach Pomerantz
|
da50eacaad
|
Resolve Hash const function and include per Jenkins
|
2016-01-05 18:08:28 -08:00 |
|
Zach Pomerantz
|
948dc26d24
|
Add debug statement for invalid ShapeKey
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
4eff377258
|
Change Slots->Slot to be congruous with gpu
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
258a414404
|
Add ShapeKey::NO_PIPELINE for shapes without Shape::Pipeline
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
df54d1dcc9
|
Fix render::Shape::Pipeline ownership by storing shared_ptr in map
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
ad329a9331
|
Return nullptr if no pipeline is found
|
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
|
c0800abdc5
|
Add virtual ~Shape
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
e96b1fa881
|
Return copies of local vars in Shape
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
74c4930034
|
Remove DrawBackround task
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
1a3a9be605
|
Use PipelinePointer for rendering Shape
|
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 |
|
Zach Pomerantz
|
16bb861046
|
Add render::Shape to abstract ModelRender
|
2016-01-05 17:20:08 -08:00 |
|
Zach Pomerantz
|
df78f895a6
|
Reorder RenderContext initializer to avoid -Wreorder
|
2015-12-22 14:54:47 -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 |
|
samcake
|
f24800cf10
|
Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script
|
2015-12-18 15:35:01 -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
|
cdcb2d565d
|
Use new RenderContext accessors for rendering
|
2015-12-18 10:34:39 -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
|
1364329886
|
FIxing the compil bug by checking security of the call with assert and avoiding the compilation error
|
2015-12-15 22:07:06 -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
|
3554f54e17
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-14 17:38:56 -08:00 |
|
Atlante45
|
7472673dae
|
More warning fixes
|
2015-12-11 17:23:12 -08:00 |
|
Atlante45
|
4bfa279b1b
|
Merge branch 'warnings-win' of github.com:Atlante45/hifi into warnings-win
|
2015-12-11 17:02:57 -08:00 |
|
Atlante45
|
b7ba3c5f17
|
More warning fixes
|
2015-12-11 17:02:03 -08:00 |
|
Atlante45
|
79fdb2e882
|
Fix warnings on windows 64bit
|
2015-12-11 16:31:27 -08:00 |
|
Atlante45
|
ce51350b65
|
Fix warnings on windows 64bit
|
2015-12-11 15:42:15 -08:00 |
|
Atlante45
|
acb9e2774e
|
Basic implementation of debug zone resizing
|
2015-12-04 21:01:53 -08:00 |
|
samcake
|
119cc733b5
|
Merging with master
|
2015-12-04 17:17:33 -08:00 |
|
Atlante45
|
c27944ae28
|
Simple normal map debug
|
2015-12-04 10:44:23 -08:00 |
|
Atlante45
|
3da80f5861
|
gpu::Shader::create* return shared_ptr
|
2015-12-03 14:56:07 -08:00 |
|
Seth Alves
|
3b6b56f316
|
formatting
|
2015-11-13 14:26:43 -08:00 |
|
Seth Alves
|
a366633f84
|
cleanups
|
2015-11-12 11:03:44 -08:00 |
|
Seth Alves
|
83d5c9cf4a
|
arrange status icons in two rows of 4 each
|
2015-11-11 18:54:07 -08:00 |
|
Seth Alves
|
a16a477134
|
fix warning
|
2015-11-11 16:51:55 -08:00 |
|
Seth Alves
|
715a46ee82
|
show actions in status icons
|
2015-11-11 16:35:04 -08:00 |
|
Seth Alves
|
66387c4530
|
use icons to show network and physics status
|
2015-11-10 17:02:57 -08:00 |
|
Seth Alves
|
d043011a11
|
Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug
|
2015-11-10 10:16:02 -08:00 |
|
Seth Alves
|
8e466190e0
|
working toward display icons for debug/status display
|
2015-11-10 10:15:58 -08:00 |
|
Seth Alves
|
f3d26e163d
|
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
|
2015-11-07 07:19:27 -08:00 |
|
Brad Hefta-Gaub
|
0b2bf8bda8
|
remove some dead code
|
2015-10-19 15:23:45 -07:00 |
|