[Pen-commits] SF.net SVN: pen:[124] src/drag.py

[<mdg...@us...>]

Revision: 124
          http://pen.svn.sourceforge.net/pen/?rev=124&view=rev
Author:   mdgeorge
Date:     2008-12-04 14:58:24 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Fixed a problem with the color on an older pygame.

Modified Paths:
--------------
    src/drag.py

Modified: src/drag.py
===================================================================
--- src/drag.py	2008-12-04 14:45:06 UTC (rev 123)
+++ src/drag.py	2008-12-04 14:58:24 UTC (rev 124)
@@ -231,8 +231,8 @@
 
 	# hole
 	surf = pygame.Surface((100,100))
+	surf.set_colorkey((0,0,0))
 	surf.fill((255,255,255))
-	surf.set_colorkey((0,0,0))
 	draw.rect(surf, (0,0,0), ((30,30), (40,40)))
 	sprite = DirtySprite()
 	sprite.base = surf
@@ -240,12 +240,24 @@
 	sprite.mask = pygame.mask.from_surface(surf)
 	sprites.append(sprite)
 
+	# draw highlighted versions
 	for s in sprites:
+		# fill contact with blue
+		s.contact = s.base.copy()
+		s.contact.fill((0,0,255))
+
+		# mask out the holes
+		s.base.set_colorkey((255,255,255))
+		s.contact.blit(s.base, (0,0))
+
+		# set the colorkeys
+		s.base.set_colorkey((0,0,0))
+		s.contact.set_colorkey((0,0,0))
+
 		s.image   = s.base
-		s.contact = s.base.copy()
-		s.contact.fill((0,0,255), None, BLEND_RGB_MULT)
 		s.rect.move_ip((300,300))
 
+
 	screen  = pygame.display.set_mode((1024, 768))
 	bg      = pygame.Surface((1024,768))
 	debug   = False
@@ -287,20 +299,31 @@
 		elif event.type == KEYDOWN and event.key == K_TAB:
 			debug = not debug
 		elif event.type == KEYDOWN and event.key == K_SPACE:
+			sprite = DirtySprite()
+
 			surf = pygame.Surface((100,100))
 			surf.set_colorkey((0,0,0))
 			draw.circle(surf, (255,255,255), surf.get_rect().center, 45)
-			label = pygame.font.Font(None, 20).render(str(len(circles)+1), False, (127,127,127), (255,255,255))
+			label = pygame.font.Font(None, 20).render(str(len(circles)+1), False, (0,0,0), (255,255,255))
 			rect  = label.get_rect()
 			rect.center = surf.get_rect().center
 			surf.blit(label, rect)
-			sprite = DirtySprite()
-			sprite.base = surf
-			sprite.contact = sprite.base.copy()
-			sprite.contact.fill((0,0,255), None, BLEND_RGB_MULT)
-			sprite.image = sprite.base
-			sprite.rect = surf.get_rect()
-			sprite.mask = pygame.mask.from_surface(surf)
+
+			sprite.base  = surf
+			sprite.image = surf
+			sprite.rect  = surf.get_rect()
+			sprite.mask  = pygame.mask.from_surface(surf)
+
+			surf = pygame.Surface((100,100))
+			surf.set_colorkey((0,0,0))
+			draw.circle(surf, (0,0,255), surf.get_rect().center, 45)
+			label = pygame.font.Font(None, 20).render(str(len(circles)+1), False, (255,255,255), (0,0,255))
+			rect  = label.get_rect()
+			rect.center = surf.get_rect().center
+			surf.blit(label, rect)
+
+			sprite.contact = surf
+
 			drawman.add(sprite)
 			dragman.add(sprite)
 			circles.append(sprite)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.