Merge branch 'conner5' of https://github.com/dxiao/SmootLight into dxiao-conner5

Conflicts:
	config/C5Sign.xml
	layouts/SpecifiedLayout.py

1 files changed, 7 insertions, 2 deletions

diff --git a/renderers/PygameRenderer.py b/renderers/PygameRenderer.py
index bc50360..8be272c 100644
--- a/renderers/PygameRenderer.py
+++ b/renderers/PygameRenderer.py
@@ -18,9 +18,14 @@ class PygameRenderer(Renderer):
     def render(self, lightSystem, currentTime=timeops.time()):
         self.background.fill(Color(0,0,0))
         #print 'drawing color:',light.color
+        if 'Scale' in self:
+            scale = self['Scale']
+        else:
+            scale = 1
         for light in lightSystem:
-            pygame.draw.circle(self.background, light.state(currentTime), light.location, \
-                light.radius)
+            scaledLoc = [l*scale for l in light.location] 
+            pygame.draw.circle(self.background, light.state(currentTime), scaledLoc, \
+                5)
 
         self.screen.blit(self.background, (0,0))
         pygame.display.flip()