Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/tgc3

master
Michael Murtaugh 7 years ago
commit 2d31187cc6

@ -1,66 +1,116 @@
<!DOCTYPE html>
<html>
<head>
<title></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<style>
body {
margin-left: 20;
margin-right: 20;
padding: 0;
color: grey;
}
form.buttons {
}
form.buttons input {
width: 150px;
height: 150px;
/*hide the labels*/
font-size: 0;
line-height: 0;
border: 0;
margin: ;
}
</style>
</head>
<body>
<form action="cgi-bin/play.cgi" class="buttons">
<input type="submit" name="p" value="BasicTurn.mp3" style="background:url(images/choreology1-BasicTurn.svg) no-repeat;" />
<input type="submit" name="p" value="Follow.mp3" style="background:url(images/choreology2-Follow.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="AmericanSpin.mp3" style="background:url(images/choreology3-AmericanSpin.svg) no-repeat;" />
<input type="submit" name="p" value="Bump.mp3" style="background:url(images/choreology4-Bump.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="StopAndGo.mp3" style="background:url(images/choreology5-StopAndGo.svg) no-repeat;" />
<input type="submit" name="p" value="Windmill.mp3" style="background:url(images/choreology6-Windmill.svg) no-repeat;" />
<br>
<input type="submit" name="p" value="SpanishArms.mp3" style="background:url(images/choreology7-SpanishArms.svg) no-repeat;" />
<input type="submit" name="p" value="Hucklebuck.mp3" style="background:url(images/choreology8-Hucklebuck.svg) no-repeat;" />
<br>
<!--"Whip" of "The Whip" options - needs testing with music playing in the background
<input type="submit" name="p" value="TheWhip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
-->
<input type="submit" name="p" value="Whip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
<input type="submit" name="p" value="ChickenWalks.mp3" style="background:url(images/choreology10-ChickenWalks.svg) no-repeat;" />
<div class="tempo">
<br>
<br>
<br>
<input id="slider3" type="range" min ="100" max="180" step ="1" style="width: 640px" />
<!-- <input id="slider3" type="range" min ="100" max="180" step ="1" orient="vertical" style="-webkit-appearance: slider-vertical; writing-mode: bt-lr" />
-->
</div>
</form>
</body>
<head>
<title> Rock Step - Triple Step - Triple Step </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<style>
body {
margin-left: 20;
margin-right: 20;
padding: 0;
}
h1 {
font-family: sans-serif, Avenir, 'Poiret One' ;
font: 8px;
/* font size and typeface not working */
text-align: center;
text-transform: capitalize;
color: rgb(61, 61, 92);
}
.responsive {
padding: 0px;
float: left;
width: 12.5%;
}
@media only screen and (max-width: 700px){
.responsive {
width: 24.99999%;
margin: 6px 0;
}
}
@media only screen and (max-width: 320px){
.responsive {
width: 50%;
}
}
form.buttons {
}
form.buttons input {
width: 150px;
height: 150px;
/*hide the labels*/
font-size: 0;
line-height: 0;
border: 0;
margin: ;
}
</style>
</head>
<body>
<!--
/* For devices smaller than 400px: */
body {
background-image: url('img_smallflower.jpg');
}
/* For devices 400px and larger: */
@media only screen and (min-device-width: 400px) {
body {
background-image: url('img_flowers.jpg');
}
}
-->
<h1> rock step - triple step - triple step </h1>
<br>
<br>
<form action="cgi-bin/play.cgi" class="buttons">
<input type="submit" name="p" value="BasicTurn.mp3" style="background:url(images/choreology1-BasicTurn.svg) no-repeat;" />
<input type="submit" name="p" value="Follow.mp3" style="background:url(images/choreology2-Follow.svg) no-repeat;" />
<input type="submit" name="p" value="AmericanSpin.mp3" style="background:url(images/choreology3-AmericanSpin.svg) no-repeat;" />
<input type="submit" name="p" value="Bump.mp3" style="background:url(images/choreology4-Bump.svg) no-repeat;" />
<input type="submit" name="p" value="StopAndGo.mp3" style="background:url(images/choreology5-StopAndGo.svg) no-repeat;" />
<input type="submit" name="p" value="Windmill.mp3" style="background:url(images/choreology6-Windmill.svg) no-repeat;" />
<input type="submit" name="p" value="SpanishArms.mp3" style="background:url(images/choreology7-SpanishArms.svg) no-repeat;" />
<input type="submit" name="p" value="Hucklebuck.mp3" style="background:url(images/choreology8-Hucklebuck.svg) no-repeat;" />
<!-- "Whip" of "The Whip" options - needs testing with music playing in the background
<input type="submit" name="p" value="TheWhip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
-->
<input type="submit" name="p" value="Whip.mp3" style="background:url(images/choreology9-Whip.svg) no-repeat;" />
<input type="submit" name="p" value="ChickenWalks.mp3" style="background:url(images/choreology10-ChickenWalks.svg) no-repeat;" />
<div class="tempo">
<br>
<br>
<br>
<!-- no slider for the launch day
<input id="slider3" type="range" min ="100" max="180" step ="1" style="width: 640px" />
<input id="slider3" type="range" min ="100" max="180" step ="1" orient="vertical" style="-webkit-appearance: slider-vertical; writing-mode: bt-lr" />
-->
</div>
</form>
</body>
</html>
@ -68,3 +118,11 @@

