~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -138,34 +138,40 @@
138	138	public void closeUI()
139	139	{
140	140	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
143	143	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
145	145
146	146	if (!GroupEditor.allparams)
147	147	return;
148	148
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);
	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);
167	167
168		- 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);
169	175	}
170	176
171	177	public ObjEditor GetEditor()
..	..	@@ -353,21 +359,23 @@
353	359	objectPanel = new JTabbedPane();
354	360	toolbarPanel = new JPanel();
355	361	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	362	+ treePanel = new cGridBag();
357	363	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
	364	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359	365	ctrlPanel.setName("Edit");
360	366	materialPanel = new cGridBag().setVertical(true);
361	367	materialPanel.setName("Material");
362	368	/JTextPane/
363	369	infoarea = createTextPane();
	370	+ doc = infoarea.getStyledDocument();
	371	+
364	372	infoarea.setEditable(true);
365	373	SetText();
366	374	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	375	// infoarea.setOpaque(false);
368	376	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	377	+// TEXTAREA infoarea.setLineWrap(true);
	378	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	379	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	380	infoPanel.setPreferredSize(new Dimension(50, 200));
373	381	infoPanel.setName("Info");
..	..	@@ -378,15 +386,15 @@
378	386	mainPanel.setName("Main");
379	387	mainPanel.setContinuousLayout(true);
380	388	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	389	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	390	+ mainPanel.setDividerLocation(0.5); //1.0);
	391	+ mainPanel.setResizeWeight(0.5);
384	392
385	393	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	394	//mainPanel.setLayout(new GridBagLayout());
387	395	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	396	+// treePanel.setLayout(new GridBagLayout());
	397	+ //ctrlPanel.setLayout(new GridBagLayout());
390	398	//materialPanel.setLayout(new GridBagLayout());
391	399
392	400	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +434,7 @@
426	434	static String newline = "\n";
427	435	protected static final String buttonString = "JButton";
428	436	StyledDocument doc;
429		- JTextArea infoarea;
	437	+ JTextPane infoarea;
430	438
431	439	void ClearInfo()
432	440	{
..	..	@@ -493,7 +501,10 @@
493	501	}
494	502
495	503	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	504	+ {
	505	+ si.SendInfo(" BBox min: " + minima, "regular");
	506	+ si.SendInfo(" BBox max: " + maxima, "regular");
	507	+ }
497	508
498	509	if (sel.bRep != null)
499	510	{
..	..	@@ -591,6 +602,9 @@
591	602	{
592	603	CameraPane.pointflow = (PointFlow) sel;
593	604	}
	605	+
	606	+ si.SendInfo("_____________________", "regular");
	607	+ si.SendInfo("", "regular");
594	608	}
595	609	}
596	610
..	..	@@ -622,52 +636,52 @@
622	636	cameraView.ToggleFullScreen();
623	637	}
624	638
625		- private JTextArea createTextPane()
	639	+ private JTextPane createTextPane()
626	640	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	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	+// }
642	683
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	684	+ return new JTextPane(); // textPane;
671	685	}
672	686
673	687	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -767,54 +781,44 @@
767	781	JButton slowerButton;
768	782	JButton fasterButton;
769	783	JButton remarkButton;
	784	+
	785	+ cGridBag namePanel;
	786	+ cGridBag setupPanel;
	787	+ cGridBag commandsPanel;
	788	+ cGridBag pushPanel;
	789	+ cGridBag fillPanel;
770	790
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	791	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	792	{
773	793	JCheckBox cb;
774	794
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- 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);
780	796	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	797
785	798	return cb;
786	799	}
787	800
788		- cButton AddButton(ObjEditor oe, String label)
	801	+ cButton AddButton(cGridBag panel, String label)
789	802	{
790	803	cButton cb;
791	804
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- 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);
797	806	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	807
802	808	return cb;
803	809	}
804	810
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	811	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	812	{
807	813	JComboBox combo;
808	814
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	815	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	816	combo.addActionListener(this);
813	817
814	818	return combo;
815	819	}
816	820
817		- cNumberSlider AddSlider(cGridBag 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)
818	822	{
819	823	cGridBag control = new cGridBag();
820	824
..	..	@@ -826,12 +830,12 @@
826	830	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	831	combo.setFloat(current);
828	832
829		- ctrlPanel.add(control);
	833	+ panel.add(control);
830	834
831		- return combo;
	835	+ return control;
832	836	}
833	837
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	838	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	839	{
836	840	cGridBag control = new cGridBag();
837	841
..	..	@@ -839,25 +843,21 @@
839	843
840	844	JLabel jlabel = new JLabel(label);
841	845	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842		- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843		- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	846	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	847	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	848	combo.setInteger(current);
845	849
846		- ctrlPanel.add(control);
	850	+ panel.add(control);
847	851
848		- return combo;
	852	+ return control;
849	853	}
850	854
851	855	JTextArea AddText(cGridBag ctrlPanel, String name)
852	856	{
853	857	JTextArea text;
854	858
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	859	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	860	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	861
862	862	return text;
863	863	}
..	..	@@ -896,7 +896,7 @@
896	896
897	897	/*
898	898	*/
899		- void Return() // ObjEditor oe)
	899	+ void Return0() // ObjEditor oe)
