Normand Briere
2019-06-09 8558ae86e65457c512a26339d3660d79eee16ae6
CameraPane.java
....@@ -11552,7 +11552,7 @@
1155211552 return;
1155311553 }
1155411554
11555
- String string = obj.GetToolTip();
11555
+ String string = obj.toString(); //.GetToolTip();
1155611556
1155711557 GL gl = GetGL();
1155811558
....@@ -14374,6 +14374,7 @@
1437414374 public void mouseReleased(MouseEvent e)
1437514375 {
1437614376 movingcamera = false;
14377
+ X = Y = 0;
1437714378 //System.out.println("mouseReleased: " + e);
1437814379 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1437914380 }
....@@ -15382,7 +15383,9 @@
1538215383 info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1538315384 //Image img = CreateImage(width, height);
1538415385 //System.out.println("width = " + width + "; height = " + height + "\n");
15386
+
1538515387 Graphics gr = g; // img.getGraphics();
15388
+
1538615389 if (!hasMarquee)
1538715390 {
1538815391 if (Xmin < Xmax) // !locked)
....@@ -15480,14 +15483,28 @@
1548015483 if (!isRenderer)
1548115484 {
1548215485 object.drawEditHandles(info, 0);
15486
+
15487
+ if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15488
+ {
15489
+ switch (object.selection.get(0).hitSomething)
15490
+ {
15491
+ case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492
+ case Object3D.hitRotate: gr.setColor(Color.green); break;
15493
+ case Object3D.hitScale: gr.setColor(Color.cyan); break;
15494
+ }
15495
+
15496
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15497
+ }
1548315498 }
1548415499 }
15500
+
1548515501 if (isRenderer)
1548615502 {
1548715503 //gr.setColor(Color.black);
1548815504 //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1548915505 //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1549015506 }
15507
+
1549115508 if (hasMarquee)
1549215509 {
1549315510 gr.setXORMode(Color.white);