openrpg-dev

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

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

Modified Files:
	_canvas.py _fog.py 
Log Message:
Some changes to get the Fog working on *nix and OSX

Index: _canvas.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_canvas.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _canvas.py	27 Feb 2007 03:07:37 -0000	1.3
--- _canvas.py	30 Mar 2007 19:13:03 -0000	1.4
***************
*** 17,23 ****
  from _fog import FogLayer
  
! USE_BUFFER = False
! if "wxMSW" in wx.PlatformInfo:
!     USE_BUFFER = True
  
  class MapCanvas(wx.ScrolledWindow):
--- 17,23 ----
  from _fog import FogLayer
  
! USE_BUFFER = True
! if "wxMAC" in wx.PlatformInfo:
!     USE_BUFFER = False
  
  class MapCanvas(wx.ScrolledWindow):

Index: _fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_fog.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _fog.py	27 Feb 2007 03:07:37 -0000	1.8
--- _fog.py	30 Mar 2007 19:13:03 -0000	1.9
***************
*** 27,34 ****
          for point in self.canvas.fogRegion:
              if point == 's' or point == 'h':
!                 if lp == 's':
                      self.region.XorRegion(wx.RegionFromPoints(points))
                      self.region.SubtractRegion(wx.RegionFromPoints(points))
!                 else:
                      self.region.UnionRegion(wx.RegionFromPoints(points))
                  lp = point
--- 27,34 ----
          for point in self.canvas.fogRegion:
              if point == 's' or point == 'h':
!                 if lp == 's' and len(points) > 0:
                      self.region.XorRegion(wx.RegionFromPoints(points))
                      self.region.SubtractRegion(wx.RegionFromPoints(points))
!                 elif len(points) > 0:
                      self.region.UnionRegion(wx.RegionFromPoints(points))
                  lp = point
***************
*** 37,46 ****
                  points.append((point.x, point.y))
  
! 
!         if lp == 's':
!             self.region.XorRegion(wx.RegionFromPoints(points))
!             self.region.SubtractRegion(wx.RegionFromPoints(points))
!         else:
!             self.region.UnionRegion(wx.RegionFromPoints(points))
  
          dc.ClipRegion(self.region)
--- 37,46 ----
                  points.append((point.x, point.y))
  
!         if len(points) > 0:
!             if lp == 's':
!                 self.region.XorRegion(wx.RegionFromPoints(points))
!                 self.region.SubtractRegion(wx.RegionFromPoints(points))
!             else:
!                 self.region.UnionRegion(wx.RegionFromPoints(points))
  
          dc.ClipRegion(self.region)