~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,
..	..	@@ -31,6 +33,9 @@
31	33	boolean timeline;
32	34	boolean wasFullScreen;
33	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
34	39	// SCRIPT
35	40
36	41	transient JFrame textpanel = null;
..	..	@@ -121,14 +126,13 @@
121	126	void keyPressed(int key, int modifiers)
122	127	{
123	128	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
125	130	}
126	131	*/
127	132
128	133	static GridBagConstraints aConstraints;
129	134	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	135	+
132	136	static int GRIDWIDTH = 100; // 4;
133	137
134	138	public void closeUI()
..	..	@@ -309,7 +313,7 @@
309	313	toggleTextureItem.setState(CameraPane.textureon);
310	314	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311	315	toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
	316	+ toggleLiveItem.setState(Globals.isLIVE());
313	317	cameraMenu.add(stepItem = new MenuItem("Step"));
314	318	stepItem.addActionListener(this);
315	319	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -351,9 +355,9 @@
351	355	toolbarPanel.setName("Toolbar");
352	356	treePanel = new JPanel();
353	357	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
	358	+ ctrlPanel = new cGridBag(); // new GridBagLayout());
355	359	ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
	360	+ materialPanel = new cGridBag().setVertical(true);
357	361	materialPanel.setName("Material");
358	362	/JTextPane/
359	363	infoarea = createTextPane();
..	..	@@ -383,7 +387,7 @@
383	387	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384	388	treePanel.setLayout(new GridBagLayout());
385	389	ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	390	+ //materialPanel.setLayout(new GridBagLayout());
387	391
388	392	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	393	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -810,65 +814,47 @@
810	814	return combo;
811	815	}
812	816
813		- 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)
814	818	{
815		- NumberSlider combo;
	819	+ cGridBag control = new cGridBag();
	820	+
	821	+ cNumberSlider combo;
816	822
817	823	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	824	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	825	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	826	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	827	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
	828	+
	829	+ ctrlPanel.add(control);
	830	+
836	831	return combo;
837	832	}
838	833
839		- 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)
840	835	{
841		- NumberSlider combo;
	836	+ cGridBag control = new cGridBag();
	837	+
	838	+ cNumberSlider combo;
842	839
843	840	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	841	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	842	+ ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	843	+ ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	844	combo.setInteger(current);
857	845
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
	846	+ ctrlPanel.add(control);
	847	+
862	848	return combo;
863	849	}
864	850
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	851	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	852	{
867	853	JTextArea text;
868	854
869	855	aConstraints.fill = GridBagConstraints.HORIZONTAL;
870	856	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	857	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	858	text.addCaretListener(this);
873	859	aConstraints.gridx += 1;
874	860	aConstraints.gridwidth = 1;
..	..	@@ -898,6 +884,13 @@
898	884	{
899	885	j.removeChangeListener(this);
900	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);
901	894	objEditor.ctrlPanel.remove(j);
902	895	}
903	896
..	..	@@ -1185,7 +1178,8 @@
1185	1178	//JPanel worldPanel =
1186	1179	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1180	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
	1181	+ centralPanel = new cGridBag();
	1182	+ centralPanel.preferredWidth = 20;
1189	1183	timelinePanel = new JPanel(new BorderLayout());
1190	1184	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1185
..	..	@@ -1215,12 +1209,13 @@
1215	1209	//frontView.object = copy;
1216	1210	//sideView.object = copy;
1217	1211
1218		- XYZPanel = new JPanel();
1219		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1212	+ XYZPanel = new cGridBag().setVertical(true);
	1213	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1220	1214
