.. | .. |
---|
43 | 43 | return l; |
---|
44 | 44 | } |
---|
45 | 45 | |
---|
46 | | - protected void deepCopySelf(Object3D other) |
---|
| 46 | + protected void deepCopyNode(Object3D other) |
---|
47 | 47 | { |
---|
48 | | - super.deepCopySelf(other); |
---|
| 48 | + super.deepCopyNode(other); |
---|
49 | 49 | BezierPatch bp = (BezierPatch)other; |
---|
50 | 50 | bp.depth = depth; |
---|
51 | 51 | int count = ctrlPnts.size(); |
---|
.. | .. |
---|
139 | 139 | Point prev = new Point(0, 0); |
---|
140 | 140 | Point curr = new Point(0, 0); |
---|
141 | 141 | Rectangle dummy = new Rectangle(); |
---|
142 | | - calcHotSpot(sample, info, prev, dummy); |
---|
| 142 | + calcHotSpot(sample, //info, |
---|
| 143 | + prev, dummy); |
---|
143 | 144 | sample = ((Sphere)ctrlPnts.get(i)).getCenter(); |
---|
144 | | - calcHotSpot(sample, info, curr, dummy); |
---|
| 145 | + calcHotSpot(sample, //info, |
---|
| 146 | + curr, dummy); |
---|
145 | 147 | info.g.drawLine(prev.x, prev.y, curr.x, curr.y); |
---|
146 | 148 | prev.x = curr.x; |
---|
147 | 149 | prev.y = curr.y; |
---|
148 | 150 | } |
---|
149 | 151 | } |
---|
150 | 152 | |
---|
151 | | - void drawEditHandles(ClickInfo info, int level) |
---|
| 153 | + void drawEditHandles(//ClickInfo info, |
---|
| 154 | + int level) |
---|
152 | 155 | { |
---|
153 | | - info.g.setColor(Color.red); |
---|
| 156 | + clickInfo.g.setColor(Color.red); |
---|
154 | 157 | int count = ctrlPnts.size(); |
---|
155 | 158 | for (int i=0; i < count; i++) |
---|
156 | 159 | { |
---|
157 | 160 | cVector p = ((Sphere)ctrlPnts.elementAt(i)).getCenter(); |
---|
158 | | - Rectangle spot = calcHotSpot(p, info); |
---|
159 | | - info.g.fillRect(spot.x, spot.y, spot.width, spot.height); |
---|
| 161 | + Rectangle spot = calcHotSpot(p); //, info); |
---|
| 162 | + clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height); |
---|
160 | 163 | } |
---|
161 | 164 | |
---|
162 | 165 | } |
---|
163 | 166 | |
---|
164 | | - boolean doEditClick(ClickInfo info, int level) |
---|
| 167 | + boolean doEditClick(//ClickInfo info, |
---|
| 168 | + int level) |
---|
165 | 169 | { |
---|
166 | | - startX = info.x; |
---|
167 | | - startY = info.y; |
---|
| 170 | + startX = clickInfo.x; |
---|
| 171 | + startY = clickInfo.y; |
---|
168 | 172 | int nPoints = ctrlPnts.size(); |
---|
169 | 173 | hitSomething = false; |
---|
170 | 174 | for (int i=0; i < nPoints; i++) |
---|
171 | 175 | { |
---|
172 | 176 | cVector p = ((Sphere)ctrlPnts.elementAt(i)).getCenter(); |
---|
173 | | - Rectangle r = calcHotSpot(p, info); |
---|
174 | | - if (r.contains(info.x, info.y)) |
---|
| 177 | + Rectangle r = calcHotSpot(p); //, clickInfo); |
---|
| 178 | + if (r.contains(clickInfo.x, clickInfo.y)) |
---|
175 | 179 | { |
---|
176 | 180 | hitSomething = true; |
---|
177 | 181 | hitIndex = i; |
---|