diff options
| author | student <student@localhost> | 2018-04-11 11:04:23 -0400 |
|---|---|---|
| committer | student <student@localhost> | 2018-04-11 11:04:23 -0400 |
| commit | cd0051da61ae4937d640f5801a5a13c7a42bb879 (patch) | |
| tree | 8febfe737e4a9ee35f8b10820b22492e6c4e2d25 /CSMath/src | |
| parent | 2cd8b0acf25c3d40c300a088ca16ce482c99e263 (diff) | |
Update
Diffstat (limited to 'CSMath/src')
| -rw-r--r-- | CSMath/src/CulkinAsssignmentNine.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/CSMath/src/CulkinAsssignmentNine.java b/CSMath/src/CulkinAsssignmentNine.java index 7931bbf..42c2a8b 100644 --- a/CSMath/src/CulkinAsssignmentNine.java +++ b/CSMath/src/CulkinAsssignmentNine.java @@ -322,10 +322,7 @@ class BezierPanel extends JPanel { g.drawLine(halfWidth, 0, halfWidth, ourHeight);
g.drawLine(0, halfHeight, ourWidth, halfHeight);
- // g.translate(halfWidth, halfHeight);
-
- TDHTransform translate = new TDHCombination(new TDHXAxisReflection(),
- new TDHTranslate(halfWidth, halfHeight));
+ TDHTransform translate = new TDHCombination(new TDHXAxisReflection(), new TDHTranslate(halfWidth, halfHeight));
for (Bezier curve : curves) {
if (curve.controls.isEmpty()) {
@@ -344,7 +341,9 @@ class BezierPanel extends JPanel { g.setColor(curve.pointColor);
for (TDPoint control : curve.controls) {
- control = translate.transform(control.toTDHPoint()).toTDPoint();
+ TDHPoint translatedPoint = translate.transform(control.multiply(curve.scale).toTDHPoint());
+
+ control = translatedPoint.toTDPoint();
drawCircle(g, control.x, control.y, 6);
}
@@ -661,8 +660,7 @@ class PointRemover implements ActionListener { String msg = String.format("Do you want to remove the control point (%.2f, %.2f)?", punkt.x, punkt.y);
- int confirmed = JOptionPane.showConfirmDialog(fram, msg, "Remove Control Point?",
- JOptionPane.YES_NO_OPTION);
+ int confirmed = JOptionPane.showConfirmDialog(fram, msg, "Remove Control Point?", JOptionPane.YES_NO_OPTION);
if (confirmed == JOptionPane.YES_OPTION) {
pointModel.remove(selectedIndex);
@@ -990,8 +988,7 @@ class TDHScale implements TDHTransform { @Override
public double[][] matrix() {
- return new double[][] { new double[] { sx, 0, 0 }, new double[] { 0, sy, 0 },
- new double[] { 0, 0, sz } };
+ return new double[][] { new double[] { sx, 0, 0 }, new double[] { 0, sy, 0 }, new double[] { 0, 0, sz } };
}
public TDHTransform invert() {
|