summaryrefslogtreecommitdiff
path: root/slideshow
AgeCommit message (Collapse)Author
2016-03-15vcl: move graph.[hx]xx to graphic.[hc]xxChris Sherlock
It's IMO a bit confusing to see a "graph" header that doesn't strictly deal with graphs, but graphics. Backporting to 5.1 series to allow for easier backporting of other potential hotfixes. Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3 Reviewed-on: https://gerrit.libreoffice.org/22949 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-03-15slideshow: Blur the shadows the further they are from the objectEmmanuel Gil Peyrot
Reviewed-on: https://gerrit.libreoffice.org/22678 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Conflicts: slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx (cherry-picked from the commit 3ed1e68a79e8dcc623eb9165577e0571cebf4709) Change-Id: I63f4fda670b86db2ee1ea66d8755d71697fac0c7 Reviewed-on: https://gerrit.libreoffice.org/22812 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: jan iversen <jani@documentfoundation.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-03-15slideshow: Only use texture() in GLSL 1.50, fixes Intel on WindowsEmmanuel Gil Peyrot
texture2D() is still available, but not in the geometry stage, so better be consistent everywhere. (cherry-picked from the commit 1a9b62dc661a26c02db34ab5075b4e209a70b196) Change-Id: I86bf1921713bcbf32946190525401bfcc633a69f Reviewed-on: https://gerrit.libreoffice.org/22777 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-03-15slideshow: Add an ugly workaround for Intel’s matrix multiplicationEmmanuel Gil Peyrot
When more than three multiplications are chained, Intel’s Windows driver returns a mat4 containing only zeroes, likely due to a misbehaving optimisation. This patch prevents it from doing any optimisation by doing each multiplication in its own uniform block. (cherry-picked from the commit db9fe1ea4a1e0e33dece63652c2b076fb323ec63) Change-Id: I0b435d3a5444afd47f78c379f0d2e442d2c2cfc0 Reviewed-on: https://gerrit.libreoffice.org/22776 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-03-15slideshow: Move Vortex calculations to the geometry stage, fixes IntelEmmanuel Gil Peyrot
Their Windows driver was failing due to too many varyings being used between the vertex and the geometry stages. (cherry-picked from the commit 06404309026b8e5aeb4c47ea68aea7ef21c6654e) Change-Id: Iec69a2ef29e6ed4ba5ce6e46c7a5eb7db5098d1b Reviewed-on: https://gerrit.libreoffice.org/22775 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-03-15slideshow: Move Vortex’ tileInfo attribute upload to the first frameEmmanuel Gil Peyrot
(cherry-picked from the commit 9adeebadd5d1728e9abaec67aa4dd8a0c300c98f) Change-Id: Ifbc154755d43a085b78740a5a3c97ed2cbe9a905 Reviewed-on: https://gerrit.libreoffice.org/22774 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-02-22WaE unqualifed float literal are doubleNorbert Thiebaud
1.0 - float => double which then trigger a warning when implicitely downcasted to float Change-Id: Ic48f753e7ccf834fd36ff1b26d315b1267a15955 Reviewed-on: https://gerrit.libreoffice.org/22594 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit a5eae091da3b9d3918a41fcbc5ff8b68dc0fd933) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-02-11tdf#97197 - GL transitions should use their context not VCL's.Michael Meeks
Change-Id: Ifab7da221e73e068ebe0856a4224ec4ca4d611b5 Reviewed-on: https://gerrit.libreoffice.org/22293 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2016-02-10slideshow: Add shadows to Honeycomb, using the same way as VortexEmmanuel Gil Peyrot
Change-Id: I1f8f11f900f281792b417c1efead272fe3e8432e Reviewed-on: https://gerrit.libreoffice.org/22255 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-02-09slideshow: Don't de-reference Nodes cast to const char *.Michael Meeks
This crept in with a conversion in: 7bdc6be9c23517eec02ce7139edd7003abbee1f8 Change-Id: Ic1c62122934d5857326258565e4b54ef6e81b884 Reviewed-on: https://gerrit.libreoffice.org/22237 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/22240 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2016-02-09slideshow: Add shadows to the Vortex transitionEmmanuel Gil Peyrot
These are done using a shadow mapping technique, we render both slides from the point of view of the light, and then do a second pass in which we lower the light of the fragment if some other cube is above it. also: slideshow: Only retrieve each uniform location once Change-Id: I8aaa1428c4481661283bf69b5e56aa4d95fb80dd Reviewed-on: https://gerrit.libreoffice.org/22232 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/22245 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-02-02slideshow: Make sure the slide is fully opaque in HoneycombEmmanuel Gil Peyrot
On Windows, the text is rendered with 0 of alpha, which is an issue in this transition as it enables GL_BLEND. Change-Id: I45fe32ccf77854e758eddc33f300791d4cdd6904 (cherry picked from commit 8b65dec8e0fdfc8564597e90aff91b971e23f7ce) Reviewed-on: https://gerrit.libreoffice.org/22021 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2016-01-28slideshow: Change quads into cubes in the Vortex transitionEmmanuel Gil Peyrot
This makes Vortex require OpenGL 3.2 instead of 2.1. (cherry picked from commit 29bd6961a23dd44bcf315cacac1189282d87fc9f) Change-Id: I9438a37c2cf75e58eafc807ad1abaa22acb231b1 Reviewed-on: https://gerrit.libreoffice.org/21647 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-01-21slideshow: Relicense every shader of which I am the sole author to MPLEmmanuel Gil Peyrot
Change-Id: I921e52d8347f3b37030818711f979517eab690a8 (cherry picked from commit 3b6f877370191795fc8422772ccb544a1ee07456) Reviewed-on: https://gerrit.libreoffice.org/21646 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-01-21slideshow: Add some volume to the Honeycomb hexagons, making them look betterEmmanuel Gil Peyrot
Change-Id: Ic0f62f36faccb65ab4fbc7bb5553d096a2658f96 (cherry picked from commit 7cca8d3b3f5a9eda0060342fd2576d08a874b1c3) Reviewed-on: https://gerrit.libreoffice.org/21645 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-01-21slideshow: Tweak a few constants to make Glitter and Honeycomb look nicerEmmanuel Gil Peyrot
Change-Id: I5dd15f3d483caaedbf58a7ad12bf24798694524f (cherry picked from commit 0fe5a3069b83d6a5e83c6c4df5d874c8802b7f52) Reviewed-on: https://gerrit.libreoffice.org/21644 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-01-07OpenGL transitions: squashed 5 commits into this oneEmmanuel Gil Peyrot
vcl: Ignore i965’s shader compiler debug (cherry picked from commit 928fe134ff6ea85f732b36a1ab11336f1d829531) slideshow: Fix a few issues in the Glitter transition Remove an unused variable, add comments, reduce the time a tile stays black, and don’t rely on implicit casts of integers into floats. (cherry picked from commit 22480b20130d10f4691cdf0a658040be7f36e47b) slideshow: Improve the Ripple transition to match PowerPoint better (cherry picked from commit 1d411cad5a7d78ead8cffb5da522f1e0fba31187) slideshow: Improve the Vortex transition to match PowerPoint better (cherry picked from commit d886fef25c5978dd4b07fa0e3ce2402874a6c29a) slideshow: Define inverse() to bring back the GLSL version to 1.20 (cherry picked from commit a301da7cb6c562cd21983d9b3b34dc01235a82a5) Change-Id: Ifd33ae982b762af3ea8d88b2b2de259aabeebc9a Reviewed-on: https://gerrit.libreoffice.org/21116 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2015-12-12slideshow: windows build fixesTomaž Vajngerl
Change-Id: I9032af7583f0cf97664d2f84d5aead0cb1547c1a (cherry picked from commit 3b397f8a41ccc810ce5048d80b1e3dab827cb093)
2015-12-12slideshow: Improve the performances of the Glitter transitionEmmanuel Gil Peyrot
Change-Id: Iaf482b357577ff8a5511607844a69c90ea28d29f (cherry picked from commit d9116f2235e1a79c86446fc67231684edac49d82)
2015-12-12slideshow: Improve the performances of the Honeycomb transitionEmmanuel Gil Peyrot
Change-Id: Iacddc7b84bf0be8bb112cba88cc7fd36f72e7ca0 (cherry picked from commit c0b8c035db9afd6271e0382c4f10ad44d3aa0dbb)
2015-12-12slideshow: Don’t upload matrices to inexistent uniformsEmmanuel Gil Peyrot
Change-Id: I1572e101be0f5d9267dd48e96212689d80d1d023 (cherry picked from commit c5228bd0e430c3e45383939cdbd3e6dc7ee9dca6)
2015-12-12slideshow: Use GL_CLAMP_TO_BORDER for texture wrapEmmanuel Gil Peyrot
No transition makes use of repeat, and it could lead to some artifacts when writing transitions. Change-Id: Icf6f4f0eb74c28d8c75991e717b6b4ffe9df5060 (cherry picked from commit b4383be80b0f24ebee670eec558d0963404d40d4)
2015-12-12opengl: Add Geometry Shader support to OpenGLHelperEmmanuel Gil Peyrot
This is the ground work for some later transitions in slideshow. Change-Id: Ib200cf7fabd579256a5255b0fb5d8c4accf7d24b (cherry picked from commit facfbeb5cbff191da956827bc37df7bc74ed0b81)
2015-12-12slideshow: Remove extraneous checks for the program object.Emmanuel Gil Peyrot
Change-Id: Ice61bfbd75aafd4197584c34ef7fbed80c20c184 (cherry picked from commit 129b8b85c945091665ad3ae1c4fa3b6d9a157d25)
2015-12-12slideshow: Don’t crash when a transition fails to initialize.Emmanuel Gil Peyrot
Instead replace it with no transition at all. Change-Id: If7085e2ecd79eda80097f96bebbb2f9d11161c22 (cherry picked from commit 9e991f43e57d7a74fa2db10a46021cbe2218ac5a)
2015-12-12slideshow: Only upload vertex data on prepareEmmanuel Gil Peyrot
Change-Id: If87f441607adf2ed0aa31023352774e7372b7edb (cherry picked from commit 463739f44e75798dbdb1239c7374ed5254a9e9d4)
2015-12-12slideshow: Fix what was remaining to be able to use a core contextEmmanuel Gil Peyrot
Change-Id: Ifb22c75c77d6bb5d3f144a1ed92bbcdf8d1112fd (cherry picked from commit c831e4851f35ddef5ef45062ba291d07dda4b1b4)
2015-12-12slideshow: Fix lighting in the Vortex transitionEmmanuel Gil Peyrot
Change-Id: I870ef7885fe569c89bde63a70ef038c4133ffbfd (cherry picked from commit 859e64aa730fa380ecaab92527e2cfe97c299a4f)
2015-12-12slideshow: Remove the last legacy uniformsEmmanuel Gil Peyrot
Change-Id: If5f7368bf53dd59e66e990e4f2c57b6ee2cba44b (cherry picked from commit a74e8ab7841a67ae353c537d449d27a931ba67d8)
2015-12-12slideshow: Upload the projection and modelview matrices as uniformsEmmanuel Gil Peyrot
Change-Id: I9d6c3ad0d2cc2f691afb2c8622471286f8a5e1c7 (cherry picked from commit 7d1c123a55d222868e27673685c25d62b1e96cd5)
2015-12-12slideshow: upload the transform matrices as uniformsEmmanuel Gil Peyrot
Change-Id: I2380fc7f8462514e6c032b18b44df51fbaaccb9f (cherry picked from commit 566eca14481ea70c83aef30824da911ccf834b41)
2015-12-12slideshow: Remove legacy lighting codeEmmanuel Gil Peyrot
Change-Id: Ib799244c6c3dd8d6fd21adc28e68690287caebd0 (cherry picked from commit 4fcebe9f8a69f40bb8629da69df5974851515d2e)
2015-12-12slideshow: Remove wrong and unused uniform uploadEmmanuel Gil Peyrot
Change-Id: I13c91af15caad888b4b56dbf92b63fdb0a97b47d (cherry picked from commit f9a0564fb900764485f5e44c9b01a467022b792f)
2015-12-03tdf#96083 slide transitions wrong with appearing shapesArmin Le Grand
When using appearing animations on shapes, some of the slide transitions incorrectly don't show these shapes. Same for disappearing shapes - both states are wrong during slide transition time. Fix slide bitmap generator to take final slide states into account. Change-Id: Iea0e576009a109c7f44a7a6498b0ee5b2c4791c5 Reviewed-on: https://gerrit.libreoffice.org/20199 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 57387eb30d07f15b1b2a798e0e4dcb0f4543945c) Reviewed-on: https://gerrit.libreoffice.org/20375 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-11-24fix build: "warning C4305: truncation from 'double' to 'float'"Thorsten Behrens
Change-Id: Ied01ccf789877c15080797de3723588e09fa6c7c
2015-11-24fix build "error C2065: ´M_PI´ : undeclared identifier"Thorsten Behrens
Change-Id: I0ba164cdc1c473184b953bffd7d264d1ec8733b6
2015-11-23slideshow: Fix rotations when the slide and the screen have a different ratioEmmanuel Gil Peyrot
Change-Id: Ia6dcc352531a6bf067f3e87086cb275b00f81c97
2015-11-23slideshow: Add back lighting in the SimpleTransition shadersEmmanuel Gil Peyrot
Change-Id: Iec854a8369a7a9f845f261233e46aea8097db109
2015-11-23slideshow: Fix the baseline version, we now require OpenGL 2.1Emmanuel Gil Peyrot
With ReflectionTransition requiring 3.0 instead. Change-Id: I9497dab91017d1d81a6a5a369524849ce5774694
2015-11-23slideshow: Make the Iris class private to the TransitionImpl translation unitEmmanuel Gil Peyrot
Change-Id: I9bf701a7f19d0f778b8fec7a39b762cc89b061b7
2015-11-23slideshow: Merge ShaderTransition into OGLTransitionImplEmmanuel Gil Peyrot
Change-Id: Ia585a5064362c261c137d8c4abefcfda7cb7bdd7
2015-11-23slideshow: Move Operation to its own translation unitEmmanuel Gil Peyrot
Change-Id: Ie0be68055152347e82da66cb48cf76c54b7966c0
2015-11-23loplugin:unusedfields in slideshow/Noel Grandin
Change-Id: I509dd0bdda284abb2b8abdb809bf1dec8b9632ce
2015-11-22loplugin:staticmethodsNoel Grandin
Change-Id: I57ab559112201269ce389bb6eff737168cec1e78 Reviewed-on: https://gerrit.libreoffice.org/20119 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-20slideshow: Reimplement reflections in shaders, and port Rochade and TurnAroundEmmanuel Gil Peyrot
This removes the hack reflections were previously, where a black quad was drawn on top of a mirror version of the first primitive only. Change-Id: I8c0863ab30e85d0130a8d7e838f3514e9be93788
2015-11-20slideshow: Reimplement both Fade transitions in shadersEmmanuel Gil Peyrot
Change-Id: I94187b9316a206578bb738411053afe070703f09
2015-11-20slideshow: Make SimpleTransition inherit from ShaderTransitionEmmanuel Gil Peyrot
Many transitions don’t like the simplistic default shader, especially since it doesn’t handle lighting or reflections properly. Those issues are addressed in the following commits. TODO: except lighting. Change-Id: Ia99308deb87c97d9bbe1da32aac64d0437061a84
2015-11-20Seems more natural to pass a homogenous list by initializer_listStephan Bergmann
...than by template parameter pack (even if that requires using ServiceDecl*, as initializer_list cannot take reference types) Change-Id: Ia986201b52d8daedfe925f132ebc79bc2c0ba378
2015-11-20loplugin:sallogareasStephan Bergmann
Change-Id: Ib1f06cb5f925535858bc14aab6f59ad7fd2a3a8d
2015-11-19loplugin:redundantcastStephan Bergmann
Change-Id: I89281db92f9b75e972313a95c33473d7649a9bef
generated by cgit (git 2.34.1) at 2024-05-23 20:50:00 +0000