Fix animation and fast mode.

Normand Briere

2019-05-01 20c1a07b76c39462594aedfedfe6e6adb17cd552

 GroupEditor.java
..
..
@@ -434,31 +434,28 @@
434
434
         oe.radioPanel.add(dummyButton);
435
435
         oe.buttonGroup.add(dummyButton);
436
436
          */
437
-                aConstraints.gridy += 1;
438
-                
439
437
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440
438
                 
441
-		oe.aConstraints.gridwidth = 1;
442
-        	oe.aConstraints.gridx = 0;
443
-                
444
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
439
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
445
440
                 liveCB.setToolTipText("Enabled animation");
446
441
                                 liveCB.addItemListener(this);
447
442
 
448
-        	oe.aConstraints.gridx += 1;
449
-                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);
450
448
                 trackCB.setToolTipText("Enable tracking");
451
449
                                 trackCB.addItemListener(this);
452
450
 
453
-        	oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
451
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
452
                 screenfitButton.setToolTipText("Screen fit");
456
453
 		screenfitButton.addActionListener(this);
457
-			oe.aConstraints.gridx += 1;
454
+
458
455
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459
456
 //		screenfitpointButton.addActionListener(this);
460
457
 //			oe.aConstraints.gridx += 1;
461
-		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
458
+		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
462
459
 		snapobjectButton.addActionListener(this);
463
460
                 snapobjectButton.setToolTipText("Snap Object");
464
461
 			oe.aConstraints.gridx += 1;
..
..
@@ -468,76 +465,66 @@
468
465
 		oe.aConstraints.weighty = 0;
469
466
 		oe.aConstraints.gridwidth = 1;
470
467
 		
471
-		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
468
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472
469
                 flashSelectionButton.setToolTipText("Show selection");
473
470
 		flashSelectionButton.addActionListener(this);
474
471
                 
475
-		oe.toolbarPanel.add(new cButton("     ", false));
472
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476
473
                 
477
-		oe.aConstraints.gridx += 1;
478
-		oe.aConstraints.weighty = 0;
479
-		oe.aConstraints.gridwidth = 1;
480
-                
481
-                //
482
-		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
474
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483
475
                 twoButton.setToolTipText("Show center view only");
484
476
 		twoButton.addActionListener(this);
485
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
477
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
486
478
 		fourButton.addActionListener(this);
487
479
                 fourButton.setToolTipText("Show left panel only");
488
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
480
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489
481
                 sixButton.setToolTipText("2-column layout left");
490
482
 		sixButton.addActionListener(this);
491
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
483
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
484
                 threeButton.setToolTipText("2-column layout right");
493
485
 		threeButton.addActionListener(this);
494
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
486
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
495
487
                 sevenButton.setToolTipText("3-column layout");
496
488
 		sevenButton.addActionListener(this);
497
489
                 //
498
490
 
499
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500
-                rootButton.setToolTipText("Edit object in new tab");
491
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
+                rootButton.setToolTipText("Edit selection in new tab");
501
493
 		rootButton.addActionListener(this);
502
-			oe.aConstraints.gridx += 1;
503
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
494
+
495
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
496
                 closeButton.setToolTipText("Close tab");
505
497
 		closeButton.addActionListener(this);
506
498
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507
499
 		//clearButton.addActionListener(this);
508
-			oe.aConstraints.gridx += 1;
509
500
                         
510
-		oe.aConstraints.gridx = 1; //
511
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
501
+                cGridBag commandsPanel = new cGridBag();
502
+                
503
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
+                editButton.setToolTipText("Edit selection");
512
505
 		editButton.addActionListener(this);
513
-		oe.aConstraints.gridx += 1;
514
-		oe.aConstraints.weighty = 0;
515
-		oe.aConstraints.gridwidth = 1;
516
506
 
517
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
507
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508
+                uneditButton.setToolTipText("Unedit selection");
518
509
 		uneditButton.addActionListener(this);
519
510
 
520
-		oe.aConstraints.gridx += 1;
521
-		oe.aConstraints.weighty = 0;
522
-		oe.aConstraints.gridwidth = 1;
523
-                
524
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
511
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
+                clearPanelButton.setToolTipText("Clear edit panel");
525
513
 		clearPanelButton.addActionListener(this);
526
514
 
527
-		oe.aConstraints.gridx += 1;
528
-		oe.aConstraints.weighty = 0;
529
-		oe.aConstraints.gridwidth = 1;
530
-                
531
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
515
+		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
+                allParamsButton.setToolTipText("All params??");
532
517
 		allParamsButton.addActionListener(this);
533
518
 
534
-		oe.aConstraints.gridx += 1;
535
-		oe.aConstraints.weighty = 0;
536
-		oe.aConstraints.gridwidth = 1;
537
-                
538
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
519
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+                unselectButton.setToolTipText("Unselect");
539
521
 		unselectButton.addActionListener(this);
540
522
 
523
+                commandsPanel.preferredHeight = 1;
524
+                
525
+                oe.treePanel.add(commandsPanel);
526
+                oe.treePanel.Return();
527
+                
541
528
 //		oe.aConstraints.gridx += 1;
542
529
 //		oe.aConstraints.weighty = 0;
543
530
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -549,40 +536,37 @@
549
536
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550
537
 //		gcButton.addActionListener(this);
551
538
                 
