WIPTest Merge Fixes

src/itdelatrisu/opsu/objects/Circle.java

@@ -66,7 +66,7 @@ public class Circle implements GameObject {
 	 */
 	public static void init(GameContainer container, float circleSize) {
 		diameter =  (108 - (circleSize * 8));
-		diameter =  (diameter * OsuHitObject.getXMultiplier());  // convert from Osupixels (640x480)
+		diameter =  (diameter * HitObject.getXMultiplier());  // convert from Osupixels (640x480)
 		int diameterInt = (int)diameter;
 		GameImage.HITCIRCLE.setImage(GameImage.HITCIRCLE.getImage().getScaledCopy(diameterInt, diameterInt));
 		GameImage.HITCIRCLE_OVERLAY.setImage(GameImage.HITCIRCLE_OVERLAY.getImage().getScaledCopy(diameterInt, diameterInt));

src/itdelatrisu/opsu/objects/GameObject.java

@@ -69,4 +69,9 @@ public interface GameObject {
 	 * Updates the position of the hit object.
 	 */
 	public void updatePosition();
+	
+	/**
+	 * Resets the hit object so that it can be reused.
+	 */
+	public void reset();
 }

src/itdelatrisu/opsu/objects/HitObject.java

@@ -1,79 +0,0 @@
-//TODO rename
-
-/*
- * opsu! - an open-source osu! client
- * Copyright (C) 2014, 2015 Jeffrey Han
- *
- * opsu! 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.
- *
- * opsu! 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 opsu!.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package itdelatrisu.opsu.objects;
-
-import org.newdawn.slick.Graphics;
-
-/**
- * Hit object interface.
- */
-public interface HitObject {
-	/**
-	 * Draws the hit object to the graphics context.
-	 * @param g the graphics context
-	 * @param trackPosition the current track position
-	 */
-	public void draw(Graphics g, int trackPosition);
-
-	/**
-	 * Updates the hit object.
-	 * @param overlap true if the next object's start time has already passed
-	 * @param delta the delta interval since the last call
-	 * @param mouseX the x coordinate of the mouse
-	 * @param mouseY the y coordinate of the mouse
-	 * @param keyPressed whether or not a game key is currently pressed
-	 * @param trackPosition the track position
-	 * @return true if object ended
-	 */
-	public boolean update(boolean overlap, int delta, int mouseX, int mouseY, boolean keyPressed, int trackPosition);
-
-	/**
-	 * Processes a mouse click.
-	 * @param x the x coordinate of the mouse
-	 * @param y the y coordinate of the mouse
-	 * @param trackPosition the track position
-	 * @return true if a hit result was processed
-	 */
-	public boolean mousePressed(int x, int y, int trackPosition);
-
-	/**
-	 * Returns the coordinates of the hit object at a given track position.
-	 * @param trackPosition the track position
-	 * @return the [x,y] coordinates
-	 */
-	public float[] getPointAt(int trackPosition);
-
-	/**
-	 * Returns the end time of the hit object.
-	 * @return the end time, in milliseconds
-	 */
-	public int getEndTime();
-
-	/**
-	 * Updates the position of the hit object.
-	 */
-	public void updatePosition();
-	
-	/**
-	 * Resets the hit object so that it can be reused.
-	 */
-	public void reset();
-}

src/itdelatrisu/opsu/objects/Slider.java

@@ -118,7 +118,7 @@ public class Slider implements GameObject {
 		containerHeight = container.getHeight();
 		
 		diameter =  (108 - (circleSize * 8));
-		diameter =  (diameter * OsuHitObject.getXMultiplier());  // convert from Osupixels (640x480)
+		diameter =  (diameter * HitObject.getXMultiplier());  // convert from Osupixels (640x480)
 		int diameterInt = (int)diameter;
 		
 		followRadius = diameter / 2 * 3f;