~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -353,9 +355,9 @@
353	355	toolbarPanel.setName("Toolbar");
354	356	treePanel = new JPanel();
355	357	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
	358	+ ctrlPanel = new cGridBag(); // new GridBagLayout());
357	359	ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
	360	+ materialPanel = new cGridBag().setVertical(true);
359	361	materialPanel.setName("Material");
360	362	/JTextPane/
361	363	infoarea = createTextPane();
..	..	@@ -385,7 +387,7 @@
385	387	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386	388	treePanel.setLayout(new GridBagLayout());
387	389	ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	390	+ //materialPanel.setLayout(new GridBagLayout());
389	391
390	392	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	393	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -812,65 +814,47 @@
812	814	return combo;
813	815	}
814	816
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	817	+ cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
816	818	{
817		- NumberSlider combo;
	819	+ cGridBag control = new cGridBag();
	820	+
	821	+ cNumberSlider combo;
818	822
819	823	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	824	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		-
	825	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	826	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	827	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
	828	+
	829	+ ctrlPanel.add(control);
	830	+
838	831	return combo;
839	832	}
840	833
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	834	+ cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
842	835	{
843		- NumberSlider combo;
	836	+ cGridBag control = new cGridBag();
	837	+
	838	+ cNumberSlider combo;
844	839
845	840	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	841	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		-
	842	+ ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	843	+ ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	844	combo.setInteger(current);
859	845
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
	846	+ ctrlPanel.add(control);
	847	+
864	848	return combo;
865	849	}
866	850
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	851	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	852	{
869	853	JTextArea text;
870	854
871	855	aConstraints.fill = GridBagConstraints.HORIZONTAL;
872	856	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	857	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	858	text.addCaretListener(this);
875	859	aConstraints.gridx += 1;
876	860	aConstraints.gridwidth = 1;
..	..	@@ -900,6 +884,13 @@
900	884	{
901	885	j.removeChangeListener(this);
902	886	objEditor.ctrlPanel.remove(j.label);
	887	+ objEditor.ctrlPanel.remove(j);
	888	+ }
	889	+
	890	+ void Remove(cNumberSlider j)
	891	+ {
	892	+ j.removeChangeListener(this);
	893	+ //objEditor.ctrlPanel.remove(j.label);
903	894	objEditor.ctrlPanel.remove(j);
904	895	}
905	896
..	..	@@ -987,10 +978,10 @@
987	978	fasterButton = AddButton(oe, "Fast");
988	979	remarkButton = AddButton(oe, "Rem");
989	980
990		- Return();
	981	+ //Return();
991	982
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	983	+ //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	984	+ //Return();
994	985
995	986	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	987	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1187,7 +1178,8 @@
1187	1178	//JPanel worldPanel =
1188	1179	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1180	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
	1181	+ centralPanel = new cGridBag();
	1182	+ centralPanel.preferredWidth = 20;
1191	1183	timelinePanel = new JPanel(new BorderLayout());
1192	1184	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1185
..	..	@@ -1217,12 +1209,13 @@
1217	1209	//frontView.object = copy;
1218	1210	//sideView.object = copy;
1219	1211
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1212	+ XYZPanel = new cGridBag().setVertical(true);
	1213	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1214
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1215	+ XYZPanel.preferredWidth = 5;
	1216	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1217	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1218	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1226	1219
1227	1220	/*
1228	1221	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1284,19 +1277,23 @@
1284	1277	scrollpane.setWheelScrollingEnabled(true);
1285	1278	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1279
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1280	+ /JTabbedPane/ scenePanel = new cGridBag();
	1281	+ scenePanel.preferredWidth = 7;
	1282	+
	1283	+ JTabbedPane tabbedPane = new JTabbedPane();
	1284	+ tabbedPane.add(scrollpane);
1289	1285
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1286	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1291	1287
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1288	+ optionsPanel = new cGridBag().setVertical(true);
1293	1289
1294	1290	optionsPanel.setName("Options");
1295	1291
1296		- AddOptions(optionsPanel, aConstraints);
	1292	+ AddOptions(optionsPanel); //, aConstraints);
1297	1293
1298		- scenePanel.add(optionsPanel);
1299		-
	1294	+ tabbedPane.add(optionsPanel);
	1295	+
	1296	+ scenePanel.add(tabbedPane);
1300	1297
1301	1298	/*
1302	1299	cTree jTree = new cTree(null);
..	..	@@ -1330,6 +1327,7 @@
1330	1327	//bigPanel.setSize(new Dimension(10,10));
1331	1328	//bigPanel.add(ctrlPanel);
1332	1329	//bigPanel.add(gridPanel);
	1330	+ /**
1333	1331	bigThree = new JPanel();
1334	1332	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1335	1333	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1353,7 +1351,13 @@
1353	1351	// aConstraints.gridheight = 3;
1354	1352	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1355	1353	bigThree.add(XYZPanel, aWindowConstraints);
	1354	+ /**/
1356	1355
	1356	+ bigThree = new cGridBag();
	1357	+ bigThree.addComponent(scenePanel);
	1358	+ bigThree.addComponent(centralPanel);
	1359	+ bigThree.addComponent(XYZPanel);
	1360	+
1357	1361	// // SIDE EFFECT!!!
1358	1362	// aConstraints.gridx = 0;
1359	1363	// aConstraints.gridy = 0;
..	..	@@ -1396,7 +1400,7 @@
1396	1400	});
1397	1401	}
1398	1402
1399		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1403	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1400	1404	{
1401	1405	}
1402	1406
..	..	@@ -1411,260 +1415,165 @@
1411	1415	ctrlPanel.removeAll();
1412	1416	}
1413	1417
1414		- void SetupMaterial(JPanel ctrlPanel)
	1418	+ void SetupMaterial(cGridBag ctrlPanel)
