blame | history | patch | commit | commitdiff
Normand Briere
2019-06-03 e24558ddeacfc945b9e9ba0a32b552d04e2ed4dd 
 CameraPane.java
....@@ -1628,7 +1628,7 @@
16281628             
16291629         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301630 
1631
-        float[] colorV = GrafreeD.colorV;
1631
+        float[] colorV = Grafreed.colorV;
16321632 
16331633         /**/
16341634         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -2140,7 +2140,7 @@
21402140         System.err.println("LIVE = " + Globals.isLIVE());
21412141         
21422142         if (!Globals.isLIVE()) // save sound
2143
-            GrafreeD.savesound = true; // wav.save();
2143
+            Grafreed.savesound = true; // wav.save();
21442144      //   else
21452145             repaint(); // start loop // may 2013
21462146     }
....@@ -8022,7 +8022,7 @@
80228022         }
80238023     }
80248024 
8025
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8025
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80268026     {
80278027         if (// DrawMode() != 0 || /*tex == null ||*/
80288028                 ambientOcclusion ) // || !textureon)
....@@ -8067,7 +8067,7 @@
80678067         return; // true;
80688068     }
80698069     
8070
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8070
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718071     {
80728072         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80738073         
....@@ -8184,7 +8184,9 @@
81848184                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81858185                                 
81868186                                 
8187
-                                if (texturedata != null)
8187
+                                if (texturedata == null)
8188
+                                    throw new Exception();
8189
+                                    
81888190                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81898191         //texture = GetTexture(tex, bump);
81908192                             }
....@@ -8306,7 +8308,7 @@
83068308         return texture;
83078309     }
83088310     
8309
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8311
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
83108312     {
83118313         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83128314                 
....@@ -8324,14 +8326,14 @@
83248326         return texture!=null?texture.texture:null;
83258327     }
83268328     
8327
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8329
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83288330     {
83298331         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83308332                 
83318333         return texture!=null?texture.texturedata:null;
83328334     }
83338335     
8334
-    boolean BindTexture(String tex, boolean bump, int resolution)
8336
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83358337     {
83368338         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83378339         {
....@@ -9542,7 +9544,7 @@
95429544             
95439545             if (!BOXMODE)
95449546             {
9545
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9547
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95469548             }
95479549     
95489550             if (!BOXMODE)
....@@ -9580,7 +9582,7 @@
95809582             ABORTED = false;
95819583         }
95829584         else
9583
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9585
+            Grafreed.wav.cursor += 735 * ACSIZE;
95849586         
95859587         if (false)
95869588         {
....@@ -10243,11 +10245,11 @@
1024310245 
1024410246     public void display(GLAutoDrawable drawable)
1024510247     {
10246
-        if (GrafreeD.savesound && GrafreeD.hassound)
10248
+        if (Grafreed.savesound && Grafreed.hassound)
1024710249         {
10248
-            GrafreeD.wav.save();
10249
-            GrafreeD.savesound = false;
10250
-            GrafreeD.hassound = false;
10250
+            Grafreed.wav.save();
10251
+            Grafreed.savesound = false;
10252
+            Grafreed.hassound = false;
1025110253         }
1025210254 //        if (DEBUG_SELECTION)
1025310255 //        {
....@@ -10377,7 +10379,7 @@
1037710379             Object3D theobject = object;
1037810380             Object3D theparent = object.parent;
1037910381             object.parent = null;
10380
-            object = (Object3D)GrafreeD.clone(object);
10382
+            object = (Object3D)Grafreed.clone(object);
1038110383             object.Stripify();
1038210384             if (theobject.selection == null || theobject.selection.Size() == 0)
1038310385                 theobject.PreprocessOcclusion(this);
....@@ -10798,7 +10800,16 @@
1079810800             // Bump noise
1079910801             gl.glActiveTexture(GL.GL_TEXTURE6);
1080010802             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
-            BindTexture(NOISE_TEXTURE, false, 2);
10803
+            
10804
+    try
10805
+    {
10806
+        BindTexture(NOISE_TEXTURE, false, 2);
10807
+    }
10808
+    catch (Exception e)
10809
+    {
10810
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10811
+    }
10812
+           
1080210813 
1080310814             gl.glActiveTexture(GL.GL_TEXTURE0);
1080410815             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -11283,8 +11294,8 @@
1128311294             e.printStackTrace();
1128411295         }
1128511296         
11286
-        if (GrafreeD.RENDERME > 0)
11287
-            GrafreeD.RENDERME--; // mechante magouille
11297
+        if (Grafreed.RENDERME > 0)
11298
+            Grafreed.RENDERME--; // mechante magouille
1128811299         
1128911300         Globals.ONESTEP = false;
1129011301     }
....@@ -11354,7 +11365,14 @@
1135411365 
1135511366                 usedtextures.clear();
1135611367             
11357
-                BindTextures(DEFAULT_TEXTURES, 2);
11368
+    try
11369
+    {
11370
+        BindTextures(DEFAULT_TEXTURES, 2);
11371
+    }
11372
+    catch (Exception e)
11373
+    {
11374
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11375
+    }
1135811376             }
1135911377             //System.out.println("--> " + stackdepth);
1136011378 //            GrafreeD.traceon();
....@@ -11445,7 +11463,14 @@
1144511463             if (checker != null && DrawMode() == DEFAULT)
1144611464             {
1144711465                 //BindTexture(IMMORTAL_TEXTURE);
11448
-                BindTextures(checker.GetTextures(), checker.texres);
11466
+    try
11467
+    {
11468
+        BindTextures(checker.GetTextures(), checker.texres);
11469
+    }
11470
+    catch (Exception e)
11471
+    {
11472
+        System.err.println("FAILED: " + checker.GetTextures());
11473
+    }
1144911474                 // NEAREST
1145011475                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145111476                 DrawChecker(gl);
....@@ -12758,7 +12783,7 @@
1275812783               "MUL final.y, fragment.texcoord[0].x, c256;" +
1275912784               "FLR final.x, final.y;" +
1276012785               "SUB final.y, final.y, final.x;" +
12761
-              //"MUL final.x, final.x, c256i;" +
12786
+              "MUL final.x, final.x, c256i;" +
1276212787               "MOV final.z, zero.x;" +
1276312788               "MOV final.a, one.w;":""
1276412789               ) +
....@@ -12766,7 +12791,7 @@
1276612791               "MUL final.y, fragment.texcoord[0].y, c256;" +
1276712792               "FLR final.x, final.y;" +
1276812793               "SUB final.y, final.y, final.x;" +
12769
-              //"MUL final.x, final.x, c256i;" +
12794
+              "MUL final.x, final.x, c256i;" +
1277012795               "MOV final.z, zero.x;" +
1277112796               "MOV final.a, one.w;":""
1277212797               ) +
....@@ -13519,7 +13544,7 @@
1351913544     public void mousePressed(MouseEvent e)
1352013545     {
1352113546         //System.out.println("mousePressed: " + e);
13522
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13547
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1352313548     }
1352413549 
1352513550     static long prevtime = 0;
....@@ -13595,8 +13620,8 @@
1359513620       //      mode |= META;
1359613621         //}
1359713622         
13598
-        SetMouseMode(WHEEL | e.getModifiersEx());
13599
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13623
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13624
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1360013625         anchorX = ax;
1360113626         anchorY = ay;
1360213627         prevX = px;
....@@ -13656,6 +13681,10 @@
1365613681 //            wasliveok = true;
1365713682 //            waslive = false;
1365813683             
13684
+            // May 2019 Forget it:
13685
+            if (true)
13686
+                    return;
13687
+            
1365913688             // source == timer
1366013689             if (mouseDown)
1366113690             {
....@@ -13694,7 +13723,7 @@
1369413723     
1369513724     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1369613725 
13697
-    void clickStart(int x, int y, int modifiers)
13726
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1369813727     {
1369913728         if (!wasliveok)
1370013729             return;
....@@ -13711,7 +13740,7 @@
1371113740 //        touched = true; // main DL
1371213741         if (isRenderer)
1371313742         {
13714
-            SetMouseMode(modifiers);
13743
+            SetMouseMode(modifiers, modifiersex);
1371513744         }
1371613745 
1371713746         selectX = anchorX = x;
....@@ -13724,7 +13753,7 @@
1372413753         clicked = true;
1372513754         hold = false;
1372613755 
13727
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13756
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1372813757         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1372913758         {
1373013759       //  System.out.println("RESTART II " + modifiers);
....@@ -13755,7 +13784,7 @@
1375513784             info.camera = renderCamera;
1375613785             info.x = x;
1375713786             info.y = y;
13758
-            info.modifiers = modifiers;
13787
+            info.modifiers = modifiersex;
1375913788             editObj = object.doEditClick(info, 0);
1376013789             if (!editObj)
1376113790             {
....@@ -13784,7 +13813,7 @@
1378413813             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1378513814         }
1378613815         else
13787
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13816
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1378813817         
1378913818     //try { Thread.sleep(1); } catch (Exception ex) {}
1379013819     }
....@@ -14021,7 +14050,7 @@
1402114050                     {
1402214051                         Globals.lighttouched = true;
1402314052                     }
14024
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14053
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1402514054                 }
1402614055             //else
1402714056             }
....@@ -14121,7 +14150,7 @@
1412114150     int X, Y;
1412214151     boolean SX, SY;
1412314152 
14124
-    void drag(int x, int y, int modifiers)
14153
+    void drag(int x, int y, int modifiers, int modifiersex)
1412514154     {
1412614155         if (IsFrozen())
1412714156         {
....@@ -14130,17 +14159,17 @@
1413014159 
1413114160         drag = true; // NEW
1413214161         
14133
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14162
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1413414163 
1413514164         X = x;
1413614165         Y = y;
1413714166         // floating state for animation
14138
-        MODIFIERS = modifiers;
14139
-        modifiers &= ~1024;
14167
+        MODIFIERS = modifiersex;
14168
+        modifiersex &= ~1024;
1414014169         if (false) // modifiers != 0)
1414114170         {
1414214171             //new Exception().printStackTrace();
14143
-            System.out.println("mouseDragged: " + modifiers);
14172
+            System.out.println("mouseDragged: " + modifiersex);
1414414173             System.out.println("SHIFT = " + SHIFT);
1414514174             System.out.println("CONTROL = " + COMMAND);
1414614175             System.out.println("META = " + META);
....@@ -14160,7 +14189,7 @@
1416014189                 info.camera = renderCamera;
1416114190                 info.x = x;
1416214191                 info.y = y;
14163
-                object.editWindow.copy.doEditDrag(info);
14192
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416414193             } else
1416514194             {
1416614195                 if (x < startX)
....@@ -14359,9 +14388,9 @@
1435914388         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1436014389         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1436114390         
14362
-        if (control || command || IsFrozen())
14391
+// No delay        if (control || command || IsFrozen())
1436314392             timeout = true;
14364
-        else
14393
+// ?? May 2019        else
1436514394        // timer.setDelay((modifiers & 128) != 0?0:350);
1436614395         mouseDown = false;
1436714396     if (!control && !command) // june 2013
....@@ -14471,7 +14500,7 @@
1447114500         System.out.println("keyReleased: " + e);
1447214501     }
1447314502 
14474
-    void SetMouseMode(int modifiers)
14503
+    void SetMouseMode(int modifiers, int modifiersex)
1447514504     {
1447614505         //System.out.println("SetMouseMode = " + modifiers);
1447714506         //modifiers &= ~1024;
....@@ -14483,25 +14512,25 @@
1448314512         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1448414513         //	return;
1448514514         //System.out.println("SetMode = " + modifiers);
14486
-        if ((modifiers & WHEEL) == WHEEL)
14515
+        if ((modifiersex & WHEEL) == WHEEL)
1448714516         {
1448814517             mouseMode |= ZOOM;
1448914518         }
1449014519         
1449114520         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14492
-        if (capsLocked || (modifiers & META) == META)
14521
+        if (capsLocked) // || (modifiers & META) == META)
1449314522         {
1449414523             mouseMode |= VR; // BACKFORTH;
1449514524         }
14496
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14525
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1449714526         {
1449814527             mouseMode |= SELECT;
1449914528         }
14500
-        if ((modifiers & COMMAND) == COMMAND)
14529
+        if ((modifiersex & COMMAND) == COMMAND)
1450114530         {
1450214531             mouseMode |= SELECT;
1450314532         }
14504
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14533
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450514534         {
1450614535             mouseMode &= ~VR;
1450714536             mouseMode |= TRANSLATE;
....@@ -14530,7 +14559,7 @@
1453014559 
1453114560         if (isRenderer) //
1453214561         {
14533
-            SetMouseMode(modifiers);
14562
+            SetMouseMode(0, modifiers);
1453414563         }
1453514564 
1453614565         Globals.theRenderer.keyPressed(key);
....@@ -14866,7 +14895,7 @@
1486614895                 //RESIZETEXTURE ^= true;
1486714896                 //break;
1486814897             case 'z':
14869
-                RENDERSHADOW ^= true;
14898
+                Globals.RENDERSHADOW ^= true;
1487014899                 Globals.lighttouched = true;
1487114900                 repaint();
1487214901                 break;
....@@ -14990,7 +15019,7 @@
1499015019         //mode = ROTATE;
1499115020         if ((MODIFIERS & COMMAND) == 0) // VR??
1499215021         {
14993
-            SetMouseMode(modifiers);
15022
+            SetMouseMode(0, modifiers);
1499415023         }
1499515024     }
1499615025 
....@@ -15126,7 +15155,7 @@
1512615155     {
1512715156         //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1512815157         //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15129
-        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15158
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1513015159         {
1513115160             mouseMoved(e);
1513215161         } else
....@@ -15563,6 +15592,7 @@
1556315592     public boolean mouseDown(Event evt, int x, int y)
1556415593     {
1556515594         System.out.println("mouseDown: " + evt);
15595
+        System.exit(0);
1556615596         /*
1556715597         locked = true;
1556815598         drag = false;
....@@ -15606,7 +15636,7 @@
1560615636         {
1560715637             keyPressed(0, modifiers);
1560815638         }
15609
-        clickStart(x, y, modifiers);
15639
+ //       clickStart(x, y, modifiers);
1561015640         return true;
1561115641     }
1561215642 
....@@ -15724,7 +15754,7 @@
1572415754         {
1572515755             keyReleased(0, 0);
1572615756         }
15727
-        drag(x, y, modifiers);
15757
+        drag(x, y, 0, modifiers);
1572815758         return true;
1572915759     }
1573015760 
....@@ -16422,16 +16452,16 @@
1642216452                             System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
1642316453                         }
1642416454                         
16425
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16455
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1642616456                     }
1642716457                 }
1642816458                 
1642916459                 if (!movingcamera && !PAINTMODE)
1643016460                     object.editWindow.ScreenFitPoint(); // fev 2014
1643116461                 
16432
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16462
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643316463                 {
16434
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16464
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1643516465                     
1643616466                     Object3D group = new Object3D("inst" + paintcount++);
1643716467                     
....@@ -16587,7 +16617,7 @@
1658716617                 gl.glDisable(gl.GL_CULL_FACE);
1658816618             }
1658916619 
16590
-            if (!RENDERSHADOW)
16620
+            if (!Globals.RENDERSHADOW)
1659116621                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659216622 
1659316623             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16597,7 +16627,7 @@
1659716627             //gl.glColorMask(false, false, false, false);
1659816628 
1659916629             //render_scene_from_light_view(gl, drawable, 0, 0);
16600
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16630
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660116631             {
1660216632                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660316633