Draw only hit animations under hit objects. (partial revert of 1b99795)

Also, draw slider tick results for version 1 skins. Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
itdelatrisu · Jan 6, 2017 · 7a1f527 · 7a1f527
1 parent ceb4e5d
commit 7a1f527
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 37 deletions.
diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
@@ -970,52 +970,59 @@ public void drawRankingElements(Graphics g, Beatmap beatmap, int time) {
 	/**
 	 * Draws stored hit results and removes them from the list as necessary.
 	 * @param trackPosition the current track position (in ms)
+	 * @param over true if drawing elements over hit objects, false for under
 	 */
-	public void drawHitResults(int trackPosition) {
+	public void drawHitResults(int trackPosition, boolean over) {
 		Iterator<HitObjectResult> iter = hitResultList.iterator();
 		while (iter.hasNext()) {
 			HitObjectResult hitResult = iter.next();
 			if (hitResult.time + HITRESULT_TIME > trackPosition) {
-				// spinner
-				if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS) {
-					Image spinnerOsu = GameImage.SPINNER_OSU.getImage();
-					spinnerOsu.setAlpha(hitResult.alpha);
-					spinnerOsu.drawCentered(width / 2, height / 4);
-					spinnerOsu.setAlpha(1f);
-				}
-
-				// hit lighting
-				else if (Options.isHitLightingEnabled() && !hitResult.hideResult && hitResult.result != HIT_MISS &&
-					hitResult.result != HIT_SLIDER30 && hitResult.result != HIT_SLIDER10) {
-					// TODO: add particle system
-					Image lighting = GameImage.LIGHTING.getImage();
-					lighting.setAlpha(hitResult.alpha);
-					lighting.drawCentered(hitResult.x, hitResult.y, hitResult.color);
-				}
+				// results drawn OVER hit objects
+				if (over) {
+					// spinner
+					if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS) {
+						Image spinnerOsu = GameImage.SPINNER_OSU.getImage();
+						spinnerOsu.setAlpha(hitResult.alpha);
+						spinnerOsu.drawCentered(width / 2, height / 4);
+						spinnerOsu.setAlpha(1f);
+					}
 
-				// hit animations (only draw when the "Hidden" mod is not enabled)
-				if (!GameMod.HIDDEN.isActive()) {
-					drawHitAnimations(hitResult, trackPosition);
-				}
+					// hit lighting
+					else if (Options.isHitLightingEnabled() && !hitResult.hideResult && hitResult.result != HIT_MISS &&
+						hitResult.result != HIT_SLIDER30 && hitResult.result != HIT_SLIDER10) {
+						// TODO: add particle system
+						Image lighting = GameImage.LIGHTING.getImage();
+						lighting.setAlpha(hitResult.alpha);
+						lighting.drawCentered(hitResult.x, hitResult.y, hitResult.color);
+					}
 
-				// hit result
-				if (!hitResult.hideResult && (
-				    hitResult.hitResultType == HitObjectType.CIRCLE ||
-				    hitResult.hitResultType == HitObjectType.SLIDER_FIRST ||
-				    hitResult.hitResultType == HitObjectType.SLIDER_LAST ||
-				    hitResult.hitResultType == HitObjectType.SPINNER)) {
-					float scaleProgress = AnimationEquation.IN_OUT_BOUNCE.calc(
+					// hit result
+					if (!hitResult.hideResult && (
+					    hitResult.hitResultType == HitObjectType.CIRCLE ||
+					    hitResult.hitResultType == HitObjectType.SLIDER_FIRST ||
+					    hitResult.hitResultType == HitObjectType.SLIDER_LAST ||
+					    hitResult.hitResultType == HitObjectType.SPINNER ||
+					    (hitResult.hitResultType == HitObjectType.SLIDERTICK && Options.getSkin().getVersion() == 1))) {
+						float scaleProgress = AnimationEquation.IN_OUT_BOUNCE.calc(
 							(float) Utils.clamp(trackPosition - hitResult.time, 0, HITCIRCLE_TEXT_BOUNCE_TIME) / HITCIRCLE_TEXT_BOUNCE_TIME);
-					float scale = 1f + (HITCIRCLE_TEXT_ANIM_SCALE - 1f) * scaleProgress;
-					float fadeProgress = AnimationEquation.OUT_CUBIC.calc(
+						float scale = 1f + (HITCIRCLE_TEXT_ANIM_SCALE - 1f) * scaleProgress;
+						float fadeProgress = AnimationEquation.OUT_CUBIC.calc(
 							(float) Utils.clamp((trackPosition - hitResult.time) - HITCIRCLE_FADE_TIME, 0, HITCIRCLE_TEXT_FADE_TIME) / HITCIRCLE_TEXT_FADE_TIME);
-					float alpha = 1f - fadeProgress;
-					Image scaledHitResult = hitResults[hitResult.result].getScaledCopy(scale);
-					scaledHitResult.setAlpha(alpha);
-					scaledHitResult.drawCentered(hitResult.x, hitResult.y);
+						float alpha = 1f - fadeProgress;
+						Image scaledHitResult = hitResults[hitResult.result].getScaledCopy(scale);
+						scaledHitResult.setAlpha(alpha);
+						scaledHitResult.drawCentered(hitResult.x, hitResult.y);
+					}
+
+					hitResult.alpha = 1 - ((float) (trackPosition - hitResult.time) / HITRESULT_FADE_TIME);
 				}
 
-				hitResult.alpha = 1 - ((float) (trackPosition - hitResult.time) / HITRESULT_FADE_TIME);
+				// results drawn UNDER hit objects
+				else {
+					// hit animations (only draw when the "Hidden" mod is not enabled)
+					if (!GameMod.HIDDEN.isActive())
+						drawHitAnimations(hitResult, trackPosition);
+				}
 			} else {
 				if (hitResult.curve != null)
 					hitResult.curve.discardGeometry();

diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
@@ -1501,8 +1501,8 @@ public void leave(GameContainer container, StateBasedGame game)
 	 * @param trackPosition the track position
 	 */
 	private void drawHitObjects(Graphics g, int trackPosition) {
-		// draw result objects
-		data.drawHitResults(trackPosition);
+		// draw result objects (under)
+		data.drawHitResults(trackPosition, false);
 
 		// include previous object in follow points
 		int lastObjectIndex = -1;
@@ -1617,6 +1617,9 @@ else if (progress > t - step)
 				g.popTransform();
 			}
 		}
+
+		// draw result objects (over)
+		data.drawHitResults(trackPosition, true);
 	}
 
 	/**