summaryrefslogtreecommitdiff
path: root/slideshow
AgeCommit message (Collapse)Author
2015-12-18related tdf#96398 pull out more NPAPI-related codeThorsten Behrens
Fixup windows PCH plus pulling out more code now unused due to NPAPI removal. Follow-up to 4c18af27bf95b332ee2006cfc0bbf469fb1a84d4. Change-Id: I8ad42a28139ceeab0cae1f608d55beb28c159db3 Reviewed-on: https://gerrit.libreoffice.org/20783 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-12-15chmod -xTor Lillqvist
Change-Id: Ifa02bde8c84326c513df74d34077710f2e28c91e
2015-12-15Use #version 140 to get inverse()Tor Lillqvist
The Linux GLSL imlementation is very loose in its interpretation of standards, it seems. (I am not surprised.) Not so on Windows, at least with AMD drivers. The inverse() function (for float matririces) is present only starting from GLSL 1.40. Bump the #version directive accordingly. (See https://www.opengl.org/sdk/docs/man/html/inverse.xhtml) To get this to work again on OS X will be a further challenge. There a 'legacy' context only has GLSL 1.20. But the intent is to move this code in the direction of using 'core' contexts anyway. Change-Id: I572dc7cc30f90321b233fbfd857455dc01761a7c
2015-12-11loplugin:nullptrStephan Bergmann
Change-Id: Ib6f55bc0ce6c09ea523174cb630c6d7cd9808f96
2015-12-11No need for a separate <vcl/graph.h>Tor Lillqvist
Change-Id: I962544005b5d408f7c044a02eefe09b87d8a81fe
2015-12-11slideshow: windows build fixesTomaž Vajngerl
Change-Id: I9032af7583f0cf97664d2f84d5aead0cb1547c1a
2015-12-11slideshow: Improve the performances of the Glitter transitionEmmanuel Gil Peyrot
Change-Id: Iaf482b357577ff8a5511607844a69c90ea28d29f
2015-12-11slideshow: Improve the performances of the Honeycomb transitionEmmanuel Gil Peyrot
Change-Id: Iacddc7b84bf0be8bb112cba88cc7fd36f72e7ca0
2015-12-11slideshow: Don’t upload matrices to inexistent uniformsEmmanuel Gil Peyrot
Change-Id: I1572e101be0f5d9267dd48e96212689d80d1d023
2015-12-11slideshow: 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
2015-12-11opengl: Add Geometry Shader support to OpenGLHelperEmmanuel Gil Peyrot
This is the ground work for some later transitions in slideshow. Change-Id: Ib200cf7fabd579256a5255b0fb5d8c4accf7d24b
2015-12-11slideshow: Remove extraneous checks for the program object.Emmanuel Gil Peyrot
Change-Id: Ice61bfbd75aafd4197584c34ef7fbed80c20c184
2015-12-11slideshow: Don’t crash when a transition fails to initialize.Emmanuel Gil Peyrot
Instead replace it with no transition at all. Change-Id: If7085e2ecd79eda80097f96bebbb2f9d11161c22
2015-12-11slideshow: Only upload vertex data on prepareEmmanuel Gil Peyrot
Change-Id: If87f441607adf2ed0aa31023352774e7372b7edb
2015-12-11slideshow: Fix what was remaining to be able to use a core contextEmmanuel Gil Peyrot
Change-Id: Ifb22c75c77d6bb5d3f144a1ed92bbcdf8d1112fd
2015-12-11slideshow: Fix lighting in the Vortex transitionEmmanuel Gil Peyrot
Change-Id: I870ef7885fe569c89bde63a70ef038c4133ffbfd
2015-12-11slideshow: Remove the last legacy uniformsEmmanuel Gil Peyrot
Change-Id: If5f7368bf53dd59e66e990e4f2c57b6ee2cba44b
2015-12-11slideshow: Upload the projection and modelview matrices as uniformsEmmanuel Gil Peyrot
Change-Id: I9d6c3ad0d2cc2f691afb2c8622471286f8a5e1c7
2015-12-11slideshow: upload the transform matrices as uniformsEmmanuel Gil Peyrot
Change-Id: I2380fc7f8462514e6c032b18b44df51fbaaccb9f
2015-12-11slideshow: Remove legacy lighting codeEmmanuel Gil Peyrot
Change-Id: Ib799244c6c3dd8d6fd21adc28e68690287caebd0
2015-12-11slideshow: Remove wrong and unused uniform uploadEmmanuel Gil Peyrot
Change-Id: I13c91af15caad888b4b56dbf92b63fdb0a97b47d
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>
2015-11-30loplugin:unusedfieldsNoel Grandin
Change-Id: Icac4ac1a2614e72bc9ff070819533e09eeb1a864
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
2015-11-19slideshow: Port all matrix operations from GL to glmEmmanuel Gil Peyrot
We are still using glPushMatrix/glMultMatrix/glPopMatrix until everything is moved to shaders, at which point we will upload it with glUniformMatrix instead. Change-Id: I1684700eb9ed5867c5a2ae2b4e8cf2f1805f4d70
2015-11-19slideshow: Batch primitive display as much as possibleEmmanuel Gil Peyrot
We now set the state and upload all vertices data at once, before each batch, in order to minimize GL calls during drawing. The next step will be to move to shaders, in order to use per-primitive uniforms instead of changing the global modelview matrix and issuing another draw call. Change-Id: I8c7cf29047047b9cad575cc6264485ae77d6ba10
2015-11-19slideshow: Use gl_ModelViewProjectionMatrix in vertex shadersEmmanuel Gil Peyrot
ftransform() is deprecated, and we shouldn’t do an extraneous multiplication to obtain the two matrices together. Change-Id: Iaa16c106b8b702468f7be643a812107f0967acdd
2015-11-19slideshow: Always enable normals, there is no case where they are emptyEmmanuel Gil Peyrot
Change-Id: Ia45a3ec98a1f548b5a976f485d4165bb3d1ff2e4
2015-11-19slideshow: Don’t create the permTexture if the shaders don’t use itEmmanuel Gil Peyrot
Change-Id: I0aefe2130a85303213e247676d45546d9859cf62
2015-11-19slideshow: Rename getVertices into getVertex, to match its only usageEmmanuel Gil Peyrot
2015-11-18slideshow: improve "honeycomb" transitionTomaž Vajngerl
Change-Id: I8687127cd9ccf6a6ddd87d934f7462a69a047053
2015-11-18remove unused typedefs and inline use-once typedefsNoel Grandin
and improve the script a little Change-Id: I2792ea4dd5df3a50736fbe209225c3f16fb86b84 Reviewed-on: https://gerrit.libreoffice.org/20033 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-17loplugin:unnecessaryvirtualNoel Grandin
update the plugin with lessons learned from the mergeclasses plugin and re-run it Change-Id: I9d622eb3d05fceaf8fa764c533c8fa5dfb4c7711 Reviewed-on: https://gerrit.libreoffice.org/20015 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-16slideshow: initial work on "honeycomb" transition (incomplete)Tomaž Vajngerl
Change-Id: I4a46f7f1ec289f96f9fd1b849317b7548ac29383
2015-11-15Fast PCH generator and optimized PCH filesAshod Nakashian
Ported update_pch.sh to Python with improved performance and features. The new script is invoked from the same update_pch.sh which calls it for each library in parallel, although it can be invoked directly. The ported script (update_pch) updates all PCH files in ~15 seconds where the old script took ~4500 seconds. In addition, the new script supports 3-tiered headers (system, module, and local) and is very flexible to support other improvement. It has a per-library optimal configuration settings that can be updated using another new scripts (update_pch_autotune.sh) which finds optimal per-PCH settings. PCH files have been generated using the new scripts which builds significantly faster (2-3x, depending on module and configuration) and the intermediate binaries are noticably smaller (by several GBs). The new script stamps each generated PCH file with the command that generated it to make it trivial for users to update them, and also adds the command to invoke another script (update_pch_bisect) that helps find missing headers or conflicting headers that may break the build after updating the PCH. Finally update_pch has built-in unit-tests for makefile parsing and other core functionality. Change-Id: Ib933b50e50374d7e2e7e3e95ba8799b0cc8a27fa Reviewed-on: https://gerrit.libreoffice.org/19965 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>