From 5852418b0b4d61f65a0f3dbaf2b7013879b27dcd Mon Sep 17 00:00:00 2001 From: Paul Schaller Date: Mon, 27 Nov 2023 14:10:11 +0100 Subject: [PATCH] scanning code now returns a Homograph, deleted unused class --- .../FourSidedScanner.java | 9 +++---- .../christmastreescanning/ScannerData.java | 24 ------------------- .../TwoSidedScanner.java | 3 ++- 3 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 src/main/java/com/cringe_studios/christmastreescanning/ScannerData.java diff --git a/src/main/java/com/cringe_studios/christmastreescanning/FourSidedScanner.java b/src/main/java/com/cringe_studios/christmastreescanning/FourSidedScanner.java index 5f41687..1d4e43f 100644 --- a/src/main/java/com/cringe_studios/christmastreescanning/FourSidedScanner.java +++ b/src/main/java/com/cringe_studios/christmastreescanning/FourSidedScanner.java @@ -23,7 +23,7 @@ public class FourSidedScanner extends SingleColorScanner { } @Override - public Point3D[] scan() { + public Homograph scan() { // TODO Auto-generated method stub frontSideScanner.scan(); frontSideScanner.normalizePoints(); @@ -35,11 +35,12 @@ public class FourSidedScanner extends SingleColorScanner { behindSideScanner.scan(); behindSideScanner.normalizePoints(); - Point2D[] frontPoints = behindSideScanner.getPoints(); + Point2D[] behindSidePoints = behindSideScanner.getPoints(); leftSideScanner.scan(); leftSideScanner.normalizePoints(); - Point2D[] rightSidePoints = leftSideScanner.getPoints(); - return null; //TODO + Point2D[] leftSidePoints = leftSideScanner.getPoints(); + + return new Homograph4(rightSidePoints, rightSidePoints, behindSidePoints, leftSidePoints); } } diff --git a/src/main/java/com/cringe_studios/christmastreescanning/ScannerData.java b/src/main/java/com/cringe_studios/christmastreescanning/ScannerData.java deleted file mode 100644 index 386b020..0000000 --- a/src/main/java/com/cringe_studios/christmastreescanning/ScannerData.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cringe_studios.christmastreescanning; - -public enum ScannerData{ - IMAGE_FRONT_RED, - IMAGE_FRONT_GREEN, - IMAGE_FRONT_BLUE, - - IMAGE_RIGHT_RED, - IMAGE_RIGHT_GREEN, - IMAGE_RIGHT_BLUE, - - IMAGE_BEHIND_RED, - IMAGE_BEHIND_GREEN, - IMAGE_BEHIND_BLUE, - - IMAGE_LEFT_RED, - IMAGE_LEFT_GREEN, - IMAGE_LEFT_BLUE, - - IMAGE_FRONT, - IMAGE_RIGHT, - IMAGE_BEHIND, - IMAGE_LEFT -} diff --git a/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java b/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java index 9fb29af..7759099 100644 --- a/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java +++ b/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java @@ -28,6 +28,7 @@ public class TwoSidedScanner extends SingleColorScanner { rightSideScanner.scan(); rightSideScanner.normalizePoints(); Point2D[] rightSidePoints = rightSideScanner.getPoints(); - return null;//TODO + + return new Homograph2(frontPoints, rightSidePoints); } }