Edit panel

Normand Briere

2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df

Edit panel

 GroupEditor.java
..
..
@@ -176,7 +176,6 @@
176
176
 		copyItem.addActionListener(this);
177
177
 		pasteItem = menu.add(new MenuItem("Paste"));
178
178
 		pasteItem.addActionListener(this);
179
-		menu.add("-");
180
179
                 
181
180
 		menu.add("-");
182
181
 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
..
..
@@ -369,11 +368,11 @@
369
368
 		billboardItem.addActionListener(this);
370
369
 		csgItem = menu.add(new MenuItem("CSG"));
371
370
 		csgItem.addActionListener(this);
372
-                shadowXItem = menu.add(new MenuItem("Shadow X"));
371
+                shadowXItem = menu.add(new MenuItem("Shadow Red"));
373
372
 		shadowXItem.addActionListener(this);
374
-                shadowYItem = menu.add(new MenuItem("Shadow Y"));
373
+                shadowYItem = menu.add(new MenuItem("Shadow Green"));
375
374
 		shadowYItem.addActionListener(this);
376
-                shadowZItem = menu.add(new MenuItem("Shadow Z"));
375
+                shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377
376
 		shadowZItem.addActionListener(this);
378
377
         if (Globals.ADVANCED)
379
378
         {
..
..
@@ -637,19 +636,19 @@
637
636
                 
638
637
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639
638
                 
640
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641
640
                 twoButton.setToolTipText("Show center view only");
642
641
 		twoButton.addActionListener(this);
643
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644
643
 		fourButton.addActionListener(this);
645
644
                 fourButton.setToolTipText("Show left panel only");
646
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645
+		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
646
                 sixButton.setToolTipText("2-column layout left");
648
647
 		sixButton.addActionListener(this);
649
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
648
+		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
649
                 threeButton.setToolTipText("2-column layout right");
651
650
 		threeButton.addActionListener(this);
652
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651
+		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653
652
                 sevenButton.setToolTipText("3-column layout");
654
653
 		sevenButton.addActionListener(this);
655
654
                 //
..
..
@@ -664,32 +663,30 @@
664
663
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665
664
 		//clearButton.addActionListener(this);
666
665
                         
667
-                cGridBag commandsPanel = new cGridBag();
668
-                
669
-		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666
+		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
667
                 editButton.setToolTipText("Edit selection");
671
668
 		editButton.addActionListener(this);
672
669
 
673
-		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674
671
                 uneditButton.setToolTipText("Unedit selection");
675
672
 		uneditButton.addActionListener(this);
676
673
 
677
-		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
674
+		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678
675
                 allParamsButton.setToolTipText("Edit all params");
679
676
 		allParamsButton.addActionListener(this);
680
677
 
681
-		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
678
+		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
679
                 clearPanelButton.setToolTipText("Clear edit panel");
683
680
 		clearPanelButton.addActionListener(this);
684
681
 
685
-		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
+		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686
683
                 unselectButton.setToolTipText("Unselect");
687
684
 		unselectButton.addActionListener(this);
688
685
 
689
-                commandsPanel.preferredHeight = 1;
686
+                editCommandsPanel.preferredHeight = 1;
690
687
                 
691
-                oe.treePanel.add(commandsPanel);
692
-                oe.treePanel.Return();
688
+//                oe.treePanel.add(commandsPanel);
689
+//                oe.treePanel.Return();
693
690
                 
694
691
 //		oe.aConstraints.gridx += 1;
695
692
 //		oe.aConstraints.weighty = 0;
..
..
@@ -1454,6 +1451,7 @@
1454
1451
             shadow.material = new cMaterial(obj.material);
1455
1452
             shadow.material.diffuse = 0.0001f;
1456
1453
             shadow.material.specular = 0.0001f;
1454
+            //shadow.projectedVertices[1].x = 300;
1457
1455
             
1458
1456
             makeSomething(shadow);
1459
1457
         }
 ObjEditor.java
