ooo-build r11233 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Wed Jan  9 15:30:42 2008
New Revision: 11233
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11233&view=rev

Log:
fix ogl transitions on solaris 11

Modified:
   trunk/ChangeLog
   trunk/patches/src680/transogl01-transitions.diff

Modified: trunk/patches/src680/transogl01-transitions.diff
==============================================================================
--- trunk/patches/src680/transogl01-transitions.diff	(original)
+++ trunk/patches/src680/transogl01-transitions.diff	Wed Jan  9 15:30:42 2008
@@ -432,6 +432,15 @@
  }
  
  // TODO(Q3): extract to basegfx
+@@ -237,7 +544,7 @@
+         NextRadius += dRadius;
+     }
+     {
+-        Radius = sqrt(2);
++        Radius = sqrt(2.0);
+         Primitive LeavingSlide;
+         Primitive EnteringSlide;
+         for(int Side(0); Side < nPointsOnCircles - 1; ++Side)
 @@ -408,6 +629,34 @@ void RotateAndScaleDepthByWidth::interpo
      glTranslated(-SlideWidthScale*origin.getX(),-SlideHeightScale*origin.getY(),-SlideWidthScale*origin.getZ());
  }
@@ -479,6 +488,15 @@
  RotateAndScaleDepthByWidth* RotateAndScaleDepthByWidth::clone()
  {
      return new RotateAndScaleDepthByWidth(*this);
+@@ -464,7 +730,7 @@
+     Verts.push_back(basegfx::B3DVector( 2*SlideLocation2.getX() - 1, -2*SlideLocation2.getY() + 1 , 0.0 ));
+ 
+     //figure out if they're facing the correct way, and make them face the correct way.
+-    basegfx::B3DVector Normal( cross( Verts[0] - Verts[1] , Verts[1] - Verts[2] ) );
++    basegfx::B3DVector Normal( basegfx::cross( Verts[0] - Verts[1] , Verts[1] - Verts[2] ) );
+     if(Normal.getZ() >= 0.0)//if the normal is facing us
+     {
+         Texs.push_back(SlideLocation0);
 @@ -494,4 +750,3 @@ 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.