1221		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1222		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1223		- 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);
1224	1219
1225	1220	/*
1226	1221	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1282,16 +1277,23 @@
1282	1277	scrollpane.setWheelScrollingEnabled(true);
1283	1278	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1279
1285		- /JTabbedPane/ scenePanel = new JTabbedPane();
1286		- scenePanel.add(scrollpane);
	1280	+ /JTabbedPane/ scenePanel = new cGridBag();
	1281	+ scenePanel.preferredWidth = 7;
	1282	+
	1283	+ JTabbedPane tabbedPane = new JTabbedPane();
	1284	+ tabbedPane.add(scrollpane);
1287	1285
1288		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1286	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1289	1287
1290		- optionsPanel = new JPanel(new GridBagLayout());
	1288	+ optionsPanel = new cGridBag().setVertical(true);
1291	1289
1292	1290	optionsPanel.setName("Options");
1293		- scenePanel.add(optionsPanel);
1294		-
	1291	+
	1292	+ AddOptions(optionsPanel); //, aConstraints);
	1293	+
	1294	+ tabbedPane.add(optionsPanel);
	1295	+
	1296	+ scenePanel.add(tabbedPane);
1295	1297
1296	1298	/*
1297	1299	cTree jTree = new cTree(null);
..	..	@@ -1325,6 +1327,7 @@
1325	1327	//bigPanel.setSize(new Dimension(10,10));
1326	1328	//bigPanel.add(ctrlPanel);
1327	1329	//bigPanel.add(gridPanel);
	1330	+ /**
1328	1331	bigThree = new JPanel();
1329	1332	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1330	1333	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1348,7 +1351,13 @@
1348	1351	// aConstraints.gridheight = 3;
1349	1352	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1350	1353	bigThree.add(XYZPanel, aWindowConstraints);
	1354	+ /**/
1351	1355
	1356	+ bigThree = new cGridBag();
	1357	+ bigThree.addComponent(scenePanel);
	1358	+ bigThree.addComponent(centralPanel);
	1359	+ bigThree.addComponent(XYZPanel);
	1360	+
1352	1361	// // SIDE EFFECT!!!
1353	1362	// aConstraints.gridx = 0;
1354	1363	// aConstraints.gridy = 0;
..	..	@@ -1369,7 +1378,8 @@
1369	1378	//worldPane.add(bigPanel);
1370	1379	//worldPane.add(worldPanel);
1371	1380	/**/
1372		- frame.getContentPane().add(/"Center",/framePanel);
	1381	+ //frame.getContentPane().add(/"Center",/framePanel);
	1382	+ frame.add(/"Center",/framePanel);
1373	1383	//frame.getContentPane().add(/"Center",/ worldPane);
1374	1384
1375	1385	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1390,6 +1400,10 @@
1390	1400	});
1391	1401	}
1392	1402
	1403	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1404	+ {
	1405	+ }
	1406	+
1393	1407	JTree GetTree()
1394	1408	{
1395	1409	return objEditor.jTree;
..	..	@@ -1401,260 +1415,175 @@
1401	1415	ctrlPanel.removeAll();
1402	1416	}
1403	1417
1404		- void SetupMaterial(JPanel ctrlPanel)
	1418	+ void SetupMaterial(cGridBag ctrlPanel)
1405	1419	{
1406		- aConstraints.weighty = 0;
1407		- //aConstraints.weightx = 1;
1408		- /*
	1420	+ /*
1409	1421	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1410	1422	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1411		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1412		- aConstraints.gridx += 1;
1413	1423	*/
1414	1424
1415		- aConstraints.gridwidth = 1;
1416		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1417		- aConstraints.gridx += 1;
1418		- aConstraints.weighty = 0;
1419		- aConstraints.gridwidth = 1;
	1425	+ cGridBag editBar = new cGridBag().setVertical(false);
	1426	+
	1427	+ editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1420	1428
1421	1429	/*
1422	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1423		- aConstraints.gridx += 1;
1424		- aConstraints.weighty = 0;
1425		- aConstraints.gridwidth = 1;
1426	1431	*/
1427	1432
1428		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1429		- 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);
1430	1437
1431		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1432		-
1433		- aConstraints.gridx += 1;
1434		-
1435		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1436		-
1437		- aConstraints.gridx += 1;
1438		-
1439		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1440		-
1441		- aConstraints.gridx = 0;
1442		- aConstraints.gridy += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	1438	+ ctrlPanel.add(editBar);
	1439	+
1445	1440	/**/
1446	1441	//aConstraints.weighty = 0;
1447	1442	////aConstraints.weightx = 1;
1448	1443	//aConstraints.weighty = 1;
1449	1444	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1450	1445	//aConstraints.gridx += 1;
1451		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1452		- aConstraints.weighty = 0;
1453		- aConstraints.gridx = 0;
1454		- aConstraints.gridy += 1;
1455		- aConstraints.gridwidth = 1;
	1446	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1456	1447
