From: Bastiaan Zapf <bzapf@example.org>
Date: Tue, 3 May 2005 17:29:00 +0000 (+0000)
Subject: * some new sounds as csound source (you'll need csound
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7ef937b79a4e3a818e919d476388146e3ae1db03;p=supertux.git

* some new sounds as csound source (you'll need csound
  to compile them, a Makefile will help you to do so)
* a new fire-flower.wav

SVN-Revision: 2390
---

diff --git a/contrib/sounds/csound/Makefile b/contrib/sounds/csound/Makefile
index 13a754a0f..222210172 100644
--- a/contrib/sounds/csound/Makefile
+++ b/contrib/sounds/csound/Makefile
@@ -1,10 +1,13 @@
 
 CSOUND = /usr/bin/csound
+SOX = /usr/bin/sox
 
-sounds: bubble.wav rain.wav lava.wav waterfall.wav 
+sounds: bubble.wav rain.wav lava.wav waterfall.wav flower.wav
 
 %.wav: %.sco sfx.orc 
-	$(CSOUND) sfx.orc $< -W -o $@ -g
+	$(CSOUND) sfx.orc $< -W -o $@.1 -g
+	$(SOX) -r 22100 -s $@.1 $@
+	rm $@.1
 
 clean: 
 	rm *.wav
diff --git a/contrib/sounds/csound/flower.sco b/contrib/sounds/csound/flower.sco
new file mode 100644
index 000000000..e2e433c7d
--- /dev/null
+++ b/contrib/sounds/csound/flower.sco
@@ -0,0 +1,24 @@
+
+f1 0 16384 10 1 0.5 0.25 0.125 0.1 0.2 0.1 0.1 0.2 0.1 0.1
+
+t 0 600
+
+i4.1 0    0.25 10     20000
+i4.2 0.25 0.25 10.04  20000
+i4.3 0.5  0.5  10.07  30000
+
+i4.4 1    0.25 10.04  20000
+i4.5 1.25 0.25 10.07  20000
+i4.6 1.5  0.5  10.09  30000
+
+i4.7 2    0.25 10.09  20000
+i4.8 2.25 0.25 11.00  20000
+i4.9 2.5  0.5  11.04  30000
+
+i4.10 3    0.25 11.00  20000
+i4.11 3.25 0.25 11.04  20000
+i4.12 3.5  0.5  11.07  30000
+
+f0 7
+
+e
diff --git a/contrib/sounds/csound/rain.sco b/contrib/sounds/csound/rain.sco
index 981789397..c8e88852f 100644
--- a/contrib/sounds/csound/rain.sco
+++ b/contrib/sounds/csound/rain.sco
@@ -1,13 +1,8 @@
 
-; some water/rain sounds 
+; rain
 
+i2 0 2 3000 0.5 5000 -0.1 3 8000
 
-;i2 0 1 3000 10 7000 1
-;i2 0 5 1000 20 2000 0.4 
-i2 0 5 2000 0.5 3000 -0.5 3
-;i2 0 1 3000 0 3000 1
-;i2 0 1 3000 2 4000 1
-;i2 0 1 6000 2 4000 1
 
 
 
diff --git a/contrib/sounds/csound/sfx.orc b/contrib/sounds/csound/sfx.orc
index 7dcfde6f7..e06f1d16d 100644
--- a/contrib/sounds/csound/sfx.orc
+++ b/contrib/sounds/csound/sfx.orc
@@ -55,9 +55,10 @@ instr 2
 	a1    pareq   a1, p4,p5, 1, 1 ; growl
 	a1    pareq   a1, p6  ,1+kncrck*p7 ,1, 0 ; "crackling"
 	a1    pareq   a1, p6/2,1+k2crck*p7 ,1, 0 ; "crackling"
+	a1    pareq   a1, p6/3,1+k2crck*p7 ,1, 0 ; "crackling"
 
-	a1    pareq   a1,  10, 0, 1, 1 ; thunder stop (dc correction)
-	a1    pareq   a1, 4000, 0, 1, 2 ; extreme high stop
+	a1    pareq   a1, 10, 0, 0.7, 1 ; thunder stop (dc correction)
+	a1    pareq   a1, p9, 0, 0.7, 2 ; extreme high stop
 
 	out a1*700 ; adjust your volume here
 endin
@@ -76,4 +77,30 @@ instr 3
 	kff = kff*p6 ; frequency exponential rise
 	out aout*kamp
 
-endin        
\ No newline at end of file
+endin        
+
+instr 4
+
+	ifqc= cpspch(p4)
+	ihold
+
+	kamp linseg 0,p3/8,1,p3*6/8,1,p3/8,0
+	kfenv expseg 0.001,p3/8,3,p3,1,p3*1,0.001
+
+	asrc oscili p5/4,ifqc,1
+	aout lowres asrc,ifqc*kfenv/2,2
+	aphs phaser2 aout, ifqc*(kfenv+1), 0.89,20, 2, 2, 0.6
+
+	aout = aout - aphs
+
+	aecho reverb aout,0.01,0.1
+	aout=aout+aecho*0.3
+
+	aout balance aout,asrc
+
+	aout butterhp aout,1000,0
+
+
+	out aout*kamp
+
+endin
\ No newline at end of file
diff --git a/contrib/sounds/csound/waterfall.sco b/contrib/sounds/csound/waterfall.sco
index 897c561e2..f43ced92a 100644
--- a/contrib/sounds/csound/waterfall.sco
+++ b/contrib/sounds/csound/waterfall.sco
@@ -1,7 +1,7 @@
 
 ; use the rain instrument to make a waterfall like sound
 
-i2 0 5 1000 10 5000 0.4 0
+i2 0 2 1000 10 5000 0.4 1 8000
 
 
 
diff --git a/data/sounds/fire-flower.wav b/data/sounds/fire-flower.wav
index 2e2be45eb..72c22725e 100644
Binary files a/data/sounds/fire-flower.wav and b/data/sounds/fire-flower.wav differ