900	900	{
901	901	aConstraints.gridy += 1;
902	902	aConstraints.gridx = 0;
..	..	@@ -955,33 +955,52 @@
955	955	// oe.aConstraints.weighty = 0;
956	956	// oe.aConstraints.gridx = 0;
957	957	// oe.aConstraints.gridy = 0;
958		- 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();
959	967
960	968	if (!GroupEditor.allparams)
961	969	return;
962	970
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- 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);
966	976	// Return();
967		- markCB = AddCheckBox(oe, "Mark", copy.marked);
968		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969		- randomCB = AddCheckBox(oe, "Rand", copy.random);
970		- Return();
971		- resetButton = AddButton(oe, "Reset");
972		- 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");
973	988	// resetAllButton = AddButton(oe, "Reset All");
974	989	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
	990	+ speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
976	991	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	992	+ slowerButton = AddButton(commandsPanel, "Slow");
	993	+ fasterButton = AddButton(commandsPanel, "Fast");
	994	+ remarkButton = AddButton(commandsPanel, "Remark");
980	995
981		- Return();
	996	+ oe.ctrlPanel.add(commandsPanel);
	997	+ oe.ctrlPanel.Return();
982	998
983		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984		- Return();
	999	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1000	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1001	+ //Return();
	1002	+
	1003	+ oe.ctrlPanel.Return();
985	1004
986	1005	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1006	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1095,7 @@
1076	1095	oe.aConstraints.gridwidth = 1;
1077	1096	/**/
1078	1097	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1098	+ oe.ctrlPanel.Return();
1080	1099
1081	1100	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1101	//textureButton.setEnabled(false);
..	..	@@ -1253,10 +1272,11 @@
1253	1272	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1273	//tmp.setName("Edit");
1255	1274	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- 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);
1260	1280	objectPanel.add(infoPanel);
1261	1281
1262	1282	/*
..	..	@@ -1415,7 +1435,7 @@
1415	1435	ctrlPanel.removeAll();
1416	1436	}
1417	1437
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1438	+ void SetupMaterial(cGridBag panel)
1419	1439	{
1420	1440	/*
1421	1441	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1444,23 @@
1424	1444
1425	1445	cGridBag editBar = new cGridBag().setVertical(false);
1426	1446
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1447	+ editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1448	+ createMaterialButton.setToolTipText("Create material");
1428	1449
1429	1450	/*
1430	1451	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1452	*/
1432	1453
1433		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
	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);
1435	1458	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436	1459	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1437	1460
1438		- ctrlPanel.add(editBar);
	1461	+ editBar.preferredHeight = 15;
	1462	+
	1463	+ panel.add(editBar);
1439	1464
1440	1465	/**/
1441	1466	//aConstraints.weighty = 0;
..	..	@@ -1445,17 +1470,13 @@
1445	1470	//aConstraints.gridx += 1;
1446	1471	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	1472
1448		- JPanel colorPanel = new JPanel(new BorderLayout());
1449		- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450		-
1451	1473	cGridBag colorSection = new cGridBag().setVertical(true);
1452		-
1453		- colorPanel.add(colorSection);
1454	1474
1455	1475	cGridBag color = new cGridBag();
1456	1476	color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457	1477	colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458	1478	color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1479	+ //colorField.preferredWidth = 200;
1459	1480	colorSection.add(color);
1460	1481
1461	1482	cGridBag modulation = new cGridBag();
..	..	@@ -1488,16 +1509,13 @@
1488	1509	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489	1510	colorSection.add(shadowbias);
1490	1511
1491		- ctrlPanel.add(colorPanel);
	1512	+ panel.add(new JSeparator());
	1513	+
	1514	+ panel.add(colorSection);
