From 3973e122cf1328a2729afdcccdfddef020ca8e0d Mon Sep 17 00:00:00 2001
From: Nic0Nic0Nii <sigonasr2@yahoo.com>
Date: Fri, 8 Oct 2021 00:40:38 +0000
Subject: [PATCH] Add in note judgements.

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 LLSIG/src/main/java/LLSIG/Canvas.java       | 10 +++++---
 LLSIG/src/main/java/LLSIG/LLSIG.java        | 28 +++++++++++++--------
 LLSIG/src/main/java/LLSIG/Lane.java         |  3 ++-
 LLSIG/src/main/java/LLSIG/TimingRating.java | 10 ++++++++
 4 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 LLSIG/src/main/java/LLSIG/TimingRating.java

diff --git a/LLSIG/src/main/java/LLSIG/Canvas.java b/LLSIG/src/main/java/LLSIG/Canvas.java
index 8e07b5a..c03a2ef 100644
--- a/LLSIG/src/main/java/LLSIG/Canvas.java
+++ b/LLSIG/src/main/java/LLSIG/Canvas.java
@@ -46,10 +46,12 @@ public class Canvas extends JPanel{
 				int noteCounter = 0;
 				while (lane.noteExists(noteCounter)) {
 					Note n = lane.getNote(noteCounter);
-					double PLAYTIME_RATIO = (1-(((double)n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition())/LLSIG.game.NOTE_SPEED));
-					if (n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition()<LLSIG.game.NOTE_SPEED) {
-						g.fillOval((int)(MIDDLE_X-Math.cos(Math.toRadians(22.5*i))*(PLAYTIME_RATIO*NOTE_DISTANCE)-NOTE_SIZE/2),(int)(MIDDLE_Y+Math.sin(Math.toRadians(22.5*i))*(PLAYTIME_RATIO*NOTE_DISTANCE)-NOTE_SIZE/2),
-								(int)(Math.min(PLAYTIME_RATIO/2+0.5,1)*NOTE_SIZE),(int)(Math.min(PLAYTIME_RATIO/2+0.5,1)*NOTE_SIZE));
+					if (n.active) {
+						double PLAYTIME_RATIO = (1-(((double)n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition())/LLSIG.game.NOTE_SPEED));
+						if (n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition()<LLSIG.game.NOTE_SPEED) {
+							g.fillOval((int)(MIDDLE_X-Math.cos(Math.toRadians(22.5*i))*(PLAYTIME_RATIO*NOTE_DISTANCE)-NOTE_SIZE/2),(int)(MIDDLE_Y+Math.sin(Math.toRadians(22.5*i))*(PLAYTIME_RATIO*NOTE_DISTANCE)-NOTE_SIZE/2),
+									(int)(Math.min(PLAYTIME_RATIO/2+0.5,1)*NOTE_SIZE),(int)(Math.min(PLAYTIME_RATIO/2+0.5,1)*NOTE_SIZE));
+						}
 					}
 					noteCounter++;
 				}
diff --git a/LLSIG/src/main/java/LLSIG/LLSIG.java b/LLSIG/src/main/java/LLSIG/LLSIG.java
index 953769e..7ed401c 100644
--- a/LLSIG/src/main/java/LLSIG/LLSIG.java
+++ b/LLSIG/src/main/java/LLSIG/LLSIG.java
@@ -33,6 +33,11 @@ public class LLSIG implements KeyListener{
 
 	public static boolean[] lanePress = new boolean[9]; //A lane is being requested to being pressed.
 	public static boolean[] keyState = new boolean[9]; //Whether or not the key is pressed down.
+
+	final static int PERFECT_TIMING_WINDOW = 20;
+	final static int EXCELLENT_TIMING_WINDOW = 50;
+	final static int GREAT_TIMING_WINDOW = 100;
+	final static int BAD_TIMING_WINDOW = 150;
 	
 	LLSIG(JFrame f) {
 		this.window = f;
@@ -55,15 +60,6 @@ public class LLSIG implements KeyListener{
 		gameLoop = new Thread() {
 			public void run() {
 				frameCount++;
-				for (int i=0;i<9;i++) {
-					if (lanePress[i]) {
-						lanePress[i]=false;
-						if (lanes.get(i).noteExists()) {
-							lanes.get(i).getNote()
-						}
-						//TODO Hit detection goes here.
-					}
-				}
 				window.repaint();
 			}
 		};
@@ -145,7 +141,19 @@ public class LLSIG implements KeyListener{
 			LLSIG.game.lanes.get(lane).addNote(new Note(NoteType.NORMAL,musicPlayer.getPlayPosition()));
 		}
 		if (lane!=-1) {
-			lanePress[lane]=true;
+			if (PLAYING) {
+				Lane l = lanes.get(lane);
+				if (l.noteExists()) {
+					Note n = l.getNote();
+					int diff = n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition();
+					if (Math.abs(diff)<=PERFECT_TIMING_WINDOW) {l.lastRating=TimingRating.PERFECT;} else
+					if (Math.abs(diff)<=EXCELLENT_TIMING_WINDOW) {l.lastRating=TimingRating.EXCELLENT;} else
+					if (Math.abs(diff)<=GREAT_TIMING_WINDOW) {l.lastRating=TimingRating.GREAT;} else
+					if (Math.abs(diff)<=BAD_TIMING_WINDOW) {l.lastRating=Math.signum(diff)>0?TimingRating.EARLY:TimingRating.LATE;}
+					l.lastNote=LLSIG.game.musicPlayer.getPlayPosition();
+					n.active=false;
+				}
+			}
 			keyState[lane]=true;
 		}
 		//System.out.println("Pressed "+e.getKeyChar()+" on frame "+musicPlayer.getPlayPosition());
diff --git a/LLSIG/src/main/java/LLSIG/Lane.java b/LLSIG/src/main/java/LLSIG/Lane.java
index 3ce50c4..f30e75d 100644
--- a/LLSIG/src/main/java/LLSIG/Lane.java
+++ b/LLSIG/src/main/java/LLSIG/Lane.java
@@ -1,10 +1,11 @@
 package main.java.LLSIG;
-import java.util.ArrayList;
 import java.util.List;
 
 public class Lane{
 	List<Note> noteChart;
 	int currentNoteIndex = 0;
+	TimingRating lastRating = TimingRating.MISS;
+	int lastNote = -1;
 	public Lane(List<Note> noteChart) {
 		super();
 		this.noteChart = noteChart;
diff --git a/LLSIG/src/main/java/LLSIG/TimingRating.java b/LLSIG/src/main/java/LLSIG/TimingRating.java
new file mode 100644
index 0000000..d3f08b3
--- /dev/null
+++ b/LLSIG/src/main/java/LLSIG/TimingRating.java
@@ -0,0 +1,10 @@
+package main.java.LLSIG;
+
+public enum TimingRating {
+    PERFECT,    //  +/-20ms
+    EXCELLENT,  //  +/-50ms
+    GREAT,      //  +/-100ms
+    EARLY,      //  +/-150ms
+    LATE,       //  +/-150ms
+    MISS;       //  >150ms
+}