~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,
..	..	@@ -28,7 +30,12 @@
28	30	iSendInfo
29	31	//KeyListener
30	32	{
	33	+ boolean timeline;
	34	+ boolean wasFullScreen;
31	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
32	39	// SCRIPT
33	40
34	41	transient JFrame textpanel = null;
..	..	@@ -119,14 +126,13 @@
119	126	void keyPressed(int key, int modifiers)
120	127	{
121	128	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
123	130	}
124	131	*/
125	132
126	133	static GridBagConstraints aConstraints;
127	134	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	135	+
130	136	static int GRIDWIDTH = 100; // 4;
131	137
132	138	public void closeUI()
..	..	@@ -158,12 +164,16 @@
158	164	objEditor.ctrlPanel.remove(slowerButton);
159	165	objEditor.ctrlPanel.remove(fasterButton);
160	166	objEditor.ctrlPanel.remove(remarkButton);
	167	+
	168	+ Remove(normalpushField);
161	169	}
162	170
163	171	public ObjEditor GetEditor()
164	172	{
165	173	return objEditor; //.GetEditor();
166	174	}
	175	+
	176	+ // Sometimes myself, sometimes my callee's.
167	177	ObjEditor objEditor;
168	178
169	179	/*
..	..	@@ -238,7 +248,7 @@
238	248	//if (!isDisplayable())
239	249	//setUndecorated(true);
240	250
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	251	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	252	client = inClient;
243	253	copy = localCopy;
244	254	copy.editWindow = this;
..	..	@@ -292,16 +302,18 @@
292	302	//normalLensItem.addActionListener(this);
293	303	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	304	revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
	305	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	306	+ toggleTimelineItem.addItemListener(this);
	307	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	308	+ toggleFullScreenItem.addItemListener(this);
	309	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298	310	cameraMenu.add("-");
299	311	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300	312	toggleTextureItem.addItemListener(this);
301	313	toggleTextureItem.setState(CameraPane.textureon);
302	314	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303	315	toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
	316	+ toggleLiveItem.setState(Globals.isLIVE());
305	317	cameraMenu.add(stepItem = new MenuItem("Step"));
306	318	stepItem.addActionListener(this);
307	319	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -343,9 +355,9 @@
343	355	toolbarPanel.setName("Toolbar");
344	356	treePanel = new JPanel();
345	357	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	358	+ ctrlPanel = new cGridBag(); // new GridBagLayout());
347	359	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	360	+ materialPanel = new cGridBag().setVertical(true);
349	361	materialPanel.setName("Material");
350	362	/JTextPane/
351	363	infoarea = createTextPane();
..	..	@@ -375,7 +387,7 @@
375	387	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376	388	treePanel.setLayout(new GridBagLayout());
377	389	ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	390	+ //materialPanel.setLayout(new GridBagLayout());
379	391
380	392	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	393	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -594,6 +606,22 @@
594	606	}
595	607	}
596	608
	609	+ void ToggleFullScreen()
	610	+ {
	611	+ if (CameraPane.FULLSCREEN)
	612	+ {
	613	+ frame.getContentPane().remove(/"Center",/bigThree);
	614	+ framePanel.add(bigThree);
	615	+ frame.getContentPane().add(/"Center",/framePanel);
	616	+ } else
	617	+ {
	618	+ frame.getContentPane().remove(/"Center",/framePanel);
	619	+ framePanel.remove(bigThree);
	620	+ frame.getContentPane().add(/"Center",/bigThree);
	621	+ }
	622	+ cameraView.ToggleFullScreen();
	623	+ }
	624	+
597	625	private JTextArea createTextPane()
598	626	{
599	627	String[] initString =
..	..	@@ -786,65 +814,47 @@
786	814	return combo;
787	815	}
788	816
789		- 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)
790	818	{
791		- NumberSlider combo;
	819	+ cGridBag control = new cGridBag();
	820	+
	821	+ cNumberSlider combo;
792	822
793	823	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	824	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	825	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	826	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	827	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
	828	+
	829	+ ctrlPanel.add(control);
	830	+
812	831	return combo;
813	832	}
814	833
815		- 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)
816	835	{
817		- NumberSlider combo;
	836	+ cGridBag control = new cGridBag();
	837	+
	838	+ cNumberSlider combo;
818	839
819	840	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	841	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
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), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	842	+ ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	843	+ ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	844	combo.setInteger(current);
833	845
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
	846	+ ctrlPanel.add(control);
	847	+
838	848	return combo;
839	849	}
840	850
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	851	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	852	{
843	853	JTextArea text;
844	854
845	855	aConstraints.fill = GridBagConstraints.HORIZONTAL;
846	856	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	857	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	858	text.addCaretListener(this);
849	859	aConstraints.gridx += 1;
850	860	aConstraints.gridwidth = 1;
..	..	@@ -874,6 +884,13 @@
874	884	{
875	885	j.removeChangeListener(this);
876	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);
877	894	objEditor.ctrlPanel.remove(j);
878	895	}
879	896
..	..	@@ -961,8 +978,11 @@
961	978	fasterButton = AddButton(oe, "Fast");
962	979	remarkButton = AddButton(oe, "Rem");
963	980
964		- Return();
	981	+ //Return();
965	982
	983	+ //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	984	+ //Return();
	985	+
966	986	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	987	// ObjEditor.aConstraints.gridx += 1;
968	988
..	..	@@ -1158,10 +1178,22 @@
1158	1178	//JPanel worldPanel =
1159	1179	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1180	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1181	+ centralPanel = new cGridBag();
	1182	+ centralPanel.preferredWidth = 20;
	1183	+ timelinePanel = new JPanel(new BorderLayout());
	1184	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1185
	1186	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1187	+ cameraPanel.setContinuousLayout(true);
	1188	+ cameraPanel.setOneTouchExpandable(true);
	1189	+// cameraPanel.setDividerLocation(0.9);
	1190	+// cameraPanel.setDividerSize(9);
	1191	+ cameraPanel.setResizeWeight(1.0);
	1192	+
	1193	+ centralPanel.add(cameraView);
	1194	+ //frame.setJMenuBar(timelineMenubar);
	1195	+ //centralPanel.add(timelinePanel);
	1196	+
1165	1197	//topView.camera = ;
1166	1198	//frontView.camera = new Camera(2);
1167	1199	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1209,13 @@
1177	1209	//frontView.object = copy;
1178	1210	//sideView.object = copy;
1179	1211
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1212	+ XYZPanel = new cGridBag().setVertical(true);
	1213	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1214
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- 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);
1186	1219
1187	1220	/*
1188	1221	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1224,7 @@
1191	1224	gridPanel.add(cameraView);
1192	1225	gridPanel.add(XYZPanel);
1193	1226	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1227	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1228	gridPanel.setContinuousLayout(true);
1196	1229	gridPanel.setOneTouchExpandable(true);
1197	1230	gridPanel.setDividerLocation(1.0);
..	..	@@ -1244,16 +1277,23 @@
1244	1277	scrollpane.setWheelScrollingEnabled(true);
1245	1278	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1279
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1280	+ /JTabbedPane/ scenePanel = new cGridBag();
	1281	+ scenePanel.preferredWidth = 7;
	1282	+
	1283	+ JTabbedPane tabbedPane = new JTabbedPane();
	1284	+ tabbedPane.add(scrollpane);
1249	1285
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1286	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1287
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1288	+ optionsPanel = new cGridBag().setVertical(true);
1253	1289
1254	1290	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1291	+
	1292	+ AddOptions(optionsPanel); //, aConstraints);
	1293	+
	1294	+ tabbedPane.add(optionsPanel);
	1295	+
	1296	+ scenePanel.add(tabbedPane);
1257	1297
1258	1298	/*
1259	1299	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1315,7 @@
1275	1315	jtp.add(tree);
1276	1316	*/
1277	1317
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1318	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1319	bigPanel.setContinuousLayout(true);
1280	1320	bigPanel.setOneTouchExpandable(true);
1281	1321	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1327,7 @@
1287	1327	//bigPanel.setSize(new Dimension(10,10));
1288	1328	//bigPanel.add(ctrlPanel);
1289	1329	//bigPanel.add(gridPanel);
	1330	+ /**
1290	1331	bigThree = new JPanel();
1291	1332	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1333	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1338,26 @@
1297	1338	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1339	aWindowConstraints.weightx = 0;
1299	1340	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1341	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1342	aWindowConstraints.weightx = 1;
1302	1343	aWindowConstraints.gridwidth = 3;
1303	1344	// aConstraints.gridheight = 3;
1304	1345	aWindowConstraints.gridx = 1;
1305	1346	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1347	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1348	aWindowConstraints.weightx = 0;
1308	1349	aWindowConstraints.gridx = 4;
1309	1350	aWindowConstraints.gridwidth = 1;
1310	1351	// aConstraints.gridheight = 3;
1311	1352	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1353	bigThree.add(XYZPanel, aWindowConstraints);
	1354	+ /**/
