.. | .. |
---|
10392 | 10392 | ambientOcclusion = false; |
---|
10393 | 10393 | } |
---|
10394 | 10394 | |
---|
10395 | | - if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN) |
---|
| 10395 | + if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN) |
---|
10396 | 10396 | { |
---|
10397 | 10397 | //if (RENDERSHADOW) // ? |
---|
10398 | 10398 | if (!IsFrozen()) |
---|
10399 | 10399 | { |
---|
10400 | 10400 | // dec 2012 |
---|
10401 | | - if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)) |
---|
| 10401 | + if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0)) |
---|
10402 | 10402 | { |
---|
10403 | 10403 | Globals.framecount++; |
---|
10404 | 10404 | shadowbuffer.display(); |
---|
.. | .. |
---|
11552 | 11552 | return; |
---|
11553 | 11553 | } |
---|
11554 | 11554 | |
---|
11555 | | - String string = obj.GetToolTip(); |
---|
| 11555 | + String string = obj.toString(); //.GetToolTip(); |
---|
11556 | 11556 | |
---|
11557 | 11557 | GL gl = GetGL(); |
---|
11558 | 11558 | |
---|
.. | .. |
---|
14374 | 14374 | public void mouseReleased(MouseEvent e) |
---|
14375 | 14375 | { |
---|
14376 | 14376 | movingcamera = false; |
---|
| 14377 | + X = Y = 0; |
---|
14377 | 14378 | //System.out.println("mouseReleased: " + e); |
---|
14378 | 14379 | clickEnd(e.getX(), e.getY(), e.getModifiersEx()); |
---|
14379 | 14380 | } |
---|
.. | .. |
---|
15382 | 15383 | info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom)); |
---|
15383 | 15384 | //Image img = CreateImage(width, height); |
---|
15384 | 15385 | //System.out.println("width = " + width + "; height = " + height + "\n"); |
---|
| 15386 | + |
---|
15385 | 15387 | Graphics gr = g; // img.getGraphics(); |
---|
| 15388 | + |
---|
15386 | 15389 | if (!hasMarquee) |
---|
15387 | 15390 | { |
---|
15388 | 15391 | if (Xmin < Xmax) // !locked) |
---|
.. | .. |
---|
15480 | 15483 | if (!isRenderer) |
---|
15481 | 15484 | { |
---|
15482 | 15485 | 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 | + } |
---|
15483 | 15498 | } |
---|
15484 | 15499 | } |
---|
| 15500 | + |
---|
15485 | 15501 | if (isRenderer) |
---|
15486 | 15502 | { |
---|
15487 | 15503 | //gr.setColor(Color.black); |
---|
15488 | 15504 | //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1); |
---|
15489 | 15505 | //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3); |
---|
15490 | 15506 | } |
---|
| 15507 | + |
---|
15491 | 15508 | if (hasMarquee) |
---|
15492 | 15509 | { |
---|
15493 | 15510 | gr.setXORMode(Color.white); |
---|