Skip to content

Commit 189da52

Browse files
authored
Fix aruco draw (#1468)
Someone hard-coded the 16h5 model. Additionally, the April tag pipeline redistorts the points before drawing them, so let's do that as well.
1 parent 48fc88c commit 189da52

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

photon-core/src/main/java/org/photonvision/vision/pipe/impl/Draw3dArucoPipe.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public Draw3dArucoParams(
3030
FrameDivisor divisor) {
3131
super(shouldDraw, cameraCalibrationCoefficients, targetModel, divisor);
3232
this.shouldDrawHull = false;
33+
this.redistortPoints = true;
3334
}
3435
}
3536
}

photon-core/src/main/java/org/photonvision/vision/pipeline/OutputStreamPipeline.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.photonvision.vision.opencv.DualOffsetValues;
2525
import org.photonvision.vision.pipe.impl.*;
2626
import org.photonvision.vision.pipeline.result.CVPipelineResult;
27-
import org.photonvision.vision.target.TargetModel;
2827
import org.photonvision.vision.target.TrackedTarget;
2928

3029
/**
@@ -108,7 +107,7 @@ protected void setPipeParams(
108107
new Draw3dArucoPipe.Draw3dArucoParams(
109108
settings.outputShouldDraw,
110109
frameStaticProperties.cameraCalibration,
111-
TargetModel.kAprilTag6in_16h5,
110+
settings.targetModel,
112111
settings.streamingFrameDivisor);
113112
draw3dArucoPipe.setParams(draw3dArucoParams);
114113

0 commit comments

Comments
 (0)