ooo-build r13098 - in trunk: . patches/dev300

From: brosenk svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13098 - in trunk: . patches/dev300
Date: Mon, 7 Jul 2008 18:51:06 +0000 (UTC)
Author: brosenk
Date: Mon Jul  7 18:51:05 2008
New Revision: 13098
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13098&view=rev

Log:
m22-ify transogl-more-transitions.diff


Added:
   trunk/patches/dev300/transogl-more-transitions-m21.diff
      - copied unchanged from r13097, /trunk/patches/dev300/transogl-more-transitions.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/transogl-more-transitions.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 18:51:05 2008
@@ -1707,7 +1707,14 @@
 transogl-transitions-sd.diff
 transogl-transitions-officecfg.diff
 transogl-transitions-scp2.diff
+
+[ OpenGLTransitions <= dev300-m21 ]
+transogl-more-transitions-m21.diff
+
+[ OpenGLTransitions >= dev300-m22 ]
 transogl-more-transitions.diff
+
+[ OpenGLTransitions ]
 transogl-vsync.diff
 transogl-shader-transitions.diff
 transogl-mesa-fallback.diff

Modified: trunk/patches/dev300/transogl-more-transitions.diff
==============================================================================
--- trunk/patches/dev300/transogl-more-transitions.diff	(original)
+++ trunk/patches/dev300/transogl-more-transitions.diff	Mon Jul  7 18:51:05 2008
@@ -1,7 +1,25 @@
-diff -rup ../ooh680-m5.orig/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
---- ../ooh680-m5.orig/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-01-18 14:03:44.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-02-11 15:57:57.000000000 +0100
-@@ -146,6 +146,10 @@ private:    
+--- sd/xml/transitions-ogl.toglmt~	2008-01-29 09:34:14.000000000 +0100
++++ sd/xml/transitions-ogl	2008-07-07 20:28:41.984845429 +0200
+@@ -30,4 +30,16 @@
+  <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:seq>
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.toglmt~	2008-06-24 14:05:08.000000000 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-07 20:45:35.814847497 +0200
+@@ -160,6 +160,10 @@ private:    
      /** Our Transition to be used.
      */    
      OGLTransitionImpl* pTransition;
@@ -12,85 +30,134 @@
  };
  
  void OGLTransitionerImpl::initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double)
-@@ -271,8 +275,11 @@ void OGLTransitionerImpl::initWindowFrom
-                                  vi,
-                                  0,
-                                  GL_TRUE);
--
+@@ -331,6 +335,8 @@ void OGLTransitionerImpl::initWindowFrom
+ 	wglMakeCurrent(GLWin.hDC,GLWin.hRC);
+ #elif defined( UNX )
      glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
-+
 +    /* TODO: check for version once the bug in fglrx driver is fixed */
 +    bBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
-+
+ #endif
      glEnable(GL_CULL_FACE);
      glCullFace(GL_BACK);
-     glClearColor (0, 0, 0, 0);
-@@ -417,28 +417,48 @@ void OGLTransitionerImpl::GLInitSlides()
+@@ -576,6 +582,7 @@ void OGLTransitionerImpl::GLInitSlides()
      
      glGenTextures(1, &GLleavingSlide);
  	glBindTexture(GL_TEXTURE_2D, GLleavingSlide);
--	gluBuild2DMipmaps(GL_TEXTURE_2D, internalFormat , SlideSize.Width, SlideSize.Height, Format, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
++
+     if( !pDetectedFormat )
+     {
+         // force-convert color to ARGB8888 int color space  
+@@ -590,18 +597,7 @@ void OGLTransitionerImpl::GLInitSlides()
+                           GL_RGBA, 
+                           GL_UNSIGNED_BYTE,
+                           &tempBytes[0]);
+-    }
+-    else
+-    {
+-        gluBuild2DMipmaps(GL_TEXTURE_2D, 
+-                          pDetectedFormat->nInternalFormat, 
+-                          SlideSize.Width, 
+-                          SlideSize.Height, 
+-                          pDetectedFormat->eFormat, 
+-                          pDetectedFormat->eType, 
+-                          &LeavingBytes[0]);
+-    }
 -    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
--	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
--	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
--	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
--	GLfloat largest_supported_anisotropy;
--	glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
--	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);//anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
--	
-+    if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-+        glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
 +        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
