diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa69fca..6b08b4e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,8 @@
-
+
+
@@ -36,6 +37,7 @@
"keyToString": {
"Application.GTCar.executor": "Run",
"Application.GraphicsProgram.executor": "Run",
+ "Application.Main.executor": "Run",
"Application.Tracker.executor": "Run",
"Downloaded.Files.Path.Enabled": "false",
"Repository.Attach.Annotations": "false",
@@ -46,7 +48,7 @@
"com.codeium.enabled": "true",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "C:/Users/david/Documents/Uni/GTCar/opencv/build/java/opencv-4100.jar",
+ "last_opened_file_path": "C:/Users/david/Documents/Uni/GTCar/processing-4.3/core/library/core.jar",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -58,7 +60,7 @@
"vue.rearranger.settings.migration": "true"
}
}]]>
-
+
@@ -67,6 +69,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,6 +92,7 @@
1732108904989
+
diff --git a/src/main/java/GameLoop.java b/src/main/java/GameLoop.java
index cdc69ee..07d30cb 100644
--- a/src/main/java/GameLoop.java
+++ b/src/main/java/GameLoop.java
@@ -17,8 +17,8 @@ public class GameLoop {
Player player2;
public GameLoop(){
- player1 = new Player(0, "ip", 9000);
- player2 = new Player(1, "ip", 9000);
+ player1 = new Player(0, "192.168.33.33", 9000);
+ player2 = new Player(1, "192.168.33.44", 9000);
tracker = new Tracker();
graphics = new GraphicsProgram();
String[] args = {"GraphicsProgram"};
@@ -69,15 +69,18 @@ public class GameLoop {
}
private List track(){
- Point p1 = tracker.getP1();
- Point p2 = tracker.getP2();
+ org.opencv.core.Point p1 = tracker.getP1();
+ org.opencv.core.Point p2 = tracker.getP2();
- player1.setKoords(p1.x, p1.y);
- player2.setKoords(p2.x, p2.y);
+ java.awt.Point p1Java = new java.awt.Point((int) p1.x, (int) p1.y);
+ java.awt.Point p2Java = new java.awt.Point((int) p2.x, (int) p2.y);
+
+ player1.setKoords(p1Java.x, p1Java.y);
+ player2.setKoords(p2Java.x, p2Java.y);
List output = new ArrayList<>();
- output.set(0, p1);
- output.add(p2);
+ output.set(0, p1Java);
+ output.set(1, p2Java);
return output;
}
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 7046417..eb0f76d 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -1,2 +1,5 @@
public class Main {
+ public static void main(String[] args){
+ GameLoop gl = new GameLoop();
+ }
}
diff --git a/src/main/java/Tracker.java b/src/main/java/Tracker.java
index a7c45b1..6cc5dbe 100644
--- a/src/main/java/Tracker.java
+++ b/src/main/java/Tracker.java
@@ -99,6 +99,14 @@ public class Tracker {
return positions;
}
+ public Point getP1(){
+ return currentPositionP1;
+ }
+
+ public Point getP2(){
+ return currentPositionP2;
+ }
+
private void drawMarkers(Mat frame) {
// Größe der Quadrate
int size = 10;