| | - Repository
- rB Blender
- Branch
- viewport_master_merge
Event TimelineThis revision now requires changes to proceed. This revision was automatically updated to reflect the committed changes. | Path | Size |
|---|
| 5 lines | | release/ | scripts/ | startup/ | bl_ui/ |
| | | 23 lines | | 30 lines | | | | 1 line | | | | 3 lines | | 1 line | | | | 20 lines | | 20 lines | | | | 12 lines | | 11 lines | | 7 lines | | | | | | 8 lines | | | | 36 lines | | | | 2 lines | | 26 lines | | 71 lines | | | | 21 lines | | 83 lines | | 22 lines | | 5 lines | | | | 2 lines | | 837 lines | | 244 lines | | | | 205 lines | | 66 lines | | 47 lines | | 81 lines | | 9 lines | | | | 3 lines | | 65 lines | | 1 line | | 12 lines | | | | 1 line | | | | 9 lines | | 116 lines | | 23 lines |
| Commit | Tree | Parents | Author | Summary | Date |
|---|
| 7409fddf272d | 5fc21cab59f7 | 4557ad66c1c9 | Antony Riakiotakis | Cleanup naming, use sane defaults | Feb 12 2015, 2:54 PM | | 4557ad66c1c9 | fd7a74cb33b7 | dc506fba9c61 | Antony Riakiotakis | Minor simplification | Feb 10 2015, 5:32 PM | | dc506fba9c61 | feeef88921b3 | 4eb6b35926c5 | Antony Riakiotakis | Cleanup redundant state changes | Feb 10 2015, 4:45 PM | | 4eb6b35926c5 | c6e43fffe929 | 0d8b701e2570 | Antony Riakiotakis | Use an enum for enabled GPU Fx | Feb 10 2015, 4:39 PM | | 0d8b701e2570 | 31d64a8687e2 | bdfd9ba38abc | Antony Riakiotakis | Forward compatibility: Use triangle strips instead of quads | Feb 10 2015, 4:20 PM | | bdfd9ba38abc | 84d308062364 | 0ea64c2b9abe | Antony Riakiotakis | Cleanup leftover code from WIP renderer | Feb 10 2015, 12:57 PM | | 0ea64c2b9abe | a280e231031e | 9d1336b653c1 | Antony Riakiotakis | More cleanup | Feb 10 2015, 11:55 AM | | 9d1336b653c1 | cba6ebfea636 | b7c1d2e898a6 | Antony Riakiotakis | | Feb 10 2015, 11:36 AM | | b7c1d2e898a6 | 00c20057f185 | 268ae6a62b21 | Antony Riakiotakis | Cleanup - bring branch to merge ready condition | Feb 10 2015, 11:34 AM | | 268ae6a62b21 | 5d5da1056061 | 7d1e7de7be66 2fe9e3c1f0fd | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Feb 10 2015, 11:18 AM | | 7d1e7de7be66 | 8df97aaf06a2 | 28f271736be0 15cd2222702d | Antony Riakiotakis | Merge branch 'master' into viewport_experiments (Show More…) | Feb 3 2015, 7:29 PM | | 28f271736be0 | 15990fcd3da1 | 8a8e29ac6ac5 | Antony Riakiotakis | Cleanup for compositing, move to c++ WIP node abstractions for compositing… (Show More…) | Jan 27 2015, 10:26 AM | | 8a8e29ac6ac5 | 6991b8ee0c4a | a75728341beb | Antony Riakiotakis | Select appropriate folder for MinGW-w64 gcc 4.9 | Jan 16 2015, 2:02 PM | | a75728341beb | 2feeb45c1f31 | da94a7005aa1 | Antony Riakiotakis | | Jan 11 2015, 9:28 PM | | da94a7005aa1 | 9ef2a8756140 | 568c8b7b5541 | Antony Riakiotakis | Add initial compositing node API, compositing code already becomes too… (Show More…) | Jan 9 2015, 4:48 PM | | 568c8b7b5541 | 743da22bacb9 | 6148295f1ab3 2f16098d2080 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Jan 9 2015, 12:51 PM | | 6148295f1ab3 | 5d7b5b2c5b35 | 0790db4f5cb3 | Antony Riakiotakis | fragment shader to downsample near circle of confusion - rename texture… (Show More…) | Jan 6 2015, 8:27 PM | | 0790db4f5cb3 | 19e8f5da7fbb | 1cfb12ddbff4 | Antony Riakiotakis | signed coc matches the low quality one. | Jan 6 2015, 8:01 PM | | 1cfb12ddbff4 | b6d079eb5087 | 27fe02f21379 | Antony Riakiotakis | As usually hard to find errors are usually quite silly. We can now see the coc… (Show More…) | Jan 6 2015, 7:40 PM | | 27fe02f21379 | c13d4d27a70f | 79b8540e66b8 | Antony Riakiotakis | | Jan 6 2015, 7:16 PM | | 79b8540e66b8 | aac037ae1f6b | fd1036e80325 | Antony Riakiotakis | First stage of better dof, downsample buffer by half. | Jan 6 2015, 5:57 PM | | fd1036e80325 | be3bb91fce3b | 08cc519e7960 | Antony Riakiotakis | Add new shader files to Scons | Jan 6 2015, 3:19 PM | | 08cc519e7960 | 8e69155750f7 | b06999435a18 | Antony Riakiotakis | WIP for new dof | Jan 6 2015, 12:01 PM | | b06999435a18 | bd4483e2f3c2 | 9ca9bb68af7d | Antony Riakiotakis | Pass enumerants for new shader effect. WIP commit to continue later. | Jan 5 2015, 7:19 PM | | 9ca9bb68af7d | b6d67ee087f4 | f54d210f2661 | Antony Riakiotakis | Depth of field: initialize textures for better algorithm. | Jan 5 2015, 7:05 PM | | f54d210f2661 | 90566c3d439a | e306e99574a0 | Antony Riakiotakis | Use nice switch statement instead of horrible chained ifs. | Jan 5 2015, 6:09 PM | | e306e99574a0 | a87f78e2acd8 | 85e9ddd515c7 22ce525bcd4f | Antony Riakiotakis | Merge branch 'master' into viewport_experiments (Show More…) | Jan 5 2015, 2:34 PM | | 85e9ddd515c7 | 000691b2165a | 63ab9c1089e8 | Antony Riakiotakis | Fix SSAO artifacts at zero distance by using a small constant bias in length… (Show More…) | Jan 5 2015, 2:11 PM | | 63ab9c1089e8 | b2baed1ede8e | dbf18d88fc87 3414d0141141 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments (Show More…) | Jan 5 2015, 11:30 AM | | dbf18d88fc87 | fddb7566bb12 | a4c154bc5a2e | Antony Riakiotakis | Add request for HDR targets - all compositing is done in HDR targets now. | Jan 2 2015, 7:21 PM | | a4c154bc5a2e | a84b0c1d1e71 | 2a189a0546a6 | Antony Riakiotakis | Disable bound textures just in case they come and bite us somewhere unpleasant. | Jan 2 2015, 5:12 PM | | 2a189a0546a6 | 359e128e26c4 | 376a004b2617 | Antony Riakiotakis | | Jan 2 2015, 4:57 PM | | 376a004b2617 | c80066a8625a | 4ca945778f9e 2a8a56929b09 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Jan 2 2015, 1:47 PM | | 4ca945778f9e | a87019b5626e | 4d6d8b8c14db | Antony Riakiotakis | cleanup diffusion dof names and add blade count (will possibly be used in high… (Show More…) | Dec 23 2014, 2:02 PM | | 4d6d8b8c14db | a0522690a20c | 702cb6c403de 3b639b8b3d77 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Dec 22 2014, 12:50 PM | | 702cb6c403de | cec27401d0c3 | c37c50e33ff9 | Antony Riakiotakis | Replace magic quality numbers, add some cleanup code, deactivate high quality… (Show More…) | Dec 6 2014, 1:09 AM | | c37c50e33ff9 | c58a327aeb53 | 44e8045ee506 | Antony Riakiotakis | Add quality settings for depth of field - still inactive. | Dec 6 2014, 12:32 AM | | 44e8045ee506 | 2865ae4bdc81 | 54670647770a 871cf701445a | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Dec 5 2014, 11:32 PM | | 54670647770a | b9ecc30311ed | bd434b92b69b 9afc5b09fd2f | Antony Riakiotakis | Merge branch 'master' into viewport_experiments (Show More…) | Nov 28 2014, 4:15 PM | | bd434b92b69b | 7103c34ce26c | 5373b4a8b17e | Antony Riakiotakis | Revert "Hook up flags to request a specific sorting scheme from GPU buffer… (Show More…) | Nov 28 2014, 4:10 PM | | 5373b4a8b17e | d7f681ca4e5a | ec69df6147f7 9f64a8643683 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments (Show More…) | Nov 25 2014, 4:31 PM | | ec69df6147f7 | 9ef28024a86e | 40b1d29ec735 2b2ac5d3cc1f | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Nov 18 2014, 5:47 PM | | 40b1d29ec735 | af13cd257d9f | 302139986920 a2d95b2f5a4d | Antony Riakiotakis | Merge branch 'master' into viewport_experiments (Show More…) | Nov 18 2014, 1:49 PM | | 302139986920 | 32ee25707c1b | ace38bdc82c8 | Antony Riakiotakis | Ensure View3D fx when using them, prevents some crashes with old files | Nov 14 2014, 11:52 PM | | ace38bdc82c8 | 427cbf5cb590 | cb94f59f71ac | Antony Riakiotakis | Fix SSAO not being constant in camera view. | Nov 14 2014, 7:55 PM | | cb94f59f71ac | 8b4dc4a59275 | 63d7d8e1e513 | Antony Riakiotakis | | Nov 14 2014, 2:45 PM | | 63d7d8e1e513 | 4332a4c2e155 | 43d4a56d8d6c 8d5d6de7615c | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Nov 14 2014, 2:07 PM | | 43d4a56d8d6c | 7a70fc90a490 | 7b0031b18704 | Antony Riakiotakis | | Nov 4 2014, 4:47 PM | | 7b0031b18704 | d74fec148a85 | 4322085f4f0a | Antony Riakiotakis | Avoid freeing and reading/writing NULL pointers. Should not happen often but… (Show More…) | Nov 4 2014, 2:48 PM | | 4322085f4f0a | ec6c0cc35651 | 4aad147fe457 | Antony Riakiotakis | Only show properties if not in camera view, else direct user to camera… (Show More…) | Nov 4 2014, 3:24 PM | | 4aad147fe457 | 0cd939464f18 | b550e788f28c | Antony Riakiotakis | Support camera GPU parameters when looking/rendering through camera in the… (Show More…) | Nov 4 2014, 2:28 PM | | b550e788f28c | 53848309dc40 | 46cc844f434a | Antony Riakiotakis | | Nov 4 2014, 1:02 PM | | 46cc844f434a | 1243407e8dc6 | 7798ecd74338 | Antony Riakiotakis | | Nov 3 2014, 8:20 PM | | 7798ecd74338 | fc51cd13947f | 78d42f7885e1 | Antony Riakiotakis | Add another level of small blur to bridge between no/medium blurring. (Show More…) | Nov 3 2014, 2:06 PM | | 78d42f7885e1 | 2d80322a0092 | eb8a09d567e1 d57ce42dfab8 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Nov 3 2014, 9:56 AM | | eb8a09d567e1 | c4fbd8b9ac34 | 2a5556b42663 | Antony Riakiotakis | DOF effect works :) | Oct 31 2014, 3:41 PM | | 2a5556b42663 | d77e310557e0 | de2781117787 a6a3989617e6 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Oct 31 2014, 2:45 PM | | de2781117787 | d7cdf94c4f5a | 6484056cc1bd | Antony Riakiotakis | Correctly downsample circles of confusion and use parallelism to do it more… (Show More…) | Oct 29 2014, 7:41 PM | | 6484056cc1bd | b526de481330 | a4f35de02636 | Antony Riakiotakis | Second pass, blurs the downsampled buffer once. | Oct 29 2014, 6:31 PM | | a4f35de02636 | f1b184e0a61d | ba2f0ad77905 | Antony Riakiotakis | Use the correct shaders and varyings | Oct 29 2014, 6:08 PM | | ba2f0ad77905 | 46474443d13a | e0cba973e71a | Antony Riakiotakis | | Oct 29 2014, 4:18 PM | | e0cba973e71a | 4f80f25e66ac | c6292918a36b | Antony Riakiotakis | First ping pong between low resolution buffers working. Nice landmark for… (Show More…) | Oct 29 2014, 12:13 PM | | c6292918a36b | 9a435a0e95c7 | 518f794a6f72 | Antony Riakiotakis | | Oct 29 2014, 12:01 PM | | 518f794a6f72 | c17da4ce24b9 | dc22a504889e | Antony Riakiotakis | SSAO and DOF work well together now. | Oct 29 2014, 11:12 AM | | dc22a504889e | 186b7c84365d | d2d3bd35c1c3 | Antony Riakiotakis | Code that enables simultaneous DOF-SSAO effect. There's some sort of texture… (Show More…) | Oct 28 2014, 9:07 PM | | d2d3bd35c1c3 | b086eaf703e4 | 0782c680a66e | Antony Riakiotakis | Use optimized view space reconstruction for ortho case as well. | Oct 28 2014, 7:44 PM | | 0782c680a66e | 539c52f45663 | 8f25b6d6c846 | Antony Riakiotakis | Add a library file for projection shader code, should enable us to use… (Show More…) | Oct 28 2014, 7:07 PM | | 8f25b6d6c846 | 11c8c82d0351 | 6e8ba2f3f555 | Antony Riakiotakis | More attempts to synchronize viewport and camera dof - probably will need fixes… (Show More…) | Oct 28 2014, 6:28 PM | | 6e8ba2f3f555 | 2d40e1e7814f | c48abbb0909c | Antony Riakiotakis | DOF calculation shader. | Oct 27 2014, 8:45 PM | | c48abbb0909c | 04366b308652 | 5efa0e03b521 9c9b145dabb9 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Oct 27 2014, 11:10 AM | | 5efa0e03b521 | 3c6ca08f11f4 | d54c249a7b5a | Antony Riakiotakis | Add separate file for DOF effect and cleanup the parameter passing a little. | Oct 26 2014, 3:43 PM | | d54c249a7b5a | 7e0b6604a905 | 3967f5659d4f | Antony Riakiotakis | Separate SSAO pass - it's unlikely we'll be able to reuse this with depth of… (Show More…) | Oct 23 2014, 10:42 PM | | 3967f5659d4f | 591e7afa2bc7 | 1082a2f125fc | Antony Riakiotakis | | Oct 23 2014, 8:12 PM | | 1082a2f125fc | 59fc46dbe83d | ddb33a3181cb | Antony Riakiotakis | Add some pedantic GLSL casts to make shader compile in OSX | Oct 23 2014, 5:01 PM | | ddb33a3181cb | e021b26f93bb | 33e7e1ddb2e3 | Antony Riakiotakis | | Oct 22 2014, 7:27 PM | | 33e7e1ddb2e3 | 1fd8b9eb7f4a | 0c8469c44014 | Antony Riakiotakis | SSAO works again. Unfortunately it's unavoidable to have it work without… (Show More…) | Oct 22 2014, 11:29 AM | | 0c8469c44014 | db55fe092225 | 30be0f097714 | Antony Riakiotakis | Correct normal reconstruction with optimized formula. (Show More…) | Oct 22 2014, 12:18 AM | | 30be0f097714 | 00995056fd27 | e1755158c0fd | Antony Riakiotakis | Refactoring of SSAO code. Uses some optimizations but result is different still… (Show More…) | Oct 21 2014, 5:57 PM | | e1755158c0fd | 965c40287236 | e963efcd19ba b770964558c4 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Oct 21 2014, 4:54 PM | | e963efcd19ba | e5455e586a8b | 5b4b83d7e3d6 | Antony Riakiotakis | Normalize the depth to the -1.0 to 1.0 range as well. | Oct 20 2014, 9:46 PM | | 5b4b83d7e3d6 | 31ae9dc5f483 | 5c31594ab77c | Antony Riakiotakis | Add shader files to the source tree. It helps by displaying them in the IDE | Oct 20 2014, 8:38 PM | | 5c31594ab77c | d2767eb82ad3 | c4b6d60af32a 50cb62a3a095 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Oct 20 2014, 6:56 PM | | c4b6d60af32a | 8a64cfc30c98 | 33cee269dac7 | Antony Riakiotakis | Attempt to fix shader compilation in OSX. strict compilation does not allow… (Show More…) | Sep 22 2014, 2:20 PM | | 33cee269dac7 | 048385883724 | ce9fb0e99750 | Antony Riakiotakis | Custom color for SSAO | Sep 18 2014, 9:40 PM | | ce9fb0e99750 | 3a04448562b4 | 81a3a364b586 | Antony Riakiotakis | Do not calculate SSAO on the background. Saves cycles on pixel shaders as well… (Show More…) | Sep 18 2014, 9:20 PM | | 81a3a364b586 | e11833421a8e | c56cf0b8873b | Antony Riakiotakis | fix issue with scons | Sep 16 2014, 11:56 PM | | c56cf0b8873b | f4bd7fbed9d7 | 827ad6075dcf | Antony Riakiotakis | WIP, beginning of renderer system that should take care of sorting materials… (Show More…) | Sep 16 2014, 7:07 PM | | 827ad6075dcf | 9eeeed40e1f7 | d1ed35480eae | Antony Riakiotakis | Hook up flags to request a specific sorting scheme from GPU buffer setup… (Show More…) | Sep 16 2014, 6:11 PM | | d1ed35480eae | f3588fc27bdf | 829addcff002 | Antony Riakiotakis | | Sep 16 2014, 2:09 PM | | 829addcff002 | 1ec3666b40a9 | 313b568f9219 | Antony Riakiotakis | Restore texture coordinates properly | Sep 16 2014, 11:25 AM | | 313b568f9219 | c3956f047ac5 | 3a0d276c5588 c9f0c20e4800 | Antony Riakiotakis | Merge branch 'master' into viewport_experiments | Sep 16 2014, 10:26 AM | | 3a0d276c5588 | 98f3095aa2e6 | acdaf71bbee9 | Antony Riakiotakis | Fix for flickering, recreate the framebuffer textures in that case (looks like… (Show More…) | Sep 15 2014, 8:32 PM | | acdaf71bbee9 | 0d73917aeb29 | 21f43fb13c4a | Antony Riakiotakis | | Sep 15 2014, 8:06 PM | | 21f43fb13c4a | 8d1ae1b065fd | 2632c1308f37 | Antony Riakiotakis | | Sep 15 2014, 4:55 PM | | 2632c1308f37 | b5370b3158bd | 33722d401125 | Antony Riakiotakis | | Sep 15 2014, 4:09 PM | | 33722d401125 | 70846ed88878 | 9e2efd68e1cf | Antony Riakiotakis | Greatly improved normal calculation using view space position derivatives. | Sep 12 2014, 7:56 PM | | 9e2efd68e1cf | 1e90c450522e | 3ac70665b012 | Antony Riakiotakis | | Sep 9 2014, 5:05 PM |
|