Changeset 8605 for trunk/src

Timestamp:

Jun 8, 2002, 4:20:07 PM (23 years ago)

Author:

sandervl

Message:

correct clipper bugfix

Location:

trunk/src/ddraw

Files:

• OS2SURFACE.CPP (modified) (2 diffs)
• oslibgpi.cpp (modified) (3 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.41 2002-06-08 11:45:19 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.42 2002-06-08 14:20:06 sandervl Exp $ */
 
 /*
@@ -2479 +2479 @@
                       for(i=0;i<lpRgnData->rdh.nCount;i++) 
                       {
+                          //win32 -> os2 coordinates (region data in screen coordinates)
                           temp               = pRectl[i].yTop;
-                          pRectl[i].yTop     = dest->DDSurfaceDesc.dwHeight - pRectl[i].yBottom;
-                          pRectl[i].yBottom  = dest->DDSurfaceDesc.dwHeight - temp;
+                          pRectl[i].yTop     = src->lpDraw->GetScreenHeight() - pRectl[i].yBottom;
+                          pRectl[i].yBottom  = src->lpDraw->GetScreenHeight() - temp;
                           dprintf(("(%d,%d)(%d,%d)", pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
+
                           //clip rectangle must be relative to lScreenPos
                           pRectl[i].xLeft   -= sBlt.lScreenPosX;

trunk/src/ddraw/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.4 2002-06-08 11:45:20 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.5 2002-06-08 14:20:07 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
     }
     hrgnVis = GreCreateRectRegion(hps, &rcl, 1);
-
-    //If there's an update region, use it. else get visible region
-    lComplexity = WinQueryUpdateRegion(hwndClientOS2, hrgnVis);
-    if(lComplexity == RGN_ERROR || lComplexity == RGN_NULL) 
-    {
-        dprintf(("No update region; take visible region"));
-        GreCopyClipRegion(hps, hrgnVis, 0, COPYCRGN_VISRGN);
-    }
+    GreCopyClipRegion(hps, hrgnVis, 0, COPYCRGN_VISRGN);
 
     RGNRECT rgnRect;
@@ -78 +71 @@
     }
     for(i=0;i<rgnRect.crcReturned;i++) {
-        dprintf(("Region rect %d (%d,%d)(%d,%d)", i, pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
-        //rectangle is in window coordinate; convert to screen
-        WinMapWindowPoints(hwndClientOS2, HWND_DESKTOP, (PPOINTL)&pRectl[i], 2);
         dprintf(("Region rect %d (%d,%d)(%d,%d)", i, pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
         temp = pRectl[i].yTop;