diff --git a/chameleon-client/src/assets/FRCtargets.json b/chameleon-client/src/assets/FRCtargets.json new file mode 100644 index 000000000..12a8babe4 --- /dev/null +++ b/chameleon-client/src/assets/FRCtargets.json @@ -0,0 +1,14 @@ +{ + "2020 Hex Goal": [ + [-19.625, 0], + [-9.819867, -17], + [9.819867, -17], + [19.625,0] + ], + "2019 Dual Target": [ + [-7.75, 3], + [-7.75, -3], + [7.75, -3], + [7.75, 3] + ] +} \ No newline at end of file diff --git a/chameleon-client/src/views/CameraViewes/3D.vue b/chameleon-client/src/views/CameraViewes/3D.vue index 6d551b7ed..5a76c92c1 100644 --- a/chameleon-client/src/views/CameraViewes/3D.vue +++ b/chameleon-client/src/views/CameraViewes/3D.vue @@ -4,35 +4,44 @@ - - - - - - + + + + mdi-upload + upload model + + + + + + + + + + Upload Premade + - diff --git a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java index d7c2a102c..ef675584e 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java +++ b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java @@ -176,7 +176,6 @@ public class RequestHandler { } public static void onPnpModel(Context ctx) throws JsonProcessingException { - System.out.println(ctx.body()); ObjectMapper objectMapper = kObjectMapper; List points = objectMapper.readValue(ctx.body(), List.class); System.out.println(points);