Test unfold UV

Normand Briere

2019-04-28 f1c718cce66e5651a0dae91375db6ebfaded1a92

 GroupEditor.java
..
..
@@ -437,11 +437,17 @@
437
437
 		oe.aConstraints.gridwidth = 1;
438
438
         	oe.aConstraints.gridx = 0;
439
439
                 
440
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
440
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441
+                liveCB.setToolTipText("Enabled animation");
441
442
                                 liveCB.addItemListener(this);
442
443
 
443
444
         	oe.aConstraints.gridx += 1;
445
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
446
+                fastCB.setToolTipText("Fast mode");
447
+                                fastCB.addItemListener(this);
448
+        	oe.aConstraints.gridx += 1;
444
449
                 oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450
+                supportCB.setToolTipText("Enabled rigging");
445
451
                                 supportCB.addItemListener(this);
446
452
 
447
453
         //	oe.aConstraints.gridx += 1;
..
..
@@ -449,22 +455,27 @@
449
455
         //                        localCB.addItemListener(this);
450
456
 
451
457
         	oe.aConstraints.gridx += 1;
452
-                oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
458
+                oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459
+                crowdCB.setToolTipText("Used for crowds");
453
460
                                 crowdCB.addItemListener(this);
454
461
 
455
462
         	oe.aConstraints.gridx += 1;
456
463
                 oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464
+                smoothCB.setToolTipText("Snapping delay");
457
465
                                 smoothCB.addItemListener(this);
458
466
 
459
467
         	oe.aConstraints.gridx += 1;
460
-                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
461
-                                fastCB.addItemListener(this);
462
-        	oe.aConstraints.gridx += 1;
463
468
                 oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469
+                slowCB.setToolTipText("Smooth interpolation");
464
470
                                 slowCB.addItemListener(this);
465
471
         	oe.aConstraints.gridx += 1;
466
-                oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
472
+                oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473
+                boxCB.setToolTipText("Display bounding boxes");
467
474
                                 boxCB.addItemListener(this);
475
+        	oe.aConstraints.gridx += 1;
476
+                oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478
+                                zoomBoxCB.addItemListener(this);
468
479
 
469
480
 //        	oe.aConstraints.gridx += 1;
470
481
 //                oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
..
..
@@ -491,19 +502,22 @@
491
502
 //                debugCB.addItemListener(this);
492
503
 
493
504
         	oe.aConstraints.gridx += 1;
494
-                oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
505
+                oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
495
506
                                 oeilCB.addItemListener(this);
496
507
 
497
508
         	oe.aConstraints.gridx += 1;
498
-                oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
509
+                oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510
+                lookAtCB.setToolTipText("Look-at target");
499
511
                                 lookAtCB.addItemListener(this);
500
512
 
501
513
         	oe.aConstraints.gridx += 1;
502
514
                 oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
515
+                trackCB.setToolTipText("Enable tracking");
503
516
                                 trackCB.addItemListener(this);
504
517
 
505
518
         	oe.aConstraints.gridx += 1;
506
519
 		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
520
+                screenfitButton.setToolTipText("Screen fit");
507
521
 		screenfitButton.addActionListener(this);
508
522
 			oe.aConstraints.gridx += 1;
509
523
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..
..
@@ -511,6 +525,7 @@
511
525
 //			oe.aConstraints.gridx += 1;
512
526
 		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513
527
 		snapobjectButton.addActionListener(this);
528
+                snapobjectButton.setToolTipText("Snap Object");
514
529
 			oe.aConstraints.gridx += 1;
515
530
 
516
531
                 //aConstraints.gridx = 0;
..
..
@@ -519,6 +534,7 @@
519
534
 		oe.aConstraints.gridwidth = 1;
520
535
 		
521
536
 		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
537
+                flashSelectionButton.setToolTipText("Show selection");
522
538
 		flashSelectionButton.addActionListener(this);
523
539
                 
524
540
 		oe.toolbarPanel.add(new cButton("     ", false));
..
..
@@ -529,21 +545,28 @@
529
545
                 
530
546
                 //
531
547
 		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
548
+                twoButton.setToolTipText("Show center view only");
532
549
 		twoButton.addActionListener(this);
533
550
 		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
534
551
 		fourButton.addActionListener(this);
