From b3ae4e889872ca0b9ca76f1d17b2f0b961226729 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 05 Aug 2019 21:48:55 -0400
Subject: [PATCH] Fix physics UI
---
BezierSurface.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/BezierSurface.java b/BezierSurface.java
index 2f28e09..da75a3a 100644
--- a/BezierSurface.java
+++ b/BezierSurface.java
@@ -67,7 +67,7 @@
return l;
}
- void draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
+ void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
// ((BezierSurface)parent.parent).currentHandle = (Sphere)this;
// parent.parent.recalculate();
@@ -117,39 +117,43 @@
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);
sample = ((Sphere)ctrlPnts.get(i)).getCenter();
- calcHotSpot(sample, info, curr, dummy);
+ calcHotSpot(sample, //info,
+ curr, dummy);
info.g.drawLine(prev.x, prev.y, curr.x, curr.y);
prev.x = curr.x;
prev.y = curr.y;
}
}
- void drawEditHandles(ClickInfo info, int level)
+ void drawEditHandles(//ClickInfo info,
+ int level)
{
- info.g.setColor(Color.red);
+ clickInfo.g.setColor(Color.red);
int count = ctrlPnts.size();
for (int i=0; i < count; i++)
{
cVector p = ((Sphere)ctrlPnts.elementAt(i)).getCenter();
- Rectangle spot = calcHotSpot(p, info);
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
+ Rectangle spot = calcHotSpot(p); //, info);
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
}
}
- boolean doEditClick(ClickInfo info, int level)
+ boolean doEditClick(//ClickInfo info,
+ int level)
{
- startX = info.x;
- startY = info.y;
+ startX = clickInfo.x;
+ startY = clickInfo.y;
int nPoints = ctrlPnts.size();
hitSomething = false;
for (int i=0; i < nPoints; i++)
{
cVector p = ((Sphere)ctrlPnts.elementAt(i)).getCenter();
- Rectangle r = calcHotSpot(p, info);
- if (r.contains(info.x, info.y))
+ Rectangle r = calcHotSpot(p); //, info);
+ if (r.contains(clickInfo.x, clickInfo.y))
{
hitSomething = true;
hitIndex = i;
--
Gitblit v1.6.2