1313	1355
	1356	+ bigThree = new cGridBag();
	1357	+ bigThree.addComponent(scenePanel);
	1358	+ bigThree.addComponent(centralPanel);
	1359	+ bigThree.addComponent(XYZPanel);
	1360	+
1314	1361	// // SIDE EFFECT!!!
1315	1362	// aConstraints.gridx = 0;
1316	1363	// aConstraints.gridy = 0;
..	..	@@ -1331,7 +1378,8 @@
1331	1378	//worldPane.add(bigPanel);
1332	1379	//worldPane.add(worldPanel);
1333	1380	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1381	+ //frame.getContentPane().add(/"Center",/framePanel);
	1382	+ frame.add(/"Center",/framePanel);
1335	1383	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1384
1337	1385	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1352,6 +1400,10 @@
1352	1400	});
1353	1401	}
1354	1402
	1403	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1404	+ {
	1405	+ }
	1406	+
1355	1407	JTree GetTree()
1356	1408	{
1357	1409	return objEditor.jTree;
..	..	@@ -1363,260 +1415,165 @@
1363	1415	ctrlPanel.removeAll();
1364	1416	}
1365	1417
1366		- void SetupMaterial(JPanel ctrlPanel)
	1418	+ void SetupMaterial(cGridBag ctrlPanel)
