RoboCup-SSL
diff --git a/‎cmd/ssl-game-controller/main.go
Lines changed: 32 additions & 8 deletions b/‎cmd/ssl-game-controller/main.go
Lines changed: 32 additions & 8 deletions
diff --git a/‎ui/public/index.html
Lines changed: 1 addition & 1 deletion b/‎ui/public/index.html
Lines changed: 1 addition & 1 deletion
diff --git a/‎ui/src/App.vue
Lines changed: 11 additions & 4 deletions b/‎ui/src/App.vue
Lines changed: 11 additions & 4 deletions
diff --git a/‎ui/src/components/field/Field.vue
Lines changed: 0 additions & 193 deletions b/‎ui/src/components/field/Field.vue
Lines changed: 0 additions & 193 deletions
@@ -1,27 +1,51 @@
 package main
 
 import (
+	"flag"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/controller"
+	"github.com/RoboCup-SSL/ssl-vision-client/pkg/vision"
 	"github.com/gobuffalo/packr"
 	"log"
 	"net/http"
 )
 
+var address = flag.String("address", "localhost:8081", "The address on which the UI and API is served, default: localhost:8081")
+var visionAddress = flag.String("visionAddress", "224.5.23.2:10006", "The multicast address of ssl-vision, default: 224.5.23.2:10006")
+
 func main() {
+	flag.Parse()
+
+	setupGameController()
+	setupVisionClient()
+	setupUi()
+
+	err := http.ListenAndServe(*address, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func setupGameController() {
+	gameController := controller.NewGameController()
+	gameController.Run()
+	// serve the bidirectional web socket
+	http.HandleFunc("/api/control", gameController.ApiServer.WsHandler)
+}
 
-	g := controller.NewGameController()
-	g.Run()
+func setupVisionClient() {
+	receiver := vision.NewReceiver()
+	publisher := vision.NewPublisher()
+	publisher.PackageProvider = receiver.ToPackage
+	http.HandleFunc("/api/vision", publisher.Handler)
+	go receiver.Receive(*visionAddress)
+}
 
+func setupUi() {
 	box := packr.NewBox("../../ui/dist")
 	http.Handle("/", http.FileServer(box))
-
 	if box.Has("index.html") {
-		log.Print("UI is available at http://localhost:8081")
+		log.Printf("UI is available at http://%v", *address)
 	} else {
 		log.Print("Backend-only version started. Run the UI separately or get a binary that has the UI included")
 	}
-
-	// serve the bidirectional web socket
-	http.HandleFunc("/ws", g.ApiServer.WsHandler)
-	http.ListenAndServe(":8081", nil)
 }
@@ -7,7 +7,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title>ssl-game-controller</title>
 </head>
-<body>
+<body style="height: 100vh">
 <noscript>
     <strong>We're sorry but ssl-game-controller doesn't work properly without JavaScript enabled. Please enable it to
         continue.</strong>
 
@@ -10,7 +10,7 @@
                 <ControlTeam class="team-views" team-color="Yellow"/>
             </div>
             <div id="field">
-                <Field/>
+                <iframe src="http://localhost:8082/" frameborder="none"></iframe>
             </div>
             <div class="team-container">
                 <TeamOverview class="team-views" team-color="Blue"/>
@@ -29,12 +29,10 @@
     import ControlTeam from "./components/control/ControlTeam";
     import Debug from "./components/Debug";
     import ControlMatch from "./components/control/ControlMatch";
-    import Field from "./components/field/Field";
 
     export default {
         name: 'app',
         components: {
-            Field,
             ControlMatch,
             Debug,
             ControlTeam,
@@ -52,6 +50,10 @@
         -moz-osx-font-smoothing: grayscale;
         text-align: center;
         color: #2c3e50;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: stretch;
     }
 
     #app-header {
@@ -77,7 +79,7 @@
         flex-direction: row;
         flex-wrap: wrap;
         justify-content: flex-start;
-        align-items: flex-start;
+        align-items: stretch;
         align-content: flex-start;
         flex-grow: 1;
     }
@@ -86,6 +88,11 @@
         flex-grow: 1;
     }
 
+    #field iframe {
+        width: 100%;
+        height: 100%;
+    }
+
     .team-container {
         display: flex;
         flex-direction: column;