blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5 
 CameraPane.java
....@@ -11088,7 +11088,7 @@
1108811088         {
1108911089             if (cubemaprgb == null)
1109011090             {
11091
-                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
11091
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1109211092             }
1109311093             
1109411094             cubemap = cubemaprgb;
....@@ -13419,8 +13419,12 @@
1341913419             program = programmin;
1342013420         }
1342113421         
13422
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13423
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13422
+        if (Globals.DEBUG)
13423
+        {
13424
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13425
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13426
+        }
13427
+        
1342413428         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1342513429 
1342613430     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13467,7 +13471,8 @@
1346713471                 "\n" +
1346813472                 "END\n";
1346913473 
13470
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13474
+        if (Globals.DEBUG)
13475
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1347113476         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1347213477 
1347313478     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -14666,11 +14671,17 @@
1466614671     void GoDown(int mod)
1466714672     {
1466814673         MODIFIERS |= COMMAND;
14674
+        boolean isVR = (mouseMode&VR)!=0;
1466914675         /**/
1467014676         if((mod&SHIFT) == SHIFT)
14671
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14677
+        {
14678
+            if (isVR)
14679
+                manipCamera.RotateInterest(0, -speed);
14680
+            else
14681
+                manipCamera.RotatePosition(0, -speed);
14682
+        }
1467214683         else
14673
-        manipCamera.RotatePosition(0, -speed);
14684
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1467414685         /**/
1467514686         if ((mod & SHIFT) == SHIFT)
1467614687         {
....@@ -14680,6 +14691,8 @@
1468014691             mouseMode |= BACKFORTH;
1468114692         }
1468214693 
14694
+        targetLookAt.set(manipCamera.lookAt);
14695
+        
1468314696         //prevX = X = anchorX;
1468414697         prevY = Y = anchorY - (int) (renderCamera.Distance());
1468514698     }
....@@ -14688,10 +14701,17 @@
1468814701     {
1468914702         MODIFIERS |= COMMAND;
1469014703         /**/
14704
+        boolean isVR = (mouseMode&VR)!=0;
14705
+        
1469114706         if((mod&SHIFT) == SHIFT)
14692
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14707
+        {
14708
+            if (isVR)
14709
+                manipCamera.RotateInterest(0, speed);
14710
+            else
14711
+                manipCamera.RotatePosition(0, speed);
14712
+        }
1469314713         else
14694
-        manipCamera.RotatePosition(0, speed);
14714
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1469514715         /**/
1469614716         if ((mod & SHIFT) == SHIFT)
1469714717         {
....@@ -14701,6 +14721,8 @@
1470114721             mouseMode |= BACKFORTH;
1470214722         }
1470314723 
14724
+        targetLookAt.set(manipCamera.lookAt);
14725
+        
1470414726         //prevX = X = anchorX;
1470514727         prevY = Y = anchorY + (int) (renderCamera.Distance());
1470614728     }
....@@ -14710,9 +14732,14 @@
1471014732         MODIFIERS |= COMMAND;
1471114733         /**/
1471214734         if((mod&SHIFT) == SHIFT)
14713
-        manipCamera.Translate(speed*delta, 0, getWidth());
14735
+            manipCamera.Translate(speed*delta, 0, getWidth());
1471414736         else
14715
-        manipCamera.RotatePosition(speed, 0);
14737
+        {
14738
+            if ((mouseMode&VR)!=0)
14739
+                manipCamera.RotateInterest(-speed, 0);
14740
+            else
14741
+                manipCamera.RotatePosition(speed, 0);
14742
+        }
1471614743         /**/
1471714744         if ((mod & SHIFT) == SHIFT)
1471814745         {
....@@ -14722,6 +14749,8 @@
1472214749             mouseMode |= ROTATE;
1472314750         } // TRANSLATE;
1472414751 
14752
+        targetLookAt.set(manipCamera.lookAt);
14753
+        
1472514754         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1472614755         prevY = Y = anchorY;
1472714756     }
....@@ -14731,9 +14760,15 @@
1473114760         MODIFIERS |= COMMAND;
1473214761         /**/
1473314762         if((mod&SHIFT) == SHIFT)
14734
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14763
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1473514764         else
14736
-        manipCamera.RotatePosition(-speed, 0);
14765
+        {
14766
+            if ((mouseMode&VR)!=0)
14767
+                manipCamera.RotateInterest(speed, 0);
14768
+            else
14769
+                manipCamera.RotatePosition(-speed, 0);
14770
+        }
14771
+        
1473714772         /**/
1473814773         if ((mod & SHIFT) == SHIFT)
1473914774         {
....@@ -14743,6 +14778,8 @@
1474314778             mouseMode |= ROTATE;
1474414779         } // TRANSLATE;
1474514780 
14781
+        targetLookAt.set(manipCamera.lookAt);
14782
+        
1474614783         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1474714784         prevY = Y = anchorY;
1474814785     }
....@@ -16127,7 +16164,7 @@
1612716164                     {
1612816165                         switch (hitSomething)
1612916166                         {
16130
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16167
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1613116168                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1613216169                                 break;
1613316170                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16153,7 +16190,7 @@
1615316190         if (hasMarquee)
1615416191         {
1615516192             gr.setXORMode(Color.white);
16156
-            gr.setColor(Color.red);
16193
+            gr.setColor(Color.white);
1615716194             if (!firstime)
1615816195             {
1615916196                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -17329,6 +17366,7 @@
1732917366 
1733017367         public void init(GLAutoDrawable drawable)
1733117368         {
17369
+        if (Globals.DEBUG)
1733217370             System.out.println("shadow buffer init");
1733317371 
1733417372             GL gl = drawable.getGL();