From e81424757c661a324cf73456a46d84fed88033c6 Mon Sep 17 00:00:00 2001 From: baldo Date: Wed, 9 Sep 2015 20:02:40 +0200 Subject: [PATCH] =?UTF-8?q?Weiter=20h=C3=BCbsch=20gemacht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ffnord-con-2015-2/room/.node.lua.swp | Bin 24576 -> 0 bytes ffnord-con-2015-2/room/.service.swp | Bin 12288 -> 0 bytes ffnord-con-2015-2/room/config.json | 4 +-- ffnord-con-2015-2/room/node.lua | 51 ++++++++++++--------------- ffnord-con-2015-2/room/service | 4 +-- 5 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 ffnord-con-2015-2/room/.node.lua.swp delete mode 100644 ffnord-con-2015-2/room/.service.swp diff --git a/ffnord-con-2015-2/room/.node.lua.swp b/ffnord-con-2015-2/room/.node.lua.swp deleted file mode 100644 index 638fa260c23377cda2accf9e9fd8820cedec98ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 KcZSrW)&Bt+1O`O_ diff --git a/ffnord-con-2015-2/room/.service.swp b/ffnord-con-2015-2/room/.service.swp deleted file mode 100644 index 0e89840d2a1be75ee9d98dbc725fc8dc8211a28d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J!~9B6vrp&_y|}~(M|4Rc~9Bfk4un~Q_jc)JBm;oiP(q&X|>*+^=)#yv&_yB zoyA8-M@5B1Lq$WN0U;qF5n3cV1QiW}f&v;u2jc(swh~t^X9#Izj=Go z$-C>ldi5G#blS}OSYmDuNlUUOD16rtbDjr}%)9+Lc-9pKmBGRRs zB;zqYa;f5enkTZqE5b~ub|{j0f8hDg_Xn<$GIL9z-b|y13G@(qF(!ta4##Ad1j3lHuO4IU^T)Ay{QtlG{r~6FjQtAz z1bq*E1APp=4ZQ^wkc3``&Olx0zo!`c1Ns5F3*CXn&^pwG81(xo#(snDK%YV%L2p1; zpiQU`{re>Bpr4@+p%0)nXaqe6{qqE4-$8ewZ=o-sPoVdpo6rl;GPDH!jl6z=euTb; zD9_Iz(+mMazz{G53;{#H5HJKD2?87~3)9@{u{7a9kmH5XAmF1B?*su&1VLxW$ch@P zKJlT`OgQC4h{785=A)&^;~<*I=$4hs+cwwb!5po`3#dBHr((W<1`oON7tITm=9;gq zm9x?*bu5&!c}GjhODXft+zIxLXwFQ8ieKUb&+`s8+-!r7cr;Z?u~w?LWUGAKERFMYZ>)#Q$qHZQWtvAKXa{R|_pB*JYuvA6?(3~ov1G2uCnPN z3aul+xCrgk7pu8j-wdv9ZEOQcJ$vK&<(Gq(uDr5-tvM$p^i<_kd#H3&RjI?QsJ4S4 zcs&eS@6-F(qb-?>8s&jWSkmHs%vhPwM`zoUY8(_Zz3)tQRGZDCA{zDgvI;wO^|Y9P zeGgSa`#4k@{77X0G@0z;O} OrE+)E+=ba#=InnVdgmel diff --git a/ffnord-con-2015-2/room/config.json b/ffnord-con-2015-2/room/config.json index 14da937..a2f0f3a 100644 --- a/ffnord-con-2015-2/room/config.json +++ b/ffnord-con-2015-2/room/config.json @@ -4,10 +4,8 @@ }, "rooms": { "attraktor": { - "dect": "", - "translation": "", "twitter": "#ffnord", - "irc": "#ffnord", + "irc": "irc://irc.hackint.org/#ffnord", "texture": "marble", "speed": 70 } diff --git a/ffnord-con-2015-2/room/node.lua b/ffnord-con-2015-2/room/node.lua index 91e035f..e3922ed 100644 --- a/ffnord-con-2015-2/room/node.lua +++ b/ffnord-con-2015-2/room/node.lua @@ -49,7 +49,7 @@ function check_next_talk() end for room, talk in pairs(room_next) do - talk.lines = wrap(talk.title, 30) + talk.lines = wrap(talk.title, 40) end if room_next[saal] then @@ -182,10 +182,10 @@ function switcher(screens) end content = switcher{ ---[[ { - time = 10; + { + time = 20; draw = function() - font:write(400, 200, "Other rooms", 80, 1,1,1,1) + redU(400, 200, "Other rooms", 80) white:draw(0, 300, WIDTH, 302, 0.6) y = 320 local time_sep = false @@ -204,16 +204,16 @@ content = switcher{ if not time_sep then alpha = 0.3 end - font:write(30, y, talk.start, 50, 1,1,1,alpha) - font:write(190, y, talk.place, 50, 1,1,1,alpha) - font:write(400, y, talk.lines[math.floor((sys.now()/2) % #talk.lines)+1], 50, 1,1,1,alpha) + blueU(30, y, talk.start, 50) + redU(190, y, talk.place, 50) + yellow(450, y, talk.lines[math.floor((sys.now()/2) % #talk.lines)+1], 50) y = y + 60 end else - font:write(400, 330, "No other talks.", 50, 1,1,1,1) + yellow(400, 330, "No other talks.", 50, 1,1,1,1) end end - }, --]] { + }, { time = 30; draw = function() if not current_talk then @@ -245,33 +245,28 @@ content = switcher{ end end end - }, --[[ { + }, { time = 10; draw = function(t) - font:write(400, 200, "Room info", 80, 1,1,1,1) + redU(400, 200, "Info", 80) + white:draw(0, 300, WIDTH, 302, 0.6) - font:write(30, 320, "Audio", 50, 1,1,1,1) - font:write(400, 320, "Dial " .. room.dect, 50, 1,1,1,1) - font:write(30, 380, "Translation", 50, 1,1,1,1) - font:write(400, 380, "Dial " .. room.translation, 50, 1,1,1,1) + blueU(30, 320, "IRC", 50) + yellow(400, 320, room.irc, 50) - font:write(30, 480, "IRC", 50, 1,1,1,1) - font:write(400, 480, room.irc, 50, 1,1,1,1) + blueU(30, 380, "Twitter", 50) + yellow(400, 380, room.twitter, 50) - font:write(30, 540, "Twitter", 50, 1,1,1,1) - font:write(400, 540, room.twitter, 50, 1,1,1,1) +--[[ + blueU(30, 480, "Audio", 50) + yellow(400, 480, "Dial " .. room.irc, 50) - if t then - local banner = -4 + t - if banner > 0 and banner < 3.1412 then - local alpha = math.pow(math.sin(banner), 2) - local x = 400 - math.pow(banner / math.pi - 0.5, 5) * WIDTH * 2 - font:write(x, 640, "http://info-beamer.org/", 30, 1,1,1,alpha) - end - end + blueU(30, 540, "Translation", 50) + yellow(400, 540, "Dial " .. room.twitter, 50) +--]] end - }, --]] + }, } function redU(x, y, text, size) diff --git a/ffnord-con-2015-2/room/service b/ffnord-con-2015-2/room/service index 4b3cc4a..853f613 100755 --- a/ffnord-con-2015-2/room/service +++ b/ffnord-con-2015-2/room/service @@ -9,7 +9,7 @@ from datetime import datetime, date diff = None # Fake time in UTC -diff = datetime(2015,9,11,8,30,00) - datetime.utcnow() +diff = datetime(2015,9,11,7,29,00) - datetime.utcnow() met = pytz.timezone("Europe/Berlin") def current_time(): @@ -29,7 +29,7 @@ def send(data): print >>sys.stderr, "SENT >>> ", data def send_clock(now, ts): - day = (now.date() - date(2015, 9, 11)).days + day = (now.date() - date(2015, 9, 10)).days since_midnight = ( now - now.replace(hour=0, minute=0, second=0, microsecond=0)