Normand Briere
2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c
CameraPane.java
....@@ -11028,9 +11028,9 @@
1102811028
1102911029 gl.glMatrixMode(GL.GL_MODELVIEW);
1103011030
11031
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11032
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11033
-//gl.glEnable(gl.GL_MULTISAMPLE);
11031
+gl.glEnable(gl.GL_POLYGON_SMOOTH);
11032
+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11033
+gl.glEnable(gl.GL_MULTISAMPLE);
1103411034 } else
1103511035 {
1103611036 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11041,7 +11041,7 @@
1104111041 //System.out.println("BLENDING ON");
1104211042 gl.glEnable(GL.GL_BLEND);
1104311043 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11044
-
11044
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1104511045 gl.glMatrixMode(gl.GL_PROJECTION);
1104611046 gl.glLoadIdentity();
1104711047
....@@ -14297,12 +14297,12 @@
1429714297 void GoDown(int mod)
1429814298 {
1429914299 MODIFIERS |= COMMAND;
14300
- /*
14300
+ /**/
1430114301 if((mod&SHIFT) == SHIFT)
1430214302 manipCamera.RotatePosition(0, -speed);
1430314303 else
14304
- manipCamera.BackForth(0, -speed*delta, getWidth());
14305
- */
14304
+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14305
+ /**/
1430614306 if ((mod & SHIFT) == SHIFT)
1430714307 {
1430814308 mouseMode = mouseMode; // VR??
....@@ -14318,12 +14318,12 @@
1431814318 void GoUp(int mod)
1431914319 {
1432014320 MODIFIERS |= COMMAND;
14321
- /*
14321
+ /**/
1432214322 if((mod&SHIFT) == SHIFT)
1432314323 manipCamera.RotatePosition(0, speed);
1432414324 else
14325
- manipCamera.BackForth(0, speed*delta, getWidth());
14326
- */
14325
+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14326
+ /**/
1432714327 if ((mod & SHIFT) == SHIFT)
1432814328 {
1432914329 mouseMode = mouseMode;
....@@ -14339,12 +14339,12 @@
1433914339 void GoLeft(int mod)
1434014340 {
1434114341 MODIFIERS |= COMMAND;
14342
- /*
14342
+ /**/
1434314343 if((mod&SHIFT) == SHIFT)
14344
- manipCamera.RotatePosition(speed, 0);
14345
- else
1434614344 manipCamera.Translate(speed*delta, 0, getWidth());
14347
- */
14345
+ else
14346
+ manipCamera.RotatePosition(speed, 0);
14347
+ /**/
1434814348 if ((mod & SHIFT) == SHIFT)
1434914349 {
1435014350 mouseMode = mouseMode;
....@@ -14360,12 +14360,12 @@
1436014360 void GoRight(int mod)
1436114361 {
1436214362 MODIFIERS |= COMMAND;
14363
- /*
14363
+ /**/
1436414364 if((mod&SHIFT) == SHIFT)
14365
- manipCamera.RotatePosition(-speed, 0);
14366
- else
1436714365 manipCamera.Translate(-speed*delta, 0, getWidth());
14368
- */
14366
+ else
14367
+ manipCamera.RotatePosition(-speed, 0);
14368
+ /**/
1436914369 if ((mod & SHIFT) == SHIFT)
1437014370 {
1437114371 mouseMode = mouseMode;
....@@ -14946,7 +14946,9 @@
1494614946 case 'E' : COMPACT ^= true;
1494714947 repaint();
1494814948 break;
14949
- case 'W' : DEBUGHSB ^= true;
14949
+ case 'W' : // Wide Window (fullscreen)
14950
+ //DEBUGHSB ^= true;
14951
+ ObjEditor.theFrame.ToggleFullScreen();
1495014952 repaint();
1495114953 break;
1495214954 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14972,13 +14974,7 @@
1497214974 repaint();
1497314975 break;
1497414976 case 'l':
14975
- lightMode ^= true;
14976
- Globals.lighttouched = true;
14977
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14978
- targetLookAt.set(manipCamera.lookAt);
14979
- repaint();
14980
- break;
14981
- case 'L':
14977
+ //case 'L':
1498214978 if (lightMode)
1498314979 {
1498414980 lightMode = false;
....@@ -15125,7 +15121,10 @@
1512515121 // kompactbit = 6;
1512615122 // break;
1512715123 case ' ':
15128
- ObjEditor.theFrame.ToggleFullScreen();
15124
+ lightMode ^= true;
15125
+ Globals.lighttouched = true;
15126
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15127
+ targetLookAt.set(manipCamera.lookAt);
1512915128 repaint();
1513015129 break;
1513115130 //case '`' :