From 717daf3831b1d400775f46822c20b91a3e07e8f5 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dupuis@etudiant.univ-rennes1.fr>
Date: Thu, 24 Jun 2021 20:06:26 +0200
Subject: [PATCH] stageBoundary Check on camera should be done too.

---
 src/main/java/gameplay/match/match.java | 38 +++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/main/java/gameplay/match/match.java b/src/main/java/gameplay/match/match.java
index 529c315..266e9d5 100644
--- a/src/main/java/gameplay/match/match.java
+++ b/src/main/java/gameplay/match/match.java
@@ -79,6 +79,10 @@ public class match {
 	private static UIInputList inputListP1;
 	private static UIElementText matchWon;
 
+	// Stage attribute
+	private static int leftBoundary;
+	private static int rightBoundary;
+
 	// Debug
 	public static boolean showP1Hitbox;
 	public static boolean showP2Hitbox;
@@ -312,6 +316,9 @@ public class match {
 		timeStampFpsCounter = System.currentTimeMillis();
 		//SetTracking
 		engine.setCameraTrackingSF3ThirdStrike(objP1, objP2);
+		//Stage
+		leftBoundary = (int) background.getXPos();
+		rightBoundary = (int) (background.getXPos() + background.getWidth() * background.getScalingFactor());
 
 		while(frameCount < 5940 && engine.getRunning()) {
 			ac(acCode);
@@ -415,10 +422,13 @@ public class match {
 				updatePos(p1,p1LooksRight);
 				updatePos(p2,!p1LooksRight);
 
+				stageBoundary();
+
 				pushBox();
 
 				cameraPushBack();
 
+
 				if(p1LooksRight) {
 
 					f = p1.getCurrentframe();
@@ -815,6 +825,34 @@ public class match {
 		}
 	}
 
+	private static void stageBoundary(){
+		// TODO arrêter de dupliquer du code
+		boolean lookRight = p1.getPosX() < p2.getPosX();
+		Character left;
+		Character right;
+		ObjectGl rightObj;
+		if (lookRight) {
+			left = p1;
+			right = p2;
+			rightObj = objP2;
+		} else {
+			left = p2;
+			right = p1;
+			rightObj = objP1;
+		}
+
+		int leftBoundaryDist = leftBoundary - left.getPosX();
+		if (leftBoundaryDist > 0){
+			left.setPos(left.getPosX() + leftBoundaryDist, left.getPosY());
+		}
+
+		int rightBoundaryDist = rightBoundary - (int) (right.getPosX() + rightObj.getWidth() * rightObj.getScalingFactor());
+		if (rightBoundaryDist < 0){
+			right.setPos(right.getPosX() + rightBoundaryDist, right.getPosY());
+		}
+
+	}
+
 	/*
 	HITBOX DEBUG METHOD
 	 */