1367	1419	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1420	+ /*
1371	1421	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1422	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1423	*/
1376	1424
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1425	+ cGridBag editBar = new cGridBag().setVertical(false);
	1426	+
	1427	+ editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1382	1428
1383	1429	/*
1384	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1431	*/
1389	1432
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- 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);
1392	1437
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1438	+ ctrlPanel.add(editBar);
	1439	+
1407	1440	/**/
1408	1441	//aConstraints.weighty = 0;
1409	1442	////aConstraints.weightx = 1;
1410	1443	//aConstraints.weighty = 1;
1411	1444	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1445	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1446	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1447
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- 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);
1429	1456
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- 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);
1439	1462
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- 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);
1449	1468
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- 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);
1459	1474
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- 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);
1469	1480
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- 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);
1479	1486
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- 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);
1488	1500
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- 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);
1498	1506
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- 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);
1508	1512
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- 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);
1518	1518
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- 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);
1528	1524
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- 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);
1538	1530
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- 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);
1548	1536
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- 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);
1558	1544
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- 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);
1567	1550
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- 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);
1577	1556
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- 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);
1587	1562
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- 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);
1597	1568
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- 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);
1607	1574
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1575	+ shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1576	+ //Return();
1620	1577	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1578	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1579	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1584,93 @@
1627	1584	// aConstraints.gridy += 1;
1628	1585	// aConstraints.gridwidth = 1;
1629	1586
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638	1587
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- 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);
1648	1595
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- 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);
1658	1601
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- 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);
1668	1607
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- 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);
1679	1613
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- 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);
1689	1619
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- 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);
1699	1627
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- 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);
1709	1633
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- 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);
1719	1639
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- 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);
1729	1645
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- 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);
1739	1651
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- 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);
1745	1657
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- 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);
1749	1669
1750	1670	SetMaterial(copy); // .GetMaterial());
1751	1671
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1672	+ //colorField.addChangeListener(this);
	1673	+// modulationField.addChangeListener(this);
1754	1674	metalnessField.addChangeListener(this);
1755	1675	diffuseField.addChangeListener(this);
1756	1676	specularField.addChangeListener(this);
..	..	@@ -2194,6 +2114,8 @@
2194	2114	{
2195	2115	Mocap sel = (Mocap) copy.selection.get(0);
2196	2116
	2117	+ sel.SetCurrentBones(sel.frame);
	2118	+
2197	2119	sel.fullname = fullname;
2198	2120
2199	2121	if (changename)
..	..	@@ -2245,6 +2167,8 @@
2245	2167	{
2246	2168	Mocap sel = (Mocap) select;
2247	2169
	2170	+ sel.SetCurrentBones(sel.frame);
	2171	+
2248	2172	File file = new File(fullname);
2249	2173
2250	2174	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2954,20 +2878,37 @@
2954	2878	// june 2013 copy.HardTouch();
2955	2879	cameraView.repaint();
2956	2880	return;
2957		- } else if (event.getSource() == toggleFullItem)
	2881	+ } else if (event.getSource() == toggleTimelineItem)
