parent: 49d9c15d | patch | commit
Normand Briere
2019-10-29 2703a8dcf1ef4745ec313af008a86681276f5a39 
Antialias button.
6 files modified
2 files added
91 ■■■■■ changed files
BoundaryRep.java 2 ●●●●● patch | view | raw | blame | history
Camera.java 5 ●●●●● patch | view | raw | blame | history
CameraPane.java 36 ●●●●● patch | view | raw | blame | history
Cone.java 2 ●●●●● patch | view | raw | blame | history
GroupEditor.java 9 ●●●●● patch | view | raw | blame | history
ObjEditor.java 37 ●●●●● patch | view | raw | blame | history
fullscenes/skullcovebirdeye.png patch | view | raw | blame | history
icons/antialias.png patch | view | raw | blame | history 
 BoundaryRep.java
....@@ -2228,7 +2228,7 @@
22282228              //   if (slow)
22292229     // aout 2013
22302230                 // sept 2013 merde...
2231
-                W = 3; // 13;
2231
+                W = 13; // 13;
22322232 
22332233            // POSERATE
22342234                     if (CameraPane.tickcount > 0 || CameraPane.SLOWPOSE)


 Camera.java
....@@ -388,6 +388,11 @@
388388             locationBuf.y = location.y * K + locationBuf.y * (1 - K);
389389             lookAtBuf.y = lookAt.y * K + lookAtBuf.y * (1 - K);
390390             
391
+            UP.x = 0 * K + UP.x * (1 - K);
392
+            UP.y = 1 * K + UP.y * (1 - K);
393
+            UP.z = 0 * K + UP.z * (1 - K);
394
+            UP.normalize();
395
+            
391396             if (CameraPane.capsLocked && !CameraPane.ambientOcclusion)
392397                 K = 0.1;
393398             


 CameraPane.java
