blame | history | patch | commit | commitdiff
Normand Briere
2019-05-01 b1585b5b2b60c4165be400636c787fae24428c6a 
 ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020         matrix.Matrix;
2121 
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325         ActionListener, ChangeListener,
2426         InputMethodListener,
....@@ -136,34 +138,40 @@
136138     public void closeUI()
137139     {
138140         //new Exception().printStackTrace();
139
-        System.out.println("this = " + this);
140
-        System.out.println("objEditor = " + objEditor);
141
+//        System.out.println("this = " + this);
142
+//        System.out.println("objEditor = " + objEditor);
141143         //nameField.removeActionListener(this);
142
-        objEditor.ctrlPanel.remove(nameField);
144
+//        objEditor.ctrlPanel.remove(nameField);
143145         
144146         if (!GroupEditor.allparams)
145147             return;
146148         
147
-        objEditor.ctrlPanel.remove(liveCB);
148
-        objEditor.ctrlPanel.remove(hideCB);
149
-        objEditor.ctrlPanel.remove(markCB);
150
-
151
-        objEditor.ctrlPanel.remove(randomCB);
152
-        objEditor.ctrlPanel.remove(speedupCB);
153
-        objEditor.ctrlPanel.remove(rewindCB);
154
-
155
-        objEditor.ctrlPanel.remove(resetButton);
156
-        objEditor.ctrlPanel.remove(stepButton);
157
-//                objEditor.ctrlPanel.remove(stepAllButton);
158
-//                objEditor.ctrlPanel.remove(resetAllButton);
159
-        objEditor.ctrlPanel.remove(link2masterCB);
160
-        //objEditor.ctrlPanel.remove(flipVCB);
161
-        //objEditor.ctrlPanel.remove(texresMenu);
162
-        objEditor.ctrlPanel.remove(slowerButton);
163
-        objEditor.ctrlPanel.remove(fasterButton);
164
-        objEditor.ctrlPanel.remove(remarkButton);
149
+//        objEditor.ctrlPanel.remove(liveCB);
150
+//        objEditor.ctrlPanel.remove(hideCB);
151
+//        objEditor.ctrlPanel.remove(markCB);
152
+//
153
+//        objEditor.ctrlPanel.remove(randomCB);
154
+//        objEditor.ctrlPanel.remove(speedupCB);
155
+//        objEditor.ctrlPanel.remove(rewindCB);
156
+//
157
+//        objEditor.ctrlPanel.remove(resetButton);
158
+//        objEditor.ctrlPanel.remove(stepButton);
159
+////                objEditor.ctrlPanel.remove(stepAllButton);
160
+////                objEditor.ctrlPanel.remove(resetAllButton);
161
+//        objEditor.ctrlPanel.remove(link2masterCB);
162
+//        //objEditor.ctrlPanel.remove(flipVCB);
163
+//        //objEditor.ctrlPanel.remove(texresMenu);
164
+//        objEditor.ctrlPanel.remove(slowerButton);
165
+//        objEditor.ctrlPanel.remove(fasterButton);
166
+//        objEditor.ctrlPanel.remove(remarkButton);
165167         
166
-        Remove(normalpushField);
168
+        objEditor.ctrlPanel.remove(namePanel);
169
+        objEditor.ctrlPanel.remove(setupPanel);
170
+        objEditor.ctrlPanel.remove(commandsPanel);
171
+        objEditor.ctrlPanel.remove(pushPanel);
172
+        //objEditor.ctrlPanel.remove(fillPanel);
173
+        
174
+        //Remove(normalpushField);
167175     }
168176 
169177     public ObjEditor GetEditor()
....@@ -351,21 +359,23 @@
351359         objectPanel = new JTabbedPane();
352360         toolbarPanel = new JPanel();
353361         toolbarPanel.setName("Toolbar");
354
-        treePanel = new JPanel();
362
+        treePanel = new cGridBag();
355363         treePanel.setName("Tree");
356
-        ctrlPanel = new JPanel(); // new GridBagLayout());
364
+        ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
357365         ctrlPanel.setName("Edit");
358
-        materialPanel = new JPanel();
366
+        materialPanel = new cGridBag().setVertical(true);
359367         materialPanel.setName("Material");
360368         /*JTextPane*/
361369         infoarea = createTextPane();
370
+        doc = infoarea.getStyledDocument();
371
+
362372         infoarea.setEditable(true);
363373         SetText();
364374 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365375 //            infoarea.setOpaque(false);
366376 //            //infoarea.setForeground(textcolor);
367
-            infoarea.setLineWrap(true);
368
-            infoarea.setWrapStyleWord(true);
377
+// TEXTAREA           infoarea.setLineWrap(true);
378
+// TEXTAREA           infoarea.setWrapStyleWord(true);
369379         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370380         infoPanel.setPreferredSize(new Dimension(50, 200));
371381         infoPanel.setName("Info");
....@@ -376,16 +386,16 @@
376386         mainPanel.setName("Main");
377387         mainPanel.setContinuousLayout(true);
378388         mainPanel.setOneTouchExpandable(true);
379
-        mainPanel.setDividerLocation(1.0);
380389         mainPanel.setDividerSize(9);
381
-        mainPanel.setResizeWeight(0);
390
+        mainPanel.setDividerLocation(0.5); //1.0);
391
+        mainPanel.setResizeWeight(0.5);
382392 
383393         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384394         //mainPanel.setLayout(new GridBagLayout());
385395         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386
-        treePanel.setLayout(new GridBagLayout());
387
-        ctrlPanel.setLayout(new GridBagLayout());
388
-        materialPanel.setLayout(new GridBagLayout());
396
+//        treePanel.setLayout(new GridBagLayout());
397
+        //ctrlPanel.setLayout(new GridBagLayout());
398
+        //materialPanel.setLayout(new GridBagLayout());
389399 
390400         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391401                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -424,7 +434,7 @@
424434     static String newline = "\n";
425435     protected static final String buttonString = "JButton";
426436     StyledDocument doc;
427
-    JTextArea infoarea;
437
+    JTextPane infoarea;
428438 
429439     void ClearInfo()
430440     {
....@@ -491,7 +501,10 @@
491501                 }
492502 
493503         if (full)
494
-            si.SendInfo("    BBox: " + minima + " - " + maxima, "regular");
504
+        {
505
+            si.SendInfo("    BBox min: " + minima, "regular");
506
+            si.SendInfo("    BBox max: " + maxima, "regular");
507
+        }
495508         
496509                 if (sel.bRep != null)
497510                 {
....@@ -589,6 +602,9 @@
589602             {
590603                 CameraPane.pointflow = (PointFlow) sel;
591604             }
605
+            
606
+            si.SendInfo("_____________________", "regular");
607
+            si.SendInfo("", "regular");
592608         }
593609     }
594610 
....@@ -620,52 +636,52 @@
620636                 cameraView.ToggleFullScreen();
621637         }
622638 
623
-    private JTextArea createTextPane()
639
+    private JTextPane createTextPane()
624640     {
625
-        String[] initString =
626
-        {
627
-            "This is an editable JTextPane, ", //regular
628
-            "another ", //italic
629
-            "styled ", //bold
630
-            "text ", //small
631
-            "component, ", //large
632
-            "which supports embedded components..." + newline,//regular
633
-            " " + newline, //button
634
-            "...and embedded icons..." + newline, //regular
635
-            " ", //icon
636
-            newline + "JTextPane is a subclass of JEditorPane that "
637
-            + "uses a StyledEditorKit and StyledDocument, and provides "
638
-            + "cover methods for interacting with those objects."
639
-        };
641
+// TEXTAREA       String[] initString =
642
+//        {
643
+//            "This is an editable JTextPane, ", //regular
644
+//            "another ", //italic
645
+//            "styled ", //bold
646
+//            "text ", //small
647
+//            "component, ", //large
648
+//            "which supports embedded components..." + newline,//regular
649
+//            " " + newline, //button
650
+//            "...and embedded icons..." + newline, //regular
651
+//            " ", //icon
652
+//            newline + "JTextPane is a subclass of JEditorPane that "
653
+//            + "uses a StyledEditorKit and StyledDocument, and provides "
654
+//            + "cover methods for interacting with those objects."
655
+//        };
656
+//
657
+//        String[] initStyles =
658
+//        {
659
+//            "regular", "italic", "bold", "small", "large",
660
+//            "regular", "button", "regular", "icon",
661
+//            "regular"
662
+//        };
663
+//
664
+//        JTextPane textPane = new JTextPane();
665
+//        textPane.setEditable(true);
666
+//        /*StyledDocument*/ doc = textPane.getStyledDocument();
667
+//        addStylesToDocument(doc);
668
+//
669
+//        try
670
+//        {
671
+//            for (int j = 0; j < 2; j++)
672
+//            {
673
+//                for (int i = 0; i < initString.length; i++)
674
+//                {
675
+//                    doc.insertString(doc.getLength(), initString[i],
676
+//                            doc.getStyle(initStyles[i]));
677
+//                }
678
+//            }
679
+//        } catch (BadLocationException ble)
680
+//        {
681
+//            System.err.println("Couldn't insert initial text into text pane.");
682
+//        }
640683 
641
-        String[] initStyles =
642
-        {
643
-            "regular", "italic", "bold", "small", "large",
644
-            "regular", "button", "regular", "icon",
645
-            "regular"
646
-        };
647
-
648
-        JTextPane textPane = new JTextPane();
649
-        textPane.setEditable(true);
650
-        /*StyledDocument*/ doc = textPane.getStyledDocument();
651
-        addStylesToDocument(doc);
652
-
653
-        try
654
-        {
655
-            for (int j = 0; j < 2; j++)
656
-            {
657
-                for (int i = 0; i < initString.length; i++)
658
-                {
659
-                    doc.insertString(doc.getLength(), initString[i],
660
-                            doc.getStyle(initStyles[i]));
661
-                }
662
-            }
663
-        } catch (BadLocationException ble)
664
-        {
665
-            System.err.println("Couldn't insert initial text into text pane.");
666
-        }
667
-
668
-        return new JTextArea(); // textPane;
684
+        return new JTextPane(); // textPane;
669685     }
670686 
671687     protected void addStylesToDocument(StyledDocument doc)
....@@ -765,115 +781,83 @@
765781     JButton slowerButton;
766782     JButton fasterButton;
767783     JButton remarkButton;
784
+    
785
+    cGridBag namePanel;
786
+    cGridBag setupPanel;
787
+    cGridBag commandsPanel;
788
+    cGridBag pushPanel;
789
+    cGridBag fillPanel;
768790 
769
-    JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
791
+    JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770792     {
771793         JCheckBox cb;
772794 
773
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774
-        oe.aConstraints.gridwidth = 1; // 3;
775
-//        oe.aConstraints.weightx = 1;
776
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
777
-        oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
795
+        panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778796         cb.addItemListener(this);
779
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
780
-        oe.aConstraints.gridwidth = 1;
781
-        oe.aConstraints.gridx += 1;
782797 
783798         return cb;
784799     }
785800 
786
-    cButton AddButton(ObjEditor oe, String label)
801
+    cButton AddButton(cGridBag panel, String label)
787802     {
788803         cButton cb;
789804 
790
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791
-        oe.aConstraints.gridwidth = 1;
792
-//        oe.aConstraints.weightx = 1;
793
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
794
-        oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
805
+        panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795806         cb.addActionListener(this);
796
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
797
-        oe.aConstraints.gridwidth = 1;
798
-        oe.aConstraints.gridx += 1;
799807 
800808         return cb;
801809     }
802810 
803
-    JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
811
+    JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804812     {
805813         JComboBox combo;
806814 
807
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808
-        oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809
-        oe.aConstraints.gridx += 1;
815
+        panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810816         combo.addActionListener(this);
811817 
812818         return combo;
813819     }
814820 
815
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
821
+    cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816822     {
817
-        NumberSlider combo;
823
+        cGridBag control = new cGridBag();
824
+            
825
+        cNumberSlider combo;
818826 
819827         JLabel jlabel = new JLabel(label);
820
-
821
-        aConstraints.fill = GridBagConstraints.VERTICAL;
822828         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
-        aConstraints.gridwidth = 1;
824
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825
-        aConstraints.gridx += 1;
826
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
827
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
-        aConstraints.gridx += 1;
830
-        aConstraints.gridwidth = 1;
831
-
829
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832831         combo.setFloat(current);
833
-
834
-        combo.label = jlabel;
835
-
836
-        combo.addChangeListener(this);
837
-
838
-        return combo;
832
+        
833
+        panel.add(control);
834
+        
835
+        return control;
839836     }
840837 
841
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
838
+    cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842839     {
843
-        NumberSlider combo;
840
+        cGridBag control = new cGridBag();
841
+        
842
+        cNumberSlider combo;
844843 
845844         JLabel jlabel = new JLabel(label);
846
-
847
-        aConstraints.fill = GridBagConstraints.VERTICAL;
848845         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849
-        aConstraints.gridwidth = 2;
850
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851
-        aConstraints.gridx += 1;
852
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
853
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855
-        aConstraints.gridx += 1;
856
-        aConstraints.gridwidth = 1;
857
-
846
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
847
+        control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858848         combo.setInteger(current);
859849 
860
-        combo.label = jlabel;
861
-
862
-        combo.addChangeListener(this);
863
-
864
-        return combo;
850
+        panel.add(control);
851
+        
852
+        return control;
865853     }
866854 
867
-    JTextArea AddText(JPanel ctrlPanel, String name)
855
+    JTextArea AddText(cGridBag ctrlPanel, String name)
868856     {
869857         JTextArea text;
870858 
871
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
872
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
859
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874860         text.addCaretListener(this);
875
-        aConstraints.gridx += 1;
876
-        aConstraints.gridwidth = 1;
877861 
878862         return text;
879863     }
....@@ -903,9 +887,16 @@
903887         objEditor.ctrlPanel.remove(j);
904888     }
905889 
890
+    void Remove(cNumberSlider j)
891
+    {
892
+        j.removeChangeListener(this);
893
+        //objEditor.ctrlPanel.remove(j.label);
894
+        objEditor.ctrlPanel.remove(j);
895
+    }
896
+
906897     /*
907898      */
908
-    void Return() // ObjEditor oe)
899
+    void Return0() // ObjEditor oe)
909900     {
910901         aConstraints.gridy += 1;
911902         aConstraints.gridx = 0;
....@@ -964,33 +955,52 @@
964955 //            oe.aConstraints.weighty = 0;
965956 //            oe.aConstraints.gridx = 0;
966957 //            oe.aConstraints.gridy = 0;
967
-        SetupName(oe);
958
+        //SetupName(oe);
959
+        
960
+            namePanel = new cGridBag();
961
+            
962
+        nameField = AddText(namePanel, copy.GetName());
963
+        namePanel.add(nameField);
964
+        oe.ctrlPanel.add(namePanel);
965
+        
966
+        oe.ctrlPanel.Return();
968967         
969968         if (!GroupEditor.allparams)
970969             return;
971970 
972
-        liveCB = AddCheckBox(oe, "Live", copy.live);
973
-        link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974
-        hideCB = AddCheckBox(oe, "Hide", copy.hide);
971
+            setupPanel = new cGridBag().setVertical(false);
972
+            
973
+        liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974
+        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
975976 //            Return();
976
-        markCB = AddCheckBox(oe, "Mark", copy.marked);
977
-        rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978
-        randomCB = AddCheckBox(oe, "Rand", copy.random);
979
-        Return();
980
-        resetButton = AddButton(oe, "Reset");
981
-        stepButton = AddButton(oe, "Step");
977
+        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978
+        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979
+        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
980
+
981
+        oe.ctrlPanel.add(setupPanel);
982
+        oe.ctrlPanel.Return();
983
+        
984
+            commandsPanel = new cGridBag().setVertical(false);
985
+        
986
+        resetButton = AddButton(commandsPanel, "Reset");
987
+        stepButton = AddButton(commandsPanel, "Step");
982988 //            resetAllButton = AddButton(oe, "Reset All");
983989 //            stepAllButton = AddButton(oe, "Step All");
984
-        speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
990
+        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
985991 //            Return();
986
-        slowerButton = AddButton(oe, "Slow");
987
-        fasterButton = AddButton(oe, "Fast");
988
-        remarkButton = AddButton(oe, "Rem");
992
+        slowerButton = AddButton(commandsPanel, "Slow");
993
+        fasterButton = AddButton(commandsPanel, "Fast");
994
+        remarkButton = AddButton(commandsPanel, "Remark");
989995 
990
-        Return();
996
+        oe.ctrlPanel.add(commandsPanel);
997
+        oe.ctrlPanel.Return();
991998 
992
-    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993
-    Return();
999
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1000
+    normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001
+    //Return();
1002
+
1003
+        oe.ctrlPanel.Return();
9941004             
9951005 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9961006 //        ObjEditor.aConstraints.gridx += 1;
....@@ -1085,7 +1095,7 @@
10851095         oe.aConstraints.gridwidth = 1;
10861096         /**/
10871097         nameField = AddText(oe.ctrlPanel, copy.GetName());
1088
-        Return();
1098
+        oe.ctrlPanel.Return();
10891099 
10901100         //ctrlPanel.add(textureButton = new Button("Texture..."));
10911101         //textureButton.setEnabled(false);
....@@ -1187,7 +1197,8 @@
11871197         //JPanel worldPanel =
11881198         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11891199         //worldPanel.setName("World");
1190
-	centralPanel = new JPanel(new BorderLayout());
1200
+	centralPanel = new cGridBag();
1201
+        centralPanel.preferredWidth = 20;
11911202 	timelinePanel = new JPanel(new BorderLayout());
11921203         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11931204 
....@@ -1217,12 +1228,13 @@
12171228         //frontView.object = copy;
12181229         //sideView.object = copy;
12191230 
1220
-        XYZPanel = new JPanel();
1221
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1231
+        XYZPanel = new cGridBag().setVertical(true);
1232
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12221233 
1223
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1224
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1225
-        XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1234
+        XYZPanel.preferredWidth = 5;
1235
+        XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1236
+        XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1237
+        XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
12261238 
12271239         /*
12281240         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1260,10 +1272,11 @@
12601272         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12611273         //tmp.setName("Edit");
12621274         objectPanel.add(materialPanel);
1263
-        JPanel north = new JPanel(new BorderLayout());
1264
-        north.setName("Edit");
1265
-        north.add(ctrlPanel, BorderLayout.NORTH);
1266
-        objectPanel.add(north);
1275
+//        JPanel north = new JPanel(new BorderLayout());
1276
+//        north.setName("Edit");
1277
+//        north.add(ctrlPanel, BorderLayout.NORTH);
1278
+//        objectPanel.add(north);
1279
+        objectPanel.add(ctrlPanel);
12671280         objectPanel.add(infoPanel);
12681281 
12691282         /*
....@@ -1284,16 +1297,23 @@
12841297         scrollpane.setWheelScrollingEnabled(true);
12851298         scrollpane.addMouseWheelListener(this); // Default not fast enough
12861299 
1287
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
-        scenePanel.add(scrollpane);
1300
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1301
+        scenePanel.preferredWidth = 7;
1302
+        
1303
+        JTabbedPane tabbedPane = new JTabbedPane();
1304
+        tabbedPane.add(scrollpane);
12891305 
1290
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1306
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12911307 
1292
-        optionsPanel = new JPanel(new GridBagLayout());
1308
+        optionsPanel = new cGridBag().setVertical(true);
12931309 
12941310         optionsPanel.setName("Options");
1295
-        scenePanel.add(optionsPanel);
1296
-
1311
+        
1312
+        AddOptions(optionsPanel); //, aConstraints);
1313
+        
1314
+        tabbedPane.add(optionsPanel);
1315
+        
1316
+        scenePanel.add(tabbedPane);
12971317 
12981318         /*
12991319         cTree jTree = new cTree(null);
....@@ -1327,6 +1347,7 @@
13271347         //bigPanel.setSize(new Dimension(10,10));
13281348         //bigPanel.add(ctrlPanel);
13291349         //bigPanel.add(gridPanel);
1350
+        /**
13301351         bigThree = new JPanel();
13311352         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13321353         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1350,7 +1371,13 @@
13501371         //	aConstraints.gridheight = 3;
13511372         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13521373         bigThree.add(XYZPanel, aWindowConstraints);
1374
+        /**/
13531375 
1376
+        bigThree = new cGridBag();
1377
+        bigThree.addComponent(scenePanel);
1378
+        bigThree.addComponent(centralPanel);
1379
+        bigThree.addComponent(XYZPanel);
1380
+        
13541381 //                // SIDE EFFECT!!!
13551382 //		aConstraints.gridx = 0;
13561383 //		aConstraints.gridy = 0;
....@@ -1393,6 +1420,10 @@
13931420         });
13941421     }
13951422 
1423
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1424
+    {
1425
+    }
1426
+    
13961427     JTree GetTree()
13971428     {
13981429         return objEditor.jTree;
....@@ -1404,260 +1435,170 @@
14041435         ctrlPanel.removeAll();
14051436     }
14061437 
1407
-    void SetupMaterial(JPanel ctrlPanel)
1438
+    void SetupMaterial(cGridBag panel)
14081439     {
1409
-        aConstraints.weighty = 0;
1410
-        //aConstraints.weightx = 1;
1411
-                /*
1440
+         /*
14121441         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14131442         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415
-        aConstraints.gridx += 1;
14161443          */
14171444 
1418
-        aConstraints.gridwidth = 1;
1419
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420
-        aConstraints.gridx += 1;
1421
-        aConstraints.weighty = 0;
1422
-        aConstraints.gridwidth = 1;
1445
+        cGridBag editBar = new cGridBag().setVertical(false);
1446
+            
1447
+        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1448
+                createMaterialButton.setToolTipText("Create material");
14231449 
14241450         /*
14251451         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426
-        aConstraints.gridx += 1;
1427
-        aConstraints.weighty = 0;
1428
-        aConstraints.gridwidth = 1;
14291452          */
14301453 
1431
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432
-        aConstraints.gridx += 1;
1454
+        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455
+                clearMaterialButton.setToolTipText("Clear material");
1456
+        
1457
+        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458
+        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459
+        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14331460 
1434
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435
-
1436
-        aConstraints.gridx += 1;
1437
-
1438
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439
-
1440
-        aConstraints.gridx += 1;
1441
-
1442
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443
-
1444
-        aConstraints.gridx = 0;
1445
-        aConstraints.gridy += 1;
1446
-        aConstraints.weighty = 0;
1447
-        aConstraints.gridwidth = 1;
1461
+        editBar.preferredHeight = 15;
1462
+        
1463
+        panel.add(editBar);
1464
+        
14481465         /**/
14491466         //aConstraints.weighty = 0;
14501467         ////aConstraints.weightx = 1;
14511468         //aConstraints.weighty = 1;
14521469         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14531470         //aConstraints.gridx += 1;
1454
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455
-        aConstraints.weighty = 0;
1456
-        aConstraints.gridx = 0;
1457
-        aConstraints.gridy += 1;
1458
-        aConstraints.gridwidth = 1;
1471
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14591472 
1460
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
-        aConstraints.gridx += 1;
1464
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
-        //aConstraints.weightx = 0;
1466
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467
-        aConstraints.gridx = 0;
1468
-        aConstraints.gridy += 1;
1469
-        aConstraints.gridwidth = 1;
1473
+        cGridBag colorSection = new cGridBag().setVertical(true);
1474
+        
1475
+        cGridBag color = new cGridBag();
1476
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1477
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479
+        //colorField.preferredWidth = 200;
1480
+        colorSection.add(color);
14701481 
1471
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474
-        aConstraints.gridx += 1;
1475
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477
-        aConstraints.gridx = 0;
1478
-        aConstraints.gridy += 1;
1479
-        aConstraints.gridwidth = 1;
1482
+        cGridBag modulation = new cGridBag();
1483
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1484
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486
+        colorSection.add(modulation);
14801487 
1481
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484
-        aConstraints.gridx += 1;
1485
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487
-        aConstraints.gridx = 0;
1488
-        aConstraints.gridy += 1;
1489
-        aConstraints.gridwidth = 1;
1488
+        cGridBag texture = new cGridBag();
1489
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1490
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492
+        colorSection.add(texture);
14901493 
1491
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494
-        aConstraints.gridx += 1;
1495
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497
-        aConstraints.gridx = 0;
1498
-        aConstraints.gridy += 1;
1499
-        aConstraints.gridwidth = 1;
1494
+        cGridBag anisoU = new cGridBag();
1495
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1496
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1498
+        colorSection.add(anisoU);
15001499 
1501
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504
-        aConstraints.gridx += 1;
1505
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507
-        aConstraints.gridx = 0;
1508
-        aConstraints.gridy += 1;
1509
-        aConstraints.gridwidth = 1;
1500
+        cGridBag anisoV = new cGridBag();
1501
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1502
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1504
+        colorSection.add(anisoV);
15101505 
1511
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514
-        aConstraints.gridx += 1;
1515
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517
-        aConstraints.gridx = 0;
1518
-        aConstraints.gridy += 1;
1519
-        aConstraints.gridwidth = 1;
1506
+        cGridBag shadowbias = new cGridBag();
1507
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1508
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1510
+        colorSection.add(shadowbias);
15201511 
1521
-        //aConstraints.weighty = 1;
1522
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523
-        //aConstraints.gridx += 1;
1524
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525
-        aConstraints.weighty = 0;
1526
-        aConstraints.gridx = 0;
1527
-        aConstraints.gridy += 1;
1528
-        aConstraints.gridwidth = 1;
1512
+        panel.add(new JSeparator());
1513
+        
1514
+        panel.add(colorSection);
1515
+        
1516
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1517
+        
1518
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1519
+        
1520
+        cGridBag diffuse = new cGridBag();
1521
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1522
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1524
+        diffuseSection.add(diffuse);
15291525 
1530
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533
-        aConstraints.gridx += 1;
1534
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536
-        aConstraints.gridx = 0;
1537
-        aConstraints.gridy += 1;
1538
-        aConstraints.gridwidth = 1;
1526
+        cGridBag diffuseness = new cGridBag();
1527
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1528
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1530
+        diffuseSection.add(diffuseness);
15391531 
1540
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543
-        aConstraints.gridx += 1;
1544
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546
-        aConstraints.gridx = 0;
1547
-        aConstraints.gridy += 1;
1548
-        aConstraints.gridwidth = 1;
1532
+        cGridBag selfshadow = new cGridBag();
1533
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1534
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1536
+        diffuseSection.add(selfshadow);
15491537 
1550
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553
-        aConstraints.gridx += 1;
1554
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556
-        aConstraints.gridx = 0;
1557
-        aConstraints.gridy += 1;
1558
-        aConstraints.gridwidth = 1;
1538
+        cGridBag sheen = new cGridBag();
1539
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1540
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
+        diffuseSection.add(sheen);
15591543 
1560
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563
-        aConstraints.gridx += 1;
1564
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566
-        aConstraints.gridx = 0;
1567
-        aConstraints.gridy += 1;
1568
-        aConstraints.gridwidth = 1;
1544
+        cGridBag subsurface = new cGridBag();
1545
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1546
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1548
+        diffuseSection.add(subsurface);
15691549 
1570
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573
-        aConstraints.gridx += 1;
1574
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576
-        aConstraints.gridx = 0;
1577
-        aConstraints.gridy += 1;
1578
-        aConstraints.gridwidth = 1;
1550
+        cGridBag shadow = new cGridBag();
1551
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1552
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1553
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1554
+        diffuseSection.add(shadow);
15791555 
1580
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583
-        aConstraints.gridx += 1;
1584
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586
-        aConstraints.gridx = 0;
1587
-        aConstraints.gridy += 1;
1588
-        aConstraints.gridwidth = 1;
1556
+        cGridBag fakedepth = new cGridBag();
1557
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1558
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1560
+        diffuseSection.add(fakedepth);
15891561 
1590
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593
-        aConstraints.gridx += 1;
1594
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596
-        aConstraints.gridx = 0;
1597
-        aConstraints.gridy += 1;
1598
-        aConstraints.gridwidth = 1;
1562
+        panel.add(new JSeparator());
1563
+        
1564
+        panel.add(diffuseSection);
1565
+        
1566
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1567
+        
1568
+        cGridBag specularSection = new cGridBag().setVertical(true);
15991569 
1600
-        //aConstraints.weighty = 1;
1601
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602
-        //aConstraints.gridx += 1;
1603
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604
-        aConstraints.weighty = 0;
1605
-        aConstraints.gridx = 0;
1606
-        aConstraints.gridy += 1;
1607
-        aConstraints.gridwidth = 1;
1570
+        cGridBag specular = new cGridBag();
1571
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1572
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1573
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1574
+        specularSection.add(specular);
16081575 
1609
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612
-        aConstraints.gridx += 1;
1613
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615
-        aConstraints.gridx = 0;
1616
-        aConstraints.gridy += 1;
1617
-        aConstraints.gridwidth = 1;
1576
+        cGridBag lightarea = new cGridBag();
1577
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1578
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1580
+        specularSection.add(lightarea);
16181581 
1619
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622
-        aConstraints.gridx += 1;
1623
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625
-        aConstraints.gridx = 0;
1626
-        aConstraints.gridy += 1;
1627
-        aConstraints.gridwidth = 1;
1582
+        cGridBag shininess = new cGridBag();
1583
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1584
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1585
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1586
+        specularSection.add(shininess);
16281587 
1629
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632
-        aConstraints.gridx += 1;
1633
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635
-        aConstraints.gridx = 0;
1636
-        aConstraints.gridy += 1;
1637
-        aConstraints.gridwidth = 1;
1588
+        cGridBag metalness = new cGridBag();
1589
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1590
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1591
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1592
+        specularSection.add(metalness);
16381593 
1639
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
-        aConstraints.gridx += 1;
1643
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645
-        aConstraints.gridx = 0;
1646
-        aConstraints.gridy += 1;
1647
-        aConstraints.gridwidth = 1;
1594
+        cGridBag velvet = new cGridBag();
1595
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1596
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1597
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598
+        specularSection.add(velvet);
16481599 
1649
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
-        aConstraints.gridx += 1;
1653
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
-        aConstraints.gridx = 0;
1656
-        aConstraints.gridy += 1;
1657
-        aConstraints.gridwidth = 1;
1658
-
1659
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660
-        Return();
1600
+        shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1601
+        //Return();
16611602 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16621603 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16631604 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1668,130 +1609,93 @@
16681609 //		aConstraints.gridy += 1;
16691610 //		aConstraints.gridwidth = 1;
16701611 
1671
-        //aConstraints.weighty = 1;
1672
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673
-        //aConstraints.gridx += 1;
1674
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675
-        aConstraints.weighty = 0;
1676
-        aConstraints.gridx = 0;
1677
-        aConstraints.gridy += 1;
1678
-        aConstraints.gridwidth = 1;
16791612 
1680
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
-        aConstraints.gridx += 1;
1684
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686
-        aConstraints.gridx = 0;
1687
-        aConstraints.gridy += 1;
1688
-        aConstraints.gridwidth = 1;
1613
+        panel.add(new JSeparator());
1614
+        
1615
+        panel.add(specularSection);
1616
+        
1617
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1618
+        
1619
+        cGridBag globalSection = new cGridBag().setVertical(true);
16891620 
1690
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
-        aConstraints.gridx += 1;
1694
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696
-        aConstraints.gridx = 0;
1697
-        aConstraints.gridy += 1;
1698
-        aConstraints.gridwidth = 1;
1621
+        cGridBag camera = new cGridBag();
1622
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1623
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
+        globalSection.add(camera);
16991626 
1700
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
-        aConstraints.gridx += 1;
1704
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706
-        aConstraints.gridx = 0;
1707
-        aConstraints.gridy += 1;
1708
-        aConstraints.gridwidth = 1;
1627
+        cGridBag ambient = new cGridBag();
1628
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1629
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1631
+        globalSection.add(ambient);
17091632 
1710
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
-        aConstraints.gridx += 1;
1714
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716
-        aConstraints.gridx = 0;
1717
-        aConstraints.gridy += 1;
1718
-        aConstraints.gridwidth = 1;
1719
-        aConstraints.weighty = 0;
1633
+        cGridBag backlit = new cGridBag();
1634
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1635
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1636
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1637
+        globalSection.add(backlit);
17201638 
1721
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724
-        aConstraints.gridx += 1;
1725
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727
-        aConstraints.gridx = 0;
1728
-        aConstraints.gridy += 1;
1729
-        aConstraints.gridwidth = 1;
1639
+        cGridBag opacity = new cGridBag();
1640
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1641
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1643
+        globalSection.add(opacity);
17301644 
1731
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734
-        aConstraints.gridx += 1;
1735
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1737
-        aConstraints.gridx = 0;
1738
-        aConstraints.gridy += 1;
1739
-        aConstraints.gridwidth = 1;
1645
+        panel.add(new JSeparator());
1646
+        
1647
+        panel.add(globalSection);
1648
+        
1649
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1650
+        
1651
+        cGridBag textureSection = new cGridBag().setVertical(true);
17401652 
1741
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744
-        aConstraints.gridx += 1;
1745
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747
-        aConstraints.gridx = 0;
1748
-        aConstraints.gridy += 1;
1749
-        aConstraints.gridwidth = 1;
1653
+        cGridBag bump = new cGridBag();
1654
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1655
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1657
+        textureSection.add(bump);
17501658 
1751
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754
-        aConstraints.gridx += 1;
1755
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757
-        aConstraints.gridx = 0;
1758
-        aConstraints.gridy += 1;
1759
-        aConstraints.gridwidth = 1;
1659
+        cGridBag noise = new cGridBag();
1660
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1661
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1663
+        textureSection.add(noise);
17601664 
1761
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764
-        aConstraints.gridx += 1;
1765
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767
-        aConstraints.gridx = 0;
1768
-        aConstraints.gridy += 1;
1769
-        aConstraints.gridwidth = 1;
1665
+        cGridBag power = new cGridBag();
1666
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1667
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1669
+        textureSection.add(power);
17701670 
1771
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774
-        aConstraints.gridx += 1;
1775
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1777
-        aConstraints.gridx = 0;
1778
-        aConstraints.gridy += 1;
1779
-        aConstraints.gridwidth = 1;
1671
+        cGridBag borderfade = new cGridBag();
1672
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1673
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1675
+        textureSection.add(borderfade);
17801676 
1781
-        //aConstraints.weighty = 1;
1782
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783
-        //aConstraints.gridx += 1;
1784
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785
-        aConstraints.weighty = 0;
1677
+        cGridBag fog = new cGridBag();
1678
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1679
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1681
+        textureSection.add(fog);
17861682 
1787
-        aConstraints.gridx = 0;
1788
-        aConstraints.gridy = 0;
1789
-        aConstraints.gridwidth = 1;
1683
+        cGridBag opacityPower = new cGridBag();
1684
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1685
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1686
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1687
+        textureSection.add(opacityPower);
1688
+
1689
+        panel.add(new JSeparator());
1690
+        
1691
+        panel.add(textureSection);
1692
+        
1693
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17901694 
17911695         SetMaterial(copy); // .GetMaterial());
17921696 
1793
-        colorField.addChangeListener(this);
1794
-        modulationField.addChangeListener(this);
1697
+        //colorField.addChangeListener(this);
1698
+//        modulationField.addChangeListener(this);
17951699         metalnessField.addChangeListener(this);
17961700         diffuseField.addChangeListener(this);
17971701         specularField.addChangeListener(this);
....@@ -2603,6 +2507,7 @@
26032507                 }
26042508                 if (input == null)
26052509                 {
2510
+                new Exception().printStackTrace();
26062511                     System.exit(0);
26072512                 }
26082513 
....@@ -3332,6 +3237,7 @@
33323237             callee.refreshContents();
33333238         } else
33343239         {
3240
+                new Exception().printStackTrace();
33353241             System.exit(0);
33363242         }
33373243     }
....@@ -3494,7 +3400,7 @@
34943400             current.fakedepth = (float) fakedepthField.getFloat();
34953401             current.shadowbias = (float) shadowbiasField.getFloat();
34963402 
3497
-            if (!NumberSlider.frozen)
3403
+            if (!cNumberSlider.frozen)
34983404             {
34993405                 //System.out.println("Propagate = " + propagate);
35003406                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3542,6 +3448,7 @@
35423448                 || e.getSource() == apertureField
35433449                 || e.getSource() == shadowblurField)
35443450         {
3451
+                new Exception().printStackTrace();
35453452             System.exit(0);
35463453             cameraView.options1[0] = (float) focusField.getFloat() * 10;
35473454             cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3867,7 +3774,7 @@
38673774 
38683775             radioPanel.revalidate();
38693776             radioPanel.repaint();
3870
-            ctrlPanel.revalidate(); // ? new
3777
+            ctrlPanel.validate(); // ? new
38713778             ctrlPanel.repaint();
38723779         }
38733780     }
....@@ -4513,8 +4420,8 @@
45134420     //MenuItem normalLensItem;
45144421     MenuItem editCameraItem;
45154422     MenuItem revertCameraItem;
4516
-    CheckboxMenuItem toggleLiveItem;
45174423     MenuItem stepItem;
4424
+    CheckboxMenuItem toggleLiveItem;
45184425     CheckboxMenuItem toggleFullScreenItem;
45194426     CheckboxMenuItem toggleTimelineItem;
45204427     CheckboxMenuItem toggleRenderItem;
....@@ -4531,20 +4438,20 @@
45314438     JSplitPane mainPanel;
45324439     JScrollPane scrollpane;
45334440     JPanel toolbarPanel;
4534
-    JPanel treePanel;
4441
+    cGridBag treePanel;
45354442     JPanel radioPanel;
45364443     ButtonGroup buttonGroup;
4537
-    JPanel ctrlPanel;
4538
-    JPanel materialPanel;
4444
+    cGridBag ctrlPanel;
4445
+    cGridBag materialPanel;
45394446     JScrollPane infoPanel;
4540
-    JPanel optionsPanel;
4447
+    cGridBag optionsPanel;
45414448     JTabbedPane objectPanel;
4542
-    JPanel XYZPanel;
4449
+    cGridBag XYZPanel;
45434450     JSplitPane gridPanel;
45444451     JSplitPane bigPanel;
4545
-    JPanel bigThree;
4546
-    JTabbedPane scenePanel;
4547
-    JPanel centralPanel;
4452
+    cGridBag bigThree;
4453
+    cGridBag scenePanel;
4454
+    cGridBag centralPanel;
45484455     JSplitPane cameraPanel;
45494456     JPanel timelinePanel;
45504457     JMenuBar timelineMenubar;
....@@ -4597,67 +4504,67 @@
45974504     // MATERIAL
45984505     JLabel materialLabel;
45994506     JLabel colorLabel;
4600
-    NumberSlider colorField;
4507
+    cNumberSlider colorField;
46014508     JLabel modulationLabel;
4602
-    NumberSlider modulationField;
4509
+    cNumberSlider modulationField;
46034510     JLabel metalnessLabel;
4604
-    NumberSlider metalnessField;
4511
+    cNumberSlider metalnessField;
46054512     JLabel diffuseLabel;
4606
-    NumberSlider diffuseField;
4513
+    cNumberSlider diffuseField;
46074514     JLabel specularLabel;
4608
-    NumberSlider specularField;
4515
+    cNumberSlider specularField;
46094516     JLabel shininessLabel;
4610
-    NumberSlider shininessField;
4517
+    cNumberSlider shininessField;
46114518     JLabel shiftLabel;
4612
-    NumberSlider shiftField;
4519
+    cNumberSlider shiftField;
46134520     JLabel ambientLabel;
4614
-    NumberSlider ambientField;
4521
+    cNumberSlider ambientField;
46154522     JLabel lightareaLabel;
4616
-    NumberSlider lightareaField;
4523
+    cNumberSlider lightareaField;
46174524     JLabel diffusenessLabel;
4618
-    NumberSlider diffusenessField;
4525
+    cNumberSlider diffusenessField;
46194526     JLabel velvetLabel;
4620
-    NumberSlider velvetField;
4527
+    cNumberSlider velvetField;
46214528     JLabel sheenLabel;
4622
-    NumberSlider sheenField;
4529
+    cNumberSlider sheenField;
46234530     JLabel subsurfaceLabel;
4624
-    NumberSlider subsurfaceField;
4531
+    cNumberSlider subsurfaceField;
46254532     //JLabel bumpLabel;
46264533     //NumberSlider bumpField;
46274534     JLabel backlitLabel;
4628
-    NumberSlider backlitField;
4535
+    cNumberSlider backlitField;
46294536     JLabel anisoLabel;
4630
-    NumberSlider anisoField;
4537
+    cNumberSlider anisoField;
46314538     JLabel anisoVLabel;
4632
-    NumberSlider anisoVField;
4539
+    cNumberSlider anisoVField;
46334540     JLabel cameraLabel;
4634
-    NumberSlider cameraField;
4541
+    cNumberSlider cameraField;
46354542     JLabel selfshadowLabel;
4636
-    NumberSlider selfshadowField;
4543
+    cNumberSlider selfshadowField;
46374544     JLabel shadowLabel;
4638
-    NumberSlider shadowField;
4545
+    cNumberSlider shadowField;
46394546     JLabel textureLabel;
4640
-    NumberSlider textureField;
4547
+    cNumberSlider textureField;
46414548     JLabel opacityLabel;
4642
-    NumberSlider opacityField;
4549
+    cNumberSlider opacityField;
46434550     JLabel fakedepthLabel;
4644
-    NumberSlider fakedepthField;
4551
+    cNumberSlider fakedepthField;
46454552     JLabel shadowbiasLabel;
4646
-    NumberSlider shadowbiasField;
4553
+    cNumberSlider shadowbiasField;
46474554     JLabel bumpLabel;
4648
-    NumberSlider bumpField;
4555
+    cNumberSlider bumpField;
46494556     JLabel noiseLabel;
4650
-    NumberSlider noiseField;
4557
+    cNumberSlider noiseField;
46514558     JLabel powerLabel;
4652
-    NumberSlider powerField;
4559
+    cNumberSlider powerField;
46534560     JLabel borderfadeLabel;
4654
-    NumberSlider borderfadeField;
4561
+    cNumberSlider borderfadeField;
46554562     JLabel fogLabel;
4656
-    NumberSlider fogField;
4563
+    cNumberSlider fogField;
46574564     JLabel opacityPowerLabel;
4658
-    NumberSlider opacityPowerField;
4565
+    cNumberSlider opacityPowerField;
46594566     JTree jTree;
46604567     //ObjectUI parent;
46614568     
4662
-    NumberSlider normalpushField;
4569
+    cNumberSlider normalpushField;
46634570 }