Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-21 00:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65484 commits 24 branches 28 tags 1.2 GiB
Commit graph

438 commits

Author SHA1 Message Date
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
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
Sam Cake
dc4b6909bc Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-06 18:58:11 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
samcake
b28e3d0045 Merging MAster and Graphics 2015-12-04 17:51:30 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
samcake
ef7ddce2b6 Trying to fix the problem of the background not showing correctly 2015-12-04 16:52:14 -08:00
samcake
a12188877a Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-04 11:50:26 -08:00
samcake
3c18664c57 Cleaning all the deferred buffers in the Prepare call 2015-12-04 11:47:57 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Atlante45
baf93e8a08 Add basic DebugDeferredBuffer job 2015-12-04 10:44:23 -08:00
samcake
d593b824e9 Introducing a true Primary Framebuffer and a different Deferred Framebuffer 2015-12-03 17:26:54 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Seth Alves
8e466190e0 working toward display icons for debug/status display 2015-11-10 10:15:58 -08:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
samcake
bad5ea7d53 grouping the depth and stencil buffer into a single buffer 2015-10-08 16:47:33 -07:00
samcake
a2ca1c033d FIxing the rear view mirror issue with background and fooling around with Lighting equations 2015-10-07 19:04:03 -07:00
samcake
690620d74d Cleaning code 2015-10-01 19:23:32 -07:00
samcake
3490e08521 Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances 2015-10-01 18:42:09 -07:00
samcake
0398f9429e fix the coo/texel blender mode for the case when color is black and the stereo issue 2015-09-30 18:39:13 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Sam Gateau
e78f1521ab getting the stencil buffer in place 2015-09-30 09:24:36 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Raffi Bedikian
ff2a58b3eb Add FXAA effect class, modeled after AO effect 2015-08-30 20:49:03 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Sam Gateau
ab4b940d83 merge with upstream 2015-07-29 17:11:13 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
ericrius1
697cb4c9d0 fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Sam Gateau
22e70ee691 merged master 2015-07-28 10:13:05 -07:00
Sam Gateau
a5ad40bee9 INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked 2015-07-27 14:07:28 -07:00
Niraj Venkat
e036602726 Fixing merge conflicts 2015-07-24 11:08:40 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Niraj Venkat
adf7a1098d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-22 10:27:39 -07:00
Niraj Venkat
e0634de403 Turn on/off debug AO from menu item 2015-07-21 12:14:09 -07:00
ericrius1
9fc54a6040 getting closer to texturing properly 2015-07-20 15:33:21 -07:00
Niraj Venkat
eaf75c01b9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.h
 2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
 2015-07-20 14:53:19 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
ericrius1
e75a6feafe can toggle hit effect on and off from a script 2015-07-20 11:58:26 -07:00
ericrius1
3439d45e0e adding hit effect logic 2015-07-20 11:02:15 -07:00
ericrius1
1e34de1c51 adding in screen space effect for getting hit 2015-07-20 10:44:38 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
052c3c987b Fix some more smart pointer 2015-07-17 18:10:34 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Niraj Venkat
022529f03f Render depth buffer to quad 
Useful for graphics debugging
 2015-07-16 09:46:28 -07:00
Niraj Venkat
0ee916fb6f Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-15 14:10:42 -07:00
Niraj Venkat
1b13f837bd Porting AO to new pipeline 2015-07-15 14:10:17 -07:00
samcake
a6148ab73d Remove naked gl call 2015-07-14 22:59:55 -07:00
Seth Alves
fb23eb0faf Merge pull request #5301 from samcake/yellow 
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
 2015-07-12 11:36:03 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
samcake
014802fd45 Merge pull request #5277 from venkatn93/gpuquery 
GPU Query infrastructure
 2015-07-10 11:59:08 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
samcake
9c744dcc46 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 11:21:38 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows 
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
 2015-07-08 21:33:27 -07:00
Niraj Venkat
1894b42773 Added EXT support for Mac GL Query calls 2015-07-08 16:11:36 -07:00
Niraj Venkat
7e59be6196 First take oon the query for the gpu 2015-07-08 10:00:58 -07:00
Sam Gateau
fe633cd545 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-06 15:04:02 -07:00
samcake
76e661f88d Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-05 12:08:56 -07:00
samcake
84b70fbaca Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass 2015-07-03 11:36:19 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Sam Gateau
20cb519c14 first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase 2015-06-30 08:19:00 -07:00
Sam Gateau
51eab1bd39 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-26 15:45:47 -07:00
Sam Gateau
c41ebcae78 Covering all the case for rendering the light passes 2015-06-26 15:40:08 -07:00
Ryan Huffman
35f9d49c06 Fix DrawOverlay3D::getOpaquePipeline invalid signature 2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/render-utils/src/RenderDeferredTask.cpp
	libraries/render-utils/src/RenderDeferredTask.h
 2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2 Move circle3d and text overlays to batches 2015-06-19 09:45:13 -07:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gateau
fb42613344 Fixing transparency that i just broke 2015-06-18 20:25:51 +02:00
samcake
89fe1c47be preping for debug the jobs 2015-06-18 13:02:06 +02:00
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
Sam Gateau
d1ac3148f0 migrating the transparent pipeline 2015-06-16 17:33:53 +02:00
Sam Gateau
9be87758fd Improving the design of the Jobs and varying 2015-06-16 15:00:47 +02:00
Ryan Huffman
81d003bdb8 Add post-scale to view matrix when in mirror mode 2015-06-12 13:05:10 -07:00
Ryan Huffman
ad77374732 Fix setting of _renderMode 2015-06-12 13:03:33 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Sam Gateau
470e24820d Back to clean state, just added the Material Key 2015-06-10 00:31:36 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
samcake
d9b7a42f60 FIxing merge 2015-06-08 19:06:04 +02:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02:00
Sam Gateau
3196c5ca77 better highlights blending 2015-06-08 05:41:36 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Sam Gateau
eea7ddf491 Trying to get Ubuntu to build 2015-06-02 19:27:32 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
Sam Gateau
c8e30ef39e On to a full rendered pipeline 2015-06-01 12:35:54 -07:00
Sam Gateau
f04f3bda72 Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme 2015-05-29 15:44:14 -07:00