....@@ -2249,6 +2249,13 @@
22492249      //   else
22502250             repaint(); // start loop // may 2013
22512251     }
2252
+    
2253
+    public void ToggleAntialiasing()
2254
+    {
2255
+        CURRENTANTIALIAS = ((CURRENTANTIALIAS != 0) ? 0 : 1);
2256
+        System.out.println("Antialias ACSIZE = " + ACSIZE);
2257
+        System.out.println("CURRENTANTIALIAS = " + CURRENTANTIALIAS);
2258
+    }
22522259 
22532260     public void ToggleSupport()
22542261     {
....@@ -2294,6 +2301,7 @@
22942301     {
22952302         IMAGEFLIP ^= true;
22962303     }
2304
+    
22972305 
22982306     public void ToggleSpeakerMocap()
22992307     {
....@@ -9642,7 +9650,7 @@
96429650                 pixdx, pixdy, edx, edy, focus);
96439651     }
96449652     
9645
-    static int ACSIZE = 4; // 16;
9653
+    static int ACSIZE = 16; // 16;
96469654     static int MAXACSIZE = 256; // 1024;
96479655     static float[] jx8 = new float[MAXACSIZE];
96489656     static float[] jy8 = new float[MAXACSIZE];
....@@ -9676,8 +9684,8 @@
96769684     void ResetOptions()
96779685     {
96789686         options1[0] = 100;
9679
-        options1[1] = 0.025f;
9680
-        options1[2] = 0.01f;
9687
+        options1[1] = 0.01f; // .025f;
9688
+        options1[2] = 10f;
96819689         options1[3] = 0;
96829690         options1[4] = 0;
96839691         
....@@ -15724,11 +15732,9 @@
1572415732                 DISPLAYTEXT ^= true;
1572515733                 repaint();
1572615734                 break;
15727
-            case 'A':
15735
+            //case 'A':
1572815736             case 'a':
15729
-                CURRENTANTIALIAS = ((CURRENTANTIALIAS != 0) ? 0 : 1);
15730
-                System.out.println("Antialias ACSIZE = " + ACSIZE);
15731
-                System.out.println("CURRENTANTIALIAS = " + CURRENTANTIALIAS);
15737
+                ToggleAntialiasing();
1573215738                 repaint();
1573315739                 break;
1573415740             case 'd':
....@@ -15832,6 +15838,7 @@
1583215838             {
1583315839                 //PrintMemory();
1583415840                 ToggleImageFlip();
15841
+                renderCamera.computeTransform();
1583515842                 repaint();
1583615843                 break;
1583715844             }
....@@ -16017,10 +16024,10 @@
1601716024             case ENTER:
1601816025                 // object.editWindow.ScreenFit(); // Edit();
1601916026                 ToggleLive();
16020
-                if (capsLocked)
16021
-                {
16022
-                    Globals.WALK ^= true;
16023
-                }
16027
+//                if (capsLocked)
16028
+//                {
16029
+//                    Globals.WALK ^= true;
16030
+//                }
1602416031                 break;
1602516032             case DELETE:
1602616033                 ClearSelection();
....@@ -16106,8 +16113,11 @@
1610616113                 repaint();
1610716114                 break;
1610816115             case BACKSPACE:
16109
-                enablebackspace = true;
16116
+                // almost working enablebackspace = true;
16117
+                Globals.WALK ^= true;
1611016118                 
16119
+            object.Step();
16120
+            object.Touch();
1611116121    //             SwitchCameras(false);
1611216122                 repaint();
1611316123                 break;
....@@ -18343,7 +18353,7 @@
1834318353     
1834418354     private boolean keepshadow;
1834518355     
18346
-    static public boolean capsLocked = true; // false; // VR
18356
+    static public boolean capsLocked = false; // VR
1834718357     
1834818358     static public int indexcount = 0;
1834918359     /*static*/ cColor vertexOcclusion = new cColor();


 Cone.java
....@@ -3,7 +3,7 @@
33 class Cone extends Biparam implements java.io.Serializable
44 {
55     static final long serialVersionUID = -2558098774090336324L; // new
6
-                                // -679715043452968126L; // old
6
+                                //-679715043452968126L; // old
77 
88     Cone()
99     {


 GroupEditor.java
....@@ -1112,6 +1112,10 @@
11121112 //		sevenButton.addActionListener(this);
11131113                 //
11141114                 
1115
+                oe.toolbarPanel.add(antialiasCB = GetToggleButton("icons/antialias.png", Globals.isLIVE())); //, oe.aConstraints);
1116
+                antialiasCB.setToolTipText("Final render");
1117
+                                antialiasCB.addItemListener(this);
1118
+                
11151119 		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11161120                 screenfitButton.setToolTipText("Screen fit");
11171121 		screenfitButton.addActionListener(this);
....@@ -1545,6 +1549,7 @@
15451549         }
15461550 
15471551         cToggleButton liveCB;
1552
+        cToggleButton antialiasCB;
15481553         cCheckBox supportCB;
15491554         cCheckBox localCB;
15501555         cCheckBox crowdCB;
....@@ -1606,6 +1611,10 @@
16061611             {
16071612                 cameraView.ToggleLive();
16081613                 refreshContents(false);
1614
+            } else if(e.getSource() == antialiasCB)
1615
+            {
1616
+                cameraView.ToggleAntialiasing();
1617
+                refreshContents(false);
16091618             }
16101619             else if(e.getSource() == supportCB)
16111620             {


 ObjEditor.java
....@@ -1899,6 +1899,9 @@
18991899 
19001900                         public void Callback(Object obj)
19011901                         {
1902
+                            CameraPane.capsLocked = false;
1903
+                            Globals.setLIVE(true);
1904
+                            Globals.WALK = false;
19021905                             LoadIt(obj);
19031906                         }
19041907 
....@@ -1921,6 +1924,9 @@
19211924 
19221925                         public void Callback(Object obj)
19231926                         {
1927
+                            CameraPane.capsLocked = false;
1928
+                            Globals.setLIVE(true);
1929
+                            Globals.WALK = false;
19241930                             LoadIt(obj);
19251931                         }
19261932 
....@@ -1945,6 +1951,9 @@
19451951 
19461952                         public void Callback(Object obj)
19471953                         {
1954
+                            CameraPane.capsLocked = true;
1955
+                            Globals.setLIVE(false);
1956
+                            Globals.WALK = true;
19481957                             LoadIt(obj);
19491958                         }
19501959 
....@@ -1967,6 +1976,9 @@
19671976 
19681977                         public void Callback(Object obj)
19691978                         {
1979
+                            CameraPane.capsLocked = true;
1980
+                            Globals.setLIVE(false);
1981
+                            Globals.WALK = true;
19701982                             LoadIt(obj);
19711983                         }
19721984 
....@@ -1991,6 +2003,9 @@
19912003 
19922004                         public void Callback(Object obj)
19932005                         {
2006
+                            CameraPane.capsLocked = true;
2007
+                            Globals.setLIVE(false);
2008
+                            Globals.WALK = true;
19942009                             LoadIt(obj);
19952010                         }
19962011 
....@@ -2013,6 +2028,9 @@
20132028 
20142029                         public void Callback(Object obj)
20152030                         {
2031
+                            CameraPane.capsLocked = true;
2032
+                            Globals.setLIVE(true);
2033
+                            Globals.WALK = true;
20162034                             LoadIt(obj);
20172035                         }
20182036 
....@@ -2037,6 +2055,9 @@
20372055 
20382056                         public void Callback(Object obj)
20392057                         {
2058
+                            CameraPane.capsLocked = true;
2059
+                            Globals.setLIVE(true);
2060
+                            Globals.WALK = true;
20402061                             LoadIt(obj);
20412062                         }
20422063 
....@@ -2059,6 +2080,9 @@
20592080 
20602081                         public void Callback(Object obj)
20612082                         {
2083
+                            CameraPane.capsLocked = true;
2084
+                            Globals.setLIVE(false);
2085
+                            Globals.WALK = false;
20622086                             LoadIt(obj);
20632087                         }
20642088 
....@@ -2083,6 +2107,9 @@
20832107 
20842108                         public void Callback(Object obj)
20852109                         {
2110
+                            CameraPane.capsLocked = true;
2111
+                            Globals.setLIVE(false);
2112
+                            Globals.WALK = true;
20862113                             LoadIt(obj);
20872114                         }
20882115 
....@@ -2105,6 +2132,9 @@
21052132 
21062133                         public void Callback(Object obj)
21072134                         {
2135
+                            CameraPane.capsLocked = true;
2136
+                            Globals.setLIVE(true);
2137
+                            Globals.WALK = true;
21082138                             LoadIt(obj);
21092139                         }
21102140 
....@@ -2129,6 +2159,9 @@
21292159 
21302160                         public void Callback(Object obj)
21312161                         {
2162
+                            CameraPane.capsLocked = true;
2163
+                            Globals.setLIVE(false);
2164
+                            Globals.WALK = true;
21322165                             LoadIt(obj);
21332166                         }
21342167 
....@@ -2151,6 +2184,9 @@
21512184 
21522185                         public void Callback(Object obj)
21532186                         {
2187
+                            CameraPane.capsLocked = true;
2188
+                            Globals.setLIVE(false);
2189
+                            Globals.WALK = true;
21542190                             LoadIt(obj);
21552191                         }
21562192 
....@@ -4458,6 +4494,7 @@
44584494         } else if (event.getSource() == sortCB)
44594495         {
44604496             copy.sort ^= true;
4497
+            copy.Touch(); // display list issue
44614498             objEditor.refreshContents();
44624499             return;
44634500         } else if (event.getSource() == link2masterCB)


 fullscenes/skullcovebirdeye.png
Binary files differ


 icons/antialias.png
Binary files differ