1415	1419	{
1416		- aConstraints.weighty = 0;
1417		- //aConstraints.weightx = 1;
1418		- /*
	1420	+ /*
1419	1421	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1420	1422	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423	1423	*/
1424	1424
1425		- aConstraints.gridwidth = 1;
1426		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1427		- aConstraints.gridx += 1;
1428		- aConstraints.weighty = 0;
1429		- aConstraints.gridwidth = 1;
	1425	+ cGridBag editBar = new cGridBag().setVertical(false);
	1426	+
	1427	+ editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1430	1428
1431	1429	/*
1432	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1433		- aConstraints.gridx += 1;
1434		- aConstraints.weighty = 0;
1435		- aConstraints.gridwidth = 1;
1436	1431	*/
1437	1432
1438		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1439		- aConstraints.gridx += 1;
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
	1434	+ editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
	1435	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1436	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1440	1437
1441		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1442		-
1443		- aConstraints.gridx += 1;
1444		-
1445		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1446		-
1447		- aConstraints.gridx += 1;
1448		-
1449		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1450		-
1451		- aConstraints.gridx = 0;
1452		- aConstraints.gridy += 1;
1453		- aConstraints.weighty = 0;
1454		- aConstraints.gridwidth = 1;
	1438	+ ctrlPanel.add(editBar);
	1439	+
1455	1440	/**/
1456	1441	//aConstraints.weighty = 0;
1457	1442	////aConstraints.weightx = 1;
1458	1443	//aConstraints.weighty = 1;
1459	1444	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1460	1445	//aConstraints.gridx += 1;
1461		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridx = 0;
1464		- aConstraints.gridy += 1;
1465		- aConstraints.gridwidth = 1;
	1446	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1466	1447
1467		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1468		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1469		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1470		- aConstraints.gridx += 1;
1471		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1472		- //aConstraints.weightx = 0;
1473		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	1448	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1449	+
	1450	+ cGridBag color = new cGridBag();
	1451	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1452	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1453	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1454	+ //colorField.preferredWidth = 200;
	1455	+ colorSection.add(color);
1477	1456
1478		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1479		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	1457	+ cGridBag modulation = new cGridBag();
	1458	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1459	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1460	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1461	+ colorSection.add(modulation);
1487	1462
1488		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1489		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	1463	+ cGridBag texture = new cGridBag();
	1464	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1465	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1466	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1467	+ colorSection.add(texture);
1497	1468
1498		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1499		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	1469	+ cGridBag anisoU = new cGridBag();
	1470	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1471	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1472	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1473	+ colorSection.add(anisoU);
1507	1474
1508		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1509		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	1475	+ cGridBag anisoV = new cGridBag();
	1476	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1477	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1478	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1479	+ colorSection.add(anisoV);
1517	1480
1518		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1519		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1520		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1521		- aConstraints.gridx += 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1523		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1524		- aConstraints.gridx = 0;
1525		- aConstraints.gridy += 1;
1526		- aConstraints.gridwidth = 1;
	1481	+ cGridBag shadowbias = new cGridBag();
	1482	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1483	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1484	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1485	+ colorSection.add(shadowbias);
1527	1486
1528		- //aConstraints.weighty = 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1530		- //aConstraints.gridx += 1;
1531		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1532		- aConstraints.weighty = 0;
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1487	+ ctrlPanel.add(new JSeparator());
	1488	+
	1489	+ ctrlPanel.add(colorSection);
	1490	+
	1491	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1492	+
	1493	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1494	+
	1495	+ cGridBag diffuse = new cGridBag();
	1496	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1497	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1498	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1499	+ diffuseSection.add(diffuse);
1536	1500
1537		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1538		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	1501	+ cGridBag diffuseness = new cGridBag();
	1502	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1503	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1504	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1505	+ diffuseSection.add(diffuseness);
1546	1506
1547		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1548		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	1507	+ cGridBag selfshadow = new cGridBag();
	1508	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1509	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1510	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1511	+ diffuseSection.add(selfshadow);
1556	1512
1557		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1558		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	1513	+ cGridBag sheen = new cGridBag();
	1514	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1515	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1516	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1517	+ diffuseSection.add(sheen);
1566	1518
1567		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1568		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	1519	+ cGridBag subsurface = new cGridBag();
	1520	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1521	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1522	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1523	+ diffuseSection.add(subsurface);
1576	1524
1577		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1578		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	1525	+ cGridBag shadow = new cGridBag();
	1526	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1527	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1528	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1529	+ diffuseSection.add(shadow);
1586	1530
1587		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1588		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	1531	+ cGridBag fakedepth = new cGridBag();
	1532	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1533	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1534	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1535	+ diffuseSection.add(fakedepth);
1596	1536
1597		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1598		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1600		- aConstraints.gridx += 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1602		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1603		- aConstraints.gridx = 0;
1604		- aConstraints.gridy += 1;
1605		- aConstraints.gridwidth = 1;
	1537	+ ctrlPanel.add(new JSeparator());
	1538	+
	1539	+ ctrlPanel.add(diffuseSection);
	1540	+
	1541	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1542	+
	1543	+ cGridBag specularSection = new cGridBag().setVertical(true);
1606	1544
1607		- //aConstraints.weighty = 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1609		- //aConstraints.gridx += 1;
1610		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1611		- aConstraints.weighty = 0;
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1545	+ cGridBag specular = new cGridBag();
	1546	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1547	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1548	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1549	+ specularSection.add(specular);
1615	1550
1616		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1617		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	1551	+ cGridBag lightarea = new cGridBag();
	1552	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1553	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1554	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1555	+ specularSection.add(lightarea);
1625	1556
1626		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1627		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	1557	+ cGridBag shininess = new cGridBag();
	1558	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1559	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1560	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1561	+ specularSection.add(shininess);
1635	1562
1636		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1637		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
	1563	+ cGridBag metalness = new cGridBag();
	1564	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1565	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1566	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1567	+ specularSection.add(metalness);
1645	1568
1646		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1647		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
	1569	+ cGridBag velvet = new cGridBag();
	1570	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1571	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1572	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1573	+ specularSection.add(velvet);
1655	1574
1656		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1657		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1659		- aConstraints.gridx += 1;
1660		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1661		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1662		- aConstraints.gridx = 0;
1663		- aConstraints.gridy += 1;
1664		- aConstraints.gridwidth = 1;
1665		-
1666		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1667		- Return();
	1575	+ shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1576	+ //Return();
1668	1577	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1669	1578	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	1579	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1675,130 +1584,93 @@
1675	1584	// aConstraints.gridy += 1;
1676	1585	// aConstraints.gridwidth = 1;
1677	1586
1678		- //aConstraints.weighty = 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1680		- //aConstraints.gridx += 1;
1681		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1682		- aConstraints.weighty = 0;
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
1686	1587
1687		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1688		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
	1588	+ ctrlPanel.add(new JSeparator());
	1589	+
	1590	+ ctrlPanel.add(specularSection);
	1591	+
	1592	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1593	+
	1594	+ cGridBag globalSection = new cGridBag().setVertical(true);
1696	1595
1697		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1698		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
	1596	+ cGridBag camera = new cGridBag();
	1597	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1598	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1599	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1600	+ globalSection.add(camera);
1706	1601
1707		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1708		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
	1602	+ cGridBag ambient = new cGridBag();
	1603	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1604	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1605	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1606	+ globalSection.add(ambient);
1716	1607
1717		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1718		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1720		- aConstraints.gridx += 1;
1721		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1722		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1723		- aConstraints.gridx = 0;
1724		- aConstraints.gridy += 1;
1725		- aConstraints.gridwidth = 1;
1726		- aConstraints.weighty = 0;
	1608	+ cGridBag backlit = new cGridBag();
	1609	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1610	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1611	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1612	+ globalSection.add(backlit);
1727	1613
1728		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1729		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	1614	+ cGridBag opacity = new cGridBag();
	1615	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1616	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1617	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1618	+ globalSection.add(opacity);
1737	1619
1738		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1739		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	1620	+ ctrlPanel.add(new JSeparator());
	1621	+
	1622	+ ctrlPanel.add(globalSection);
	1623	+
	1624	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1625	+
	1626	+ cGridBag textureSection = new cGridBag().setVertical(true);
1747	1627
1748		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1749		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	1628	+ cGridBag bump = new cGridBag();
	1629	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1630	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1631	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1632	+ textureSection.add(bump);
1757	1633
1758		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1759		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	1634	+ cGridBag noise = new cGridBag();
	1635	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1636	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1637	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1638	+ textureSection.add(noise);
1767	1639
1768		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1769		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	1640	+ cGridBag power = new cGridBag();
	1641	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1642	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1643	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1644	+ textureSection.add(power);
1777	1645
1778		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1779		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1780		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1781		- aConstraints.gridx += 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1783		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy += 1;
1786		- aConstraints.gridwidth = 1;
	1646	+ cGridBag borderfade = new cGridBag();
	1647	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1648	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1649	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1650	+ textureSection.add(borderfade);
1787	1651
1788		- //aConstraints.weighty = 1;
1789		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1790		- //aConstraints.gridx += 1;
1791		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1792		- aConstraints.weighty = 0;
	1652	+ cGridBag fog = new cGridBag();
	1653	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1654	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1655	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1656	+ textureSection.add(fog);
1793	1657
1794		- aConstraints.gridx = 0;
1795		- aConstraints.gridy = 0;
1796		- aConstraints.gridwidth = 1;
	1658	+ cGridBag opacityPower = new cGridBag();
	1659	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1660	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1661	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1662	+ textureSection.add(opacityPower);
	1663	+
	1664	+ ctrlPanel.add(new JSeparator());
	1665	+
	1666	+ ctrlPanel.add(textureSection);
	1667	+
	1668	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1669
1798	1670	SetMaterial(copy); // .GetMaterial());
1799	1671
1800		- colorField.addChangeListener(this);
1801		- modulationField.addChangeListener(this);
	1672	+ //colorField.addChangeListener(this);
	1673	+// modulationField.addChangeListener(this);
1802	1674	metalnessField.addChangeListener(this);
1803	1675	diffuseField.addChangeListener(this);
1804	1676	specularField.addChangeListener(this);
..	..	@@ -3501,7 +3373,7 @@
3501	3373	current.fakedepth = (float) fakedepthField.getFloat();
3502	3374	current.shadowbias = (float) shadowbiasField.getFloat();
3503	3375
3504		- if (!NumberSlider.frozen)
	3376	+ if (!cNumberSlider.frozen)
3505	3377	{
3506	3378	//System.out.println("Propagate = " + propagate);
3507	3379	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3874,7 +3746,7 @@
3874	3746
3875	3747	radioPanel.revalidate();
3876	3748	radioPanel.repaint();
3877		- ctrlPanel.revalidate(); // ? new
	3749	+ ctrlPanel.validate(); // ? new
3878	3750	ctrlPanel.repaint();
3879	3751	}
3880	3752	}
..	..	@@ -4541,17 +4413,17 @@
4541	4413	JPanel treePanel;
4542	4414	JPanel radioPanel;
4543	4415	ButtonGroup buttonGroup;
4544		- JPanel ctrlPanel;
4545		- JPanel materialPanel;
	4416	+ cGridBag ctrlPanel;
	4417	+ cGridBag materialPanel;