-+    } else {
-+        gluBuild2DMipmaps(GL_TEXTURE_2D, internalFormat, SlideSize.Width, SlideSize.Height, Format, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //TRILINEAR FILTERING
-+
-+        //anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
-+        GLfloat largest_supported_anisotropy;
-+        glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
-+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
+ 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
+ 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+ 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
+@@ -609,6 +605,34 @@ void OGLTransitionerImpl::GLInitSlides()
+ 	glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
+ 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);//anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
+ 	
++    }
++    else
++    {
++	if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
++	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.width,
++			 SlideSize.Height, &LeavingBytes[0]);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
++	} else {
++            gluBuild2DMipmaps(GL_TEXTURE_2D, 
++                              pDetectedFormat->nInternalFormat, 
++                              SlideSize.Width, 
++                              SlideSize.Height, 
++                              pDetectedFormat->eFormat, 
++                              pDetectedFormat->eType, 
++                              &LeavingBytes[0]);
++            glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
++	    //anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
++	    GLfloat largest_supported_anisotropy;
++	    glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
++	    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
 +	}
++    }
  	OSL_ENSURE(glIsTexture(GLleavingSlide), "Can't generate Leaving slide textures in OpenGL");
  	
  	glDeleteTextures(1,&GLenteringSlide);
- 	
- 	glGenTextures(1, &GLenteringSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLenteringSlide);
--	gluBuild2DMipmaps(GL_TEXTURE_2D, internalFormat , SlideSize.Width, SlideSize.Height, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
+@@ -629,23 +653,42 @@ void OGLTransitionerImpl::GLInitSlides()
+                           GL_RGBA, 
+                           GL_UNSIGNED_BYTE,
+                           &tempBytes[0]);
+-    }
+-    else
+-    {
+-        gluBuild2DMipmaps(GL_TEXTURE_2D, 
+-                          pDetectedFormat->nInternalFormat, 
+-                          SlideSize.Width, 
+-                          SlideSize.Height, 
+-                          pDetectedFormat->eFormat, 
+-                          pDetectedFormat->eType, 
+-                          &EnteringBytes[0]);
+-    }
 -    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
--	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
--	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
--	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
--	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);//anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
--	
-+    if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-+        glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
-+    } else {
-+        gluBuild2DMipmaps(GL_TEXTURE_2D, internalFormat, SlideSize.Width, SlideSize.Height, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
 +        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-+        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
-+
-+        //anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
-+        GLfloat largest_supported_anisotropy;
-+        glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
-+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
+ 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
+ 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+ 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
++	GLfloat largest_supported_anisotropy;
++	glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
+ 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);//anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
+ 	
++    }
++    else
++    {
++	if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
++	    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
++	} else {
++            gluBuild2DMipmaps(GL_TEXTURE_2D, 
++                              pDetectedFormat->nInternalFormat, 
++                              SlideSize.Width, 
++                              SlideSize.Height, 
++                              pDetectedFormat->eFormat, 
++                              pDetectedFormat->eType, 
++                              &EnteringBytes[0]);
++            glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
++	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);//TRILINEAR FILTERING
++	    //anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
++	    GLfloat largest_supported_anisotropy;
++	    glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
++	    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
++	
 +	}
++    }
  	OSL_ENSURE( glIsTexture(GLenteringSlide), "Can't generate entering slide textures in OpenGL" );
  }
  
-@@ -509,26 +529,32 @@ public:
+@@ -737,26 +780,32 @@ public:
      // XTransitionFactory
      virtual ::sal_Bool SAL_CALL hasTransition( ::sal_Int16 transitionType, ::sal_Int16 transitionSubType ) throw (uno::RuntimeException)
      {
@@ -142,7 +209,7 @@
      }
  
      virtual uno::Reference< presentation::XTransition > SAL_CALL createTransition( 
-@@ -539,44 +563,59 @@ public:
+@@ -767,44 +816,59 @@ public:
          const uno::Reference< rendering::XBitmap >&           enteringBitmap, 
          const geometry::RealPoint2D&                          slideOffset ) throw (uno::RuntimeException)
      {
@@ -239,19 +306,17 @@
          }
  
          rtl::Reference<OGLTransitionerImpl> xRes(
-Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionerImpl.cxx.~1.3.2.1.~
-diff -rup ../ooh680-m5.orig/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
---- ../ooh680-m5.orig/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-02-11 13:45:46.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-02-08 15:37:31.000000000 +0100
-@@ -34,6 +34,7 @@
-  ************************************************************************/
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx.toglmt~	2008-07-07 20:27:31.875846382 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-07-07 20:28:41.980845898 +0200
+@@ -30,6 +30,7 @@
  #include "OGLTrans_TransitionImpl.hxx"
+ 
  #include <GL/gl.h>
 +#include <math.h>
  
+ 
  void OGLTransitionImpl::clear()
- {
-@@ -46,7 +47,7 @@ void OGLTransitionImpl::clear()
+@@ -43,7 +44,7 @@ void OGLTransitionImpl::clear()
          delete maSceneObjects[i];
      maSceneObjects.clear();
  
@@ -260,7 +325,7 @@
  }
  
  OGLTransitionImpl::~OGLTransitionImpl()
-@@ -73,23 +74,25 @@ static void blendSlide( double depth )
+@@ -70,23 +71,25 @@ static void blendSlide( double depth )
      double showHeight = -1 + depth*2;
      GLfloat reflectionColor[] = {0, 0, 0, 0.25};
  
@@ -294,7 +359,7 @@
  }
  
  void OGLTransitionImpl::display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex,
