|
@@ -143,8 +143,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
}
|
|
|
unPos.x /= model.getSelectedCpsObjects().size();
|
|
|
unPos.y /= model.getSelectedCpsObjects().size();
|
|
|
- unPos.x +=model.getScaleDiv2();
|
|
|
- unPos.y +=model.getScaleDiv2();
|
|
|
|
|
|
|
|
|
ArrayList<Position> savePos = new ArrayList<>();
|
|
@@ -160,8 +158,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
public void actionPerformed(ActionEvent e) {
|
|
|
if (animDuration - animDelay >= 0 && model.getSelectedCpsObjects().size() > 1) {
|
|
|
for (int i = 0; i < model.getSelectedCpsObjects().size(); i++) {
|
|
|
- double x1 = savePos.get(i).x;
|
|
|
- double y1 = savePos.get(i).y;
|
|
|
+ double x1 = model.getSelectedCpsObjects().get(i).getPosition().x;
|
|
|
+ double y1 = model.getSelectedCpsObjects().get(i).getPosition().y;
|
|
|
x1 = x1 - unPos.x;
|
|
|
y1 = y1 - unPos.y;
|
|
|
model.getSelectedCpsObjects().get(i).getPosition().x -= x1 / animSteps;
|
|
@@ -169,9 +167,11 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
}
|
|
|
repaint();
|
|
|
animDuration -= animDelay;
|
|
|
+ animSteps--;
|
|
|
controller.addTextToConsole("" + animDuration);
|
|
|
} else {
|
|
|
animDuration = 500;
|
|
|
+ animSteps = animDuration / animDelay;
|
|
|
animT.stop();
|
|
|
for (int i = 0; i < model.getSelectedCpsObjects().size(); i++) {
|
|
|
model.getSelectedCpsObjects().get(i).getPosition().x = savePos.get(i).x;
|