summaryrefslogtreecommitdiff
authorMichael Hamann <michael@content-space.de>2009-06-28 13:39:10 (GMT)
committer Michael Hamann <michael@content-space.de>2009-06-28 13:39:10 (GMT)
commit58fcbaa41069122a54cdb747c42bfaab8e27e070 (patch) (side-by-side diff)
tree7b7f144b5927272fcfb43d7aaca87f4ebe3475a9
parentc5fa7d874a2e8bd1665c66553c6c376022ae6d16 (diff)
download_3dpongcube-master.zip
_3dpongcube-master.tar.gz
_3dpongcube-master.tar.bz2
Changed music file, added them to local directory, added LICENSE.HEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--01 - Gothika and Hydraulic - Creep.mp3bin0 -> 8910455 bytes
-rw-r--r--LICENSE25
-rw-r--r--Racket.java6
-rw-r--r--_3dpongcube.pde2
-rw-r--r--pop.wavbin0 -> 4068 bytes
-rw-r--r--wee.wavbin0 -> 9620 bytes
6 files changed, 29 insertions, 4 deletions
diff --git a/01 - Gothika and Hydraulic - Creep.mp3 b/01 - Gothika and Hydraulic - Creep.mp3
new file mode 100644
index 0000000..47cedee
--- a/dev/null
+++ b/01 - Gothika and Hydraulic - Creep.mp3
Binary files differ
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..560f85a
--- a/dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+Copyright (C) 2009 Michael Hamann <michael@content-space.de>
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, see http://www.gnu.org/licenses/.
+
+
+
+01 - Gothika and Hydraulic - Creep.mp3 - Gothika and Hydraulic - Creep from
+the album Psytranceproducts Vol.01 by Speedsound - see
+http://www.jamendo.com/de/album/26731 - Creative Commons Attribution License,
+see http://creativecommons.org/licenses/by/3.0/ for details
+
+pop.wav from the KDE project, see http://www.kde.org, licensed under the GPL
+
+wee.wav from the game Supertuxkart, see http://supertuxkart.sourceforge.net/,
+licensed under GPL version 2
diff --git a/Racket.java b/Racket.java
index f56e79f..54b902f 100644
--- a/Racket.java
+++ b/Racket.java
@@ -15,8 +15,8 @@ class Racket extends Side {
private Side side;
private Score score = new Score();
- private AudioPlayer hit = minim.loadFile("/usr/share/sounds/pop.wav", 2048);
- private AudioPlayer miss = minim.loadFile("/usr/share/supertuxkart/data/sfx/wee.wav", 2048);
+ private AudioPlayer hit = minim.loadFile("pop.wav", 2048);
+ private AudioPlayer miss = minim.loadFile("wee.wav", 2048);
public Racket(HardwareCube cube, final Side side, Minim minim, VisualCube.Color color) {
super(cube, minim);
@@ -188,7 +188,7 @@ class Racket extends Side {
class Score implements Element {
int score = 0;
public void increment() {
- side.getPixel(0, score).setElement(this, new VisualCube.Color(150, 150, 150));
+ side.getPixel(0, score).setElement(this, baseColor);
if (score < side.getHeight()-1) {
score++;
}
diff --git a/_3dpongcube.pde b/_3dpongcube.pde
index b149daa..404823e 100644
--- a/_3dpongcube.pde
+++ b/_3dpongcube.pde
@@ -14,7 +14,7 @@ void setup() {
cube.clear();
cube.simulate(800, 800);
Minim minim = new Minim(this);
- AudioPlayer player = minim.loadFile("/home/michitux/pub/musik/suhov-symphaty_modul_ep/01_suhov-exx_fuck.mp3", 2048);
+ AudioPlayer player = minim.loadFile("01 - Gothika and Hydraulic - Creep.mp3", 2048);
player.loop();
pongcube = new HardwareCube(cube, minim);
}
diff --git a/pop.wav b/pop.wav
new file mode 100644
index 0000000..adf5c6c
--- a/dev/null
+++ b/pop.wav
Binary files differ
diff --git a/wee.wav b/wee.wav
new file mode 100644
index 0000000..db4ba8f
--- a/dev/null
+++ b/wee.wav
Binary files differ