4546	4418	JScrollPane infoPanel;
4547		- JPanel optionsPanel;
	4419	+ cGridBag optionsPanel;
4548	4420	JTabbedPane objectPanel;
4549		- JPanel XYZPanel;
	4421	+ cGridBag XYZPanel;
4550	4422	JSplitPane gridPanel;
4551	4423	JSplitPane bigPanel;
4552		- JPanel bigThree;
4553		- JTabbedPane scenePanel;
4554		- JPanel centralPanel;
	4424	+ cGridBag bigThree;
	4425	+ cGridBag scenePanel;
	4426	+ cGridBag centralPanel;
4555	4427	JSplitPane cameraPanel;
4556	4428	JPanel timelinePanel;
4557	4429	JMenuBar timelineMenubar;
..	..	@@ -4604,67 +4476,67 @@
4604	4476	// MATERIAL
4605	4477	JLabel materialLabel;
4606	4478	JLabel colorLabel;
4607		- NumberSlider colorField;
	4479	+ cNumberSlider colorField;
4608	4480	JLabel modulationLabel;
4609		- NumberSlider modulationField;
	4481	+ cNumberSlider modulationField;
4610	4482	JLabel metalnessLabel;
4611		- NumberSlider metalnessField;
	4483	+ cNumberSlider metalnessField;