552
+                fourButton.setToolTipText("Show left panel only");
535
553
 		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
554
+                sixButton.setToolTipText("2-column layout left");
536
555
 		sixButton.addActionListener(this);
537
556
 		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
557
+                threeButton.setToolTipText("2-column layout right");
538
558
 		threeButton.addActionListener(this);
539
559
 		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
560
+                sevenButton.setToolTipText("3-column layout");
540
561
 		sevenButton.addActionListener(this);
541
562
                 //
542
563
 
543
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o  E  ")); //, oe.aConstraints);
564
+		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565
+                rootButton.setToolTipText("Edit object in new tab");
544
566
 		rootButton.addActionListener(this);
545
567
 			oe.aConstraints.gridx += 1;
546
568
 		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
569
+                closeButton.setToolTipText("Close tab");
547
570
 		closeButton.addActionListener(this);
548
571
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549
572
 		//clearButton.addActionListener(this);
..
..
@@ -649,14 +672,14 @@
649
672
 	
650
673
         void EditObject(Object3D obj)
651
674
         {
652
-            cRadio dummyButton = new cRadio(obj.name);
653
-            dummyButton.SetObject(obj);
654
-            dummyButton.layout = sevenButton;
655
-            dummyButton.SetCamera(cameraView.renderCamera, false);
656
-            dummyButton.addActionListener(this);
657
-            radioPanel.add(dummyButton);
658
-            buttonGroup.add(dummyButton);
659
-            dummyButton.doClick();
675
+            cRadio radioButton = new cRadio(obj.name);
676
+            radioButton.SetObject(obj);
677
+            radioButton.layout = sevenButton;
678
+            radioButton.SetCamera(cameraView.renderCamera, false);
679
+            radioButton.addActionListener(this);
680
+            radioPanel.add(radioButton);
681
+            buttonGroup.add(radioButton);
682
+            radioButton.doClick();
660
683
         }
661
684
         void SetupViews(ObjEditor oe)
662
685
         {
..
..
@@ -676,6 +699,7 @@
676
699
         JCheckBox fastCB;
677
700
         JCheckBox slowCB;
678
701
         JCheckBox boxCB;
702
+        JCheckBox zoomBoxCB;
679
703
         JCheckBox trackCB;
680
704
         JCheckBox smoothfocusCB;
681
705
 //        JCheckBox speakerMocapCB;
..
..
@@ -755,6 +779,10 @@
755
779
                 Recompile();
756
780
         cameraView.repaint();
757
781
 //                refreshContents();
782
+            }
783
+            else if(e.getSource() == zoomBoxCB)
784
+            {
785
+                cameraView.ToggleZoomBoxMode();
758
786
             }
759
787
             else if(e.getSource() == smoothfocusCB)
760
788
             {
..
..
@@ -1120,6 +1148,8 @@
1120
1148
 		resetParentItem.addActionListener(this);
1121
1149
 		repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122
1150
 		repairParentItem.addActionListener(this);
1151
+		repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
1152
+		repairShadowItem.addActionListener(this);
1123
1153
 		menu.add(invariantsItem = new MenuItem("Invariants"));
1124
1154
 		invariantsItem.addActionListener(this);
1125
1155
 		menu.add(recompileItem = new MenuItem("Recompile"));
..
..
@@ -1780,8 +1810,8 @@
1780
1810
 		} else
1781
1811
 		if (event.getSource() == computeAOItem)
1782
1812
 		{
1783
-                    CameraPane.drawMode = CameraPane.OCCLUSION;
1784
-                    CameraPane.theRenderer.repaint();
1813
+                    Globals.drawMode = CameraPane.OCCLUSION;
1814
+                    Globals.theRenderer.repaint();
1785
1815
 		} else
1786
1816
 		if (event.getSource() == recompileItem)
1787
1817
 		{
..
..
@@ -2092,7 +2122,7 @@
2092
2122
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2093
2123
                             content = ((cGroup)content).get(0);
2094
2124
 
2095
-            CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2125
+            Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096
2126
                         for (int i=0; i<group.selection.size(); i++)
2097
2127
                         {
2098
2128
                             boolean random = CameraPane.RANDOM;
..
..
@@ -2101,7 +2131,7 @@
2101
2131
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2102
2132
                             CameraPane.RANDOM = random;
2103
2133
                         }
2104
-            CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2134
+            Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105
2135
 		refreshContents();
2106
2136
                     }
