Normand Briere
2019-11-21 ddb10cb84dddfeef1ef9946f2e13cef3c93e6cc4
CameraPane.java
....@@ -9688,7 +9688,7 @@
96889688 {
96899689 options1[0] = 100;
96909690 options1[1] = 0.01f; // .025f;
9691
- options1[2] = 10f;
9691
+ options1[2] = 3f;
96929692 options1[3] = 0;
96939693 options1[4] = 0;
96949694
....@@ -15987,8 +15987,11 @@
1598715987 // kompactbit = 6;
1598815988 // break;
1598915989 case ' ':
15990
- capsLocked ^= true;
15991
- repaint();
15990
+ if (manipCamera != lightCamera)
15991
+ {
15992
+ capsLocked ^= true;
15993
+ repaint();
15994
+ }
1599215995 break;
1599315996 case 'l':
1599415997 lightMode ^= true;
....@@ -16187,24 +16190,48 @@
1618716190 }
1618816191 else
1618916192 {
16190
- switch (e.getKeyCode())
16193
+ if (manipCamera == lightCamera)
1619116194 {
16192
- case DOWN_ARROW:
16193
- GoDown(e.getModifiersEx());
16194
- break;
16195
- case UP_ARROW:
16196
- GoUp(e.getModifiersEx());
16197
- break;
16198
- case LEFT_ARROW:
16199
- GoLeft(e.getModifiersEx());
16200
- break;
16201
- case RIGHT_ARROW:
16202
- GoRight(e.getModifiersEx());
16203
- break;
16204
- default:
16205
- modifiers = e.getModifiersEx();
16206
- keyPressed(e.getKeyChar(), modifiers);
16207
- break;
16195
+ switch (e.getKeyCode())
16196
+ {
16197
+ case DOWN_ARROW:
16198
+ lightCamera.DECAL /= 2;
16199
+ break;
16200
+ case UP_ARROW:
16201
+ lightCamera.DECAL *= 2;
16202
+ break;
16203
+ case LEFT_ARROW:
16204
+ lightCamera.SCALE /= 2;
16205
+ break;
16206
+ case RIGHT_ARROW:
16207
+ lightCamera.SCALE *= 2;
16208
+ break;
16209
+ default:
16210
+ break;
16211
+ }
16212
+
16213
+ System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16214
+ } else
16215
+ {
16216
+ switch (e.getKeyCode())
16217
+ {
16218
+ case DOWN_ARROW:
16219
+ GoDown(e.getModifiersEx());
16220
+ break;
16221
+ case UP_ARROW:
16222
+ GoUp(e.getModifiersEx());
16223
+ break;
16224
+ case LEFT_ARROW:
16225
+ GoLeft(e.getModifiersEx());
16226
+ break;
16227
+ case RIGHT_ARROW:
16228
+ GoRight(e.getModifiersEx());
16229
+ break;
16230
+ default:
16231
+ modifiers = e.getModifiersEx();
16232
+ keyPressed(e.getKeyChar(), modifiers);
16233
+ break;
16234
+ }
1620816235 }
1620916236 }
1621016237