1457		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1458		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1459		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1460		- aConstraints.gridx += 1;
1461		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1462		- //aConstraints.weightx = 0;
1463		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1464		- aConstraints.gridx = 0;
1465		- aConstraints.gridy += 1;
1466		- aConstraints.gridwidth = 1;
	1448	+ JPanel colorPanel = new JPanel(new BorderLayout());
	1449	+ colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
	1450	+
	1451	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1452	+
	1453	+ colorPanel.add(colorSection);
	1454	+
	1455	+ cGridBag color = new cGridBag();
	1456	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1457	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1458	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1459	+ colorSection.add(color);
1467	1460
1468		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1469		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1471		- aConstraints.gridx += 1;
1472		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1473		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	1461	+ cGridBag modulation = new cGridBag();
	1462	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1463	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1464	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1465	+ colorSection.add(modulation);
1477	1466
1478		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1479		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	1467	+ cGridBag texture = new cGridBag();
	1468	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1469	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1470	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1471	+ colorSection.add(texture);
1487	1472
1488		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1489		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	1473	+ cGridBag anisoU = new cGridBag();
	1474	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1475	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1476	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1477	+ colorSection.add(anisoU);
1497	1478
1498		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1499		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	1479	+ cGridBag anisoV = new cGridBag();
	1480	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1481	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1482	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1483	+ colorSection.add(anisoV);
1507	1484
1508		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1509		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	1485	+ cGridBag shadowbias = new cGridBag();
	1486	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1487	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1488	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1489	+ colorSection.add(shadowbias);
1517	1490
1518		- //aConstraints.weighty = 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1520		- //aConstraints.gridx += 1;
1521		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1522		- aConstraints.weighty = 0;
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	1491	+ ctrlPanel.add(colorPanel);
	1492	+
	1493	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1494	+
	1495	+ JPanel diffusePanel = new JPanel(new BorderLayout());
	1496	+ diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
	1497	+
	1498	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1499	+
	1500	+ diffusePanel.add(diffuseSection);
	1501	+
	1502	+ cGridBag diffuse = new cGridBag();
	1503	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1504	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1505	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1506	+ diffuseSection.add(diffuse);
1526	1507
1527		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1528		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1508	+ cGridBag diffuseness = new cGridBag();
	1509	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1510	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1511	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1512	+ diffuseSection.add(diffuseness);
1536	1513
1537		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1538		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	1514	+ cGridBag selfshadow = new cGridBag();
	1515	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1516	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1517	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1518	+ diffuseSection.add(selfshadow);
1546	1519
1547		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1548		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	1520	+ cGridBag sheen = new cGridBag();
	1521	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1522	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1523	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1524	+ diffuseSection.add(sheen);
1556	1525
1557		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1558		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	1526	+ cGridBag subsurface = new cGridBag();
	1527	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1528	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1529	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1530	+ diffuseSection.add(subsurface);
1566	1531
1567		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1568		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	1532	+ cGridBag shadow = new cGridBag();
	1533	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1534	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1535	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1536	+ diffuseSection.add(shadow);
1576	1537
1577		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1578		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	1538	+ cGridBag fakedepth = new cGridBag();
	1539	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1540	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1541	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1542	+ diffuseSection.add(fakedepth);
1586	1543
1587		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1588		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	1544	+ ctrlPanel.add(diffusePanel);
	1545	+
	1546	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1547	+
	1548	+ JPanel specularPanel = new JPanel(new BorderLayout());
	1549	+ specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
	1550	+
	1551	+ cGridBag specularSection = new cGridBag().setVertical(true);
	1552	+
	1553	+ specularPanel.add(specularSection);
1596	1554
1597		- //aConstraints.weighty = 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1599		- //aConstraints.gridx += 1;
1600		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1601		- aConstraints.weighty = 0;
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	1555	+ cGridBag specular = new cGridBag();
	1556	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1557	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1558	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1559	+ specularSection.add(specular);
1605	1560
1606		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1607		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1561	+ cGridBag lightarea = new cGridBag();
	1562	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1563	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1564	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1565	+ specularSection.add(lightarea);
