diff options
| -rw-r--r-- | operationscore/PixelEvent.py | 2 | ||||
| -rw-r--r-- | renderers/PygameRenderer.py | 6 | ||||
| -rw-r--r-- | util/ColorOps.py | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/operationscore/PixelEvent.py b/operationscore/PixelEvent.py index e2b852a..6b0812f 100644 --- a/operationscore/PixelEvent.py +++ b/operationscore/PixelEvent.py @@ -11,6 +11,8 @@ class PixelEvent(SmootCoreObject): pass #Returns a new PixelEvent, but with a response scaled by c. def scale(self,c): + if c == 1: + return self newDict = dict(self.argDict) newDict['Color'] = color.multiplyColor(newDict['Color'], c) return self.__class__(newDict) diff --git a/renderers/PygameRenderer.py b/renderers/PygameRenderer.py index 6f7f65b..a10700b 100644 --- a/renderers/PygameRenderer.py +++ b/renderers/PygameRenderer.py @@ -1,4 +1,5 @@ from operationscore.Renderer import * +import util.TimeOps as clock import pygame from pygame.locals import * import pdb @@ -9,6 +10,8 @@ class PygameRenderer(Renderer): self.background = pygame.Surface(self.screen.get_size()) self.background = self.background.convert() self.background.fill(Color('Black')) + self.stopwatch = clock.Stopwatch() + self.stopwatch.start() def render(self, lightSystem): self.background.fill(Color('Black')) #print 'drawing color:',light.color @@ -18,3 +21,6 @@ class PygameRenderer(Renderer): self.screen.blit(self.background, (0,0)) pygame.display.flip() + self.stopwatch.stop() + pygame.display.set_caption(str(int(1000/self.stopwatch.elapsed()))) + self.stopwatch.start() diff --git a/util/ColorOps.py b/util/ColorOps.py index da1e704..143444f 100644 --- a/util/ColorOps.py +++ b/util/ColorOps.py @@ -1,4 +1,5 @@ import random +from util.TimeOps import Stopwatch def randomColor(): return [random.randint(0,255) for i in range(3)] def chooseRandomColor(colorList): |