Fix manip window + new icons.

Normand Briere

2019-06-24 914255f70cf047897212839cbf3a6722703f4457

 CameraPane.java
..
..
@@ -37,7 +37,6 @@
37
37
     static boolean[] selectedstack = new boolean[65536];
38
38
     static int materialdepth = 0;
39
39
 
40
-    static boolean DEBUG = false;
41
40
     static boolean FRUSTUM = false; // still bogus true; // frustum culling
42
41
 
43
42
     // camera change fix
..
..
@@ -327,7 +326,7 @@
327
326
                 cStatic.objectstack[materialdepth++] = obj;
328
327
                 //System.out.println("material " + material);
329
328
                 //Applet3D.tracein(this, selected);
330
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
331
330
                 if (obj instanceof Camera)
332
331
                 {
333
332
                     display.options1[0] = material.shift;
..
..
@@ -359,7 +358,7 @@
359
358
                 /**/
360
359
                 } else
361
360
                 {
362
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
363
362
                 }
364
363
             } else
365
364
             {
..
..
@@ -383,8 +382,8 @@
383
382
             cStatic.objectstack[materialdepth++] = obj;
384
383
             //System.out.println("material " + material);
385
384
             //Applet3D.tracein("selected ", selected);
386
-            display.vector2buffer = obj.projectedVertices;
387
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
388
387
         }
389
388
     }
390
389
     
..
..
@@ -401,8 +400,8 @@
401
400
                 materialdepth -= 1;
402
401
                 if (materialdepth > 0)
403
402
                 {
404
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405
-                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
403
+                    //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
+                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406
405
                 }
407
406
             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408
407
             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..
..
@@ -422,8 +421,8 @@
422
421
             materialdepth -= 1;
423
422
             if (materialdepth > 0)
424
423
             {
425
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426
-                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
424
+                //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
+                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427
426
             }
428
427
         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429
428
         //else
..
..
@@ -1611,7 +1610,7 @@
1611
1610
 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612
1611
     }
1613
1612
     
