Fix random/switch node.

Normand Briere

2019-05-01 d1e1417edc8a6ccf195b6da3270f22234dda61e4

 GroupEditor.java
..
..
@@ -12,6 +12,7 @@
12
12
 import com.jme.math.Vector3f;
13
13
 import com.jme.renderer.ColorRGBA;
14
14
 
15
+import grafeme.ui.*;
15
16
 //import buoy.widget.BFileChooser;
16
17
 
17
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..
..
@@ -238,16 +239,16 @@
238
239
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
239
240
 		ungroupItem.addActionListener(this);
240
241
 		menu.add("-");
241
-		randomItem = menu.add(new MenuItem("Random"));
242
+		randomItem = menu.add(new MenuItem("Switch node"));
242
243
 		randomItem.addActionListener(this);
243
-		physicsItem = menu.add(new MenuItem("Physics"));
244
-		physicsItem.addActionListener(this);
245
-		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246
-		frameselectorItem.addActionListener(this);
247
244
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248
245
 		switchGeoItem.addActionListener(this);
249
246
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250
247
 		switchTransfoItem.addActionListener(this);
248
+		physicsItem = menu.add(new MenuItem("Physics"));
249
+		physicsItem.addActionListener(this);
250
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251
+		frameselectorItem.addActionListener(this);
251
252
 		morphItem = menu.add(new MenuItem("Morph"));
252
253
 		morphItem.addActionListener(this);
253
254
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
..
..
@@ -433,110 +434,94 @@
433
434
         oe.radioPanel.add(dummyButton);
434
435
         oe.buttonGroup.add(dummyButton);
435
436
          */
436
-                aConstraints.gridy += 1;
437
-                
438
437
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439
438
                 
440
-		oe.aConstraints.gridwidth = 1;
441
-        	oe.aConstraints.gridx = 0;
442
-                
443
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
439
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
444
440
                 liveCB.setToolTipText("Enabled animation");
445
441
                                 liveCB.addItemListener(this);
446
442
 
447
-        	oe.aConstraints.gridx += 1;
448
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
443
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444
+                fastCB.setToolTipText("Fast mode");
445
+                                fastCB.addItemListener(this);
446
+                                
447
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449
448
                 trackCB.setToolTipText("Enable tracking");
450
449
                                 trackCB.addItemListener(this);
451
450
 
452
-        	oe.aConstraints.gridx += 1;
453
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
451
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
454
452
                 screenfitButton.setToolTipText("Screen fit");
455
453
 		screenfitButton.addActionListener(this);
456
-			oe.aConstraints.gridx += 1;
454
+
457
455
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458
456
 //		screenfitpointButton.addActionListener(this);
459
-//			oe.aConstraints.gridx += 1;
460
-		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461
-		snapobjectButton.addActionListener(this);
462
-                snapobjectButton.setToolTipText("Snap Object");
463
-			oe.aConstraints.gridx += 1;
464
457
 
465
-                //aConstraints.gridx = 0;
466
-                //aConstraints.gridy += 1;
467
-		oe.aConstraints.weighty = 0;
468
-		oe.aConstraints.gridwidth = 1;
469
-		
470
-		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
458
+                if (Globals.ADVANCED)
459
+                {
460
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
461
+                        snapobjectButton.addActionListener(this);
462
+                        snapobjectButton.setToolTipText("Snap Object");
463
+                }
464
+
465
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471
466
                 flashSelectionButton.setToolTipText("Show selection");
472
467
 		flashSelectionButton.addActionListener(this);
473
468
                 
474
-		oe.toolbarPanel.add(new cButton("     ", false));
469
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475
470
                 
476
-		oe.aConstraints.gridx += 1;
477
-		oe.aConstraints.weighty = 0;
478
-		oe.aConstraints.gridwidth = 1;
479
-                
480
-                //
481
-		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
471
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
482
472
                 twoButton.setToolTipText("Show center view only");
483
473
 		twoButton.addActionListener(this);
484
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
474
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485
475
 		fourButton.addActionListener(this);
486
476
                 fourButton.setToolTipText("Show left panel only");
487
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
477
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
478
                 sixButton.setToolTipText("2-column layout left");
489
479
 		sixButton.addActionListener(this);
490
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
480
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
491
481
                 threeButton.setToolTipText("2-column layout right");
492
482
 		threeButton.addActionListener(this);
493
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
483
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494
484
                 sevenButton.setToolTipText("3-column layout");
495
485
 		sevenButton.addActionListener(this);
496
486
                 //
497
487
 
498
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499
-                rootButton.setToolTipText("Edit object in new tab");
488
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489
+                rootButton.setToolTipText("Edit selection in new tab");
500
490
 		rootButton.addActionListener(this);