-@@ -100,8 +103,13 @@ void OGLTransitionImpl::display( double 
+@@ -97,8 +100,13 @@ void OGLTransitionImpl::display( double 
      SlideWidthScale = SlideWidth/DispWidth;
      SlideHeightScale = SlideHeight/DispHeight;
  
@@ -309,7 +374,7 @@
          double reflectionDepth = 0.3;
          double surfaceLevel = -0.04;
  
-@@ -148,18 +156,28 @@ void OGLTransitionImpl::applyOverallOper
+@@ -145,18 +153,28 @@ void OGLTransitionImpl::applyOverallOper
          OverallOperations[i]->interpolate(nTime,SlideWidthScale,SlideHeightScale);
  }
  
@@ -347,7 +412,7 @@
  }
  
  void OGLTransitionImpl::displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight )
-@@ -300,6 +318,8 @@ void OGLTransitionImpl::makeFallLeaving(
+@@ -298,6 +316,8 @@ void OGLTransitionImpl::makeFallLeaving(
  
      Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(1,0,0),basegfx::B3DVector(0,-1,0), 90,true,0.0,1.0));
      maLeavingSlidePrimitives.push_back(Slide);
@@ -356,7 +421,7 @@
  }
  
  void OGLTransitionImpl::makeTurnAround()
-@@ -307,7 +327,7 @@ void OGLTransitionImpl::makeTurnAround()
+@@ -305,7 +325,7 @@ void OGLTransitionImpl::makeTurnAround()
      clear();
      Primitive Slide;
  
@@ -365,7 +430,7 @@
      
      Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
      Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
-@@ -334,6 +354,8 @@ void OGLTransitionImpl::makeTurnDown()
+@@ -332,6 +352,8 @@ void OGLTransitionImpl::makeTurnDown()
      Slide.Operations.push_back(new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(-1, 1, 0), -90, true, 0.0, 1.0));
      Slide.Operations.push_back(new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(-1, 1, 0), 90, false, -1.0, 0.0));
      maEnteringSlidePrimitives.push_back(Slide);
@@ -374,7 +439,7 @@
  }
  
  void OGLTransitionImpl::makeIris()
-@@ -345,8 +367,8 @@ void OGLTransitionImpl::makeIris()
+@@ -343,8 +365,8 @@ void OGLTransitionImpl::makeIris()
      Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
      maEnteringSlidePrimitives.push_back (Slide);
  
@@ -385,7 +450,7 @@
      maLeavingSlidePrimitives.push_back (Slide);
  
  
-@@ -399,6 +421,8 @@ void OGLTransitionImpl::makeIris()
+@@ -397,6 +419,8 @@ void OGLTransitionImpl::makeIris()
      }
  
      maSceneObjects.push_back (pIris);
@@ -394,7 +459,7 @@
  }
  
  void OGLTransitionImpl::makeRochade()
-@@ -406,7 +430,7 @@ void OGLTransitionImpl::makeRochade()
+@@ -404,7 +428,7 @@ void OGLTransitionImpl::makeRochade()
      clear();
      Primitive Slide;
      
@@ -403,7 +468,7 @@
  
      double w, h;
  
-@@ -655,6 +679,13 @@ RotateAndScaleDepthByWidth::RotateAndSca
+@@ -653,6 +677,13 @@ RotateAndScaleDepthByWidth::RotateAndSca
      bInterpolate = bInter;
  }
  
@@ -417,7 +482,7 @@
  
  STranslate::STranslate(const basegfx::B3DVector& Vector, bool bInter, double T0, double T1):vector(Vector)
  {
-@@ -714,6 +745,18 @@ void RotateAndScaleDepthByWidth::interpo
+@@ -712,6 +743,18 @@ void RotateAndScaleDepthByWidth::interpo
      glTranslated(-SlideWidthScale*origin.getX(),-SlideHeightScale*origin.getY(),-SlideWidthScale*origin.getZ());
  }
  