1615	1566
1616		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1617		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	1567	+ cGridBag shininess = new cGridBag();
	1568	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1569	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1570	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1571	+ specularSection.add(shininess);
1625	1572
1626		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1627		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	1573	+ cGridBag metalness = new cGridBag();
	1574	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1575	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1576	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1577	+ specularSection.add(metalness);
1635	1578
1636		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1637		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
	1579	+ cGridBag velvet = new cGridBag();
	1580	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1581	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1582	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1583	+ specularSection.add(velvet);
1645	1584
1646		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1647		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
1655		-
1656		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1657		- Return();
	1585	+ shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1586	+ //Return();
1658	1587	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1659	1588	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660	1589	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1665,130 +1594,97 @@
1665	1594	// aConstraints.gridy += 1;
1666	1595	// aConstraints.gridwidth = 1;
1667	1596
1668		- //aConstraints.weighty = 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1670		- //aConstraints.gridx += 1;
1671		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1672		- aConstraints.weighty = 0;
1673		- aConstraints.gridx = 0;
1674		- aConstraints.gridy += 1;
1675		- aConstraints.gridwidth = 1;
1676	1597
1677		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1678		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1680		- aConstraints.gridx += 1;
1681		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1682		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
	1598	+ ctrlPanel.add(specularPanel);
	1599	+
	1600	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1601	+
	1602	+ JPanel globalPanel = new JPanel(new BorderLayout());
	1603	+ globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
	1604	+
	1605	+ cGridBag globalSection = new cGridBag().setVertical(true);
	1606	+
	1607	+ globalPanel.add(globalSection);
1686	1608
1687		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1688		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
	1609	+ cGridBag camera = new cGridBag();
	1610	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1611	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1612	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1613	+ globalSection.add(camera);
1696	1614
1697		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1698		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
	1615	+ cGridBag ambient = new cGridBag();
	1616	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1617	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1618	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1619	+ globalSection.add(ambient);
1706	1620
1707		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1708		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
1716		- aConstraints.weighty = 0;
	1621	+ cGridBag backlit = new cGridBag();
	1622	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1623	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1624	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1625	+ globalSection.add(backlit);
1717	1626
1718		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1719		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1721		- aConstraints.gridx += 1;
1722		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1723		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1724		- aConstraints.gridx = 0;
1725		- aConstraints.gridy += 1;
1726		- aConstraints.gridwidth = 1;
	1627	+ cGridBag opacity = new cGridBag();
	1628	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1629	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1630	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1631	+ globalSection.add(opacity);
1727	1632
1728		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1729		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	1633	+ ctrlPanel.add(globalPanel);
	1634	+
	1635	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1636	+
	1637	+ JPanel texturePanel = new JPanel(new BorderLayout());
	1638	+ texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
	1639	+
	1640	+ cGridBag textureSection = new cGridBag().setVertical(true);
	1641	+
	1642	+ texturePanel.add(textureSection);
1737	1643
1738		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1739		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	1644	+ cGridBag bump = new cGridBag();
	1645	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1646	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1647	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1648	+ textureSection.add(bump);
1747	1649
1748		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1749		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	1650	+ cGridBag noise = new cGridBag();
	1651	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1652	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1653	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1654	+ textureSection.add(noise);
1757	1655
1758		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1759		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	1656	+ cGridBag power = new cGridBag();
	1657	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1658	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1659	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1660	+ textureSection.add(power);
1767	1661
1768		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1769		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	1662	+ cGridBag borderfade = new cGridBag();
	1663	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1664	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1665	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1666	+ textureSection.add(borderfade);
1777	1667
1778		- //aConstraints.weighty = 1;
1779		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1780		- //aConstraints.gridx += 1;
1781		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1782		- aConstraints.weighty = 0;
	1668	+ cGridBag fog = new cGridBag();
	1669	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1670	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1671	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1672	+ textureSection.add(fog);
1783	1673
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy = 0;
1786		- aConstraints.gridwidth = 1;
	1674	+ cGridBag opacityPower = new cGridBag();
	1675	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1676	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1677	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1678	+ textureSection.add(opacityPower);
	1679	+
	1680	+ ctrlPanel.add(texturePanel);
	1681	+
	1682	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1787	1683