2958	2882	{
2959		- if (CameraPane.FULLSCREEN)
	2883	+ timeline ^= true;
	2884	+
	2885	+ if (timeline)
2960	2886	{
2961		- frame.getContentPane().remove(/"Center",/bigThree);
2962		- framePanel.add(bigThree);
2963		- frame.getContentPane().add(/"Center",/framePanel);
2964		- } else
2965		- {
2966		- frame.getContentPane().remove(/"Center",/framePanel);
2967		- frame.getContentPane().add(/"Center",/bigThree);
	2887	+ centralPanel.remove(cameraView);
	2888	+ cameraPanel.add(cameraView);
	2889	+ centralPanel.add(cameraPanel);
	2890	+ frame.setJMenuBar(timelineMenubar);
	2891	+ wasFullScreen = CameraPane.FULLSCREEN;
	2892	+ if (!CameraPane.FULLSCREEN)
	2893	+ ToggleFullScreen();
	2894	+ toggleFullScreenItem.setEnabled(false);
2968	2895	}
	2896	+ else
	2897	+ {
	2898	+ centralPanel.remove(cameraPanel);
	2899	+ centralPanel.add(cameraView);
	2900	+ frame.setJMenuBar(null);
	2901	+ if (!wasFullScreen)
	2902	+ ToggleFullScreen();
	2903	+ toggleFullScreenItem.setEnabled(true);
	2904	+ }
	2905	+
2969	2906	frame.validate();
2970		- cameraView.ToggleFullScreen();
	2907	+ return;
	2908	+ } else if (event.getSource() == toggleFullScreenItem)
	2909	+ {
	2910	+ ToggleFullScreen();
	2911	+ frame.validate();
2971	2912
2972	2913	return;
2973	2914	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3077,7 +3018,8 @@
3077	3018	objEditor.refreshContents();
3078	3019	} else if (event.getSource() == stepItem)
3079	3020	{
3080		- cameraView.ONESTEP = true;
	3021	+ //cameraView.ONESTEP = true;
	3022	+ Globals.ONESTEP = true;
3081	3023	cameraView.repaint();
3082	3024	return;
3083	3025	} else if (event.getSource() == stepButton)
..	..	@@ -3216,9 +3158,9 @@
3216	3158	cameraView.RevertCamera();
3217	3159	cameraView.repaint();
3218	3160	return;
3219		- } else if (event.getSource() == textureButton)
3220		- {
3221		- return; // true;
	3161	+// } else if (event.getSource() == textureButton)
	3162	+// {
	3163	+// return; // true;
3222	3164	} else // combos...
3223	3165	if (event.getSource() == texresMenu)
3224	3166	{
..	..	@@ -3234,25 +3176,25 @@
3234	3176
3235	3177	void ToggleAnimation()
3236	3178	{
3237		- if (!CameraPane.ANIMATION)
	3179	+ if (!Globals.ANIMATION)
3238	3180	{
3239	3181	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3240	3182	browser.show();
3241	3183	String filename = browser.getFile();
3242	3184	if (filename != null && filename.length() > 0)
3243	3185	{
3244		- CameraPane.filename = browser.getDirectory() + filename;
	3186	+ Globals.filename = browser.getDirectory() + filename;
3245	3187	//CameraPane.framecount = 0;
3246		- CameraPane.imagecount = 0;
	3188	+ Globals.imagecount = 0;
3247	3189
3248		- CameraPane.ANIMATION ^= true;
	3190	+ Globals.ANIMATION ^= true;
3249	3191
3250	3192	GrafreeD.wav.cursor = 0;
3251	3193	GrafreeD.wav.loop = 0;
3252	3194	}
3253	3195	} else
3254	3196	{
3255		- CameraPane.ANIMATION ^= true;
	3197	+ Globals.ANIMATION ^= true;
3256	3198	}
3257	3199	}
3258	3200
..	..	@@ -3431,7 +3373,7 @@
3431	3373	current.fakedepth = (float) fakedepthField.getFloat();
3432	3374	current.shadowbias = (float) shadowbiasField.getFloat();
3433	3375
3434		- if (!NumberSlider.frozen)
	3376	+ if (!cNumberSlider.frozen)
3435	3377	{
3436	3378	//System.out.println("Propagate = " + propagate);
3437	3379	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3505,7 +3447,13 @@
3505	3447	//System.out.println("PARENT = " + parent);
3506	3448	//if (parent != null)
3507	3449	// parent.applySelf();
3508		- refreshContents();
	3450	+ if (e.getSource() == normalpushField)
	3451	+ {
	3452	+ objEditor.refreshContents();
	3453	+ //Refresh();
	3454	+ }
	3455	+ else
	3456	+ refreshContents();
3509	3457	// ??? client.refreshEditWindow();
3510	3458	}
3511	3459	//else
..	..	@@ -3517,7 +3465,7 @@
3517	3465	//group.name = nameField.getText();
3518	3466	//objEditor.applySelf();
3519	3467
3520		- assert (objEditor == this);
	3468	+ // OCT2018: assert (objEditor == this);
3521	3469	if (copy.selection == null \|\| copy.selection.size() == 0)
3522	3470	//super.applySelf()
3523	3471	; else
..	..	@@ -3541,12 +3489,18 @@
3541	3489	objEditor.copy = keep;
3542	3490	}
3543	3491	}
	3492	+
	3493	+ if (normalpushField != null)
	3494	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3544	3495	}
