Mercurial > hg > mood-conductor
changeset 51:41ab44a85497 moodplay
shoreditch changes - default neutral and reconnect
| author | alo |
|---|---|
| date | Mon, 15 Jun 2015 07:12:54 -0700 |
| parents | fe0ef9e24fee |
| children | 4455a77435b0 |
| files | visualclient2/gradients.pyc visualclient2/visclient.py |
| diffstat | 2 files changed, 29 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/visualclient2/visclient.py Mon May 11 10:55:03 2015 +0100 +++ b/visualclient2/visclient.py Mon Jun 15 07:12:54 2015 -0700 @@ -36,7 +36,7 @@ moods = [] universe = 1 -totalActiveFixtures = 6 +totalActiveFixtures = 2 totalPassiveFixtures = 0 ambicol = (224, 184, 30, 255) @@ -84,7 +84,7 @@ SCIP = "127.0.0.1" SCPORT = 57120 OSCADDR = "/mood-conductor-sc" -HTTP_TIMEOUT = 3 +HTTP_TIMEOUT = 7 SERVER_UPDATE_INTERVAL = 0.8 def DmxSent(state): @@ -237,7 +237,9 @@ #print (self.c[0],self.c[1],self.c[2],self.alpha) - alphalight = int(self.alpha*0.35) + #less brightness + #alphalight = int(self.alpha * 0.4) + alphalight = self.alpha #for x in range(0, 3): # dmxdata.append(alphalight) @@ -245,12 +247,25 @@ # dmxdata.append(0) # dmxdata.append(0) + #r,g,b = map(lambda i: int(math.pow((self.c[i]/255),0.7)*255),[0,1,2]) for x in range(0, totalActiveFixtures): #on SlimPAR_Pro_TRI: Brightness, R, G, B dmxdata.append(alphalight) - dmxdata.append(self.c[0]) - dmxdata.append(self.c[1]) - dmxdata.append(self.c[2]) + #dmxdata.append(r) + #dmxdata.append(g) + #dmxdata.append(b) + if self.x <0.3 and self.y <0.3: + dmxdata.append(0) + else: + dmxdata.append(self.c[0]) + if self.x < 0.2: + dmxdata.append(0) + else: + dmxdata.append(self.c[1]) + if self.x > 0.5 and self.y > 0.7: + dmxdata.append(0) + else: + dmxdata.append(self.c[2]) for x in range(0, totalPassiveFixtures): #DMX address starts at 1 + totalActiveFixtures x 4 @@ -259,7 +274,7 @@ dmxdata.append(ambicol[1]) dmxdata.append(ambicol[2]) - print dmxdata + #print dmxdata client.SendDmx(universe, dmxdata, DmxSent) wrapper.Run() @@ -675,19 +690,23 @@ for blob in self.blobs : if not blob.visible : self.blobs.remove(blob) - + + if not self.indicators["conn"].ison: + self.init_reconnect = True + # get new coordinates from the server self.conn.putrequest("GET","/moodconductor/result", skip_host=True) self.conn.putheader("Host", "www.isophonics.net") self.conn.endheaders() res = self.conn.getresponse() data = res.read() - data = eval(data) + data = eval(data) + if not data : self.conn.close() self.indicators["data"].toggle() return False - + tempx = 0 tempy = 0 tempcount = 0 @@ -964,9 +983,6 @@ self.screen.blit(self.bg, (0, 0)) pg.display.flip() self.fpsClock.tick(FRAMERATE) - - if self.conn.sock == None: - self.init_reconnect = True if self.init_reconnect: self.reconnect()