1788	1684	SetMaterial(copy); // .GetMaterial());
1789	1685
1790		- colorField.addChangeListener(this);
1791		- modulationField.addChangeListener(this);
	1686	+ //colorField.addChangeListener(this);
	1687	+// modulationField.addChangeListener(this);
1792	1688	metalnessField.addChangeListener(this);
1793	1689	diffuseField.addChangeListener(this);
1794	1690	specularField.addChangeListener(this);
..	..	@@ -3136,7 +3032,8 @@
3136	3032	objEditor.refreshContents();
3137	3033	} else if (event.getSource() == stepItem)
3138	3034	{
3139		- cameraView.ONESTEP = true;
	3035	+ //cameraView.ONESTEP = true;
	3036	+ Globals.ONESTEP = true;
3140	3037	cameraView.repaint();
3141	3038	return;
3142	3039	} else if (event.getSource() == stepButton)
..	..	@@ -3293,25 +3190,25 @@
3293	3190
3294	3191	void ToggleAnimation()
3295	3192	{
3296		- if (!CameraPane.ANIMATION)
	3193	+ if (!Globals.ANIMATION)
3297	3194	{
3298	3195	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3299	3196	browser.show();
3300	3197	String filename = browser.getFile();
3301	3198	if (filename != null && filename.length() > 0)
3302	3199	{
3303		- CameraPane.filename = browser.getDirectory() + filename;
	3200	+ Globals.filename = browser.getDirectory() + filename;
3304	3201	//CameraPane.framecount = 0;
3305		- CameraPane.imagecount = 0;
	3202	+ Globals.imagecount = 0;
3306	3203
3307		- CameraPane.ANIMATION ^= true;
	3204	+ Globals.ANIMATION ^= true;
3308	3205
3309	3206	GrafreeD.wav.cursor = 0;
3310	3207	GrafreeD.wav.loop = 0;
3311	3208	}
3312	3209	} else
3313	3210	{
3314		- CameraPane.ANIMATION ^= true;
	3211	+ Globals.ANIMATION ^= true;
3315	3212	}
3316	3213	}
3317	3214
..	..	@@ -3490,7 +3387,7 @@
3490	3387	current.fakedepth = (float) fakedepthField.getFloat();
3491	3388	current.shadowbias = (float) shadowbiasField.getFloat();
3492	3389
3493		- if (!NumberSlider.frozen)
	3390	+ if (!cNumberSlider.frozen)
3494	3391	{
3495	3392	//System.out.println("Propagate = " + propagate);
3496	3393	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3863,7 +3760,7 @@
3863	3760
3864	3761	radioPanel.revalidate();
3865	3762	radioPanel.repaint();
3866		- ctrlPanel.revalidate(); // ? new
	3763	+ ctrlPanel.validate(); // ? new
3867	3764	ctrlPanel.repaint();
3868	3765	}
3869	3766	}
..	..	@@ -4530,17 +4427,17 @@
4530	4427	JPanel treePanel;
4531	4428	JPanel radioPanel;
4532	4429	ButtonGroup buttonGroup;
4533		- JPanel ctrlPanel;
4534		- JPanel materialPanel;
	4430	+ cGridBag ctrlPanel;
	4431	+ cGridBag materialPanel;
4535	4432	JScrollPane infoPanel;
4536		- JPanel optionsPanel;
	4433	+ cGridBag optionsPanel;
4537	4434	JTabbedPane objectPanel;
4538		- JPanel XYZPanel;
	4435	+ cGridBag XYZPanel;
4539	4436	JSplitPane gridPanel;
4540	4437	JSplitPane bigPanel;
4541		- JPanel bigThree;
4542		- JTabbedPane scenePanel;
4543		- JPanel centralPanel;
	4438	+ cGridBag bigThree;
	4439	+ cGridBag scenePanel;
	4440	+ cGridBag centralPanel;
4544	4441	JSplitPane cameraPanel;
4545	4442	JPanel timelinePanel;
4546	4443	JMenuBar timelineMenubar;
..	..	@@ -4593,67 +4490,67 @@
4593	4490	// MATERIAL
4594	4491	JLabel materialLabel;
4595	4492	JLabel colorLabel;
4596		- NumberSlider colorField;
	4493	+ cNumberSlider colorField;
