.. | .. |
---|
250 | 250 | |
---|
251 | 251 | public javax.media.opengl.GL GetGL0() |
---|
252 | 252 | { |
---|
253 | | - return null; |
---|
| 253 | + return currentGL; |
---|
254 | 254 | } |
---|
255 | 255 | |
---|
256 | 256 | public int GenList() |
---|
.. | .. |
---|
10761 | 10761 | } |
---|
10762 | 10762 | /**/ |
---|
10763 | 10763 | |
---|
10764 | | - if (selection) |
---|
| 10764 | + boolean control = ((modifiers & CTRL) != 0); |
---|
| 10765 | + |
---|
| 10766 | + if (selection && (!Globals.isLIVE() || control)) |
---|
10765 | 10767 | { |
---|
10766 | 10768 | selectbuffer.display(); |
---|
10767 | 10769 | return; |
---|
.. | .. |
---|
14346 | 14348 | |
---|
14347 | 14349 | public void mousePressed(MouseEvent e) |
---|
14348 | 14350 | { |
---|
14349 | | - RigidBody.justclicked = true; |
---|
14350 | | - System.out.println("justclicked: " + e); |
---|
14351 | 14351 | //System.out.println("mousePressed: " + e); |
---|
14352 | 14352 | clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx()); |
---|
14353 | 14353 | } |
---|
.. | .. |
---|
14655 | 14655 | boolean jump; |
---|
14656 | 14656 | boolean live; |
---|
14657 | 14657 | |
---|
14658 | | - boolean mute; |
---|
| 14658 | + boolean mute = false; |
---|
14659 | 14659 | |
---|
14660 | 14660 | // void JumpToTarget() |
---|
14661 | 14661 | // { |
---|
.. | .. |
---|
15367 | 15367 | |
---|
15368 | 15368 | public void mouseReleased(MouseEvent e) |
---|
15369 | 15369 | { |
---|
| 15370 | + if (isRenderer && !movingcamera) |
---|
| 15371 | + { |
---|
| 15372 | + RigidBody.justclicked = true; |
---|
| 15373 | + System.out.println("justclicked: " + e); |
---|
| 15374 | + } |
---|
| 15375 | + |
---|
15370 | 15376 | Globals.MOUSEDRAGGED = false; |
---|
15371 | 15377 | |
---|
15372 | 15378 | movingcamera = false; |
---|