1492	1515
1493	1516	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494	1517
1495		- JPanel diffusePanel = new JPanel(new BorderLayout());
1496		- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497		-
1498	1518	cGridBag diffuseSection = new cGridBag().setVertical(true);
1499		-
1500		- diffusePanel.add(diffuseSection);
1501	1519
1502	1520	cGridBag diffuse = new cGridBag();
1503	1521	diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..	..	@@ -1541,16 +1559,13 @@
1541	1559	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1560	diffuseSection.add(fakedepth);
1543	1561
1544		- ctrlPanel.add(diffusePanel);
	1562	+ panel.add(new JSeparator());
	1563	+
	1564	+ panel.add(diffuseSection);
1545	1565
1546	1566	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547	1567
1548		- JPanel specularPanel = new JPanel(new BorderLayout());
1549		- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550		-
1551	1568	cGridBag specularSection = new cGridBag().setVertical(true);
1552		-
1553		- specularPanel.add(specularSection);
1554	1569
1555	1570	cGridBag specular = new cGridBag();
1556	1571	specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..	..	@@ -1582,7 +1597,7 @@
1582	1597	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583	1598	specularSection.add(velvet);
1584	1599
1585		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1600	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586	1601	//Return();
1587	1602	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588	1603	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1595,16 +1610,13 @@
1595	1610	// aConstraints.gridwidth = 1;
1596	1611
1597	1612
1598		- ctrlPanel.add(specularPanel);
	1613	+ panel.add(new JSeparator());
	1614	+
	1615	+ panel.add(specularSection);
1599	1616
1600	1617	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601	1618
1602		- JPanel globalPanel = new JPanel(new BorderLayout());
1603		- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604		-
1605	1619	cGridBag globalSection = new cGridBag().setVertical(true);
1606		-
1607		- globalPanel.add(globalSection);
1608	1620
1609	1621	cGridBag camera = new cGridBag();
1610	1622	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
..	..	@@ -1630,16 +1642,13 @@
1630	1642	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631	1643	globalSection.add(opacity);
1632	1644
1633		- ctrlPanel.add(globalPanel);
	1645	+ panel.add(new JSeparator());
	1646	+
	1647	+ panel.add(globalSection);
1634	1648
1635	1649	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636	1650
1637		- JPanel texturePanel = new JPanel(new BorderLayout());
1638		- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639		-
1640	1651	cGridBag textureSection = new cGridBag().setVertical(true);
1641		-
1642		- texturePanel.add(textureSection);
1643	1652
1644	1653	cGridBag bump = new cGridBag();
1645	1654	bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..	..	@@ -1677,7 +1686,9 @@
1677	1686	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1678	1687	textureSection.add(opacityPower);
1679	1688
1680		- ctrlPanel.add(texturePanel);
	1689	+ panel.add(new JSeparator());
	1690	+
	1691	+ panel.add(textureSection);
1681	1692
1682	1693	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683	1694
..	..	@@ -2496,6 +2507,7 @@
2496	2507	}
2497	2508	if (input == null)
2498	2509	{
	2510	+ new Exception().printStackTrace();
2499	2511	System.exit(0);
2500	2512	}
2501	2513
..	..	@@ -3225,6 +3237,7 @@
3225	3237	callee.refreshContents();
3226	3238	} else
3227	3239	{
	3240	+ new Exception().printStackTrace();
3228	3241	System.exit(0);
3229	3242	}
3230	3243	}
..	..	@@ -3435,6 +3448,7 @@
3435	3448	\|\| e.getSource() == apertureField
3436	3449	\|\| e.getSource() == shadowblurField)
3437	3450	{
	3451	+ new Exception().printStackTrace();
3438	3452	System.exit(0);
3439	3453	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440	3454	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -4406,8 +4420,8 @@
4406	4420	//MenuItem normalLensItem;
4407	4421	MenuItem editCameraItem;
4408	4422	MenuItem revertCameraItem;
4409		- CheckboxMenuItem toggleLiveItem;
4410	4423	MenuItem stepItem;
	4424	+ CheckboxMenuItem toggleLiveItem;
4411	4425	CheckboxMenuItem toggleFullScreenItem;
4412	4426	CheckboxMenuItem toggleTimelineItem;
4413	4427	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4424,7 +4438,7 @@
4424	4438	JSplitPane mainPanel;
4425	4439	JScrollPane scrollpane;
4426	4440	JPanel toolbarPanel;
4427		- JPanel treePanel;
	4441	+ cGridBag treePanel;
4428	4442	JPanel radioPanel;
4429	4443	ButtonGroup buttonGroup;
4430	4444	cGridBag ctrlPanel;