2107
2137
 		} else
..
..
@@ -2545,6 +2575,20 @@
2545
2575
 			
2546
2576
 			refreshContents();
2547
2577
 		} else
2578
+		if (event.getSource() == repairShadowItem)
2579
+		{
2580
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581
+			{
2582
+				Object3D obj = (Object3D)e.nextElement();
2583
+                                obj.RepairShadow();
2584
+//                                for (int i=0; i<obj.size(); i++)
2585
+//                                {
2586
+//                                    obj.get(i).parent = obj;
2587
+//                                }
2588
+			}
2589
+			
2590
+			refreshContents();
2591
+		} else
2548
2592
 		if (event.getSource() == sortbysizeItem)
2549
2593
 		{
2550
2594
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -2895,7 +2939,7 @@
2895
2939
                     }
2896
2940
                     
2897
2941
                     copy = group;
2898
-                    //CameraPane.theRenderer.object = group;
2942
+                    //Globals.theRenderer.object = group;
2899
2943
                     if(!useclient)
2900
2944
                     {
2901
2945
                         cameraView.renderCamera = radio.camera;
..
..
@@ -2904,7 +2948,8 @@
2904
2948
                         cameraView.cameras[cameraView.cameracount] = radio.camera;
2905
2949
                         cameraView.targetLookAt.set(radio.camera.lookAt);
2906
2950
                         cameraView.object = group;
2907
-                        cameraView.lighttouched = true;
2951
+                        //cameraView.lighttouched = true;
2952
+                        Globals.lighttouched = true;
2908
2953
                         topView.object = group;
2909
2954
                         frontView.object = group;
2910
2955
                         sideView.object = group;
..
..
@@ -2940,7 +2985,7 @@
2940
2985
             if (useclient)
2941
2986
             {
2942
2987
                 cameraView.object = client;
2943
-                cameraView.lighttouched = true;
2988
+                Globals.lighttouched = true;
2944
2989
                 //topView.object = client;
2945
2990
                 //frontView.object = client;
2946
2991
                 //sideView.object = client;
..
..
@@ -2948,7 +2993,7 @@
2948
2993
             else
2949
2994
             {
2950
2995
                 cameraView.object = group;
2951
-                cameraView.lighttouched = true;
2996
+                Globals.lighttouched = true;
2952
2997
                 //topView.object = group;
2953
2998
                 //frontView.object = group;
2954
2999
                 //sideView.object = group;
..
..
@@ -3456,7 +3501,7 @@
3456
3501
                             String pigment = Object3D.GetPigment(tex);
3457
3502
                             //String bump = Object3D.GetBump(tex);
3458
3503
                             
3459
-                            com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
3504
+                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3460
3505
                             
3461
3506
                             double s = v.s;
3462
3507
                             
..
..
@@ -3757,7 +3802,7 @@
3757
3802
             group.selection.RelinkToSupport(); // july 2014
3758
3803
             System.out.println("DONE.");
3759
3804
             refreshContents();
3760
-        CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3805
+        Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761
3806
         }
3762
3807
         
3763
3808
 	void ReduceMesh(boolean reduction34)
..
..
@@ -4042,16 +4087,16 @@
4042
4087
 			
4043
4088
                         objEditor.SetText(); // jan 2014
4044
4089
                         
4045
-			if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4090
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4046
4091
 				CameraPane.flash = true;
4047
4092
                         
4048
4093
 			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4049
4094
                             // a camera
4050
4095
                         {
4051
4096
                             CameraPane.camerachangeframe = 0; // don't refuse it
4052
-                            CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4053
-                         //   CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4054
-                         //   CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
4097
+                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4098
+                         //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099
+                         //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055
4100
                         }
4056
4101
                             
4057
4102
 			refreshContents();
..
..
@@ -5009,6 +5054,7 @@
5009
5054
         
5010
5055
 	private MenuItem resetParentItem;
5011
5056
 	private MenuItem repairParentItem;
5057
+	private MenuItem repairShadowItem;
5012
5058
 	private MenuItem sortbysizeItem;
5013
5059
 	private MenuItem sortbynameItem;
5014
5060