From b47b8779d05306551b6819c2ba2ab78e201127e9 Mon Sep 17 00:00:00 2001 From: Windy Feng <1745500559@qq.com> Date: Thu, 12 Dec 2019 15:39:58 -0500 Subject: [PATCH] Yet another Vuforia Bugfix --- ...kyStoneVuforiaTargetConceptValidation.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/TeamCode/src/main/java/org/darbots/darbotsftclib/testcases/DarbotsVuforiaTargetTest/DarbotsSkyStoneVuforiaTargetConceptValidation.java b/TeamCode/src/main/java/org/darbots/darbotsftclib/testcases/DarbotsVuforiaTargetTest/DarbotsSkyStoneVuforiaTargetConceptValidation.java index a798507e3b0..97ed595ab9a 100644 --- a/TeamCode/src/main/java/org/darbots/darbotsftclib/testcases/DarbotsVuforiaTargetTest/DarbotsSkyStoneVuforiaTargetConceptValidation.java +++ b/TeamCode/src/main/java/org/darbots/darbotsftclib/testcases/DarbotsVuforiaTargetTest/DarbotsSkyStoneVuforiaTargetConceptValidation.java @@ -3,7 +3,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.darbots.darbotsftclib.libcore.OpModes.DarbotsBasicOpMode; -import org.darbots.darbotsftclib.libcore.calculations.dimentionalcalculation.Robot3DPositionIndicator; +import org.darbots.darbotsftclib.libcore.calculations.dimentional_calculation.RobotPose3D; import org.darbots.darbotsftclib.libcore.sensors.cameras.RobotOnPhoneCamera; import org.darbots.darbotsftclib.libcore.templates.RobotCore; import org.firstinspires.ftc.robotcore.external.Telemetry; @@ -20,7 +20,7 @@ public RobotCore getRobotCore() { @Override public void hardwareInitialize() { RobotOnPhoneCamera myCamera = new RobotOnPhoneCamera(this,true, RobotOnPhoneCamera.PhoneCameraDirection.Back, Robot4100Common.VUFORIA_LICENSE); - Robot3DPositionIndicator PhonePosition = new Robot3DPositionIndicator( + RobotPose3D PhonePosition = new RobotPose3D( 0, 0, 0, @@ -40,19 +40,19 @@ public void hardwareDestroy() { @Override public void RunThisOpMode() { while(this.opModeIsActive()){ - Robot3DPositionIndicator OriginalPose = Detector.getDarbotsRobotAxisOriginalStonePosition(); - Robot3DPositionIndicator DarbotsPose = Detector.getDarbotsRobotAxisDarbotsStonePosition(); + RobotPose3D OriginalPose = Detector.getDarbotsRobotAxisOriginalStonePosition(); + RobotPose3D DarbotsPose = Detector.getDarbotsRobotAxisDarbotsStonePosition(); if(OriginalPose != null) { Telemetry.Line OriginalLine = telemetry.addLine("Original Pose"); - OriginalLine.addData("X", OriginalPose.getX()); - OriginalLine.addData("Y", OriginalPose.getY()); - OriginalLine.addData("Z", OriginalPose.getZ()); + OriginalLine.addData("X", OriginalPose.X); + OriginalLine.addData("Y", OriginalPose.Y); + OriginalLine.addData("Z", OriginalPose.Z); } if(DarbotsPose != null) { Telemetry.Line DarbotsLine = telemetry.addLine("Darbots Pose"); - DarbotsLine.addData("X", DarbotsPose.getX()); - DarbotsLine.addData("Y", DarbotsPose.getY()); - DarbotsLine.addData("Z", DarbotsPose.getZ()); + DarbotsLine.addData("X", DarbotsPose.X); + DarbotsLine.addData("Y", DarbotsPose.Y); + DarbotsLine.addData("Z", DarbotsPose.Z); telemetry.update(); } }