@ -4,3 +4,5 @@ p { margin: 0 0 70px; }
#defaultCanvas0 { display: block !important; margin: 5em auto ; }
#header { margin: 30px 0px 0px; }
.text { display: block; margin: 0 50px; font-size: 3em; font-weight: 100 !important; }
#download { color: #FFCC00; }
#download:hover { cursor: pointer; color: #FFEE55; }

@ -5,6 +5,7 @@
<title>Euclid</title>
<link rel="stylesheet" type="text/css" href="css/style.css">
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="js/p5.min.js"></script>
<script type="text/javascript" src="js/p5.svg.js"></script>
<script type="text/javascript" src="./js/euclidScore.js"></script>
@ -21,7 +22,13 @@
<p>The state of your composition is recorded, and displayed here as a downloadable score.</p>
<p>Never to be played, nor heard again.</p>
<p id="download">XX--X--X--X-XX--X--X--X-XX--X--X--X-XX--X--X--X-XX--X--X-X</p>
</content>
<script type="text/javascript">
$("#download").click(function() { saveMe(); console.log("clicked")})
</script>
</body>
</html>

@ -4,9 +4,6 @@ var left, right, genLight, score
var el1 = [], el2 = [], scrVals = []
function preload() {
// left = loadSVG('../svgs/leftHand.svg')
// right = loadSVG('../svgs/rightHand.svg')
genLight = loadFont("fonts/Gen-Light.otf");
score = loadStrings('../score/score.txt')
@ -26,32 +23,27 @@ function setup() {
noLoop()
fill(220)
textSize(150)
textSize(30)
textAlign('right')
}
function draw() {
background('#151515')
fill("#DDDDDD")
fill("#111111")
rect(0, 220, width, 280)
fill("#BBBBBB")
for (var i = 0; i < score.length; i++) {
var line = split(score[i].slice(0, -1), ' ')
text(line.join(" "), 90, 150 + (i*90), 710)
text(line.join(" "), 600, 280 + (i*20), 170)
scrVals.push(line)
}
stroke('#FFCC00')
fill('#FFCC00')
// left.attribute('fill', 'none')
// right.attribute('fill', 'none')
// left.attribute('stroke', '#FFCC00')
// right.attribute('stroke', '#FFCC00')
// image(right, 0, 0, 600, 600)
for (var i = 0; i < el1.length; i++) {
var r = random(5)
var rVal = int(scrVals[int(random(scrVals.length))][int(random(7))])

@ -18,7 +18,7 @@ dic={
}
f=open("transcripts-drone-attack.txt","r")
f=open("/media/floppy/transcripts-drone-attack.txt","r")
txt=f.readlines()
p= re.compile(r"^(\d\d\:\d\d) \((.*?)\)\: (.*)") # regex for capturing groups: time, character, sentence
for line in txt:
@ -32,7 +32,7 @@ for line in txt:
sentence_parts=re.split(r"(\*\w+\*)", sentence)
for part in sentence_parts:
if part == '*expletive*':
subprocess.call(["aplay", 'swear.wav'], stdout=devnull, stderr=devnull)
subprocess.call(["aplay", '/media/floppy/swear.wav'], stdout=devnull, stderr=devnull)
else:
subprocess.call(["espeak", part, "-v", voice], stdout=devnull, stderr=devnull) # character speaks: his
sleep(float(random.randint(1,10))/100)

@ -8,7 +8,7 @@ dic={
"narrator": "en-us",
}
f=open("detail_of_attack.txt","r")
f=open("/media/floppy/detail_of_attack.txt","r")
txt=f.readlines()
for line in txt:
print line

Loading…
Cancel
Save