4612	4484	JLabel diffuseLabel;
4613		- NumberSlider diffuseField;
	4485	+ cNumberSlider diffuseField;
4614	4486	JLabel specularLabel;
4615		- NumberSlider specularField;
	4487	+ cNumberSlider specularField;
4616	4488	JLabel shininessLabel;
4617		- NumberSlider shininessField;
	4489	+ cNumberSlider shininessField;
4618	4490	JLabel shiftLabel;
4619		- NumberSlider shiftField;
	4491	+ cNumberSlider shiftField;
4620	4492	JLabel ambientLabel;
4621		- NumberSlider ambientField;
	4493	+ cNumberSlider ambientField;
4622	4494	JLabel lightareaLabel;
4623		- NumberSlider lightareaField;
	4495	+ cNumberSlider lightareaField;
4624	4496	JLabel diffusenessLabel;
4625		- NumberSlider diffusenessField;
	4497	+ cNumberSlider diffusenessField;
4626	4498	JLabel velvetLabel;
4627		- NumberSlider velvetField;
	4499	+ cNumberSlider velvetField;
4628	4500	JLabel sheenLabel;
4629		- NumberSlider sheenField;
	4501	+ cNumberSlider sheenField;
4630	4502	JLabel subsurfaceLabel;
4631		- NumberSlider subsurfaceField;
	4503	+ cNumberSlider subsurfaceField;