..
..
@@ -171,7 +171,7 @@
171
171
         
172
172
         objEditor.ctrlPanel.remove(setupPanel);
173
173
         objEditor.ctrlPanel.remove(setupPanel2);
174
-        objEditor.ctrlPanel.remove(commandsPanel);
174
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
175
175
         objEditor.ctrlPanel.remove(pushPanel);
176
176
         //objEditor.ctrlPanel.remove(fillPanel);
177
177
         
..
..
@@ -327,9 +327,18 @@
327
327
         toolbarPanel.setName("Toolbar");
328
328
         treePanel = new cGridBag();
329
329
         treePanel.setName("Tree");
330
+        
331
+        editPanel = new cGridBag().setVertical(true);
332
+        editPanel.setName("Edit");
333
+        
330
334
         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331
-        ctrlPanel.setName("Edit");
335
+        
336
+        editCommandsPanel = new cGridBag();
337
+        editPanel.add(editCommandsPanel);
338
+        editPanel.add(ctrlPanel);
339
+                
332
340
         materialPanel = new cGridBag().setVertical(true);
341
+        
333
342
         materialPanel.setName("Material");
334
343
         /*JTextPane*/
335
344
         infoarea = createTextPane();
..
..
@@ -819,10 +828,13 @@
819
828
     JButton fasterButton;
820
829
     JButton remarkButton;
821
830
     
831
+    cGridBag editPanel;
832
+    cGridBag editCommandsPanel;
833
+    
822
834
     cGridBag namePanel;
823
835
     cGridBag setupPanel;
824
836
     cGridBag setupPanel2;
825
-    cGridBag commandsPanel;
837
+    cGridBag objectCommandsPanel;
826
838
     cGridBag pushPanel;
827
839
     cGridBag fillPanel;
828
840
 
..
..
@@ -1035,23 +1047,23 @@
1035
1047
         oe.ctrlPanel.add(setupPanel2);
1036
1048
         oe.ctrlPanel.Return();
1037
1049
         
1038
-            commandsPanel = new cGridBag().setVertical(false);
1050
+            objectCommandsPanel = new cGridBag().setVertical(false);
1039
1051
         
1040
-        resetButton = AddButton(commandsPanel, "Reset");
1052
+        resetButton = AddButton(objectCommandsPanel, "Reset");
1041
1053
         resetButton.setToolTipText("Jump to frame zero");
1042
-        stepButton = AddButton(commandsPanel, "Step");
1054
+        stepButton = AddButton(objectCommandsPanel, "Step");
1043
1055
         stepButton.setToolTipText("Step one frame");
1044
1056
 //            resetAllButton = AddButton(oe, "Reset All");
1045
1057
 //            stepAllButton = AddButton(oe, "Step All");
1046
1058
 //            Return();
1047
-        slowerButton = AddButton(commandsPanel, "Slow");
1059
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
1048
1060
         slowerButton.setToolTipText("Decrease animation speed");
1049
-        fasterButton = AddButton(commandsPanel, "Fast");
1061
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
1050
1062
         fasterButton.setToolTipText("Increase animation speed");
1051
-        remarkButton = AddButton(commandsPanel, "Remark");
1063
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
1052
1064
         remarkButton.setToolTipText("Set the current transform as the target");
1053
1065
 
1054
-        oe.ctrlPanel.add(commandsPanel);
1066
+        oe.ctrlPanel.add(objectCommandsPanel);
1055
1067
         oe.ctrlPanel.Return();
1056
1068
 
1057
1069
     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..
..
@@ -1340,7 +1352,7 @@
1340
1352
 //        north.setName("Edit");
1341
1353
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1342
1354
 //        objectPanel.add(north);
1343
-        objectPanel.add(ctrlPanel);
1355
+        objectPanel.add(editPanel);
1344
1356
         objectPanel.add(infoPanel);
1345
1357
 
1346
1358
         /*