diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-01-04 12:28:58 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-01-04 12:28:58 (GMT) |
commit | 3f9ba56d2b76a6d99a020bf84b98392832ee04c7 (patch) | |
tree | 6a8efb2088b4a2c7150bc1e7c25ffbafb720b153 | |
parent | 64c400bb24649218f54d6dcee2928015416f8875 (diff) |
a) Fixed a bug in line 110 (self.count&self.numpairs --> self.count==self.numpairs). This comparison could lead into wrong decisions by the model.
b) added a new game to show better the capabilities of this game (e.g. similar sounds)
c) a bigger grid
-rwxr-xr-x | csserver/universe.py | 101 | ||||
-rwxr-xr-x | csserver/univorc.csd | 446 | ||||
-rw-r--r-- | games/drumgit/drumgit.mson | 24 | ||||
-rw-r--r-- | games/drumgit/images/drumkit10_b.jpg | bin | 0 -> 16416 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit11_b.jpg | bin | 0 -> 16488 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit12_b.jpg | bin | 0 -> 16755 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit1_b.jpg | bin | 0 -> 17279 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit2_b.jpg | bin | 0 -> 17257 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit3_b.jpg | bin | 0 -> 17294 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit4_b.jpg | bin | 0 -> 17157 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit5_b.jpg | bin | 0 -> 17248 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit6_b.jpg | bin | 0 -> 17376 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit7_b.jpg | bin | 0 -> 17223 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit8_b.jpg | bin | 0 -> 17257 bytes | |||
-rw-r--r-- | games/drumgit/images/drumkit9_b.jpg | bin | 0 -> 16014 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar10_2.jpg | bin | 0 -> 14457 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar11_2.jpg | bin | 0 -> 14497 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar12_2.jpg | bin | 0 -> 14590 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar1_2.jpg | bin | 0 -> 13943 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar2_2.jpg | bin | 0 -> 13949 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar3_2.jpg | bin | 0 -> 13925 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar4_2.jpg | bin | 0 -> 13922 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar5_2.jpg | bin | 0 -> 13943 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar6_2.jpg | bin | 0 -> 14468 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar7_2.jpg | bin | 0 -> 13909 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar8_2.jpg | bin | 0 -> 13930 bytes | |||
-rw-r--r-- | games/drumgit/images/guitar9_2.jpg | bin | 0 -> 14525 bytes | |||
-rw-r--r-- | games/drumgit/images/reference | 18 | ||||
-rw-r--r-- | games/drumgit/sounds/beat10.aiff | bin | 0 -> 175948 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat14.aiff | bin | 0 -> 240880 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat16.aiff | bin | 0 -> 264554 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat17.aiff | bin | 0 -> 198606 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat1_a.aiff | bin | 0 -> 220588 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat1_b.aiff | bin | 0 -> 220588 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat1_c.aiff | bin | 0 -> 220588 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat2.aiff | bin | 0 -> 165126 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat3.aiff | bin | 0 -> 221942 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat4.aiff | bin | 0 -> 152274 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat6_2.aiff | bin | 0 -> 174932 bytes | |||
-rw-r--r-- | games/drumgit/sounds/beat8.aiff | bin | 0 -> 198268 bytes | |||
-rw-r--r-- | games/drumgit/sounds/bending_a.aiff | bin | 0 -> 220588 bytes | |||
-rw-r--r-- | games/drumgit/sounds/bending_b.aiff | bin | 0 -> 220588 bytes | |||
-rw-r--r-- | games/drumgit/sounds/flashcomp2a.aiff | bin | 0 -> 220588 bytes | |||
-rw-r--r-- | games/drumgit/sounds/flashcomp2b.aiff | bin | 0 -> 176624 bytes | |||
-rw-r--r-- | games/drumgit/sounds/flasholet4.aiff | bin | 0 -> 219724 bytes | |||
-rw-r--r-- | games/drumgit/sounds/gedaempft.aiff | bin | 0 -> 94268 bytes | |||
-rw-r--r-- | games/drumgit/sounds/git_hit1.aiff | bin | 0 -> 215250 bytes | |||
-rw-r--r-- | games/drumgit/sounds/git_hit4.aiff | bin | 0 -> 222862 bytes | |||
-rw-r--r-- | games/drumgit/sounds/guitcello.aiff | bin | 0 -> 265230 bytes | |||
-rw-r--r-- | games/drumgit/sounds/jimi1.aiff | bin | 0 -> 66136 bytes | |||
-rw-r--r-- | games/drumgit/sounds/jimi4.aiff | bin | 0 -> 65112 bytes | |||
-rw-r--r-- | games/drumgit/sounds/ungedaempft.aiff | bin | 0 -> 183376 bytes | |||
-rw-r--r-- | games/test/images/darabuka.jpg | bin | 19353 -> 0 bytes | |||
-rw-r--r-- | games/test/images/djembe.jpg | bin | 25302 -> 0 bytes | |||
-rw-r--r-- | games/test/images/flute.jpg | bin | 5646 -> 0 bytes | |||
-rw-r--r-- | games/test/images/gong.jpg | bin | 21796 -> 0 bytes | |||
-rw-r--r-- | games/test/images/maracas.jpg | bin | 22892 -> 0 bytes | |||
-rw-r--r-- | games/test/images/marimba.jpg | bin | 34981 -> 0 bytes | |||
-rw-r--r-- | games/test/images/piano.jpg | bin | 20853 -> 0 bytes | |||
-rw-r--r-- | games/test/images/reference | 9 | ||||
-rw-r--r-- | games/test/images/spring.jpg | bin | 15285 -> 0 bytes | |||
-rw-r--r-- | games/test/images/triangle.jpg | bin | 15569 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/darabuka | bin | 75168 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/djembe | bin | 55234 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/flute | bin | 57574 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/gam | bin | 227240 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/gong | bin | 295114 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/maracas | bin | 71092 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/marimba | bin | 119436 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/piano | bin | 248794 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/spring | bin | 71926 -> 0 bytes | |||
-rw-r--r-- | games/test/sounds/triangle | bin | 124450 -> 0 bytes | |||
-rw-r--r-- | games/test/test.mson | 9 | ||||
-rw-r--r-- | images/player1_0.jpg | bin | 7043 -> 3430 bytes | |||
-rw-r--r-- | images/player1_0b.jpg | bin | 9192 -> 5759 bytes | |||
-rw-r--r-- | images/player1_1.jpg | bin | 9111 -> 4509 bytes | |||
-rw-r--r-- | images/player1_10.jpg | bin | 0 -> 9122 bytes | |||
-rw-r--r-- | images/player1_10_b.jpg | bin | 0 -> 11489 bytes | |||
-rw-r--r-- | images/player1_11.jpg | bin | 0 -> 9593 bytes | |||
-rw-r--r-- | images/player1_11b.jpg | bin | 0 -> 11957 bytes | |||
-rw-r--r-- | images/player1_12.jpg | bin | 0 -> 9838 bytes | |||
-rw-r--r-- | images/player1_12b.jpg | bin | 0 -> 12197 bytes | |||
-rw-r--r-- | images/player1_13.jpg | bin | 0 -> 10301 bytes | |||
-rw-r--r-- | images/player1_13b.jpg | bin | 0 -> 12674 bytes | |||
-rw-r--r-- | images/player1_14.jpg | bin | 0 -> 10566 bytes | |||
-rw-r--r-- | images/player1_14b.jpg | bin | 0 -> 12907 bytes | |||
-rw-r--r-- | images/player1_15.jpg | bin | 0 -> 11165 bytes | |||
-rw-r--r-- | images/player1_15b.jpg | bin | 0 -> 13482 bytes | |||
-rw-r--r-- | images/player1_16.jpg | bin | 0 -> 12060 bytes | |||
-rw-r--r-- | images/player1_16b.jpg | bin | 0 -> 14325 bytes | |||
-rw-r--r-- | images/player1_17.jpg | bin | 0 -> 12575 bytes | |||
-rw-r--r-- | images/player1_17b.jpg | bin | 0 -> 14866 bytes | |||
-rw-r--r-- | images/player1_18.jpg | bin | 0 -> 12888 bytes | |||
-rw-r--r-- | images/player1_18b.jpg | bin | 0 -> 15162 bytes | |||
-rw-r--r-- | images/player1_1b.jpg | bin | 11303 -> 6886 bytes | |||
-rw-r--r-- | images/player1_2.jpg | bin | 10520 -> 5226 bytes | |||
-rw-r--r-- | images/player1_2b.jpg | bin | 12718 -> 7619 bytes | |||
-rw-r--r-- | images/player1_3.jpg | bin | 11820 -> 5781 bytes | |||
-rw-r--r-- | images/player1_3b.jpg | bin | 14013 -> 8153 bytes | |||
-rw-r--r-- | images/player1_4.jpg | bin | 13548 -> 6657 bytes | |||
-rw-r--r-- | images/player1_4b.jpg | bin | 15768 -> 9050 bytes | |||
-rw-r--r-- | images/player1_5.jpg | bin | 15175 -> 7363 bytes | |||
-rw-r--r-- | images/player1_5b.jpg | bin | 17393 -> 9757 bytes | |||
-rw-r--r-- | images/player1_6.jpg | bin | 16084 -> 7757 bytes | |||
-rw-r--r-- | images/player1_6b.jpg | bin | 18329 -> 10150 bytes | |||
-rw-r--r-- | images/player1_7.jpg | bin | 16789 -> 8067 bytes | |||
-rw-r--r-- | images/player1_7b.jpg | bin | 19081 -> 10487 bytes | |||
-rw-r--r-- | images/player1_8.jpg | bin | 17556 -> 8485 bytes | |||
-rw-r--r-- | images/player1_8b.jpg | bin | 19859 -> 10914 bytes | |||
-rw-r--r-- | images/player1_9.jpg | bin | 0 -> 8805 bytes | |||
-rw-r--r-- | images/player1_9b.jpg | bin | 0 -> 11203 bytes | |||
-rw-r--r-- | images/player2_0.jpg | bin | 7043 -> 3403 bytes | |||
-rw-r--r-- | images/player2_0b.jpg | bin | 9172 -> 5760 bytes | |||
-rw-r--r-- | images/player2_1.jpg | bin | 8473 -> 4147 bytes | |||
-rw-r--r-- | images/player2_10.jpg | bin | 0 -> 9743 bytes | |||
-rw-r--r-- | images/player2_10b.jpg | bin | 0 -> 12130 bytes | |||
-rw-r--r-- | images/player2_11.jpg | bin | 0 -> 10538 bytes | |||
-rw-r--r-- | images/player2_11b.jpg | bin | 0 -> 12951 bytes | |||
-rw-r--r-- | images/player2_12.jpg | bin | 0 -> 11217 bytes | |||
-rw-r--r-- | images/player2_12b.jpg | bin | 0 -> 13623 bytes | |||
-rw-r--r-- | images/player2_13.jpg | bin | 0 -> 11668 bytes | |||
-rw-r--r-- | images/player2_13b.jpg | bin | 0 -> 14095 bytes | |||
-rw-r--r-- | images/player2_14.jpg | bin | 0 -> 12033 bytes | |||
-rw-r--r-- | images/player2_14b.jpg | bin | 0 -> 14415 bytes | |||
-rw-r--r-- | images/player2_15.jpg | bin | 0 -> 12676 bytes | |||
-rw-r--r-- | images/player2_15b.jpg | bin | 0 -> 15049 bytes | |||
-rw-r--r-- | images/player2_16.jpg | bin | 0 -> 12859 bytes | |||
-rw-r--r-- | images/player2_16b.jpg | bin | 0 -> 15243 bytes | |||
-rw-r--r-- | images/player2_17.jpg | bin | 0 -> 13300 bytes | |||
-rw-r--r-- | images/player2_17b.jpg | bin | 0 -> 15676 bytes | |||
-rw-r--r-- | images/player2_18.jpg | bin | 0 -> 13885 bytes | |||
-rw-r--r-- | images/player2_18b.jpg | bin | 0 -> 16231 bytes | |||
-rw-r--r-- | images/player2_1b.jpg | bin | 10621 -> 6501 bytes | |||
-rw-r--r-- | images/player2_2.jpg | bin | 10048 -> 4929 bytes | |||
-rw-r--r-- | images/player2_2b.jpg | bin | 12221 -> 7319 bytes | |||
-rw-r--r-- | images/player2_3.jpg | bin | 11822 -> 5738 bytes | |||
-rw-r--r-- | images/player2_3b.jpg | bin | 13987 -> 8125 bytes | |||
-rw-r--r-- | images/player2_4.jpg | bin | 13389 -> 6514 bytes | |||
-rw-r--r-- | images/player2_4b.jpg | bin | 15597 -> 8908 bytes | |||
-rw-r--r-- | images/player2_5.jpg | bin | 14470 -> 6935 bytes | |||
-rw-r--r-- | images/player2_5b.jpg | bin | 16682 -> 9327 bytes | |||
-rw-r--r-- | images/player2_6.jpg | bin | 15755 -> 7583 bytes | |||
-rw-r--r-- | images/player2_6b.jpg | bin | 17998 -> 9952 bytes | |||
-rw-r--r-- | images/player2_7.jpg | bin | 16899 -> 8100 bytes | |||
-rw-r--r-- | images/player2_7b.jpg | bin | 19154 -> 10480 bytes | |||
-rw-r--r-- | images/player2_8.jpg | bin | 17911 -> 8604 bytes | |||
-rw-r--r-- | images/player2_8b.jpg | bin | 20211 -> 10992 bytes | |||
-rw-r--r-- | images/player2_9.jpg | bin | 0 -> 9013 bytes | |||
-rw-r--r-- | images/player2_9b.jpg | bin | 0 -> 11390 bytes | |||
-rwxr-xr-x | memosono.py | 44 |
150 files changed, 70 insertions, 581 deletions
diff --git a/csserver/universe.py b/csserver/universe.py deleted file mode 100755 index cef92db..0000000 --- a/csserver/universe.py +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/python -import select -import sys -import socket -import threading -import time -import os.path -import csnd - -# this is a multiple-client csound server -# the listener is put in a separate thread - -class CsoundServerMult: - # server start-up - def __init__(self, addr, orcfile): - self.orcfile = orcfile - self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.server.bind(addr) - self.size = 1024 - print "*** CsServer: Csound Python server listening at: @%s:%d" % (ipaddr, port) - self.server.listen(32) - self.input = [self.server,sys.stdin] - self.running = 1 - - # this is the interpreter function - # if something is seen on the socket - # it executes it as Python code - def interpret(self): - # run the universal orchestra - csound = csnd.Csound() - perf = csnd.CsoundPerformanceThread(csound) - csound.Compile( self.orcfile ) - perf.Play() - - while self.running: - inputready,outputready,exceptready = select.select(self.input,[],[]) - - for s in inputready: - if s == self.server: - # handle the server socket - client, address = self.server.accept() - print'*** CsServer: Client has been accepted on: ',address - self.input.append(client) - - elif s == sys.stdin: - # handle standard input - junk = sys.stdin.readline() - csound.SetChannel('udprecv.0.on', 0) - perf.Stop() - perf.Join() - csound.Reset() - csound = None - print '*** CsServer: The csound instance has been reset successfully.' - self.running = 0 - - else: - # handle all other sockets - data = s.recv(self.size) - print data - if data.strip('\n') == 'off()': - csound.SetChannel('udprecv.0.on', 0) - perf.Stop() - perf.Join() - csound.Reset() - csound = None - print '*** CsServer: The csound instance has been reset successfully.' - self.running = 0 - - elif data: - try: - exec data - except: - print "exception in code: " + data - else: - print '*** CsServer: remove socket: ', s.fileno() - s.close() - self.input.remove(s) - - for i in self.input: - i.close() - self.input.remove(i) - self.server.close() - print '*** CsServer: The server has been closed.' - -if __name__=="__main__": - if len(sys.argv) > 1: - ipaddr = sys.argv[1] - else: - ipaddr = 'localhost' - if len(sys.argv) > 2: - port = int(sys.argv[2]) - else: - port = 40002 - if len(sys.argv) > 3: - orcfile = sys.argv[3] - else: - orcfile = 'univorc.csd' - - s = CsoundServerMult((ipaddr, port), orcfile) - s.interpret() - diff --git a/csserver/univorc.csd b/csserver/univorc.csd deleted file mode 100755 index 0080f8a..0000000 --- a/csserver/univorc.csd +++ /dev/null @@ -1,446 +0,0 @@ -<CsoundSynthesizer> -<CsOptions> --+rtaudio=alsa -idevaudio -odevaudio -m0 -W -s -d -b256 -B1024 -</CsOptions> -<CsInstruments> -sr=44100 -ksmps=100 -nchnls=2 - -gaudp1 init 0 -gaudp2 init 0 -gainrev init 0 -gaoutL init 0 -gaoutR init 0 - -/***************************************************************** -Reverb + master out -*****************************************************************/ -instr 200 - -koutGain chnget "masterVolume" -koutGain = koutGain * 0.01 - -ia ftgen 89, 0, 64, -2, -1009, -1103, -1123, -1281, -1289, -1307, -1361, -1409, -1429, -1543, -1583, -1601, -1613, -1709, -1801, -1949, -2003, -2111, -2203, -2341, -2411, -2591, -2609, -2749, -2801, -2903, -3001, -3109, -3203, -3301, -3407, -3539, 0.82, 0.81, 0.8, 0.79, 0.78, 0.77, 0.76, 0.75, 0.74, 0.73, 0.72, 0.71, 0.7, 0.69, 0.68, 0.67, 0.66, 0.65, 0.64, 0.63, 0.62, 0.61, 0.6, 0.59, 0.58, 0.57, 0.56, 0.55, 0.54, 0.53, 0.52, 0.51 - -ib ftgen 90, 0, 16, -2, -179, -223, -233, -311, -347, -409, -433, -509, 0.76, 0.74, 0.72, 0.7, 0.68, 0.64, 0.62, 0.6 - -ain dcblock gainrev*0.05 -arev nreverb ain, 2.8, 0.7, 0, 32, 89, 8, 90 -arev butterlp arev, 5000 -arev butterlp arev, 5000 - - outs (arev + gaoutL)*koutGain, (arev + gaoutR) * koutGain - - gaoutL = 0 - gaoutR = 0 - gainrev = 0 - -endin - -/**************************************************************** -Audio input recording -****************************************************************/ -instr 201 - -ain inch 1 -itable = 300 + p4 -aindex line 0, p3, 1 -kenv adsr 0.005, 0.05, .9, 0.01 -tabw ain*kenv, aindex, itable, 1 -endin - -/**************************************************************** -Soundfile player with tied notes -****************************************************************/ -instr 101 - -ipit = p4 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -iatt = p9 -idecay = p10 -ifiltType = p11 - 1 -icutoff = p12 - -idurfadein init 0.002 -idurfadeout init 0.098 -iampe0 init 1 ; FADE IN -iampe1 = iamp ; SUSTAIN -iampe2 init 1 ; FADE OUT - -itie tival ; VERIFIE SI LA NOTE EST LIEE -if itie == 1 igoto nofadein ; SI NON "FADE IN" - -idurfadein init iatt -iampe0 init 0 ; FADE IN -iskip = 1 -kpitch init ipit ; INIT FREQUENCE POUR LES NOTES NON-LIEES -kamp init iamp -kpan init ipan -krg init irg - -nofadein: -iskip = 0 -igliss = 0.005 - -if p3 < 0 igoto nofadeout ; VERIFIE SI LA NOTE EST TENUE, SI NON "FADE OUT" - -idurfadeout init idecay -iampe2 init 0 ; FADE OUT - -nofadeout: - -idelta = idurfadein+idurfadeout -if idelta > abs(p3) then -idelta = abs(p3) -endif - -iampe0 = iampe0 * iamp -iampe2 = iampe2 * iamp -kenv linseg iampe0, idurfadein, iampe1, abs(p3)-idelta, iampe1, idurfadeout, iampe2 ; AMPLITUDE GLOBALE - -; SI LA NOTE EST LIEE, ON SAUTE LE RESTE DE L'INITIALISATION - tigoto tieskip - -kpitch portk ipit, igliss, ipit ; GLISSANDO -kpan portk ipan, igliss, ipan -krg portk irg, igliss, irg -kcutoff portk icutoff, igliss, icutoff - -a1 flooper2 1, kpitch, .25, .5, .1, itab, 0, 0, 0, iskip - -if ifiltType != -1 then -acomp = a1 -a1 bqrez a1, kcutoff, 6, ifiltType -a1 balance a1, acomp -endif - -a1 = a1*kenv - -gaoutL = a1*(1-kpan)+gaoutL -gaoutR = a1*kpan+gaoutR - -gainrev = a1*krg+gainrev - - tieskip: -endin - -/******************************************************************** -soundfile player for percussion - resonance notes -********************************************************************/ -instr 102 - -p3 = p3 -ipit = p4 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -iatt = p9 -idecay = p10 -ifiltType = p11 - 1 -icutoff = p12 - -a1 flooper2 1, ipit, .25, .750, .2, itab - -if ifiltType != -1 then -acomp = a1 -a1 bqrez a1, icutoff, 6, ifiltType -a1 balance a1, acomp -endif - -kenv expseg 0.001, .003, .6, p3 - .003, 0.001 -klocalenv adsr iatt, 0.05, .8, idecay - -a1 = a1*kenv*klocalenv - -gaoutL = a1*(1-ipan)+gaoutL -gaoutR = a1*ipan+gaoutR - -gainrev = a1*irg+gainrev - -endin - -/*********************************************************************** -Simple soundfile player -***********************************************************************/ -instr 103 - -ipit = p4 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -p3 = nsamp(itab) * 0.00002268 -iatt = p9 -idecay = p10 -ifiltType = p11-1 -icutoff = p12 - -a1 loscil iamp, ipit, itab, 1 - -if ifiltType != -1 then -acomp = a1 -a1 bqrez a1, icutoff, 6, ifiltType -a1 balance a1, acomp -endif - -kenv adsr iatt, 0.05, .8, idecay - -a1 = a1*kenv - -gaoutL = a1*(1-ipan)+gaoutL -gaoutR = a1*ipan+gaoutR - -gainrev = a1*irg+gainrev - -endin - -/******************************************************************** -soundfile simple crossfade player -********************************************************************/ -instr 104 - -ipit = p4 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -iatt = p9 -idecay = p10 - -a1 flooper2 1, ipit, .25, .750, .2, itab -a2 = a1 - -kenv adsr iatt, 0.05, .8, idecay - -gaoutL = a1*kenv*iamp*(1-ipan)+gaoutL -gaoutR = a2*kenv*iamp*ipan+gaoutR - -gainrev = (a1+a2)*irg*kenv*.5*iamp+gainrev - -endin - - -/********************************************************************* -simple karplus-strong plucked string -*********************************************************************/ -instr 105 - -p3 = p3+1 -ipit = p4 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -iatt = p9 -idecay = p10 - -icps = 261.626 * ipit - -a1 pluck 20000, icps, icps, 0, 5, .495, .495 -a1 butterlp a1, 4000 -a2 = a1 - -kenv adsr iatt, 0.05, .8, idecay - -gaoutL = a1*kenv*iamp*(1-ipan)+gaoutL -gaoutR = a2*kenv*iamp*ipan+gaoutR - -gainrev = (a1+a2)*irg*kenv*.5*iamp+gainrev - -endin - -/********************************************************************** -FM synth instrument -**********************************************************************/ -instr 106 - -ipit = p4 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -iatt = p9 -idecay = p10 - -kModDev randomi 0.995, 1.005, .45 -kFondDev randomi 0.9962, 1.0029, .93 -kvibrato vibrato .5, 5, 0.08, 0.5, 3, 5, 3, 5, 1 - -iImin = 2 -iImax = 4 -iamp = 3000 -kfond = 261.626 * ipit * kFondDev + kvibrato -kformant = 800 -kPortFreq = kfond * 3 -kModFreq = kfond * 2 * kModDev -kModFreq2 = kfond * 2.001 * kModDev -kPortFreq2 = int((kformant/kPortFreq) + 0.5) * kfond - -kenv1 expseg 0.001, .05, iamp, p3 - .15, iamp, .1, 0.001 -kenv2 oscil1i 0, kModFreq*(iImax-iImin), p3, 44 - -amod oscili iImin*kModFreq+kenv2, kModFreq, 1 -amod2 oscili iImin*kModFreq2+kenv2, kModFreq2, 1 - -aport1 oscili kenv1, kPortFreq+amod+amod2, 1 -aport2 oscili kenv1*0.5, kPortFreq2+(amod*0.33), 1 - -a1 = aport1+aport2 -a2 = a1 - -kenv adsr iatt, 0.05, .8, idecay - -gaoutL = a1*kenv*iamp*(1-ipan)+gaoutL -gaoutR = a2*kenv*iamp*ipan+gaoutR - -gainrev = (a1+a2)*irg*kenv*iamp+gainrev - - endin - -/********************************************************************** -Waveshaping instrument -**********************************************************************/ -instr 107 - -ipit = p4 * 261.626 -irg = p5 -iamp = p6 -ipan = p7 -itab = p8 -iatt = p9 -idecay = p10 - -kvib vibr 2, 5, 53 -kamp line .42, p3, .1 -kampdev randi .07, .5, .666 - -asig oscili kamp+kampdev, ipit+kvib, 50 - -a1 table asig, 51, 1, .5 -a1 balance a1, asig -a1 = a1*10000 -a2 delay a1, .041 - -kenv adsr iatt, 0.05, .8, idecay - -gaoutL = a1*kenv*iamp*(1-ipan)+gaoutL -gaoutR = a2*kenv*iamp*ipan+gaoutR - -gainrev = (a1+a2)*irg*kenv*iamp+gainrev - -endin - - -/************************************************************************** - General Soundfile Player - Used by Memosono -**************************************************************************/ - - -instr 108 -/* soundfile play control - p4 : filename - p5 : unique instance ID - p6 : output gain (0-1) - p7 : udp send gain (0-1) - p8 : offset in seconds - - channels: - sfplay.<ID>.on - instance control channel (1:on 0: off) - sfplay.<ID>.gain - soundfile play gain (0-1) - sfplay.<ID>.udpgain - udp send gain (0-1) - sfplay.<ID>.flen - holds the channel length -*/ -S1 strget p4 -inst = p5 -ich filenchnls S1 -iln filelen S1 -ioffset = p8 - -Slen sprintf "sfplay.%d.flen", p5 ; file length channel -chnset iln, Slen - -if ioffset >= iln then -turnoff -else -iln = iln - ioffset -endif - -Splay sprintf "sfplay.%d.on", inst ; instance control channel -Sname sprintf "sfplay.%d.fname", inst ; filename channel -Sgain sprintf "sfplay.%d.gain", inst ; gain channel -Sudp sprintf "sfplay.%d.udpgain", inst ; udp gain channel -chnset S1, Sname -chnset 1, Splay -chnset p6, Sgain -chnset p7, Sudp -event_i "i",109,0,iln,inst,ich,ioffset -turnoff -endin - - -instr 109 -/* soundfile player - This is the actual soundfile player. - It never gets called directly -*/ -ich = p5 -inst= p4 -ioffset = p6 -Splay sprintf "sfplay.%d.on", inst ; instance control channel -Sname sprintf "sfplay.%d.fname", inst ; filename channel -Sgain sprintf "sfplay.%d.gain", inst ; gain channel -Sudp sprintf "sfplay.%d.udpgain", inst ; udp gain channel -kon chnget Splay -kg1 chnget Sgain -kg2 chnget Sudp -S1 chnget Sname -if kon == 0 then -printf "sfplay:%d OFF\n", 1, inst -turnoff -endif -if ich = 1 then -a1 diskin2 S1,1,ioffset,1 -a2 = a1 -else -a1,a2 diskin2 S1,1,ioffset,1 -endif - outs a1*kg1, a2*kg1 -gaudp1 = a1*kg2 + gaudp1 -gaudp2 = a2*kg2 + gaudp2 -printf_i "sfplay:%d\n", 1, inst -endin - - - -/************************************************************************** -UDP receiver -**************************************************************************/ - -instr 256 -gaudp1 = 0 -gaudp2 = 0 -a1 = 0 -outs a1, a1 -endin - -</CsInstruments> -<CsScore> -f1 0 8192 10 1 -f40 0 1024 10 1 0 .5 0 0 .3 0 0 .2 0 .1 0 0 0 0 .2 0 0 0 .05 0 0 0 0 .03 ; ADDITIVE SYNTHESIS WAVE -f41 0 8193 19 .5 .5 270 .5 ; SIGMOID FUNCTION -f44 0 8192 5 1 8192 0.001 ; EXPONENTIAL FUNCTION -f50 0 8192 10 1 .1 .005 ; forme d'onde de l'index -f51 0 8192 13 1 1 0 1 .7 .8 .3 .1 .3 .4 .3 .2 0 0 .2 .1 0 .6 0 0 .5 .4 .3 0 0 .6 .7 ; premiere fonction de Chebichev -f52 0 4096 4 51 1 ; table de correction d'amplitude -f53 0 512 10 1 ; VIBRATO WAVE - -i256 0 600000 -i200 0 600000 - -</CsScore> -</CsoundSynthesizer> diff --git a/games/drumgit/drumgit.mson b/games/drumgit/drumgit.mson new file mode 100644 index 0000000..a006e87 --- /dev/null +++ b/games/drumgit/drumgit.mson @@ -0,0 +1,24 @@ +drumkit1_b.jpg beat1_a.aiff +drumkit2_b.jpg beat1_b.aiff +drumkit3_b.jpg beat1_c.aiff +drumkit4_b.jpg beat8.aiff +drumkit5_b.jpg beat2.aiff +drumkit6_b.jpg beat3.aiff +drumkit7_b.jpg beat4.aiff +drumkit8_b.jpg beat14.aiff +drumkit9_b.jpg beat6_2.aiff +drumkit10_b.jpg beat16.aiff +drumkit11_b.jpg beat17.aiff +drumkit12_b.jpg beat10.aiff +guitar1_2.jpg bending_a.aiff +guitar2_2.jpg bending_b.aiff +guitar3_2.jpg flashcomp2a.aiff +guitar4_2.jpg flashcomp2b.aiff +guitar5_2.jpg gedaempft.aiff +guitar6_2.jpg ungedaempft.aiff +guitar7_2.jpg jimi4.aiff +guitar8_2.jpg git_hit1.aiff +guitar9_2.jpg git_hit4.aiff +guitar10_2.jpg guitcello.aiff +guitar11_2.jpg flasholet4.aiff +guitar12_2.jpg jimi1.aiff diff --git a/games/drumgit/images/drumkit10_b.jpg b/games/drumgit/images/drumkit10_b.jpg Binary files differnew file mode 100644 index 0000000..9288d4c --- /dev/null +++ b/games/drumgit/images/drumkit10_b.jpg diff --git a/games/drumgit/images/drumkit11_b.jpg b/games/drumgit/images/drumkit11_b.jpg Binary files differnew file mode 100644 index 0000000..cd169ce --- /dev/null +++ b/games/drumgit/images/drumkit11_b.jpg diff --git a/games/drumgit/images/drumkit12_b.jpg b/games/drumgit/images/drumkit12_b.jpg Binary files differnew file mode 100644 index 0000000..f10ade8 --- /dev/null +++ b/games/drumgit/images/drumkit12_b.jpg diff --git a/games/drumgit/images/drumkit1_b.jpg b/games/drumgit/images/drumkit1_b.jpg Binary files differnew file mode 100644 index 0000000..98ab27d --- /dev/null +++ b/games/drumgit/images/drumkit1_b.jpg diff --git a/games/drumgit/images/drumkit2_b.jpg b/games/drumgit/images/drumkit2_b.jpg Binary files differnew file mode 100644 index 0000000..e1a7fc7 --- /dev/null +++ b/games/drumgit/images/drumkit2_b.jpg diff --git a/games/drumgit/images/drumkit3_b.jpg b/games/drumgit/images/drumkit3_b.jpg Binary files differnew file mode 100644 index 0000000..3a75f41 --- /dev/null +++ b/games/drumgit/images/drumkit3_b.jpg diff --git a/games/drumgit/images/drumkit4_b.jpg b/games/drumgit/images/drumkit4_b.jpg Binary files differnew file mode 100644 index 0000000..a4c5b97 --- /dev/null +++ b/games/drumgit/images/drumkit4_b.jpg diff --git a/games/drumgit/images/drumkit5_b.jpg b/games/drumgit/images/drumkit5_b.jpg Binary files differnew file mode 100644 index 0000000..063ef59 --- /dev/null +++ b/games/drumgit/images/drumkit5_b.jpg diff --git a/games/drumgit/images/drumkit6_b.jpg b/games/drumgit/images/drumkit6_b.jpg Binary files differnew file mode 100644 index 0000000..991edd8 --- /dev/null +++ b/games/drumgit/images/drumkit6_b.jpg diff --git a/games/drumgit/images/drumkit7_b.jpg b/games/drumgit/images/drumkit7_b.jpg Binary files differnew file mode 100644 index 0000000..4f993e7 --- /dev/null +++ b/games/drumgit/images/drumkit7_b.jpg diff --git a/games/drumgit/images/drumkit8_b.jpg b/games/drumgit/images/drumkit8_b.jpg Binary files differnew file mode 100644 index 0000000..dfdd67c --- /dev/null +++ b/games/drumgit/images/drumkit8_b.jpg diff --git a/games/drumgit/images/drumkit9_b.jpg b/games/drumgit/images/drumkit9_b.jpg Binary files differnew file mode 100644 index 0000000..16197e4 --- /dev/null +++ b/games/drumgit/images/drumkit9_b.jpg diff --git a/games/drumgit/images/guitar10_2.jpg b/games/drumgit/images/guitar10_2.jpg Binary files differnew file mode 100644 index 0000000..cc1f29b --- /dev/null +++ b/games/drumgit/images/guitar10_2.jpg diff --git a/games/drumgit/images/guitar11_2.jpg b/games/drumgit/images/guitar11_2.jpg Binary files differnew file mode 100644 index 0000000..a738ef2 --- /dev/null +++ b/games/drumgit/images/guitar11_2.jpg diff --git a/games/drumgit/images/guitar12_2.jpg b/games/drumgit/images/guitar12_2.jpg Binary files differnew file mode 100644 index 0000000..2998cfe --- /dev/null +++ b/games/drumgit/images/guitar12_2.jpg diff --git a/games/drumgit/images/guitar1_2.jpg b/games/drumgit/images/guitar1_2.jpg Binary files differnew file mode 100644 index 0000000..89dbd7c --- /dev/null +++ b/games/drumgit/images/guitar1_2.jpg diff --git a/games/drumgit/images/guitar2_2.jpg b/games/drumgit/images/guitar2_2.jpg Binary files differnew file mode 100644 index 0000000..6766232 --- /dev/null +++ b/games/drumgit/images/guitar2_2.jpg diff --git a/games/drumgit/images/guitar3_2.jpg b/games/drumgit/images/guitar3_2.jpg Binary files differnew file mode 100644 index 0000000..3cf7431 --- /dev/null +++ b/games/drumgit/images/guitar3_2.jpg diff --git a/games/drumgit/images/guitar4_2.jpg b/games/drumgit/images/guitar4_2.jpg Binary files differnew file mode 100644 index 0000000..ea12232 --- /dev/null +++ b/games/drumgit/images/guitar4_2.jpg diff --git a/games/drumgit/images/guitar5_2.jpg b/games/drumgit/images/guitar5_2.jpg Binary files differnew file mode 100644 index 0000000..a5cec0d --- /dev/null +++ b/games/drumgit/images/guitar5_2.jpg diff --git a/games/drumgit/images/guitar6_2.jpg b/games/drumgit/images/guitar6_2.jpg Binary files differnew file mode 100644 index 0000000..6212245 --- /dev/null +++ b/games/drumgit/images/guitar6_2.jpg diff --git a/games/drumgit/images/guitar7_2.jpg b/games/drumgit/images/guitar7_2.jpg Binary files differnew file mode 100644 index 0000000..356a90f --- /dev/null +++ b/games/drumgit/images/guitar7_2.jpg diff --git a/games/drumgit/images/guitar8_2.jpg b/games/drumgit/images/guitar8_2.jpg Binary files differnew file mode 100644 index 0000000..2b33f99 --- /dev/null +++ b/games/drumgit/images/guitar8_2.jpg diff --git a/games/drumgit/images/guitar9_2.jpg b/games/drumgit/images/guitar9_2.jpg Binary files differnew file mode 100644 index 0000000..691423d --- /dev/null +++ b/games/drumgit/images/guitar9_2.jpg diff --git a/games/drumgit/images/reference b/games/drumgit/images/reference new file mode 100644 index 0000000..79ce4c4 --- /dev/null +++ b/games/drumgit/images/reference @@ -0,0 +1,18 @@ +The guitar pictures are distributed under the Creative Commons Attribution ShareAlike 2.0 Germany License since they derive of the following work: + +guitar: + creator: Martin Moeller + name: Classical_Guitar_two_views + licence: Creative Commons Attribution ShareAlike 2.0 Germany License + (http://creativecommons.org/licenses/by-sa/2.0/de/) + link: http://de.wikipedia.org/wiki/Bild:Classical_Guitar_two_views.jpg + + +The drumkit pictures are distributed under the GNU Free Documentation License since they derive of the following work: + +drumkit: + creator: Clngre + name: Illustration of a drum kit for "drum kit component" + licence: GNU-Lizenz für freie Dokumentation + (http://commons.wikimedia.org/wiki/Commons:GNU_Free_Documentation_License) + found at: http://de.wikipedia.org/wiki/Bild:Drum_kit_illustration_template.png
\ No newline at end of file diff --git a/games/drumgit/sounds/beat10.aiff b/games/drumgit/sounds/beat10.aiff Binary files differnew file mode 100644 index 0000000..7a86e46 --- /dev/null +++ b/games/drumgit/sounds/beat10.aiff diff --git a/games/drumgit/sounds/beat14.aiff b/games/drumgit/sounds/beat14.aiff Binary files differnew file mode 100644 index 0000000..ae530e2 --- /dev/null +++ b/games/drumgit/sounds/beat14.aiff diff --git a/games/drumgit/sounds/beat16.aiff b/games/drumgit/sounds/beat16.aiff Binary files differnew file mode 100644 index 0000000..9bd9474 --- /dev/null +++ b/games/drumgit/sounds/beat16.aiff diff --git a/games/drumgit/sounds/beat17.aiff b/games/drumgit/sounds/beat17.aiff Binary files differnew file mode 100644 index 0000000..92990b4 --- /dev/null +++ b/games/drumgit/sounds/beat17.aiff diff --git a/games/drumgit/sounds/beat1_a.aiff b/games/drumgit/sounds/beat1_a.aiff Binary files differnew file mode 100644 index 0000000..654ba5f --- /dev/null +++ b/games/drumgit/sounds/beat1_a.aiff diff --git a/games/drumgit/sounds/beat1_b.aiff b/games/drumgit/sounds/beat1_b.aiff Binary files differnew file mode 100644 index 0000000..a8328e9 --- /dev/null +++ b/games/drumgit/sounds/beat1_b.aiff diff --git a/games/drumgit/sounds/beat1_c.aiff b/games/drumgit/sounds/beat1_c.aiff Binary files differnew file mode 100644 index 0000000..776bb23 --- /dev/null +++ b/games/drumgit/sounds/beat1_c.aiff diff --git a/games/drumgit/sounds/beat2.aiff b/games/drumgit/sounds/beat2.aiff Binary files differnew file mode 100644 index 0000000..33069d4 --- /dev/null +++ b/games/drumgit/sounds/beat2.aiff diff --git a/games/drumgit/sounds/beat3.aiff b/games/drumgit/sounds/beat3.aiff Binary files differnew file mode 100644 index 0000000..3c22de6 --- /dev/null +++ b/games/drumgit/sounds/beat3.aiff diff --git a/games/drumgit/sounds/beat4.aiff b/games/drumgit/sounds/beat4.aiff Binary files differnew file mode 100644 index 0000000..1c2fe08 --- /dev/null +++ b/games/drumgit/sounds/beat4.aiff diff --git a/games/drumgit/sounds/beat6_2.aiff b/games/drumgit/sounds/beat6_2.aiff Binary files differnew file mode 100644 index 0000000..911e630 --- /dev/null +++ b/games/drumgit/sounds/beat6_2.aiff diff --git a/games/drumgit/sounds/beat8.aiff b/games/drumgit/sounds/beat8.aiff Binary files differnew file mode 100644 index 0000000..fa85017 --- /dev/null +++ b/games/drumgit/sounds/beat8.aiff diff --git a/games/drumgit/sounds/bending_a.aiff b/games/drumgit/sounds/bending_a.aiff Binary files differnew file mode 100644 index 0000000..661c67f --- /dev/null +++ b/games/drumgit/sounds/bending_a.aiff diff --git a/games/drumgit/sounds/bending_b.aiff b/games/drumgit/sounds/bending_b.aiff Binary files differnew file mode 100644 index 0000000..ddbfb97 --- /dev/null +++ b/games/drumgit/sounds/bending_b.aiff diff --git a/games/drumgit/sounds/flashcomp2a.aiff b/games/drumgit/sounds/flashcomp2a.aiff Binary files differnew file mode 100644 index 0000000..3b5f284 --- /dev/null +++ b/games/drumgit/sounds/flashcomp2a.aiff diff --git a/games/drumgit/sounds/flashcomp2b.aiff b/games/drumgit/sounds/flashcomp2b.aiff Binary files differnew file mode 100644 index 0000000..0d7d14d --- /dev/null +++ b/games/drumgit/sounds/flashcomp2b.aiff diff --git a/games/drumgit/sounds/flasholet4.aiff b/games/drumgit/sounds/flasholet4.aiff Binary files differnew file mode 100644 index 0000000..0c4d56e --- /dev/null +++ b/games/drumgit/sounds/flasholet4.aiff diff --git a/games/drumgit/sounds/gedaempft.aiff b/games/drumgit/sounds/gedaempft.aiff Binary files differnew file mode 100644 index 0000000..0ede22e --- /dev/null +++ b/games/drumgit/sounds/gedaempft.aiff diff --git a/games/drumgit/sounds/git_hit1.aiff b/games/drumgit/sounds/git_hit1.aiff Binary files differnew file mode 100644 index 0000000..ac7a33e --- /dev/null +++ b/games/drumgit/sounds/git_hit1.aiff diff --git a/games/drumgit/sounds/git_hit4.aiff b/games/drumgit/sounds/git_hit4.aiff Binary files differnew file mode 100644 index 0000000..528d843 --- /dev/null +++ b/games/drumgit/sounds/git_hit4.aiff diff --git a/games/drumgit/sounds/guitcello.aiff b/games/drumgit/sounds/guitcello.aiff Binary files differnew file mode 100644 index 0000000..0d5c90b --- /dev/null +++ b/games/drumgit/sounds/guitcello.aiff diff --git a/games/drumgit/sounds/jimi1.aiff b/games/drumgit/sounds/jimi1.aiff Binary files differnew file mode 100644 index 0000000..94c50e4 --- /dev/null +++ b/games/drumgit/sounds/jimi1.aiff diff --git a/games/drumgit/sounds/jimi4.aiff b/games/drumgit/sounds/jimi4.aiff Binary files differnew file mode 100644 index 0000000..a70611a --- /dev/null +++ b/games/drumgit/sounds/jimi4.aiff diff --git a/games/drumgit/sounds/ungedaempft.aiff b/games/drumgit/sounds/ungedaempft.aiff Binary files differnew file mode 100644 index 0000000..d9e5d7c --- /dev/null +++ b/games/drumgit/sounds/ungedaempft.aiff diff --git a/games/test/images/darabuka.jpg b/games/test/images/darabuka.jpg Binary files differdeleted file mode 100644 index 1146d8c..0000000 --- a/games/test/images/darabuka.jpg +++ /dev/null diff --git a/games/test/images/djembe.jpg b/games/test/images/djembe.jpg Binary files differdeleted file mode 100644 index 264d137..0000000 --- a/games/test/images/djembe.jpg +++ /dev/null diff --git a/games/test/images/flute.jpg b/games/test/images/flute.jpg Binary files differdeleted file mode 100644 index ae58db3..0000000 --- a/games/test/images/flute.jpg +++ /dev/null diff --git a/games/test/images/gong.jpg b/games/test/images/gong.jpg Binary files differdeleted file mode 100644 index dbe7bcf..0000000 --- a/games/test/images/gong.jpg +++ /dev/null diff --git a/games/test/images/maracas.jpg b/games/test/images/maracas.jpg Binary files differdeleted file mode 100644 index ce15a4d..0000000 --- a/games/test/images/maracas.jpg +++ /dev/null diff --git a/games/test/images/marimba.jpg b/games/test/images/marimba.jpg Binary files differdeleted file mode 100644 index e6a2b73..0000000 --- a/games/test/images/marimba.jpg +++ /dev/null diff --git a/games/test/images/piano.jpg b/games/test/images/piano.jpg Binary files differdeleted file mode 100644 index 7e117f4..0000000 --- a/games/test/images/piano.jpg +++ /dev/null diff --git a/games/test/images/reference b/games/test/images/reference deleted file mode 100644 index 3d703c4..0000000 --- a/games/test/images/reference +++ /dev/null @@ -1,9 +0,0 @@ -flute: Public domain image from Websters Dictionary 1911 (wikipedia) -gong: Public domain (wikipedia) -maracas: Axel Heymann GNU-Lizenz für freie Dokumentation (wikipedia) -marimba: Frederick Langhorst Creative Commons (wikipedia) -piano: Public domain (wikipedia) -spring: creative commons (wikipedia) -triangle: Public domain (wikipedia) -djembe: GNU-Lizenz für freie Dokumentation (wikipedia) -darbuka: GNU-Lizenz für freie Dokumentation (wikipedia) diff --git a/games/test/images/spring.jpg b/games/test/images/spring.jpg Binary files differdeleted file mode 100644 index 309bcc5..0000000 --- a/games/test/images/spring.jpg +++ /dev/null diff --git a/games/test/images/triangle.jpg b/games/test/images/triangle.jpg Binary files differdeleted file mode 100644 index 4e04308..0000000 --- a/games/test/images/triangle.jpg +++ /dev/null diff --git a/games/test/sounds/darabuka b/games/test/sounds/darabuka Binary files differdeleted file mode 100644 index 28c38b6..0000000 --- a/games/test/sounds/darabuka +++ /dev/null diff --git a/games/test/sounds/djembe b/games/test/sounds/djembe Binary files differdeleted file mode 100644 index 0c6e3b7..0000000 --- a/games/test/sounds/djembe +++ /dev/null diff --git a/games/test/sounds/flute b/games/test/sounds/flute Binary files differdeleted file mode 100644 index 3331948..0000000 --- a/games/test/sounds/flute +++ /dev/null diff --git a/games/test/sounds/gam b/games/test/sounds/gam Binary files differdeleted file mode 100644 index f798d48..0000000 --- a/games/test/sounds/gam +++ /dev/null diff --git a/games/test/sounds/gong b/games/test/sounds/gong Binary files differdeleted file mode 100644 index 66261bb..0000000 --- a/games/test/sounds/gong +++ /dev/null diff --git a/games/test/sounds/maracas b/games/test/sounds/maracas Binary files differdeleted file mode 100644 index 5d20d9b..0000000 --- a/games/test/sounds/maracas +++ /dev/null diff --git a/games/test/sounds/marimba b/games/test/sounds/marimba Binary files differdeleted file mode 100644 index 6804f9f..0000000 --- a/games/test/sounds/marimba +++ /dev/null diff --git a/games/test/sounds/piano b/games/test/sounds/piano Binary files differdeleted file mode 100644 index e2f1354..0000000 --- a/games/test/sounds/piano +++ /dev/null diff --git a/games/test/sounds/spring b/games/test/sounds/spring Binary files differdeleted file mode 100644 index fc76f76..0000000 --- a/games/test/sounds/spring +++ /dev/null diff --git a/games/test/sounds/triangle b/games/test/sounds/triangle Binary files differdeleted file mode 100644 index 9a7e352..0000000 --- a/games/test/sounds/triangle +++ /dev/null diff --git a/games/test/test.mson b/games/test/test.mson deleted file mode 100644 index 9e9e3d7..0000000 --- a/games/test/test.mson +++ /dev/null @@ -1,9 +0,0 @@ -darabuka.jpg darabuka -flute.jpg flute -maracas.jpg maracas -piano.jpg piano -triangle.jpg triangle -djembe.jpg djembe -gong.jpg gong -marimba.jpg marimba -spring.jpg spring diff --git a/images/player1_0.jpg b/images/player1_0.jpg Binary files differindex 0d1f842..dba9eea 100644 --- a/images/player1_0.jpg +++ b/images/player1_0.jpg diff --git a/images/player1_0b.jpg b/images/player1_0b.jpg Binary files differindex f44eade..c45e373 100644 --- a/images/player1_0b.jpg +++ b/images/player1_0b.jpg diff --git a/images/player1_1.jpg b/images/player1_1.jpg Binary files differindex 541b3da..e0dc86a 100644 --- a/images/player1_1.jpg +++ b/images/player1_1.jpg diff --git a/images/player1_10.jpg b/images/player1_10.jpg Binary files differnew file mode 100644 index 0000000..4343898 --- /dev/null +++ b/images/player1_10.jpg diff --git a/images/player1_10_b.jpg b/images/player1_10_b.jpg Binary files differnew file mode 100644 index 0000000..a020954 --- /dev/null +++ b/images/player1_10_b.jpg diff --git a/images/player1_11.jpg b/images/player1_11.jpg Binary files differnew file mode 100644 index 0000000..df5b42e --- /dev/null +++ b/images/player1_11.jpg diff --git a/images/player1_11b.jpg b/images/player1_11b.jpg Binary files differnew file mode 100644 index 0000000..cfe3735 --- /dev/null +++ b/images/player1_11b.jpg diff --git a/images/player1_12.jpg b/images/player1_12.jpg Binary files differnew file mode 100644 index 0000000..ad91a1d --- /dev/null +++ b/images/player1_12.jpg diff --git a/images/player1_12b.jpg b/images/player1_12b.jpg Binary files differnew file mode 100644 index 0000000..8ff81c1 --- /dev/null +++ b/images/player1_12b.jpg diff --git a/images/player1_13.jpg b/images/player1_13.jpg Binary files differnew file mode 100644 index 0000000..835f9cd --- /dev/null +++ b/images/player1_13.jpg diff --git a/images/player1_13b.jpg b/images/player1_13b.jpg Binary files differnew file mode 100644 index 0000000..3748a93 --- /dev/null +++ b/images/player1_13b.jpg diff --git a/images/player1_14.jpg b/images/player1_14.jpg Binary files differnew file mode 100644 index 0000000..8328b47 --- /dev/null +++ b/images/player1_14.jpg diff --git a/images/player1_14b.jpg b/images/player1_14b.jpg Binary files differnew file mode 100644 index 0000000..0c1ca80 --- /dev/null +++ b/images/player1_14b.jpg diff --git a/images/player1_15.jpg b/images/player1_15.jpg Binary files differnew file mode 100644 index 0000000..26d91d0 --- /dev/null +++ b/images/player1_15.jpg diff --git a/images/player1_15b.jpg b/images/player1_15b.jpg Binary files differnew file mode 100644 index 0000000..ca7bf4e --- /dev/null +++ b/images/player1_15b.jpg diff --git a/images/player1_16.jpg b/images/player1_16.jpg Binary files differnew file mode 100644 index 0000000..f751723 --- /dev/null +++ b/images/player1_16.jpg diff --git a/images/player1_16b.jpg b/images/player1_16b.jpg Binary files differnew file mode 100644 index 0000000..03e8042 --- /dev/null +++ b/images/player1_16b.jpg diff --git a/images/player1_17.jpg b/images/player1_17.jpg Binary files differnew file mode 100644 index 0000000..f8a56bc --- /dev/null +++ b/images/player1_17.jpg diff --git a/images/player1_17b.jpg b/images/player1_17b.jpg Binary files differnew file mode 100644 index 0000000..a663f81 --- /dev/null +++ b/images/player1_17b.jpg diff --git a/images/player1_18.jpg b/images/player1_18.jpg Binary files differnew file mode 100644 index 0000000..9e97e98 --- /dev/null +++ b/images/player1_18.jpg diff --git a/images/player1_18b.jpg b/images/player1_18b.jpg Binary files differnew file mode 100644 index 0000000..c36b23d --- /dev/null +++ b/images/player1_18b.jpg diff --git a/images/player1_1b.jpg b/images/player1_1b.jpg Binary files differindex 7273bac..74e1f94 100644 --- a/images/player1_1b.jpg +++ b/images/player1_1b.jpg diff --git a/images/player1_2.jpg b/images/player1_2.jpg Binary files differindex 14ac05f..fa23c0f 100644 --- a/images/player1_2.jpg +++ b/images/player1_2.jpg diff --git a/images/player1_2b.jpg b/images/player1_2b.jpg Binary files differindex 3a6acdb..ec02cbf 100644 --- a/images/player1_2b.jpg +++ b/images/player1_2b.jpg diff --git a/images/player1_3.jpg b/images/player1_3.jpg Binary files differindex 5241ad4..ba0e12f 100644 --- a/images/player1_3.jpg +++ b/images/player1_3.jpg diff --git a/images/player1_3b.jpg b/images/player1_3b.jpg Binary files differindex c922599..20b399f 100644 --- a/images/player1_3b.jpg +++ b/images/player1_3b.jpg diff --git a/images/player1_4.jpg b/images/player1_4.jpg Binary files differindex 761442b..205757d 100644 --- a/images/player1_4.jpg +++ b/images/player1_4.jpg diff --git a/images/player1_4b.jpg b/images/player1_4b.jpg Binary files differindex fe0b65e..f8fabb7 100644 --- a/images/player1_4b.jpg +++ b/images/player1_4b.jpg diff --git a/images/player1_5.jpg b/images/player1_5.jpg Binary files differindex 3ffa126..3eca2d0 100644 --- a/images/player1_5.jpg +++ b/images/player1_5.jpg diff --git a/images/player1_5b.jpg b/images/player1_5b.jpg Binary files differindex a08f4a4..efe3a91 100644 --- a/images/player1_5b.jpg +++ b/images/player1_5b.jpg diff --git a/images/player1_6.jpg b/images/player1_6.jpg Binary files differindex f84b564..655bf16 100644 --- a/images/player1_6.jpg +++ b/images/player1_6.jpg diff --git a/images/player1_6b.jpg b/images/player1_6b.jpg Binary files differindex 574691a..ff5299a 100644 --- a/images/player1_6b.jpg +++ b/images/player1_6b.jpg diff --git a/images/player1_7.jpg b/images/player1_7.jpg Binary files differindex e00c91b..1eb63ac 100644 --- a/images/player1_7.jpg +++ b/images/player1_7.jpg diff --git a/images/player1_7b.jpg b/images/player1_7b.jpg Binary files differindex aef8423..7b74076 100644 --- a/images/player1_7b.jpg +++ b/images/player1_7b.jpg diff --git a/images/player1_8.jpg b/images/player1_8.jpg Binary files differindex 1ee3628..c4a5fd1 100644 --- a/images/player1_8.jpg +++ b/images/player1_8.jpg diff --git a/images/player1_8b.jpg b/images/player1_8b.jpg Binary files differindex 2ca426f..c1873fb 100644 --- a/images/player1_8b.jpg +++ b/images/player1_8b.jpg diff --git a/images/player1_9.jpg b/images/player1_9.jpg Binary files differnew file mode 100644 index 0000000..46ec9d3 --- /dev/null +++ b/images/player1_9.jpg diff --git a/images/player1_9b.jpg b/images/player1_9b.jpg Binary files differnew file mode 100644 index 0000000..bdb688b --- /dev/null +++ b/images/player1_9b.jpg diff --git a/images/player2_0.jpg b/images/player2_0.jpg Binary files differindex 0d1f842..677f2da 100644 --- a/images/player2_0.jpg +++ b/images/player2_0.jpg diff --git a/images/player2_0b.jpg b/images/player2_0b.jpg Binary files differindex e7da22e..9ea1223 100644 --- a/images/player2_0b.jpg +++ b/images/player2_0b.jpg diff --git a/images/player2_1.jpg b/images/player2_1.jpg Binary files differindex fe8d45d..b52b708 100644 --- a/images/player2_1.jpg +++ b/images/player2_1.jpg diff --git a/images/player2_10.jpg b/images/player2_10.jpg Binary files differnew file mode 100644 index 0000000..f2f17b4 --- /dev/null +++ b/images/player2_10.jpg diff --git a/images/player2_10b.jpg b/images/player2_10b.jpg Binary files differnew file mode 100644 index 0000000..0b7e722 --- /dev/null +++ b/images/player2_10b.jpg diff --git a/images/player2_11.jpg b/images/player2_11.jpg Binary files differnew file mode 100644 index 0000000..7593a39 --- /dev/null +++ b/images/player2_11.jpg diff --git a/images/player2_11b.jpg b/images/player2_11b.jpg Binary files differnew file mode 100644 index 0000000..759cd1a --- /dev/null +++ b/images/player2_11b.jpg diff --git a/images/player2_12.jpg b/images/player2_12.jpg Binary files differnew file mode 100644 index 0000000..cd60538 --- /dev/null +++ b/images/player2_12.jpg diff --git a/images/player2_12b.jpg b/images/player2_12b.jpg Binary files differnew file mode 100644 index 0000000..d6c9524 --- /dev/null +++ b/images/player2_12b.jpg diff --git a/images/player2_13.jpg b/images/player2_13.jpg Binary files differnew file mode 100644 index 0000000..ae3e720 --- /dev/null +++ b/images/player2_13.jpg diff --git a/images/player2_13b.jpg b/images/player2_13b.jpg Binary files differnew file mode 100644 index 0000000..73cdcd3 --- /dev/null +++ b/images/player2_13b.jpg diff --git a/images/player2_14.jpg b/images/player2_14.jpg Binary files differnew file mode 100644 index 0000000..98f04a0 --- /dev/null +++ b/images/player2_14.jpg diff --git a/images/player2_14b.jpg b/images/player2_14b.jpg Binary files differnew file mode 100644 index 0000000..28246e5 --- /dev/null +++ b/images/player2_14b.jpg diff --git a/images/player2_15.jpg b/images/player2_15.jpg Binary files differnew file mode 100644 index 0000000..362ec90 --- /dev/null +++ b/images/player2_15.jpg diff --git a/images/player2_15b.jpg b/images/player2_15b.jpg Binary files differnew file mode 100644 index 0000000..0c848f5 --- /dev/null +++ b/images/player2_15b.jpg diff --git a/images/player2_16.jpg b/images/player2_16.jpg Binary files differnew file mode 100644 index 0000000..bde5bfd --- /dev/null +++ b/images/player2_16.jpg diff --git a/images/player2_16b.jpg b/images/player2_16b.jpg Binary files differnew file mode 100644 index 0000000..8505b95 --- /dev/null +++ b/images/player2_16b.jpg diff --git a/images/player2_17.jpg b/images/player2_17.jpg Binary files differnew file mode 100644 index 0000000..276d86f --- /dev/null +++ b/images/player2_17.jpg diff --git a/images/player2_17b.jpg b/images/player2_17b.jpg Binary files differnew file mode 100644 index 0000000..2cead9d --- /dev/null +++ b/images/player2_17b.jpg diff --git a/images/player2_18.jpg b/images/player2_18.jpg Binary files differnew file mode 100644 index 0000000..4d92c9a --- /dev/null +++ b/images/player2_18.jpg diff --git a/images/player2_18b.jpg b/images/player2_18b.jpg Binary files differnew file mode 100644 index 0000000..af8ca7a --- /dev/null +++ b/images/player2_18b.jpg diff --git a/images/player2_1b.jpg b/images/player2_1b.jpg Binary files differindex ebbaa0e..a139128 100644 --- a/images/player2_1b.jpg +++ b/images/player2_1b.jpg diff --git a/images/player2_2.jpg b/images/player2_2.jpg Binary files differindex 7dca52a..c365682 100644 --- a/images/player2_2.jpg +++ b/images/player2_2.jpg diff --git a/images/player2_2b.jpg b/images/player2_2b.jpg Binary files differindex c214e2a..95c649c 100644 --- a/images/player2_2b.jpg +++ b/images/player2_2b.jpg diff --git a/images/player2_3.jpg b/images/player2_3.jpg Binary files differindex 492acf8..2fc2caa 100644 --- a/images/player2_3.jpg +++ b/images/player2_3.jpg diff --git a/images/player2_3b.jpg b/images/player2_3b.jpg Binary files differindex 27368b9..696c331 100644 --- a/images/player2_3b.jpg +++ b/images/player2_3b.jpg diff --git a/images/player2_4.jpg b/images/player2_4.jpg Binary files differindex 4005d69..68615d8 100644 --- a/images/player2_4.jpg +++ b/images/player2_4.jpg diff --git a/images/player2_4b.jpg b/images/player2_4b.jpg Binary files differindex 4be8f90..e603354 100644 --- a/images/player2_4b.jpg +++ b/images/player2_4b.jpg diff --git a/images/player2_5.jpg b/images/player2_5.jpg Binary files differindex 0e5e1f7..f7694cf 100644 --- a/images/player2_5.jpg +++ b/images/player2_5.jpg diff --git a/images/player2_5b.jpg b/images/player2_5b.jpg Binary files differindex b35a58e..8d1f4db 100644 --- a/images/player2_5b.jpg +++ b/images/player2_5b.jpg diff --git a/images/player2_6.jpg b/images/player2_6.jpg Binary files differindex 31989f4..4d11675 100644 --- a/images/player2_6.jpg +++ b/images/player2_6.jpg diff --git a/images/player2_6b.jpg b/images/player2_6b.jpg Binary files differindex b469458..a9084f8 100644 --- a/images/player2_6b.jpg +++ b/images/player2_6b.jpg diff --git a/images/player2_7.jpg b/images/player2_7.jpg Binary files differindex 2e9822f..1ae42a1 100644 --- a/images/player2_7.jpg +++ b/images/player2_7.jpg diff --git a/images/player2_7b.jpg b/images/player2_7b.jpg Binary files differindex 0f795a8..f221c17 100644 --- a/images/player2_7b.jpg +++ b/images/player2_7b.jpg diff --git a/images/player2_8.jpg b/images/player2_8.jpg Binary files differindex cac16a8..eab290a 100644 --- a/images/player2_8.jpg +++ b/images/player2_8.jpg diff --git a/images/player2_8b.jpg b/images/player2_8b.jpg Binary files differindex 1791058..2918589 100644 --- a/images/player2_8b.jpg +++ b/images/player2_8b.jpg diff --git a/images/player2_9.jpg b/images/player2_9.jpg Binary files differnew file mode 100644 index 0000000..4b49d00 --- /dev/null +++ b/images/player2_9.jpg diff --git a/images/player2_9b.jpg b/images/player2_9b.jpg Binary files differnew file mode 100644 index 0000000..ca3ad37 --- /dev/null +++ b/images/player2_9b.jpg diff --git a/memosono.py b/memosono.py index 5c62dfd..ddb22ee 100755 --- a/memosono.py +++ b/memosono.py @@ -103,10 +103,11 @@ class Server: self.oscapi.sendMsg("/MEMO/game/next",[self.players[self.currentplayer], self.players[self.lastplayer]], self.addresses[i][0], self.addresses[i][1]) - i = 0 + i = 0 + logging.debug("count: "+str(self.count)+"numpairs: "+str(self.numpairs)) for i in self.addresses: self.oscapi.sendMsg("/MEMO/game/match", [self.match, self.players[self.lastplayer], - self.comtile, self.tile, self.count&self.numpairs], + self.comtile, self.tile, self.count==self.numpairs], self.addresses[i][0], self.addresses[i][1]) self.compkey = '' self.comptile = 0 @@ -290,12 +291,23 @@ class Model(gobject.GObject): ['player1_2.jpg', 'player1_2b.jpg'],['player2_3.jpg', 'player2_3b.jpg'], ['player1_4.jpg', 'player1_4b.jpg'],['player1_5.jpg', 'player1_5b.jpg'], ['player1_6.jpg', 'player1_6b.jpg'],['player1_7.jpg', 'player1_7b.jpg'], - ['player1_8.jpg', 'player1_8b.jpg']] + ['player1_8.jpg', 'player1_8b.jpg'],['player1_9.jpg', 'player1_9b.jpg'], + ['player1_10.jpg', 'player1_10b.jpg'],['player1_11.jpg', 'player1_11b.jpg'], + ['player1_12.jpg', 'player1_12b.jpg'],['player1_13.jpg', 'player1_13b.jpg'], + ['player1_14.jpg', 'player1_14b.jpg'],['player1_15.jpg', 'player1_15b.jpg'], + ['player1_16.jpg', 'player1_16b.jpg'],['player1_17.jpg', 'player1_17b.jpg'], + ['player1_18.jpg', 'player1_18b.jpg']] + self.player['simon'] = [0, ['player2_0.jpg', 'player2_0b.jpg'],['player2_1.jpg', 'player2_1b.jpg'], - ['player2_2.jpg', 'player2_2b.jpg'],['player2_3.jpg', 'player2_3b.jpg'], - ['player2_4.jpg', 'player2_4b.jpg'],['player2_5.jpg', 'player2_5b.jpg'], - ['player2_6.jpg', 'player2_6b.jpg'],['player2_7.jpg', 'player2_7b.jpg'], - ['player2_8.jpg', 'player2_8b.jpg']] + ['player2_2.jpg', 'player2_2b.jpg'],['player2_3.jpg', 'player2_3b.jpg'], + ['player2_4.jpg', 'player2_4b.jpg'],['player2_5.jpg', 'player2_5b.jpg'], + ['player2_6.jpg', 'player2_6b.jpg'],['player2_7.jpg', 'player2_7b.jpg'], + ['player2_8.jpg', 'player2_8b.jpg'],['player2_9.jpg', 'player2_9b.jpg'], + ['player2_10.jpg', 'player2_10b.jpg'],['player2_11.jpg', 'player2_11b.jpg'], + ['player2_12.jpg', 'player2_12b.jpg'],['player2_13.jpg', 'player2_13b.jpg'], + ['player2_14.jpg', 'player2_14b.jpg'],['player2_15.jpg', 'player2_15b.jpg'], + ['player2_16.jpg', 'player2_16b.jpg'],['player2_17.jpg', 'player2_17b.jpg'], + ['player2_18.jpg', 'player2_18b.jpg']] # game self.numplayers = 2 @@ -351,14 +363,14 @@ class View: # SLOTS: def _game_init(self, controler, playername, numplayers, gamename): # Create a table for the grid - self.num_elem_x = 4 - self.num_elem_y = 4 + self.num_elem_x = 6 + self.num_elem_y = 6 self.table = gtk.Table(self.num_elem_y, self.num_elem_x, True) self.row1.pack_start(self.table) # scale black - self.scale_x = 200 - self.scale_y = 200 + self.scale_x = 100 + self.scale_y = 100 pixbuf_i = gtk.gdk.pixbuf_new_from_file(os.path.join(self._MEMO['_DIR_IMAGES'],"black80.jpg")) self.scaledbuf_i = pixbuf_i.scale_simple(self.scale_x, self.scale_y, gtk.gdk.INTERP_BILINEAR) @@ -383,8 +395,8 @@ class View: self.y+=1 # Players - self.pscale_x = 400 - self.pscale_y = 400 + self.pscale_x = 100 + self.pscale_y = 100 self.downbox = gtk.HBox(False, 0) self.playerbox = gtk.VBox(False, 0) self.p1 = 'eva' @@ -518,7 +530,7 @@ class MemosonoActivity(Activity): Activity.__init__(self) self.connect('destroy', self._cleanup_cb) - self.gamename = 'test' + self.gamename = 'drumgit' self.set_title("Memosono - "+self.gamename) # set path @@ -532,8 +544,8 @@ class MemosonoActivity(Activity): _MEMO['_DIR_GSOUNDS'] = path[2] # read config seed = random.randint(0, 14567) - _MEMO['_NUM_GRIDPOINTS'] = 16 - _MEMO['_NUM_ELEMS'] = 8 + _MEMO['_NUM_GRIDPOINTS'] = 36 + _MEMO['_NUM_ELEMS'] = 18 grid = read_config(path[0], seed, _MEMO['_NUM_ELEMS']) _MEMO['_NUM_PLAYERS'] = 2 |