diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-12-04 06:12:47 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-12-04 06:12:47 -0600 |
| commit | d25c3b2dc3b7ed47910379bfec54ae6d51a2bb2f (patch) | |
| tree | 24a0b699681f1abc843e58528c4994c2e9ae6f11 /sd/xml | |
| parent | 42b4aaf23bf4852ac2fbbe2ec68badad9e95c600 (diff) | |
merge transogl-transitions-sd.diff and transogl-more-transitions.diff
Diffstat (limited to 'sd/xml')
| -rw-r--r-- | sd/xml/makefile.mk | 13 | ||||
| -rw-r--r-- | sd/xml/transitions-ogl.xml | 15 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sd/xml/makefile.mk b/sd/xml/makefile.mk new file mode 100644 index 000000000000..7fe266b6d47f --- /dev/null +++ b/sd/xml/makefile.mk @@ -0,0 +1,13 @@ +PRJ=.. +PRJNAME=sd + +.INCLUDE : settings.mk + +.IF "$(ENABLE_OPENGL)" != "TRUE" +@all: + @echo "Building without OpenGL Transitions..." + @test -f transitions-ogl.xml && mv transitions-ogl.xml transitions-ogl || true +.ELSE +@all: + @test ! -f transitions-ogl.xml && mv transitions-ogl transitions-ogl.xml || true +.ENDIF diff --git a/sd/xml/transitions-ogl.xml b/sd/xml/transitions-ogl.xml index 8db94340611a..ca1e3661c182 100644 --- a/sd/xml/transitions-ogl.xml +++ b/sd/xml/transitions-ogl.xml @@ -30,4 +30,19 @@ <anim:par pres:preset-id="rochade"> <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="bottomRight"/> </anim:par> + <anim:par pres:preset-id="venetian3dv"> + <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="bottomLeft"/> + </anim:par> + <anim:par pres:preset-id="venetian3dh"> + <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="topCenter"/> + </anim:par> + <anim:par pres:preset-id="static"> + <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="rightCenter"/> + </anim:par> + <anim:par pres:preset-id="finedissolve"> + <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="bottomCenter"/> + </anim:par> + <anim:par pres:preset-id="zoom-rotate-in"> + <anim:transitionFilter smil:type="zoom" smil:subtype="rotateIn"/> + </anim:par> </anim:seq> |