Edit panel

Normand Briere

2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df

 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
         }