From e96132853038f55cdb6e27f116852cff0e813f00 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 22 Sep 2019 09:27:26 -0400
Subject: [PATCH] Replace on make off.
---
Spline.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Spline.java b/Spline.java
index 45c5a1d..8baab7b 100644
--- a/Spline.java
+++ b/Spline.java
@@ -19,9 +19,9 @@
return spline;
}
- protected void deepCopySelf(Object3D other)
+ protected void deepCopyNode(Object3D other)
{
- super.deepCopySelf(other);
+ super.deepCopyNode(other);
Spline spline = (Spline)other;
spline.type = type;
int count = ctrlPnts.size();
@@ -157,11 +157,13 @@
Point prev = new Point(0, 0);
Point curr = new Point(0, 0);
Rectangle dummy = new Rectangle();
- calcHotSpot(sample, info, prev, dummy);
+ calcHotSpot(sample, //info,
+ prev, dummy);
for (double t = 0.1; t < 1.01; t += 0.1)
{
solve(t, a, b, c, d, sample);
- calcHotSpot(sample, info, curr, dummy);
+ calcHotSpot(sample, //info,
+ curr, dummy);
info.g.drawLine(prev.x, prev.y, curr.x, curr.y);
info.g.drawLine(prev.x, prev.y + 1, curr.x, curr.y + 1);
info.g.drawLine(prev.x + 1, prev.y, curr.x + 1, curr.y);
@@ -181,7 +183,7 @@
for (int i=0; i < count; i++)
{
cVector p = (cVector)ctrlPnts.elementAt(i);
- Rectangle spot = calcHotSpot(p, info);
+ Rectangle spot = calcHotSpot(p); //, info);
info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
}
@@ -197,7 +199,7 @@
for (int i=0; i < nPoints; i++)
{
cVector p = (cVector)ctrlPnts.elementAt(i);
- Rectangle r = calcHotSpot(p, info);
+ Rectangle r = calcHotSpot(p); //, info);
if (r.contains(info.x, info.y))
{
hitSomething = true;
@@ -235,7 +237,8 @@
for (double t = 0; t < 1.001; t += 0.01)
{
solve(t, a, b, c, d, sample);
- calcHotSpot(sample, info, pnt, rect);
+ calcHotSpot(sample, //info,
+ pnt, rect);
if (!rect.contains(info.x, info.y))
continue;
hitSomething = true;
--
Gitblit v1.6.2