501
-			oe.aConstraints.gridx += 1;
502
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
491
+
492
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
503
493
                 closeButton.setToolTipText("Close tab");
504
494
 		closeButton.addActionListener(this);
505
495
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506
496
 		//clearButton.addActionListener(this);
507
-			oe.aConstraints.gridx += 1;
508
497
                         
509
-		oe.aConstraints.gridx = 1; //
510
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
498
+                cGridBag commandsPanel = new cGridBag();
499
+                
500
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501
+                editButton.setToolTipText("Edit selection");
511
502
 		editButton.addActionListener(this);
512
-		oe.aConstraints.gridx += 1;
513
-		oe.aConstraints.weighty = 0;
514
-		oe.aConstraints.gridwidth = 1;
515
503
 
516
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
504
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505
+                uneditButton.setToolTipText("Unedit selection");
517
506
 		uneditButton.addActionListener(this);
518
507
 
519
-		oe.aConstraints.gridx += 1;
520
-		oe.aConstraints.weighty = 0;
521
-		oe.aConstraints.gridwidth = 1;
522
-                
523
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
508
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
509
+                clearPanelButton.setToolTipText("Clear edit panel");
524
510
 		clearPanelButton.addActionListener(this);
525
511
 
526
-		oe.aConstraints.gridx += 1;
527
-		oe.aConstraints.weighty = 0;
528
-		oe.aConstraints.gridwidth = 1;
529
-                
530
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
512
+		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
+                allParamsButton.setToolTipText("All params??");
531
514
 		allParamsButton.addActionListener(this);
532
515
 
533
-		oe.aConstraints.gridx += 1;
534
-		oe.aConstraints.weighty = 0;
535
-		oe.aConstraints.gridwidth = 1;
536
-                
537
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
516
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517
+                unselectButton.setToolTipText("Unselect");
538
518
 		unselectButton.addActionListener(this);
539
519
 
520
+                commandsPanel.preferredHeight = 1;
521
+                
522
+                oe.treePanel.add(commandsPanel);
523
+                oe.treePanel.Return();
524
+                
540
525
 //		oe.aConstraints.gridx += 1;
541
526
 //		oe.aConstraints.weighty = 0;
542
527
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -548,40 +533,37 @@
548
533
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549
534
 //		gcButton.addActionListener(this);
550
535
                 
551
-                oe.aConstraints.gridx = 0;
552
-		oe.aConstraints.gridy += 1;
553
-                
554
-		//ctrlPanel.add(objList = new List(5, true));
555
-		oe.aConstraints.gridwidth = 100;
556
-	//	oe.aConstraints.gridheight = 100;
557
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558
-		oe.aConstraints.gridheight = 1;
559
-		oe.aConstraints.weighty = 0.5;
560
-		oe.aConstraints.gridx = 0;
561
-		JScrollPane jSP;
536
+                cGridBag jSPPanel = new cGridBag();
537
+
538
+                JScrollPane jSP;
562
539
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
540
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564
541
                 ResetModel();
565
-		oe.aConstraints.weighty = 0.5;
566
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567
-		oe.aConstraints.gridy += 1;
568
-		oe.aConstraints.gridwidth = 1;
542
+                
543
+                oe.treePanel.add(jSPPanel);
544
+                oe.treePanel.Return();
569
545
 
570
-		oe.aConstraints.weighty = 0;
571
-		oe.aConstraints.gridwidth = 2;
572
-
573
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
546
+                cGridBag copyOptionsPanel = new cGridBag();
547
+                
548
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549
+                colorCB.setToolTipText("Copy color when dropped");
574
550
                 colorCB.addItemListener(this);
575
-                oe.aConstraints.gridx += 2;
576
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
551
+
552
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553
+                materialCB.setToolTipText("Copy material when dropped");
577
554
                 materialCB.addItemListener(this);
578
-                oe.aConstraints.gridx += 2;
579
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
555
+
556
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557
+                textureCB.setToolTipText("Copy texture when dropped");
580
558
                 textureCB.addItemListener(this);
581
559
                         
582
-                oe.aConstraints.gridx = 0;
583
-		oe.aConstraints.gridy += 1;
560
+                copyOptionsPanel.preferredHeight = 1;
561
+                oe.treePanel.add(copyOptionsPanel);
562
+                oe.treePanel.Return();
584
563
                 
564
+//        mainPanel.setDividerLocation(0.5); //1.0);
565
+//        mainPanel.setResizeWeight(0.5);
566
+        
585
567
 		//jList.addListSelectionListener(this);
586
568
 		oe.jTree.addTreeSelectionListener(this);
587
569
 		//jTree.setRootVisible(false);
..
..
@@ -604,42 +586,32 @@
604
586
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605
587
 	}
606
588
         