3545	3496
3546	3497	void SnapObject()
3547	3498	{
3548		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3549		- SnapObject(obj);
	3499	+ if (copy.selection.size() > 0)
	3500	+ {
	3501	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3502	+ SnapObject(obj);
	3503	+ }
3550	3504	}
3551	3505
3552	3506	void SnapObject(Object3D obj)
..	..	@@ -3660,7 +3614,7 @@
3660	3614
3661	3615	if (obj.parent != null)
3662	3616	{
3663		- obj.parent.TransformToWorld(interest);
	3617	+// obj.parent.TransformToWorld(interest);
3664	3618	}
3665	3619
3666	3620	if (!CameraPane.TRACK)
..	..	@@ -3792,7 +3746,7 @@
3792	3746
3793	3747	radioPanel.revalidate();
3794	3748	radioPanel.repaint();
3795		- ctrlPanel.revalidate(); // ? new
	3749	+ ctrlPanel.validate(); // ? new
3796	3750	ctrlPanel.repaint();
3797	3751	}
3798	3752	}
..	..	@@ -4440,7 +4394,8 @@
4440	4394	MenuItem revertCameraItem;
4441	4395	CheckboxMenuItem toggleLiveItem;
4442	4396	MenuItem stepItem;
4443		- CheckboxMenuItem toggleFullItem;
	4397	+ CheckboxMenuItem toggleFullScreenItem;
	4398	+ CheckboxMenuItem toggleTimelineItem;
4444	4399	CheckboxMenuItem toggleRenderItem;
4445	4400	CheckboxMenuItem toggleDebugItem;
4446	4401	CheckboxMenuItem toggleFrustumItem;
..	..	@@ -4458,20 +4413,23 @@
4458	4413	JPanel treePanel;
4459	4414	JPanel radioPanel;
4460	4415	ButtonGroup buttonGroup;
4461		- JPanel ctrlPanel;
4462		- JPanel materialPanel;
	4416	+ cGridBag ctrlPanel;
	4417	+ cGridBag materialPanel;
4463	4418	JScrollPane infoPanel;
4464		- JPanel optionsPanel;
	4419	+ cGridBag optionsPanel;
4465	4420	JTabbedPane objectPanel;
4466		- JPanel XYZPanel;
	4421	+ cGridBag XYZPanel;
4467	4422	JSplitPane gridPanel;
4468	4423	JSplitPane bigPanel;
4469		- JPanel bigThree;
4470		- JTabbedPane jtp;
4471		- JPanel cameraPanel;
	4424	+ cGridBag bigThree;
	4425	+ cGridBag scenePanel;
	4426	+ cGridBag centralPanel;
	4427	+ JSplitPane cameraPanel;
	4428	+ JPanel timelinePanel;
	4429	+ JMenuBar timelineMenubar;
4472	4430	JSplitPane framePanel;
4473	4431	JTextArea/Field/ nameField;
4474		- cButton textureButton;
	4432	+ //cButton textureButton;
