Commit Graph

1903 Commits

Author SHA1 Message Date
Stephan Bergmann
b6fe760beb loplugin:nullptr (automatic rewrite)
Change-Id: Ief4dd31d68bd7c8e45070eea689d07057449ce77
2015-11-10 10:31:39 +01:00
Tor Lillqvist
3042270bc5 Improve the Vortex transition
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-10 10:51:39 +02:00
Tor Lillqvist
6bb8194341 Simplify and improve (?) the Vortex transition
Change-Id: I0602be9567961ca3bb5d41febd35ad65d8d7fb2a
2015-11-09 09:11:46 +02:00
Tor Lillqvist
04352b481c Now I understand why that multiplication by 10 was there originally
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 1877228ae8)

Change-Id: I1d350446460fe2fdd3e55f00053a5ce01d2d117c
2015-11-08 17:31:39 +02:00
Tor Lillqvist
ef04c66659 Improve transition shader portability
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-07 01:45:48 +02:00
Tor Lillqvist
24db02dc8d Make the Vortex transition a bit more interesting
Also some minor cleanups in the C++ code.

Change-Id: I106657130dd6e32b458cb416717806caac5031ce
2015-11-06 20:49:55 +02:00
Stephan Bergmann
69b81b64f8 loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I23de1fa2f8e6c0cf6281b32eab179e131aa98056
2015-11-06 09:37:21 +01:00
Tor Lillqvist
75465aadff Add a 'Ripple' transition
Change-Id: I18efe35c299bc3a4a2a5e449021323fc1f53f378
2015-11-06 01:01:44 +02:00
Noel Grandin
1c3d3ffa81 use uno::Reference::set method instead of assignment
Change-Id: Ib93d762cf523e0029bbed16e08beebd9f418ae24
2015-11-05 09:59:30 +02:00
Noel Grandin
59b072e22b yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
2015-11-04 14:10:44 +02:00
Stephan Bergmann
dc3fca8483 Mac fix
Change-Id: Ib44f84ae028a73dd1940797acdadaff1e3c206d9
2015-10-30 13:25:31 +01:00
Tor Lillqvist
76cfcea672 The fglrx driver is an X11 only thing
It means "FireGL and Radeon for X".

Change-Id: I188fa03a113d9977a7a240bc0fc9f6dc9be054b8
2015-10-30 13:42:47 +02:00
Noel Grandin
3bc5df7f32 UNO: no need to use OUString constructor when calling createInstance
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-30 08:59:59 +00:00
Caolán McNamara
6e2736705d coverity#1332210 Uninitialized scalar field
Change-Id: I9f62e3f9d2bb517ad8f40400004670de1c4d06a5
2015-10-30 08:13:26 +00:00
Noel Grandin
c7e8f21a53 loplugin:unusedmethods
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-30 05:58:41 +00:00
Noel Grandin
e195b2ec95 com::sun::star->css in slideshow
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-29 10:24:23 +00:00
Tor Lillqvist
973a4086d7 Remove initial :: from sal_* types
Change-Id: Idcdc9aeb7d3fdca0a9db43c1cb518ab1d1b2f0f4
2015-10-27 15:42:54 +02:00
Tor Lillqvist
6b520a3378 Nothing that would be covered by that here
Change-Id: I4f76c7699333cd9236f5231984db5c6d02a31445
2015-10-27 14:51:34 +02:00
Tor Lillqvist
f157d0fa9d WaE: unused parameters
Change-Id: I4273a4ddc00d24f561cce6a21b5237d4dfc56a92
2015-10-27 14:42:52 +02:00
Tor Lillqvist
30cdd16cbf Initial work on a "Vortex" transition
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-27 14:39:48 +02:00
Tor Lillqvist
2e61410d25 Bin dead code
We already have an if statement for (time < PART) right above.