552
-                oe.aConstraints.gridx = 0;
553
-		oe.aConstraints.gridy += 1;
554
-                
555
-		//ctrlPanel.add(objList = new List(5, true));
556
-		oe.aConstraints.gridwidth = 100;
557
-	//	oe.aConstraints.gridheight = 100;
558
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559
-		oe.aConstraints.gridheight = 1;
560
-		oe.aConstraints.weighty = 0.5;
561
-		oe.aConstraints.gridx = 0;
562
-		JScrollPane jSP;
539
+                cGridBag jSPPanel = new cGridBag();
540
+
541
+                JScrollPane jSP;
563
542
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
543
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565
544
                 ResetModel();
566
-		oe.aConstraints.weighty = 0.5;
567
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568
-		oe.aConstraints.gridy += 1;
569
-		oe.aConstraints.gridwidth = 1;
545
+                
546
+                oe.treePanel.add(jSPPanel);
547
+                oe.treePanel.Return();
570
548
 
571
-		oe.aConstraints.weighty = 0;
572
-		oe.aConstraints.gridwidth = 2;
573
-
574
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
549
+                cGridBag copyOptionsPanel = new cGridBag();
550
+                
551
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552
+                colorCB.setToolTipText("Copy color when dropped");
575
553
                 colorCB.addItemListener(this);
576
-                oe.aConstraints.gridx += 2;
577
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
554
+
555
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556
+                materialCB.setToolTipText("Copy material when dropped");
578
557
                 materialCB.addItemListener(this);
579
-                oe.aConstraints.gridx += 2;
580
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
558
+
559
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560
+                textureCB.setToolTipText("Copy texture when dropped");
581
561
                 textureCB.addItemListener(this);
582
562
                         
583
-                oe.aConstraints.gridx = 0;
584
-		oe.aConstraints.gridy += 1;
563
+                copyOptionsPanel.preferredHeight = 1;
564
+                oe.treePanel.add(copyOptionsPanel);
565
+                oe.treePanel.Return();
585
566
                 
567
+//        mainPanel.setDividerLocation(0.5); //1.0);
568
+//        mainPanel.setResizeWeight(0.5);
569
+        
586
570
 		//jList.addListSelectionListener(this);
587
571
 		oe.jTree.addTreeSelectionListener(this);
588
572
 		//jTree.setRootVisible(false);
..
..
@@ -607,39 +591,29 @@
607
591
         
608
592
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609
593
         {
610
-        	//constraints.gridx = 0;
611
-        	//constraints.gridy = 0;
612
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613
-                fastCB.setToolTipText("Fast mode");
614
-                                fastCB.addItemListener(this);
615
-        	//constraints.gridy += 1;
616
594
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617
595
                 supportCB.setToolTipText("Enabled rigging");
618
596
                                 supportCB.addItemListener(this);
619
597
 
620
-        //	constraints.gridy += 1;
621
598
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622
599
         //                        localCB.addItemListener(this);
623
600
 
624
-        	//constraints.gridy += 1;
625
601
                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626
602
                 crowdCB.setToolTipText("Used for crowds");
627
603
                                 crowdCB.addItemListener(this);
628
604
 
629
-        	//constraints.gridy += 1;
630
605
                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631
606
                 smoothCB.setToolTipText("Snapping delay");
632
607
                                 smoothCB.addItemListener(this);
633
608
 
634
-        	//constraints.gridy += 1;
635
609
                 panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636
610
                 slowCB.setToolTipText("Smooth interpolation");
637
611
                                 slowCB.addItemListener(this);
638
-        	//constraints.gridy += 1;
612
+                                
639
613
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640
614
                 boxCB.setToolTipText("Display bounding boxes");
641
615
                                 boxCB.addItemListener(this);
642
-        	//constraints.gridy += 1;
616
+                                
643
617
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644
618
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645
619
                                 zoomBoxCB.addItemListener(this);
..
..
@@ -668,14 +642,18 @@
668
642
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669
643
 //                debugCB.addItemListener(this);
670
644
 
671
-        	//constraints.gridy += 1;
672
645
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
673
646
                                 oeilCB.addItemListener(this);
674
647
 
675
-        	//constraints.gridy += 1;
676
648
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677
649
                 lookAtCB.setToolTipText("Look-at target");
678
650
                                 lookAtCB.addItemListener(this);
651
+                                
652
+                cGridBag fill = new cGridBag();
653
+                                
654
+                fill.preferredHeight = 200;
655
+                
656
+                panel.add(fill);
679
657
 
680
658
         }
681
659
 	
..
..
@@ -1124,7 +1102,7 @@
1124
1102
 	{
1125
1103
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126
1104
 		animationItem.addItemListener(this);
1127
-                animationItem.setState(CameraPane.ANIMATION);
1105
+                animationItem.setState(Globals.ANIMATION);
1128
1106
                 
1129
1107
 		menu.add("-");
1130
1108
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -4125,12 +4103,12 @@
4125
4103
             System.err.println("info : " + child.GetPath());
4126
4104
 				}
4127
4105
 			}
4128
-			else
4129
-                        {
4130
-				objEditor.SetMaterial(group); // .GetMaterial());
4131
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4132
-            System.err.println("info : " + group.GetPath());
4133
-                        }
4106
+//			else
4107
+//                        {
4108
+//				objEditor.SetMaterial(group); // .GetMaterial());
4109
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4110
+//            System.err.println("info : " + group.GetPath());
4111
+//                        }
4134
4112
 			
4135
4113
                         objEditor.SetText(); // jan 2014
4136
4114