1614
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615
1614
     {
1616
1615
             CameraPane display = this;
1617
1616
         //new Exception().printStackTrace();
..
..
@@ -1646,7 +1645,7 @@
1646
1645
             colorV[0] = display.modelParams0[0] * material.diffuse;
1647
1646
             colorV[1] = display.modelParams0[1] * material.diffuse;
1648
1647
             colorV[2] = display.modelParams0[2] * material.diffuse;
1649
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
1650
1649
 
1651
1650
             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652
1651
             //System.out.println("Opacity = " + opacity);
..
..
@@ -1754,9 +1753,9 @@
1754
1753
         display.modelParams7[2] = 0;
1755
1754
         display.modelParams7[3] = 0;
1756
1755
 
1757
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
1758
1757
         
1759
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760
1759
         if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761
1760
         {
1762
1761
             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..
..
@@ -2267,7 +2266,7 @@
2267
2266
     
2268
2267
     void ToggleDebug()
2269
2268
     {
2270
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
2271
2270
     }
2272
2271
 
2273
2272
     void ToggleLookAt()
..
..
@@ -10549,7 +10548,8 @@
10549
10548
             ambientOcclusion = false;
10550
10549
         }
10551
10550
 
10552
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10551
+        if (//Globals.lighttouched &&
10552
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553
10553
         {
10554
10554
             //if (RENDERSHADOW) // ?
10555
10555
             if (!IsFrozen())
..
..
@@ -11459,6 +11459,24 @@
11459
11459
 
11460
11460
     static boolean zoomonce = false;
11461
11461
     
11462
+    static void CreateSelectedPoint()
11463
+    {
11464
+        if (selectedpoint == null)
11465
+        {
11466
+            debugpointG = new Sphere();
11467
+            debugpointP = new Sphere();
11468
+            debugpointC = new Sphere();
11469
+            debugpointR = new Sphere();
11470
+            
11471
+            selectedpoint = new Superellipsoid();
11472
+            
11473
+            for (int i=0; i<8; i++)
11474
+            {
11475
+                debugpoints[i] = new Sphere();
11476
+            }
11477
+        }
11478
+    }
11479
+    
11462
11480
     void DrawObject(GL gl, boolean draw)
11463
11481
     {
11464
11482
         //System.out.println("DRAW OBJECT " + mouseDown);
..
..
@@ -11539,8 +11557,9 @@
11539
11557
             
11540
11558
             if (DrawMode() == DEFAULT)
11541
11559
             {
11542
-                if (DEBUG)
11560
+                if (Globals.DEBUG)
11543
11561
                 {
11562
+                    CreateSelectedPoint();
11544
11563
                     float radius = 0.05f;
11545
11564
                     if (selectedpoint.radius != radius)
11546
11565
                     {
..
..
@@ -13297,7 +13316,8 @@
13297
13316
     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298
13317
     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299
13318
     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300
-    Object3D.cVector2[] vector2buffer;
13319
+    
13320
+    //Object3D.cVector2[] vector2buffer;
13301
13321
 
13302
13322
     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303
13323
     // OUT : diff, spec
..
..
@@ -14357,7 +14377,8 @@
14357
14377
                 info.camera = renderCamera;
14358
14378
                 info.x = x;
14359
14379
                 info.y = y;
14360
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14380
+                object.manipWindow.copy
14381
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14361
14382
             } else
14362
14383
             {
14363
14384
                 if (x < startX)
..
..
@@ -14521,7 +14542,9 @@
14521
14542
         ci.camera = renderCamera;
14522
14543
         if (!isRenderer)
14523
14544
         {
14524
-            if (object.editWindow.copy.doEditClick(ci, 0))
14545
+            //ObjEditor editWindow = object.editWindow;
14546
+            //Object3D copy = editWindow.copy;
14547
+            if (object.doEditClick(ci, 0))
14525
14548
             {
14526
14549
                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527
14550
             } else
..
..
@@ -14902,8 +14925,14 @@
14902
14925
                 RevertCamera();
14903
14926
                 repaint();
14904
14927
                 break;
14905
-            case 'L':
14906
14928
             case 'l':
14929
+                lightMode ^= true;
14930
+                Globals.lighttouched = true;
14931
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14932
+                targetLookAt.set(manipCamera.lookAt);
14933
+                repaint();
14934
+                break;
14935
+            case 'L':
14907
14936
                 if (lightMode)
14908
14937
                 {
14909
14938
                     lightMode = false;
..
..
@@ -15050,16 +15079,14 @@
15050
15079
                 kompactbit = 6;
15051
15080
                 break;
15052
15081
             case ' ':
15053
-                lightMode ^= true;
15054
-                Globals.lighttouched = true;
15055
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15056
-                targetLookAt.set(manipCamera.lookAt);
15082
+                ObjEditor.theFrame.ToggleFullScreen();
15057
15083
                 repaint();
15058
15084
                 break;
15059
15085
             //case '`' :
15060
15086
             case ESC:
15061
15087
                 RENDERPROGRAM += 1;
15062
15088
                 RENDERPROGRAM %= 3;
15089
+
15063
15090
                 repaint();
15064
15091
                 break;
15065
15092
             case 'Z':
..
..
@@ -16363,16 +16390,16 @@
16363
16390
                 cStatic.objectstack[materialdepth++] = checker;
16364
16391
                 //System.out.println("material " + material);
16365
16392
                 //Applet3D.tracein(this, selected);
16366
-                vector2buffer = checker.projectedVertices;
16393
+                //vector2buffer = checker.projectedVertices;
16367
16394
 
16368
16395
         //checker.GetMaterial().Draw(this, false); // true);
16369
-        DrawMaterial(checker.GetMaterial(), false); // true);
16396
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370
16397
 
16371
16398
                 materialdepth -= 1;
16372
16399
                 if (materialdepth > 0)
16373
16400
                 {
16374
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16401
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16402
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16376
16403
                 }
16377
16404
         //checker.GetMaterial().opacity = 1f;
16378
16405
         ////checker.GetMaterial().ambient = 1f;
..
..
@@ -16595,6 +16622,8 @@
16595
16622
 //                System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596
16623
 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597
16624
 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16625
+                
16626
+                CreateSelectedPoint();
16598
16627
                 
16599
16628
                 // Will fit the mesh !!!
16600
16629
                 selectedpoint.toParent[0][0] = 0.0001;
..
..
@@ -17235,23 +17264,15 @@
17235
17264
     int AAbuffersize = 0;
17236
17265
     
17237
17266
     //double[] selectedpoint = new double[3];
17238
-    static Superellipsoid selectedpoint = new Superellipsoid();
17267
+    static Superellipsoid selectedpoint;
17239
17268
     static Sphere previousselectedpoint = null;
17240
-    static Sphere debugpointG = new Sphere();
17241
-    static Sphere debugpointP = new Sphere();
17242
-    static Sphere debugpointC = new Sphere();
17243
-    static Sphere debugpointR = new Sphere();
17269
+    static Sphere debugpointG;
17270
+    static Sphere debugpointP;
17271
+    static Sphere debugpointC;
17272
+    static Sphere debugpointR;
17244
17273
     
17245
17274
     static Sphere debugpoints[] = new Sphere[8];
17246
17275
  
17247
-    static
17248
-    {
17249
-        for (int i=0; i<8; i++)
17250
-        {
17251
-            debugpoints[i] = new Sphere();
17252
-        }
17253
-    }
17254
-    
17255
17276
     static void InitPoints(float radius)
17256
17277
     {
17257
17278
         for (int i=0; i<8; i++)