[Openrpg-dev] openrpg1/orpg/mapper fog.py,1.27,1.28

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16642/orpg/mapper

Modified Files:
	fog.py 
Log Message:
experimental fog code for OSX

Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** fog.py	12 Feb 2007 02:29:08 -0000	1.27
--- fog.py	3 Mar 2007 00:33:49 -0000	1.28
***************
*** 122,125 ****
--- 122,127 ----
  
          self.color = wx.Color(128,128,128)
+         if "__WXMAC__" in wx.PlatformInfo:
+             self.color = wx.Color(0,0,0, 128)
          self.fogregion = wx.Region()
          self.fogregion.Clear()
***************
*** 187,191 ****
  
          if not self.use_fog:
- 
              self.log.log("Exit fog_layer->recompute_fog(self)", ORPG_DEBUG)
              return
--- 189,192 ----
***************
*** 202,206 ****
  
          if not self.use_fog:
- 
              self.log.log("Exit fog_layer->fill_fog(self)", ORPG_DEBUG)
              return
--- 203,206 ----
***************
*** 261,265 ****
          img = wx.ImageFromBitmap(self.fog_bmp).GetSubImage(wx.Rect(srct[0], srct[1], srcsz[0], srcsz[1]))
          img.Rescale(srcsz[0]*COURSE*sc[0], srcsz[1]*COURSE*sc[1])
!         fog= wx.BitmapFromImage(img)
          mdc.SetDeviceOrigin(-topleft[0], -topleft[1])
          mdc.DrawBitmap(fog, srct[0]*COURSE*sc[0], srct[1]*COURSE*sc[1])
--- 261,266 ----
          img = wx.ImageFromBitmap(self.fog_bmp).GetSubImage(wx.Rect(srct[0], srct[1], srcsz[0], srcsz[1]))
          img.Rescale(srcsz[0]*COURSE*sc[0], srcsz[1]*COURSE*sc[1])
! 
!         fog = wx.BitmapFromImage(img)
          mdc.SetDeviceOrigin(-topleft[0], -topleft[1])
          mdc.DrawBitmap(fog, srct[0]*COURSE*sc[0], srct[1]*COURSE*sc[1])
***************
*** 269,273 ****
          mdc.EndDrawing()
          dc.SetUserScale(1,1)
!         dc.Blit(topleft[0], topleft[1], size[0], size[1], mdc,0,0,wx.AND)
          dc.SetUserScale(sc[0],sc[1])
          mdc.SelectObject(wx.NullBitmap)
--- 270,286 ----
          mdc.EndDrawing()
          dc.SetUserScale(1,1)
!         if "__WXMAC__" in wx.PlatformInfo:
!             gc = wx.GraphicsContext.Create(dc)
!             gc.SetBrush(wx.Brush(wx.BLACK))
!             if (self.canvas.frame.session.role == "GM"):
!                 gc.SetBrush(wx.Brush(self.color))
! 
!             rgn = wx.Region(topleft[0], topleft[1], size[0], size[1])
!             if self.fogregion.GetBox().GetWidth() > 0:
!                 rgn.SubtractRegion(self.fogregion)
!             gc.ClipRegion(rgn)
!             gc.DrawRectangle(topleft[0], topleft[1], size[0], size[1])
!         else:
!             dc.Blit(topleft[0], topleft[1], size[0], size[1], mdc,0,0,wx.AND)
          dc.SetUserScale(sc[0],sc[1])
          mdc.SelectObject(wx.NullBitmap)
***************
*** 321,327 ****
          for i in list:
              if loop == 0:
!                 regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
!                 regn.Union(i.left, i.y, i.right+1-i.left, 1)
              loop += 1
  
--- 334,346 ----
          for i in list:
              if loop == 0:
!                 if "__WXMAC__" in wx.PlatformInfo:
!                     regn = wx.Region(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
!                 else:
!                     regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
!                 if "__WXMAC__" in wx.PlatformInfo:
!                     regn.Union(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
!                 else:
!                     regn.Union(i.left, i.y, i.right+1-i.left, 1)
              loop += 1