Changeset 587 for trunk/src/ddraw/OS2PALETTE.CPP

Timestamp:

Aug 19, 1999, 8:08:48 PM (26 years ago)

Author:

hugh

Message:

Implemented new colorconversion routine and fixed bug in fastblt function.
Changed the palettehandling code

File:

• trunk/src/ddraw/OS2PALETTE.CPP (modified) (8 diffs)

trunk/src/ddraw/OS2PALETTE.CPP

@@ -4 +4 @@
 #include <memory.h>
 #define INITGUID
+#include "os2ddraw.h"
+#include "os2clipper.h"
 #include "os2palette.h"
+#include "os2surface.h"
 #define _OS2WIN_H
 #define FAR
@@ -11 +14 @@
 #include <winerror.h>
 
-//******************************************************************************
-//******************************************************************************
-OS2IDirectDrawPalette::OS2IDirectDrawPalette( OS2IDirectDraw *lpDirectDraw,
+#undef THIS
+#define THIS IDirectDrawPalette*
+
+//******************************************************************************
+//******************************************************************************
+OS2IDirectDrawPalette::OS2IDirectDrawPalette( VOID *lpDirectDraw,
                                               int palsize,
                                               LPPALETTEENTRY lpColorTable,
@@ -19 +25 @@
                                               Referenced(0), os2pal(NULL),
                                               lastError(DD_OK), lpDraw(NULL)
+
 {
   lpVtbl              = &Vtbl;
@@ -30 +37 @@
 
   lpDraw                        = lpDirectDraw;
-  lpDraw->Vtbl.AddRef(lpDraw);
-  hDive                         = lpDirectDraw->GetDiveInstance();
+  ((OS2IDirectDraw*)lpDraw)->Vtbl.AddRef(lpDraw);
+  hDive                         = ((OS2IDirectDraw*)lpDirectDraw)->GetDiveInstance();
   dwCaps                        = dwPalFlags;
+  hDiveCC                       = ((OS2IDirectDraw*)lpDirectDraw)->GetCCDiveInstance();
 
   dwSize = palsize;
@@ -41 +49 @@
   os2pal = (LPPALETTEENTRY)malloc(palsize*sizeof(PALETTEENTRY));
   memcpy((char *)os2pal, (char *)lpColorTable, palsize*sizeof(PALETTEENTRY));
+
+  for(DWORD i=0;i<dwSize;i++)
+  {
+    aPal16[i] = (lpColorTable[i].peBlue>>3) +
+                ((lpColorTable[i].peGreen>>2) <<5) +
+                ((lpColorTable[i].peRed>>3) << 11);
+    aPal24[i] = (lpColorTable[i].peBlue <<8) +
+                (lpColorTable[i].peGreen<<16) +
+                (lpColorTable[i].peRed<<24);
+  }
 }
 //******************************************************************************
@@ -48 +66 @@
   if(os2pal)
     free(os2pal);
-  lpDraw->Vtbl.Release(lpDraw);
+  ((OS2IDirectDraw*)lpDraw)->Vtbl.Release((OS2IDirectDraw*)lpDraw);
 }
 //******************************************************************************
@@ -175 +193 @@
          dwNumEntries*sizeof(PALETTEENTRY));
 
-  if(me->fAttachedToPrimary)
-    me->SetPhysPalette();
-
+  for(DWORD i=0;i<dwNumEntries;i++)
+  {
+    me->aPal16[dwBase+i] = (lpNewEntries[i].peBlue>>3) +
+                           ((lpNewEntries[i].peGreen>>2) <<5) +
+                           ((lpNewEntries[i].peRed>>3) << 11);
+    me->aPal24[dwBase+i] = (lpNewEntries[i].peBlue <<8) +
+                           (lpNewEntries[i].peGreen<<16) +
+                           (lpNewEntries[i].peRed<<24);
+  }
+
+  if(8==((OS2IDirectDraw*)me->lpDraw)->dCaps.ulDepth)
+  {
+    if(me->fAttachedToPrimary)
+      me->SetPhysPalette();
+  }
+  else
+  {
+    if(NULL!=((OS2IDirectDraw*)me->lpDraw)->pPrimSurf)
+      ((OS2IDirectDrawSurface*)((OS2IDirectDraw*)me->lpDraw)->pPrimSurf)->ColorConversion(NULL);;
+  }
+  /*
+  if(NULL!=me->hDiveCC)
+  {
+    DiveSetSourcePalette( me->hDiveCC,
+                          dwBase,
+                          dwNumEntries,
+                          (PBYTE)lpNewEntries);
+
+  }
+  else
+  {
+    // Only usefull if system and game are in 8bit mode
+    // 16bit games don't use palettes and setting the Phys palette
+    // in >8Bit Modes has no effect.
+
+    if(me->fAttachedToPrimary)
+      me->SetPhysPalette();
+  }
+  */
   return(DD_OK);
 }
@@ -199 +253 @@
     return;
   fAttachedToPrimary = fNewVal;
+
+  /*
   if(fAttachedToPrimary)
-    SetPhysPalette();
-
-}
-//******************************************************************************
-//******************************************************************************
-
+  {
+    if(NULL!=hDiveCC)
+      DiveSetSourcePalette( hDiveCC,
+                            0,
+                            255,
+                            (PBYTE)os2pal);
+    else
+      SetPhysPalette();
+  }
+  */
+}
+//******************************************************************************
+//******************************************************************************
+