4632	4504	//JLabel bumpLabel;
4633	4505	//NumberSlider bumpField;
4634	4506	JLabel backlitLabel;
4635		- NumberSlider backlitField;
	4507	+ cNumberSlider backlitField;
4636	4508	JLabel anisoLabel;
4637		- NumberSlider anisoField;
	4509	+ cNumberSlider anisoField;
4638	4510	JLabel anisoVLabel;
4639		- NumberSlider anisoVField;
	4511	+ cNumberSlider anisoVField;
4640	4512	JLabel cameraLabel;
4641		- NumberSlider cameraField;
	4513	+ cNumberSlider cameraField;
4642	4514	JLabel selfshadowLabel;
4643		- NumberSlider selfshadowField;
	4515	+ cNumberSlider selfshadowField;
4644	4516	JLabel shadowLabel;
4645		- NumberSlider shadowField;
	4517	+ cNumberSlider shadowField;
4646	4518	JLabel textureLabel;
4647		- NumberSlider textureField;
	4519	+ cNumberSlider textureField;
4648	4520	JLabel opacityLabel;
4649		- NumberSlider opacityField;
	4521	+ cNumberSlider opacityField;
4650	4522	JLabel fakedepthLabel;
4651		- NumberSlider fakedepthField;
	4523	+ cNumberSlider fakedepthField;
4652	4524	JLabel shadowbiasLabel;
4653		- NumberSlider shadowbiasField;
	4525	+ cNumberSlider shadowbiasField;
4654	4526	JLabel bumpLabel;
4655		- NumberSlider bumpField;
	4527	+ cNumberSlider bumpField;
4656	4528	JLabel noiseLabel;
4657		- NumberSlider noiseField;
	4529	+ cNumberSlider noiseField;
4658	4530	JLabel powerLabel;
4659		- NumberSlider powerField;
	4531	+ cNumberSlider powerField;
4660	4532	JLabel borderfadeLabel;
4661		- NumberSlider borderfadeField;
	4533	+ cNumberSlider borderfadeField;
4662	4534	JLabel fogLabel;
4663		- NumberSlider fogField;
	4535	+ cNumberSlider fogField;
4664	4536	JLabel opacityPowerLabel;
4665		- NumberSlider opacityPowerField;
	4537	+ cNumberSlider opacityPowerField;
4666	4538	JTree jTree;
4667	4539	//ObjectUI parent;
4668	4540
4669		- NumberSlider normalpushField;
	4541	+ cNumberSlider normalpushField;
4670	4542	}