Version slider

Normand Briere

2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1

 CameraPane.java
..
..
@@ -11028,9 +11028,9 @@
11028
11028
 
11029
11029
             gl.glMatrixMode(GL.GL_MODELVIEW);
11030
11030
 
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);
11034
11034
         } else
11035
11035
         {
11036
11036
             //gl.glDisable(GL.GL_TEXTURE_2D);
..
..
@@ -11041,7 +11041,7 @@
11041
11041
         //System.out.println("BLENDING ON");
11042
11042
         gl.glEnable(GL.GL_BLEND);
11043
11043
         gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11044
-
11044
+//        gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11045
11045
         gl.glMatrixMode(gl.GL_PROJECTION);
11046
11046
         gl.glLoadIdentity();
11047
11047
 
..
..
@@ -14297,12 +14297,12 @@
14297
14297
     void GoDown(int mod)
14298
14298
     {
14299
14299
         MODIFIERS |= COMMAND;
14300
-        /*
14300
+        /**/
14301
14301
         if((mod&SHIFT) == SHIFT)
14302
14302
         manipCamera.RotatePosition(0, -speed);
14303
14303
         else
14304
-        manipCamera.BackForth(0, -speed*delta, getWidth());
14305
-         */
14304
+        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14305
+        /**/
14306
14306
         if ((mod & SHIFT) == SHIFT)
14307
14307
         {
14308
14308
             mouseMode = mouseMode; // VR??
..
..
@@ -14318,12 +14318,12 @@
14318
14318
     void GoUp(int mod)
14319
14319
     {
14320
14320
         MODIFIERS |= COMMAND;
14321
-        /*
14321
+        /**/
14322
14322
         if((mod&SHIFT) == SHIFT)
14323
14323
         manipCamera.RotatePosition(0, speed);
14324
14324
         else
14325
-        manipCamera.BackForth(0, speed*delta, getWidth());
14326
-         */
14325
+        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14326
+        /**/
14327
14327
         if ((mod & SHIFT) == SHIFT)
14328
14328
         {
14329
14329
             mouseMode = mouseMode;
..
..
@@ -14339,12 +14339,12 @@
14339
14339
     void GoLeft(int mod)
14340
14340
     {
14341
14341
         MODIFIERS |= COMMAND;
14342
-        /*
14342
+        /**/
14343
14343
         if((mod&SHIFT) == SHIFT)
14344
-        manipCamera.RotatePosition(speed, 0);
14345
-        else
14346
14344
         manipCamera.Translate(speed*delta, 0, getWidth());
14347
-         */
14345
+        else
14346
+        manipCamera.RotatePosition(speed, 0);
14347
+        /**/
14348
14348
         if ((mod & SHIFT) == SHIFT)
14349
14349
         {
14350
14350
             mouseMode = mouseMode;
..
..
@@ -14360,12 +14360,12 @@
14360
14360
     void GoRight(int mod)
14361
14361
     {
14362
14362
         MODIFIERS |= COMMAND;
14363
-        /*
14363
+        /**/
14364
14364
         if((mod&SHIFT) == SHIFT)
14365
-        manipCamera.RotatePosition(-speed, 0);
14366
-        else
14367
14365
         manipCamera.Translate(-speed*delta, 0, getWidth());
14368
-         */
14366
+        else
14367
+        manipCamera.RotatePosition(-speed, 0);
14368
+        /**/
14369
14369
         if ((mod & SHIFT) == SHIFT)
14370
14370
         {
14371
14371
             mouseMode = mouseMode;
..
..
@@ -14946,7 +14946,9 @@
14946
14946
             case 'E' : COMPACT ^= true;
14947
14947
                 repaint();
14948
14948
                 break;
14949
-            case 'W' : DEBUGHSB ^= true;
14949
+            case 'W' : // Wide Window (fullscreen)
14950
+                //DEBUGHSB ^= true;
14951
+                ObjEditor.theFrame.ToggleFullScreen();
14950
14952
                 repaint();
14951
14953
                 break;
14952
14954
             case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..
..
@@ -14972,13 +14974,7 @@
14972
14974
                 repaint();
14973
14975
                 break;
14974
14976
             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':
14982
14978
                 if (lightMode)
14983
14979
                 {
14984
14980
                     lightMode = false;
..
..
@@ -15125,7 +15121,10 @@
15125
15121
 //                kompactbit = 6;
15126
15122
 //                break;
15127
15123
             case ' ':
15128
-                ObjEditor.theFrame.ToggleFullScreen();
15124
+                lightMode ^= true;
15125
+                Globals.lighttouched = true;
15126
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15127
+                targetLookAt.set(manipCamera.lookAt);
15129
15128
                 repaint();
15130
15129
                 break;
15131
15130
             //case '`' :
..
..
@@ -15709,6 +15708,7 @@
15709
15708
                     info.bounds.y += (height - desired) / 2;
15710
15709
                 }
15711
15710
             }
15711
+            
15712
15712
             info.g = gr;
15713
15713
             info.camera = renderCamera;
15714
15714
             /* 
..
..
@@ -15718,6 +15718,8 @@
15718
15718
              */
15719
15719
             if (!isRenderer)
15720
15720
             {
15721
+                Grafreed.Assert(object != null);
15722
+                Grafreed.Assert(object.selection != null);
15721
15723
                 if (object.selection.Size() > 0)
15722
15724
                 {
15723
15725
                     int hitSomething = object.selection.get(0).hitSomething;