Change-Id: I43b817dd6d0a11be4ed51a5bd378806447abf69c
2015-10-26 13:17:39 +02:00
Tor Lillqvist
8c84777c46 Actually, the permTexture is 256*256 pixels
Change-Id: Ia32c98d8162f31a8ee0b0d0c1301ca204c9c3c87
2015-10-26 13:04:30 +02:00
Tor Lillqvist
1877228ae8 Add confused comment
Change-Id: I5179ee1cd295f256526feebb192a8548c41276a7
2015-10-26 12:27:46 +02:00
Tor Lillqvist
191cbcc173 Drop some 'using', the std:: is not that ugly
Change-Id: If26ae80278dc55d5bf9fa644763e653c69415597
2015-10-26 11:12:34 +02:00
Tor Lillqvist
c59d726976 Use std::shared_ptr instead of boost
Change-Id: Id1b48f190831bbd4cc75d0d9e315e5b2b491d595
2015-10-26 11:09:36 +02:00
Tor Lillqvist
25e777f92f Simplify ifdefs
Change-Id: I5c3835f6fdc215e5d9dc1b8146c12e0d1a57da7c
2015-10-26 10:45:47 +02:00
Stephan Bergmann
3569c58c0e Remove obsolete version map files
Change-Id: Ic179264fe306bb2bca9797f10e26c0224fb1dd00
2015-10-23 15:10:09 +02:00
Tor Lillqvist
42e2b43715 Use same order in this switch, too, as above
Change-Id: Icbe775e59d66efbb994a73c00024f9f7750f9ef0
2015-10-22 16:01:25 +03:00
Tor Lillqvist
e6cf271f13 Add a bit of explanatory comment
Also, sort the cases in the switch in numeric order for clarity.

Change-Id: Ic32da29a78b3aeedf22ee5f646a0975e4cbcb9cc
2015-10-22 15:21:11 +03:00
Tor Lillqvist
9bfe1d13c0 No, it isn't
Change-Id: I0236ff718ec9c3ee8d5845a044d65c927a896879
2015-10-21 11:33:53 +03:00
Noel Grandin
382eb1a23c remove untyped Link<>
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-21 07:44:43 +00:00
Daniel Robertson
7e5bada554 slideshow: remove unecessary boost/bind includes
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-19 06:52:58 +00:00
Noel Grandin
90d82f73b8 loplugin:unreffun
Change-Id: If9ca3e2d88d1b0dee57531ed954ba4895fb37fe3
2015-10-15 08:48:45 +02:00
Daniel Robertson
39c7826c81 tdf#93243 slideshow: boost::bind -> C++11 lambdas
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-15 06:23:24 +00:00
Daniel Robertson
4038b27a0b tdf#93243 slideshow: boost::bind -> C++11 lambdas
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-13 08:05:18 +00:00
Noel Grandin
ed7361ef0b cppcheck:variableScope
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-13 06:22:33 +00:00
Stephan Bergmann
b36963c0a6 Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
2015-10-12 17:52:29 +02:00
Daniel Robertson
91e0161dc5 tdf#93243 slideshow: replace boost::bind
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-11 06:15:35 +00:00
Daniel Robertson
b629728085 Replace simple while loops with range-based for
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-11 06:13:15 +00:00
Daniel Robertson
6e8f1a3bd1 slideshow: replace for_each with range-based for
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-09 07:09:22 +00:00
Jan Holesovsky
862bd36439 tdf#94222: Revert "slideshow: replace for_each with range-based loop"
This reverts commit ead5bc3cfb.

Change-Id: Icc2778cf904a71c4deaff4575d0de231acfc1335
2015-10-08 15:35:47 +02:00
Noel Grandin
d68a0fc050 loplugin:unusedmethods
Change-Id: Ie1603adf3908fd0668bcbe8f75c6bafa0d0bfd6c
Reviewed-on: https://gerrit.libreoffice.org/19072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-02 06:20:35 +00:00
Andrea Gelmini
f45ac62a20 Fix typos
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-30 10:34:17 +00:00
Stefan Heinemann
c50eb68af3 Renamed wrongly prefixed boolean variables
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-29 18:33:40 +00:00
Stephan Bergmann
4c657f5a1a Properly #if these debug hooks
...moved here with 6fbab2ce87 "loplugin:unreffun";
this file still indirectly includes boost/scoped_ptr.hpp via. boost/spirit

Change-Id: Ib2f251420950395f58415c1f7c944b7e8fd61476
2015-09-21 12:07:42 +02:00
Stephan Bergmann
6fbab2ce87 loplugin:unreffun
Change-Id: I526b9e1cff25a30c3f6b935c1a11ef571f7a12ea
2015-09-21 10:31:39 +02:00
Caolán McNamara
64144c28fe boost->std
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-21 08:11:17 +00:00
Michael Stahl
afce2eee1d slideshow: fix mysterious crash with the gtk3 vclplug
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-16 22:13:42 +02:00
Michael Meeks
625d83e430 tdf#94006 - need an explicit dispose for slideshow's GLContext.
Fixes crasher exiting slideshow.

Change-Id: I14b6a2c1abc946f590bf91cab19099753172fd95
2015-09-16 03:12:16 +01:00
Caolán McNamara
22b80ac8e2 boost->std
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>
2015-09-14 12:54:25 +00:00