@@ -436,7 +501,7 @@
  SEllipseTranslate::SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1)
  {
      nT0 = T0;
-@@ -766,6 +809,11 @@ RotateAndScaleDepthByWidth* RotateAndSca
+@@ -764,6 +807,11 @@ RotateAndScaleDepthByWidth* RotateAndSca
      return new RotateAndScaleDepthByWidth(*this);
  }
  
@@ -448,7 +513,7 @@
  const Primitive& Primitive::operator=(const Primitive& rvalue)
  {
      for(unsigned int i( 0 ); i < rvalue.Operations.size(); ++i)
-@@ -833,3 +881,108 @@ void Primitive::pushTriangle(const baseg
+@@ -831,3 +879,108 @@ void Primitive::pushTriangle(const baseg
      Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed.
      Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed.
  }
@@ -557,10 +622,9 @@
 +    mmDisplaySlides = &OGLTransitionImpl::displaySlidesFadeSmoothly;
 +    mbUseMipMapLeaving = mbUseMipMapEntering = false;
 +}
-diff -rup ../ooh680-m5.orig/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
---- ../ooh680-m5.orig/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2008-02-11 13:45:46.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2008-02-08 12:27:43.000000000 +0100
-@@ -53,9 +53,14 @@ class OGLTransitionImpl
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.toglmt~	2008-07-07 20:27:31.876846509 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2008-07-07 20:31:23.258846593 +0200
+@@ -62,9 +62,14 @@ class OGLTransitionImpl
  {
  public:
      OGLTransitionImpl() :
@@ -576,7 +640,7 @@
      {}
  
      ~OGLTransitionImpl();
-@@ -74,6 +79,17 @@ public:
+@@ -83,6 +88,17 @@ public:
      void makeTurnDown();
      void makeIris();
      void makeRochade();
@@ -594,36 +658,36 @@
  
  private:
      /** clears all the primitives and operations
-@@ -99,11 +115,27 @@ private:
-     /** Whether to reflect slides, the reflection happens on flat surface beneath the slides.
-      ** Now it only works with slides which keep their rectangular shape together.
-      */
--    bool bReflectSlides;
-+    bool mbReflectSlides;
-+
-+    /** When this method is not NULL, it is called in display method to prepare the slides, scene, etc.
-+     ** We might later replace this by cleaner derived class.
-+     */
-+    void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
-+
-+    /** When this method is not NULL, it is called in display method to display the slides.
-+     ** We might later replace this by cleaner derived class.
-+     */
-+    void (OGLTransitionImpl::*mmDisplaySlides)( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
- 
-     void displaySlides( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-+    void displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives, double SlideWidthScale, double SlideHeightScale );
-     void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
-     void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );
-+
-+    /** various transitions helper methods
-+     */
-+    void prepareDiamond( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
-+    void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
+@@ -108,11 +124,27 @@ private:
+ 	/** Whether to reflect slides, the reflection happens on flat surface beneath the slides.
+ 	 ** Now it only works with slides which keep their rectangular shape together.
+ 	 */
+-	bool bReflectSlides;
++	bool mbReflectSlides;
++
++	/** When this method is not NULL, it is called in display method to prepare the slides, scene, etc.
++	 ** We might later replace this by cleaner derived class.
++	 */
++	void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
++
++	/** When this method is not NULL, it is called in display method to display the slides.
++	 ** We might later replace this by cleaner derived class.
++	 */
++	void (OGLTransitionImpl::*mmDisplaySlides)( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
+ 
+ 	void displaySlides( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
++	void displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives, double SlideWidthScale, double SlideHeightScale );
+ 	void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
+ 	void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );
++
++	/** various transitions helper methods
++	 */
++	void prepareDiamond( double nTime, double SlideWidth, double SlideHeight,double DispWidth, double DispHeight );
++	void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
  };
  
  class SceneObject
-@@ -410,5 +442,21 @@ private:
+@@ -419,5 +451,21 @@ private:
  	double angle;
  };
  
@@ -645,22 +709,3 @@
 +
  #endif // INCLUDED_SLIDESHOW_TRANSITION_HXX_
  
---- sd/xml-orig/transitions-ogl	2008-02-13 09:19:54.000000000 +0100
-+++ sd/xml/transitions-ogl	2008-02-15 12:51:49.000000000 +0100
-@@ -30,4 +30,16 @@
-  <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:seq>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]