Merge branch 'performance'

Conflicts:
	config/Outdoor.xml
	util/ColorOps.py

1 files changed, 6 insertions, 0 deletions

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()