4597	4494	JLabel modulationLabel;
4598		- NumberSlider modulationField;
	4495	+ cNumberSlider modulationField;
4599	4496	JLabel metalnessLabel;
4600		- NumberSlider metalnessField;
	4497	+ cNumberSlider metalnessField;
4601	4498	JLabel diffuseLabel;
4602		- NumberSlider diffuseField;
	4499	+ cNumberSlider diffuseField;
4603	4500	JLabel specularLabel;
4604		- NumberSlider specularField;
	4501	+ cNumberSlider specularField;
4605	4502	JLabel shininessLabel;
4606		- NumberSlider shininessField;
	4503	+ cNumberSlider shininessField;
4607	4504	JLabel shiftLabel;
4608		- NumberSlider shiftField;
	4505	+ cNumberSlider shiftField;
4609	4506	JLabel ambientLabel;
4610		- NumberSlider ambientField;
	4507	+ cNumberSlider ambientField;
4611	4508	JLabel lightareaLabel;
4612		- NumberSlider lightareaField;
	4509	+ cNumberSlider lightareaField;
4613	4510	JLabel diffusenessLabel;
4614		- NumberSlider diffusenessField;
	4511	+ cNumberSlider diffusenessField;
4615	4512	JLabel velvetLabel;
4616		- NumberSlider velvetField;
	4513	+ cNumberSlider velvetField;
4617	4514	JLabel sheenLabel;
4618		- NumberSlider sheenField;
	4515	+ cNumberSlider sheenField;
4619	4516	JLabel subsurfaceLabel;
4620		- NumberSlider subsurfaceField;
	4517	+ cNumberSlider subsurfaceField;
4621	4518	//JLabel bumpLabel;
4622	4519	//NumberSlider bumpField;
4623	4520	JLabel backlitLabel;
4624		- NumberSlider backlitField;
	4521	+ cNumberSlider backlitField;
4625	4522	JLabel anisoLabel;
4626		- NumberSlider anisoField;
	4523	+ cNumberSlider anisoField;
4627	4524	JLabel anisoVLabel;
4628		- NumberSlider anisoVField;
	4525	+ cNumberSlider anisoVField;
4629	4526	JLabel cameraLabel;
4630		- NumberSlider cameraField;
	4527	+ cNumberSlider cameraField;
4631	4528	JLabel selfshadowLabel;
4632		- NumberSlider selfshadowField;
	4529	+ cNumberSlider selfshadowField;
4633	4530	JLabel shadowLabel;
4634		- NumberSlider shadowField;
	4531	+ cNumberSlider shadowField;
4635	4532	JLabel textureLabel;
4636		- NumberSlider textureField;
	4533	+ cNumberSlider textureField;
4637	4534	JLabel opacityLabel;
4638		- NumberSlider opacityField;
	4535	+ cNumberSlider opacityField;
4639	4536	JLabel fakedepthLabel;
4640		- NumberSlider fakedepthField;
	4537	+ cNumberSlider fakedepthField;
4641	4538	JLabel shadowbiasLabel;
4642		- NumberSlider shadowbiasField;
	4539	+ cNumberSlider shadowbiasField;
4643	4540	JLabel bumpLabel;
4644		- NumberSlider bumpField;
	4541	+ cNumberSlider bumpField;
4645	4542	JLabel noiseLabel;
4646		- NumberSlider noiseField;
	4543	+ cNumberSlider noiseField;
4647	4544	JLabel powerLabel;
4648		- NumberSlider powerField;
	4545	+ cNumberSlider powerField;
4649	4546	JLabel borderfadeLabel;
4650		- NumberSlider borderfadeField;
	4547	+ cNumberSlider borderfadeField;
4651	4548	JLabel fogLabel;
4652		- NumberSlider fogField;
	4549	+ cNumberSlider fogField;
4653	4550	JLabel opacityPowerLabel;
4654		- NumberSlider opacityPowerField;
	4551	+ cNumberSlider opacityPowerField;
4655	4552	JTree jTree;
4656	4553	//ObjectUI parent;
4657	4554
4658		- NumberSlider normalpushField;
	4555	+ cNumberSlider normalpushField;
4659	4556	}