aboutsummaryrefslogtreecommitdiff
path: root/renderers
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2011-01-04 17:23:30 -0500
committerGravatar rcoh <rcoh@mit.edu>2011-01-04 17:23:30 -0500
commit1679719e7ca8ce433c5714474a32c926161dc5b8 (patch)
treedc75dc66ee8695fe786df2b48c0e6911332ed7c5 /renderers
parent395e99394ead5d0d656e74fed23dc780652b6090 (diff)
Some performance improvements -- we also synchronize all the frames, giving us a meaning that even
if things slow down, rendering doesn't look weird.
Diffstat (limited to 'renderers')
-rw-r--r--renderers/IndoorRenderer.py6
-rw-r--r--renderers/PygameRenderer.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/renderers/IndoorRenderer.py b/renderers/IndoorRenderer.py
index 0ee566a..5f8546a 100644
--- a/renderers/IndoorRenderer.py
+++ b/renderers/IndoorRenderer.py
@@ -1,6 +1,7 @@
from operationscore.Renderer import *
import util.PacketComposition as composer
import util.NetworkOps as network
+import util.TimeOps as timeops
import socket,pdb
sock_port = 6038
#Renderer for a Specific Light System.
@@ -19,7 +20,7 @@ class IndoorRenderer(Renderer):
for stripId in stripsInPowerSupply:
self.stripLocations[stripId] = (ip, \
stripsInPowerSupply[stripId])
- def render(self, lightSystem):
+ def render(self, lightSystem, currentTime=timeops.time()):
try:
for pixelStrip in lightSystem.pixelStrips:
stripId = pixelStrip.argDict['Id']
@@ -27,9 +28,8 @@ class IndoorRenderer(Renderer):
if not ip in self.sockets: #do we have a socket to this
#strip? if not, spin off a new one
self.sockets[ip] = network.getConnectedSocket(ip,sock_port)
- packet = composer.composePixelStripPacket(pixelStrip, port)
+ packet = composer.composePixelStripPacket(pixelStrip, port, currentTime)
self.sockets[ip].send(packet, 0x00)
- #pdb.set_trace()
except Exception as inst:
print inst
diff --git a/renderers/PygameRenderer.py b/renderers/PygameRenderer.py
index a10700b..24b2d08 100644
--- a/renderers/PygameRenderer.py
+++ b/renderers/PygameRenderer.py
@@ -1,5 +1,5 @@
from operationscore.Renderer import *
-import util.TimeOps as clock
+import util.TimeOps as timeops
import pygame
from pygame.locals import *
import pdb
@@ -10,13 +10,13 @@ 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 = timeops.Stopwatch()
self.stopwatch.start()
- def render(self, lightSystem):
+ def render(self, lightSystem, currentTime=timeops.time()):
self.background.fill(Color('Black'))
#print 'drawing color:',light.color
for light in lightSystem:
- pygame.draw.circle(self.background, light.state(), light.location, \
+ pygame.draw.circle(self.background, light.state(currentTime), light.location, \
light.radius)
self.screen.blit(self.background, (0,0))