summaryrefslogtreecommitdiff
path: root/slideshow
AgeCommit message (Collapse)Author
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann
Change-Id: Ief4dd31d68bd7c8e45070eea689d07057449ce77
2015-11-10Improve the Vortex transitionTor Lillqvist
Let about half the tiles move around in one direction (in front of the slide plane), and the rest the other direction (behind the slide plane). Make sure tiles that rotate into each other's location go the same way around, so that they don't pass through each others, which looks ugly. Avoid z-fighting by not letting the tile end up exactly on top of the one it is replacing, in case that one has not started moving yet. Change-Id: I232b0f815412d5d575b0dde4df2d337288e645bb
2015-11-09Simplify and improve (?) the Vortex transitionTor Lillqvist
Change-Id: I0602be9567961ca3bb5d41febd35ad65d8d7fb2a
2015-11-08Now I understand why that multiplication by 10 was there originallyTor Lillqvist
I was suffering from one basic misunderstanding: I did not get it that samplers are indexed with normalized texture coordinates, i.e. 0..1. (Note that multiplying a coordinate by any number does not break anything horribly for this use case, looking up a pseudo-random number, because textures by default repeat as a coordinate wraps.) We multiply by 10 so that neighbouring pixels that map to close index into the permTexture don't get clumped together with close sn values, and thus same behaviour. (Sure, the multiplication by 256 that I had changed it to worked, too, but not the way my initial reasoning went... So let's use the original 10 to avoid somebody else thinking that we need to multiply by 256 because permTexture is built from a 256x256 array.) (See 1877228ae8e7cc298cf4e45d061ee54774aa1d08) Change-Id: I1d350446460fe2fdd3e55f00053a5ce01d2d117c
2015-11-07Improve transition shader portabilityTor Lillqvist
Use #version 120 explicitly, and adapt the shader shader code accordingly, to use strictly only GLSL 1.20 constructs. Also, use less vertex attribute data in the Vortex vertex shader: We can pack the per-vertex tile x and y index and in-tile vertex index information into one float. Also, the shader can calculate the center of the tile a vertex belongs to based on the knowledge of which tile it is. Now the shader transitions work on OS X, too. Change-Id: I93e8b5069a6d06d2e412ffee322b1eb32805e606
2015-11-06Make the Vortex transition a bit more interestingTor Lillqvist
Also some minor cleanups in the C++ code. Change-Id: I106657130dd6e32b458cb416717806caac5031ce
2015-11-06loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)Stephan Bergmann
Change-Id: I23de1fa2f8e6c0cf6281b32eab179e131aa98056
2015-11-06Add a 'Ripple' transitionTor Lillqvist
Change-Id: I18efe35c299bc3a4a2a5e449021323fc1f53f378
2015-11-05use uno::Reference::set method instead of assignmentNoel Grandin
Change-Id: Ib93d762cf523e0029bbed16e08beebd9f418ae24
2015-11-04yyyyyNoel Grandin
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
2015-10-30Mac fixStephan Bergmann
Change-Id: Ib44f84ae028a73dd1940797acdadaff1e3c206d9
2015-10-30The fglrx driver is an X11 only thingTor Lillqvist
It means "FireGL and Radeon for X". Change-Id: I188fa03a113d9977a7a240bc0fc9f6dc9be054b8
2015-10-30UNO: no need to use OUString constructor when calling createInstanceNoel Grandin
Change-Id: I37da28539b94706574116d0fff5f008aabfb5526 Reviewed-on: https://gerrit.libreoffice.org/19682 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-30coverity#1332210 Uninitialized scalar fieldCaolán McNamara
Change-Id: I9f62e3f9d2bb517ad8f40400004670de1c4d06a5
2015-10-30loplugin:unusedmethodsNoel Grandin
Change-Id: Id3b5cd75d4357336ed592ef11a3f34d209f8e95f Reviewed-on: https://gerrit.libreoffice.org/19636 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-29com::sun::star->css in slideshowNoel Grandin
Change-Id: I7ae3c5198c22a3937e8c3ef87f48fa2a7e562c62 Reviewed-on: https://gerrit.libreoffice.org/19664 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-27Remove initial :: from sal_* typesTor Lillqvist
Change-Id: Idcdc9aeb7d3fdca0a9db43c1cb518ab1d1b2f0f4
2015-10-27Nothing that would be covered by that hereTor Lillqvist
Change-Id: I4f76c7699333cd9236f5231984db5c6d02a31445
2015-10-27WaE: unused parametersTor Lillqvist
Change-Id: I4273a4ddc00d24f561cce6a21b5237d4dfc56a92
2015-10-27Initial work on a "Vortex" transitionTor Lillqvist
The actual transition is not yet at all like the one in the competing product. But some basic ideas are in place. Change-Id: Ie17a4fe03ae93abe51a2f1f760f417ee4b193e2c
2015-10-26Bin dead codeTor Lillqvist
We already have an if statement for (time < PART) right above. Change-Id: I43b817dd6d0a11be4ed51a5bd378806447abf69c
2015-10-26Actually, the permTexture is 256*256 pixelsTor Lillqvist
Change-Id: Ia32c98d8162f31a8ee0b0d0c1301ca204c9c3c87
2015-10-26Add confused commentTor Lillqvist
Change-Id: I5179ee1cd295f256526feebb192a8548c41276a7
2015-10-26Drop some 'using', the std:: is not that uglyTor Lillqvist
Change-Id: If26ae80278dc55d5bf9fa644763e653c69415597
2015-10-26Use std::shared_ptr instead of boostTor Lillqvist
Change-Id: Id1b48f190831bbd4cc75d0d9e315e5b2b491d595
2015-10-26Simplify ifdefsTor Lillqvist
Change-Id: I5c3835f6fdc215e5d9dc1b8146c12e0d1a57da7c
2015-10-23Remove obsolete version map filesStephan Bergmann
Change-Id: Ic179264fe306bb2bca9797f10e26c0224fb1dd00
2015-10-22Use same order in this switch, too, as aboveTor Lillqvist
Change-Id: Icbe775e59d66efbb994a73c00024f9f7750f9ef0
2015-10-22Add a bit of explanatory commentTor Lillqvist
Also, sort the cases in the switch in numeric order for clarity. Change-Id: Ic32da29a78b3aeedf22ee5f646a0975e4cbcb9cc
2015-10-21No, it isn'tTor Lillqvist
Change-Id: I0236ff718ec9c3ee8d5845a044d65c927a896879
2015-10-21remove untyped Link<>Noel Grandin
Change-Id: I809f9e10309ceadda0a82c3818277323b34ec61b Reviewed-on: https://gerrit.libreoffice.org/19491 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-19slideshow: remove unecessary boost/bind includesDaniel Robertson
All of the remaining includes of boost/bind.hpp may be removed from slideshow, as last remaining uses of boost::bind have been removed from the module. There should be no side effects due to this change. Change-Id: I4e1855545fad69d09e594d0be139c09aad561b2d Reviewed-on: https://gerrit.libreoffice.org/19395 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-15loplugin:unreffunNoel Grandin
Change-Id: If9ca3e2d88d1b0dee57531ed954ba4895fb37fe3
2015-10-15tdf#93243 slideshow: boost::bind -> C++11 lambdasDaniel Robertson
Replace boost::bind with C++11 lambdas. In addition, replace the use of FuncT::result_type in ListenerOperations::notifyAllListeners with a less type specific means of determining the return type of the function to be applied in order to allow for the use of C++11 lambdas. Change-Id: I1035be976e542d8b5bbd451c473a896d91ed66ca Reviewed-on: https://gerrit.libreoffice.org/19314 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-13tdf#93243 slideshow: boost::bind -> C++11 lambdasDaniel Robertson
Replace boost::bind with C++11 lambdas Change-Id: I37e769c88d997eaecf46c07e510cef6a30fbce8e Reviewed-on: https://gerrit.libreoffice.org/19334 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-13cppcheck:variableScopeNoel Grandin
Change-Id: I7cbd5a9e9bb5417f754d4e2445df309140fd40af Reviewed-on: https://gerrit.libreoffice.org/19329 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-12Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY codeStephan Bergmann
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
2015-10-11tdf#93243 slideshow: replace boost::bindDaniel Robertson
Replace boost::bind with C++11 lambdas Change-Id: I13c500d085e6b8e80b2c067139db4ed0fffb2c71 Reviewed-on: https://gerrit.libreoffice.org/19299 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-11Replace simple while loops with range-based forDaniel Robertson
Replace simple while loops with range-based for-loops when apropriate. There should be no side effects due to this change. Change-Id: I0c39d4c10c991354248e864a09333144974c953c Reviewed-on: https://gerrit.libreoffice.org/19281 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-09slideshow: replace for_each with range-based forDaniel Robertson
Replace ::std::for_each for a more readable range-based for loop in cases in which the function object to be applied by for_each is more readable as the body of a for loop. Change-Id: I5798293cdd0d784cc4c95c67e3fc6a0b930db8bb Reviewed-on: https://gerrit.libreoffice.org/19261 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-08tdf#94222: Revert "slideshow: replace for_each with range-based loop"Jan Holesovsky
This reverts commit ead5bc3cfb07a4e96e367e7904dc674ee5f5ccd6. Change-Id: Icc2778cf904a71c4deaff4575d0de231acfc1335
2015-10-02loplugin:unusedmethodsNoel Grandin
Change-Id: Ie1603adf3908fd0668bcbe8f75c6bafa0d0bfd6c Reviewed-on: https://gerrit.libreoffice.org/19072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-09-30Fix typosAndrea Gelmini
Change-Id: I89ff6d31662824d83961d6457b82db8d8031168c Reviewed-on: https://gerrit.libreoffice.org/18977 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-09-29Renamed wrongly prefixed boolean variablesStefan Heinemann
Fixed tdf#94269 Change-Id: I63109cc4e095bad680d7637a065080ea368860ae Reviewed-on: https://gerrit.libreoffice.org/18851 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-09-21Properly #if these debug hooksfeature/chained-text-boxesStephan Bergmann
...moved here with 6fbab2ce87372bd98275d8239cd782d0ca6375e8 "loplugin:unreffun"; this file still indirectly includes boost/scoped_ptr.hpp via. boost/spirit Change-Id: Ib2f251420950395f58415c1f7c944b7e8fd61476
2015-09-21loplugin:unreffunStephan Bergmann
Change-Id: I526b9e1cff25a30c3f6b935c1a11ef571f7a12ea
2015-09-21boost->stdCaolán McNamara
Change-Id: I787ff19fd41d5ecee56efa1aa7ee539f46650703 Reviewed-on: https://gerrit.libreoffice.org/18703 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-16slideshow: fix mysterious crash with the gtk3 vclplugMichael Stahl
For some reason with gtk3 events are handled a bit differently, and in particular after the PresenterSlideShowView::Resize() sets the mbIsForcedPaintPending = true, with gtk2 we get a notifySlideAnimationsEnded event and then a notifyViewChanged event that calls PresenterSlideShowView::clear() to reset the flag, but with gtk3 the flag isn't reset and then PresenterSlideShowView::ForceRepaint() destroys the SlideView, while there are still events in the EventQueue with pointers to it. Since i'm evidently too dumb to tell what of this event handling is working correctly and what is buggy, avoid the crash by checking that the SlideView is still alive in the event handlers. Change-Id: Ib88e61536c21e9787cef8a436341bfbd89914f4b
2015-09-16tdf#94006 - need an explicit dispose for slideshow's GLContext.Michael Meeks
Fixes crasher exiting slideshow. Change-Id: I14b6a2c1abc946f590bf91cab19099753172fd95
2015-09-14boost->stdCaolán McNamara
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit (git 2.34.1) at 2024-08-03 01:24:56 +0000