Fix manip window + new icons.

Normand Briere

2019-06-24 914255f70cf047897212839cbf3a6722703f4457

 CameraPane.java
..
..
@@ -326,7 +326,7 @@
326
326
                 cStatic.objectstack[materialdepth++] = obj;
327
327
                 //System.out.println("material " + material);
328
328
                 //Applet3D.tracein(this, selected);
329
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
330
330
                 if (obj instanceof Camera)
331
331
                 {
332
332
                     display.options1[0] = material.shift;
..
..
@@ -358,7 +358,7 @@
358
358
                 /**/
359
359
                 } else
360
360
                 {
361
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
362
362
                 }
363
363
             } else
364
364
             {
..
..
@@ -382,8 +382,8 @@
382
382
             cStatic.objectstack[materialdepth++] = obj;
383
383
             //System.out.println("material " + material);
384
384
             //Applet3D.tracein("selected ", selected);
385
-            display.vector2buffer = obj.projectedVertices;
386
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
387
387
         }
388
388
     }
389
389
     
..
..
@@ -400,8 +400,8 @@
400
400
                 materialdepth -= 1;
401
401
                 if (materialdepth > 0)
402
402
                 {
403
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
-                    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);
405
405
                 }
406
406
             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
407
407
             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..
..
@@ -421,8 +421,8 @@
421
421
             materialdepth -= 1;
422
422
             if (materialdepth > 0)
423
423
             {
424
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
-                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);
426
426
             }
427
427
         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
428
428
         //else
..
..
@@ -1610,7 +1610,7 @@
1610
1610
 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1611
1611
     }
1612
1612
     
1613
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1614
1614
     {
1615
1615
             CameraPane display = this;
1616
1616
         //new Exception().printStackTrace();
..
..
@@ -1645,7 +1645,7 @@
1645
1645
             colorV[0] = display.modelParams0[0] * material.diffuse;
1646
1646
             colorV[1] = display.modelParams0[1] * material.diffuse;
1647
1647
             colorV[2] = display.modelParams0[2] * material.diffuse;
1648
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
1649
1649
 
1650
1650
             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1651
1651
             //System.out.println("Opacity = " + opacity);
..
..
@@ -1753,9 +1753,9 @@
1753
1753
         display.modelParams7[2] = 0;
1754
1754
         display.modelParams7[3] = 0;
1755
1755
 
1756
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
1757
1757
         
1758
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
1759
1759
         if (extparams != null && extparams.length > 0 && extparams[0] != null)
1760
1760
         {
1761
1761
             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..
..
@@ -10548,7 +10548,8 @@
10548
10548
             ambientOcclusion = false;
10549
10549
         }
10550
10550
 
10551
-        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10551
+        if (//Globals.lighttouched &&
10552
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552
10553
         {
10553
10554
             //if (RENDERSHADOW) // ?
10554
10555
             if (!IsFrozen())
..
..
@@ -11458,7 +11459,7 @@
11458
11459
 
11459
11460
     static boolean zoomonce = false;
11460
11461
     
11461
-    void CreateSelectedPoint()
11462
+    static void CreateSelectedPoint()
11462
11463
     {
11463
11464
         if (selectedpoint == null)
11464
11465
         {
..
..
@@ -13315,7 +13316,8 @@
13315
13316
     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13316
13317
     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13317
13318
     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13318
-    Object3D.cVector2[] vector2buffer;
13319
+    
13320
+    //Object3D.cVector2[] vector2buffer;
13319
13321
 
13320
13322
     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13321
13323
     // OUT : diff, spec
..
..
@@ -14375,7 +14377,8 @@
14375
14377
                 info.camera = renderCamera;
14376
14378
                 info.x = x;
14377
14379
                 info.y = y;
14378
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14380
+                object.manipWindow.copy
14381
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14379
14382
             } else
14380
14383
             {
14381
14384
                 if (x < startX)
..
..
@@ -14539,7 +14542,9 @@
14539
14542
         ci.camera = renderCamera;
14540
14543
         if (!isRenderer)
14541
14544
         {
14542
-            if (object.editWindow.copy.doEditClick(ci, 0))
14545
+            //ObjEditor editWindow = object.editWindow;
14546
+            //Object3D copy = editWindow.copy;
14547
+            if (object.doEditClick(ci, 0))
14543
14548
             {
14544
14549
                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14545
14550
             } else
..
..
@@ -16385,16 +16390,16 @@
16385
16390
                 cStatic.objectstack[materialdepth++] = checker;
16386
16391
                 //System.out.println("material " + material);
16387
16392
                 //Applet3D.tracein(this, selected);
16388
-                vector2buffer = checker.projectedVertices;
16393
+                //vector2buffer = checker.projectedVertices;
16389
16394
 
16390
16395
         //checker.GetMaterial().Draw(this, false); // true);
16391
-        DrawMaterial(checker.GetMaterial(), false); // true);
16396
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16392
16397
 
16393
16398
                 materialdepth -= 1;
16394
16399
                 if (materialdepth > 0)
16395
16400
                 {
16396
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16397
-                    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);
16398
16403
                 }
16399
16404
         //checker.GetMaterial().opacity = 1f;
16400
16405
         ////checker.GetMaterial().ambient = 1f;
..
..
@@ -16618,6 +16623,8 @@
16618
16623
 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16619
16624
 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16620
16625
                 
16626
+                CreateSelectedPoint();
16627
+                
16621
16628
                 // Will fit the mesh !!!
16622
16629
                 selectedpoint.toParent[0][0] = 0.0001;
16623
16630
                 selectedpoint.toParent[1][1] = 0.0001;