4475	4433	cButton okButton;
4476	4434	cButton applyButton;
4477	4435	cButton cancelButton;
..	..	@@ -4518,65 +4476,67 @@
4518	4476	// MATERIAL
4519	4477	JLabel materialLabel;
4520	4478	JLabel colorLabel;
4521		- NumberSlider colorField;
	4479	+ cNumberSlider colorField;
4522	4480	JLabel modulationLabel;
4523		- NumberSlider modulationField;
	4481	+ cNumberSlider modulationField;
4524	4482	JLabel metalnessLabel;
4525		- NumberSlider metalnessField;
	4483	+ cNumberSlider metalnessField;
4526	4484	JLabel diffuseLabel;
4527		- NumberSlider diffuseField;
	4485	+ cNumberSlider diffuseField;
4528	4486	JLabel specularLabel;
4529		- NumberSlider specularField;
	4487	+ cNumberSlider specularField;
4530	4488	JLabel shininessLabel;
4531		- NumberSlider shininessField;
	4489	+ cNumberSlider shininessField;
4532	4490	JLabel shiftLabel;
4533		- NumberSlider shiftField;
	4491	+ cNumberSlider shiftField;
4534	4492	JLabel ambientLabel;
4535		- NumberSlider ambientField;
	4493	+ cNumberSlider ambientField;
4536	4494	JLabel lightareaLabel;
4537		- NumberSlider lightareaField;
	4495	+ cNumberSlider lightareaField;
4538	4496	JLabel diffusenessLabel;
4539		- NumberSlider diffusenessField;
	4497	+ cNumberSlider diffusenessField;
4540	4498	JLabel velvetLabel;
4541		- NumberSlider velvetField;
	4499	+ cNumberSlider velvetField;
4542	4500	JLabel sheenLabel;
4543		- NumberSlider sheenField;
	4501	+ cNumberSlider sheenField;
4544	4502	JLabel subsurfaceLabel;
4545		- NumberSlider subsurfaceField;
	4503	+ cNumberSlider subsurfaceField;
4546	4504	//JLabel bumpLabel;
4547	4505	//NumberSlider bumpField;
4548	4506	JLabel backlitLabel;
4549		- NumberSlider backlitField;
	4507	+ cNumberSlider backlitField;
4550	4508	JLabel anisoLabel;
4551		- NumberSlider anisoField;
	4509	+ cNumberSlider anisoField;
4552	4510	JLabel anisoVLabel;
4553		- NumberSlider anisoVField;
	4511	+ cNumberSlider anisoVField;
4554	4512	JLabel cameraLabel;
4555		- NumberSlider cameraField;
	4513	+ cNumberSlider cameraField;
4556	4514	JLabel selfshadowLabel;
4557		- NumberSlider selfshadowField;
	4515	+ cNumberSlider selfshadowField;
4558	4516	JLabel shadowLabel;
4559		- NumberSlider shadowField;
	4517	+ cNumberSlider shadowField;
4560	4518	JLabel textureLabel;
4561		- NumberSlider textureField;
	4519	+ cNumberSlider textureField;
4562	4520	JLabel opacityLabel;
4563		- NumberSlider opacityField;
	4521	+ cNumberSlider opacityField;
4564	4522	JLabel fakedepthLabel;
4565		- NumberSlider fakedepthField;
	4523	+ cNumberSlider fakedepthField;
4566	4524	JLabel shadowbiasLabel;
4567		- NumberSlider shadowbiasField;
	4525	+ cNumberSlider shadowbiasField;
4568	4526	JLabel bumpLabel;
4569		- NumberSlider bumpField;
	4527	+ cNumberSlider bumpField;
4570	4528	JLabel noiseLabel;
4571		- NumberSlider noiseField;
	4529	+ cNumberSlider noiseField;
4572	4530	JLabel powerLabel;
4573		- NumberSlider powerField;
	4531	+ cNumberSlider powerField;
4574	4532	JLabel borderfadeLabel;
4575		- NumberSlider borderfadeField;
	4533	+ cNumberSlider borderfadeField;
4576	4534	JLabel fogLabel;
4577		- NumberSlider fogField;
	4535	+ cNumberSlider fogField;
4578	4536	JLabel opacityPowerLabel;
4579		- NumberSlider opacityPowerField;
	4537	+ cNumberSlider opacityPowerField;
4580	4538	JTree jTree;
4581	4539	//ObjectUI parent;
	4540	+
	4541	+ cNumberSlider normalpushField;
4582	4542	}