diff --git a/audio/AudioPlayer$1.class b/audio/AudioPlayer$1.class new file mode 100644 index 0000000..3dd9ddd Binary files /dev/null and b/audio/AudioPlayer$1.class differ diff --git a/image/cursor.png b/image/cursor.png new file mode 100644 index 0000000..9c9d22d Binary files /dev/null and b/image/cursor.png differ diff --git a/image/pulse.png b/image/pulse.png new file mode 100644 index 0000000..8c8085c Binary files /dev/null and b/image/pulse.png differ diff --git a/model/SongHandler.java b/model/SongHandler.java index 9caa4ee..3975268 100644 --- a/model/SongHandler.java +++ b/model/SongHandler.java @@ -35,7 +35,7 @@ public class SongHandler { if(Window.ON_RASP) dir = new File(System.getProperty( "user.home" ) + "/ColorStrike/Songs/"); else - dir = new File(System.getProperty( "user.home" ) + "/ColorStrike/Songs/"); + dir = new File(System.getProperty( "user.home" ) + "/Documents/songs/"); songs = DirScanner.scanDirectories(dir); System.out.println(songs.size()); diff --git a/model/drawObjects/Player.java b/model/drawObjects/Player.java index 0d349af..856638b 100644 --- a/model/drawObjects/Player.java +++ b/model/drawObjects/Player.java @@ -9,25 +9,54 @@ import java.awt.image.BufferedImage; public class Player extends DrawObject { - private BufferedImage img; + private BufferedImage img,pulse; private AffineTransform transform; private int lastindex; private Point2D middlePoint; + private int subImgX,subImgY, indexCursor =0; + + private int subImgXBeat, indexBeat = 0; + private boolean beat = false; + public Player(int x, int y){ - img = Images.getImage(Images.ImageType.player2); - width = img.getWidth(); - height = img.getHeight(); + img = Images.getImage(Images.ImageType.cursor); + pulse = Images.getImage(Images.ImageType.pulse); + width = 100;//img.getWidth(); + height = 100;//img.getHeight(); lastindex = -10; middlePoint = new Point2D.Double(x,y); } public void draw(Graphics2D g2){// - g2.drawImage(img, transform, null); + subImgX = (indexCursor % 8)*100; + subImgY = (indexCursor / 8)*100; + + subImgXBeat = (indexBeat % 9)*100; + + + BufferedImage subImg2 = pulse.getSubimage(subImgXBeat,0,100,100); + g2.drawImage(subImg2, transform, null); + + + BufferedImage subImg = img.getSubimage(subImgX,subImgY,100,100); + g2.drawImage(subImg, transform, null); } public void update(float update){ + if(beat){ + indexBeat++; + if(indexBeat >= 9) + { + indexBeat = 0; + beat = false; + } + } + + indexCursor++; + indexCursor%=32; + if(lastindex != index){ transform = new AffineTransform(); transform.rotate(Math.toRadians(index*45),middlePoint.getX(),middlePoint.getY()); @@ -35,5 +64,11 @@ public class Player extends DrawObject { lastindex = index; } } + + public void setBeat() { + beat = true; + indexBeat = 0; + + } }