607
-        void AddOptions(JPanel panel, GridBagConstraints constraints)
589
+        void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608
590
         {
609
-        	constraints.gridx = 0;
610
-        	constraints.gridy = 0;
611
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612
-                fastCB.setToolTipText("Fast mode");
613
-                                fastCB.addItemListener(this);
614
-        	constraints.gridy += 1;
615
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
591
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
616
592
                 supportCB.setToolTipText("Enabled rigging");
617
593
                                 supportCB.addItemListener(this);
618
594
 
619
-        //	constraints.gridy += 1;
620
595
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621
596
         //                        localCB.addItemListener(this);
622
597
 
623
-        	constraints.gridy += 1;
624
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
598
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625
599
                 crowdCB.setToolTipText("Used for crowds");
626
600
                                 crowdCB.addItemListener(this);
627
601
 
628
-        	constraints.gridy += 1;
629
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
602
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630
603
                 smoothCB.setToolTipText("Snapping delay");
631
604
                                 smoothCB.addItemListener(this);
632
605
 
633
-        	constraints.gridy += 1;
634
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
606
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635
607
                 slowCB.setToolTipText("Smooth interpolation");
636
608
                                 slowCB.addItemListener(this);
637
-        	constraints.gridy += 1;
638
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
609
+                                
610
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639
611
                 boxCB.setToolTipText("Display bounding boxes");
640
612
                                 boxCB.addItemListener(this);
641
-        	constraints.gridy += 1;
642
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
613
+                                
614
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643
615
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644
616
                                 zoomBoxCB.addItemListener(this);
645
617
 
..
..
@@ -650,16 +622,16 @@
650
622
             if (false)
651
623
             {
652
624
                 // handled in scripts
653
-        	constraints.gridy += 1;
654
-                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
625
+        	//constraints.gridy += 1;
626
+                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655
627
                                 speakerCameraCB.addItemListener(this);
656
628
 
657
-        	constraints.gridy += 1;
658
-                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
629
+        	//constraints.gridy += 1;
630
+                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659
631
                                 speakerFocusCB.addItemListener(this);
660
632
 
661
-        	constraints.gridy += 1;
662
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
633
+        	//constraints.gridy += 1;
634
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663
635
                                 smoothfocusCB.addItemListener(this);
664
636
             }
665
637
 
..
..
@@ -667,14 +639,18 @@
667
639
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668
640
 //                debugCB.addItemListener(this);
669
641
 
670
-        	constraints.gridy += 1;
671
-                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
642
+                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672
643
                                 oeilCB.addItemListener(this);
673
644
 
674
-        	constraints.gridy += 1;
675
-                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
645
+                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676
646
                 lookAtCB.setToolTipText("Look-at target");
677
647
                                 lookAtCB.addItemListener(this);
648
+                                
649
+                cGridBag fill = new cGridBag();
650
+                                
651
+                fill.preferredHeight = 200;
652
+                
653
+                panel.add(fill);
678
654
 
679
655
         }
680
656
 	
..
..
@@ -1123,7 +1099,7 @@
1123
1099
 	{
1124
1100
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125
1101
 		animationItem.addItemListener(this);
1126
-                animationItem.setState(CameraPane.ANIMATION);
1102
+                animationItem.setState(Globals.ANIMATION);
1127
1103
                 
1128
1104
 		menu.add("-");
1129
1105
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -2259,7 +2235,7 @@
2259
2235
                         RandomNode random = new RandomNode();
2260
2236
 			group(random);
2261
2237
                         if (random.size() > 0)
2262
-                            random.name = random.get(0).name + "Rnd";
2238
+                            random.name = random.get(0).name + "Switch";
2263
2239
 		} else
2264
2240
 		if (source == physicsItem)
2265
2241
                 {
..
..
@@ -2916,7 +2892,7 @@
2916
2892
                                 
2917
2893
                                 child.editWindow = null; // ???????????
2918
2894
 			}
2919
-			objEditor.ctrlPanel.revalidate();
2895
+			objEditor.ctrlPanel.validate();
2920
2896
 			//objEditor.jTree.clearSelection();
2921
2897
 			//objEditor.ResetSliders();
2922
2898
                     refreshContents(true);
..
..
@@ -4124,12 +4100,12 @@
4124
4100
             System.err.println("info : " + child.GetPath());
4125
4101
 				}
4126
4102
 			}
4127
-			else
4128
-                        {
4129
-				objEditor.SetMaterial(group); // .GetMaterial());
4130
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4131
-            System.err.println("info : " + group.GetPath());
4132
-                        }
4103
+//			else
4104
+//                        {
4105
+//				objEditor.SetMaterial(group); // .GetMaterial());
4106
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4107
+//            System.err.println("info : " + group.GetPath());
4108
+//                        }
4133
4109
 			
4134
4110
                         objEditor.SetText(); // jan 2014
4135
4111