~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"));
..	..	@@ -522,18 +534,18 @@
522	534	maxima.y = sel.toParent[3][1];
523	535	maxima.z = sel.toParent[3][2];
524	536	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	537	maxima.x = sel.toParent[0][0];
531	538	maxima.y = sel.toParent[1][1];
532	539	maxima.z = sel.toParent[2][2];
533	540	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	541	+ maxima.x = sel.globalTransform[3][0];
	542	+ maxima.y = sel.globalTransform[3][1];
	543	+ maxima.z = sel.globalTransform[3][2];
	544	+ if (full)
	545	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	546	+ maxima.x = sel.globalTransform[0][0];
	547	+ maxima.y = sel.globalTransform[1][1];
	548	+ maxima.z = sel.globalTransform[2][2];
537	549	if (full)
538	550	si.SendInfo(" Global Scale: " + maxima, "regular");
539	551	}
..	..	@@ -593,6 +605,22 @@
593	605	System.err.println("Couldn't insert initial text into text pane.");
594	606	}
595	607	}
	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	+ }
596	624
597	625	private JTextArea createTextPane()
598	626	{
..	..	@@ -794,7 +822,7 @@
794	822
795	823	aConstraints.fill = GridBagConstraints.VERTICAL;
796	824	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
	825	+ aConstraints.gridwidth = 1;
798	826	ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799	827	aConstraints.gridx += 1;
800	828	aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -963,6 +991,9 @@
963	991
964	992	Return();
965	993
	994	+ normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	995	+ Return();
	996	+
966	997	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	998	// ObjEditor.aConstraints.gridx += 1;
968	999
..	..	@@ -1158,10 +1189,22 @@
1158	1189	//JPanel worldPanel =
1159	1190	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1191	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1192	+ centralPanel = new cGridBag();
	1193	+ centralPanel.preferredWidth = 20;
	1194	+ timelinePanel = new JPanel(new BorderLayout());
	1195	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1196
	1197	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1198	+ cameraPanel.setContinuousLayout(true);
	1199	+ cameraPanel.setOneTouchExpandable(true);
	1200	+// cameraPanel.setDividerLocation(0.9);
	1201	+// cameraPanel.setDividerSize(9);
	1202	+ cameraPanel.setResizeWeight(1.0);
	1203	+
	1204	+ centralPanel.add(cameraView);
	1205	+ //frame.setJMenuBar(timelineMenubar);
	1206	+ //centralPanel.add(timelinePanel);
	1207	+
1165	1208	//topView.camera = ;
1166	1209	//frontView.camera = new Camera(2);
1167	1210	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1220,13 @@
1177	1220	//frontView.object = copy;
1178	1221	//sideView.object = copy;
1179	1222
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1223	+ XYZPanel = new cGridBag().setVertical(true);
	1224	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1225
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1226	+ XYZPanel.preferredWidth = 5;
	1227	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1228	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1229	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1230
1187	1231	/*
1188	1232	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1235,7 @@
1191	1235	gridPanel.add(cameraView);
1192	1236	gridPanel.add(XYZPanel);
1193	1237	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1238	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1239	gridPanel.setContinuousLayout(true);
1196	1240	gridPanel.setOneTouchExpandable(true);
1197	1241	gridPanel.setDividerLocation(1.0);
..	..	@@ -1244,16 +1288,23 @@
1244	1288	scrollpane.setWheelScrollingEnabled(true);
1245	1289	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1290
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1291	+ /JTabbedPane/ scenePanel = new cGridBag();
	1292	+ scenePanel.preferredWidth = 7;
	1293	+
	1294	+ JTabbedPane tabbedPane = new JTabbedPane();
	1295	+ tabbedPane.add(scrollpane);
1249	1296
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1297	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1298
1252	1299	optionsPanel = new JPanel(new GridBagLayout());
1253	1300
1254	1301	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1302	+
	1303	+ AddOptions(optionsPanel, aConstraints);
	1304	+
	1305	+ tabbedPane.add(optionsPanel);
	1306	+
	1307	+ scenePanel.add(tabbedPane);
1257	1308
1258	1309	/*
1259	1310	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1326,7 @@
1275	1326	jtp.add(tree);
1276	1327	*/
1277	1328
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1329	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1330	bigPanel.setContinuousLayout(true);
1280	1331	bigPanel.setOneTouchExpandable(true);
1281	1332	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1338,7 @@
1287	1338	//bigPanel.setSize(new Dimension(10,10));
1288	1339	//bigPanel.add(ctrlPanel);
1289	1340	//bigPanel.add(gridPanel);
	1341	+ /**
1290	1342	bigThree = new JPanel();
1291	1343	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1344	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1349,26 @@
1297	1349	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1350	aWindowConstraints.weightx = 0;
1299	1351	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1352	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1353	aWindowConstraints.weightx = 1;
1302	1354	aWindowConstraints.gridwidth = 3;
1303	1355	// aConstraints.gridheight = 3;
1304	1356	aWindowConstraints.gridx = 1;
1305	1357	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1358	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1359	aWindowConstraints.weightx = 0;
1308	1360	aWindowConstraints.gridx = 4;
1309	1361	aWindowConstraints.gridwidth = 1;
1310	1362	// aConstraints.gridheight = 3;
1311	1363	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1364	bigThree.add(XYZPanel, aWindowConstraints);
	1365	+ /**/
1313	1366
	1367	+ bigThree = new cGridBag();
	1368	+ bigThree.addComponent(scenePanel);
	1369	+ bigThree.addComponent(centralPanel);
	1370	+ bigThree.addComponent(XYZPanel);
	1371	+
1314	1372	// // SIDE EFFECT!!!
1315	1373	// aConstraints.gridx = 0;
1316	1374	// aConstraints.gridy = 0;
..	..	@@ -1331,7 +1389,8 @@
1331	1389	//worldPane.add(bigPanel);
1332	1390	//worldPane.add(worldPanel);
1333	1391	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1392	+ //frame.getContentPane().add(/"Center",/framePanel);
	1393	+ frame.add(/"Center",/framePanel);
1335	1394	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1395
1337	1396	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1352,6 +1411,10 @@
1352	1411	});
1353	1412	}
1354	1413
	1414	+ void AddOptions(JPanel panel, GridBagConstraints constraints)
	1415	+ {
	1416	+ }
	1417	+
1355	1418	JTree GetTree()
1356	1419	{
1357	1420	return objEditor.jTree;
..	..	@@ -1422,7 +1485,7 @@
1422	1485	aConstraints.gridx += 1;
1423	1486	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424	1487	//aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1488	+ ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1426	1489	aConstraints.gridx = 0;
1427	1490	aConstraints.gridy += 1;
1428	1491	aConstraints.gridwidth = 1;
..	..	@@ -1432,7 +1495,7 @@
1432	1495	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433	1496	aConstraints.gridx += 1;
1434	1497	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1498	+ ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1436	1499	aConstraints.gridx = 0;
1437	1500	aConstraints.gridy += 1;
1438	1501	aConstraints.gridwidth = 1;
..	..	@@ -1442,7 +1505,7 @@
1442	1505	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443	1506	aConstraints.gridx += 1;
1444	1507	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1508	+ ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1446	1509	aConstraints.gridx = 0;
1447	1510	aConstraints.gridy += 1;
1448	1511	aConstraints.gridwidth = 1;
..	..	@@ -1452,7 +1515,7 @@
1452	1515	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453	1516	aConstraints.gridx += 1;
1454	1517	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1518	+ ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1456	1519	aConstraints.gridx = 0;
1457	1520	aConstraints.gridy += 1;
1458	1521	aConstraints.gridwidth = 1;
..	..	@@ -1462,7 +1525,7 @@
1462	1525	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463	1526	aConstraints.gridx += 1;
1464	1527	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1528	+ ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1466	1529	aConstraints.gridx = 0;
1467	1530	aConstraints.gridy += 1;
1468	1531	aConstraints.gridwidth = 1;
..	..	@@ -1531,7 +1594,7 @@
1531	1594	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532	1595	aConstraints.gridx += 1;
1533	1596	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1597	+ ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1535	1598	aConstraints.gridx = 0;
1536	1599	aConstraints.gridy += 1;
1537	1600	aConstraints.gridwidth = 1;
..	..	@@ -1600,7 +1663,7 @@
1600	1663	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601	1664	aConstraints.gridx += 1;
1602	1665	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1666	+ ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1604	1667	aConstraints.gridx = 0;
1605	1668	aConstraints.gridy += 1;
1606	1669	aConstraints.gridwidth = 1;
..	..	@@ -1671,7 +1734,7 @@
1671	1734	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672	1735	aConstraints.gridx += 1;
1673	1736	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1737	+ ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1675	1738	aConstraints.gridx = 0;
1676	1739	aConstraints.gridy += 1;
1677	1740	aConstraints.gridwidth = 1;
..	..	@@ -2194,6 +2257,8 @@
2194	2257	{
2195	2258	Mocap sel = (Mocap) copy.selection.get(0);
2196	2259
	2260	+ sel.SetCurrentBones(sel.frame);
	2261	+
2197	2262	sel.fullname = fullname;
2198	2263
2199	2264	if (changename)
..	..	@@ -2207,14 +2272,18 @@
2207	2272	sel.smoothed = false;
2208	2273
2209	2274	// if (!changename)
2210		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2275	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2276	+ sel.SetGlobalTransform();
	2277	+ sel.LoadData();
	2278	+ sel.Rewind();
	2279	+ sel.Fade();
2211	2280	// sel.setPose(0);
2212	2281	refreshContents();
2213	2282	} else
2214	2283	{
2215	2284	mocap.Reset();
2216	2285	// new skeleton
2217		- makeSomething(mocap, false); // true);
	2286	+ makeSomething(mocap, true); // true);
2218	2287	}
2219	2288	} catch (Exception e)
2220	2289	{
..	..	@@ -2241,6 +2310,8 @@
2241	2310	{
2242	2311	Mocap sel = (Mocap) select;
2243	2312
	2313	+ sel.SetCurrentBones(sel.frame);
	2314	+
2244	2315	File file = new File(fullname);
2245	2316
2246	2317	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2307,7 +2378,11 @@
2307	2378
2308	2379	if (!changename)
2309	2380	{
2310		- sel.SetPositionDelta(false, true, true, true/?/);
	2381	+ //sel.SetPositionDelta(false, true, true, true/?/);
	2382	+ sel.SetGlobalTransform();
	2383	+ sel.LoadData();
	2384	+ sel.Rewind();
	2385	+ sel.Fade();
2311	2386	}
2312	2387
2313	2388	// sel.setPose(0);
..	..	@@ -2946,20 +3021,37 @@
2946	3021	// june 2013 copy.HardTouch();
2947	3022	cameraView.repaint();
2948	3023	return;
2949		- } else if (event.getSource() == toggleFullItem)
	3024	+ } else if (event.getSource() == toggleTimelineItem)
2950	3025	{
2951		- if (CameraPane.FULLSCREEN)
	3026	+ timeline ^= true;
	3027	+
	3028	+ if (timeline)
2952	3029	{
2953		- frame.getContentPane().remove(/"Center",/bigThree);
2954		- framePanel.add(bigThree);
2955		- frame.getContentPane().add(/"Center",/framePanel);
2956		- } else
2957		- {
2958		- frame.getContentPane().remove(/"Center",/framePanel);
2959		- frame.getContentPane().add(/"Center",/bigThree);
	3030	+ centralPanel.remove(cameraView);
	3031	+ cameraPanel.add(cameraView);
	3032	+ centralPanel.add(cameraPanel);
	3033	+ frame.setJMenuBar(timelineMenubar);
	3034	+ wasFullScreen = CameraPane.FULLSCREEN;
	3035	+ if (!CameraPane.FULLSCREEN)
	3036	+ ToggleFullScreen();
	3037	+ toggleFullScreenItem.setEnabled(false);
2960	3038	}
	3039	+ else
	3040	+ {
	3041	+ centralPanel.remove(cameraPanel);
	3042	+ centralPanel.add(cameraView);
	3043	+ frame.setJMenuBar(null);
	3044	+ if (!wasFullScreen)
	3045	+ ToggleFullScreen();
	3046	+ toggleFullScreenItem.setEnabled(true);
	3047	+ }
	3048	+
2961	3049	frame.validate();
2962		- cameraView.ToggleFullScreen();
	3050	+ return;
	3051	+ } else if (event.getSource() == toggleFullScreenItem)
	3052	+ {
	3053	+ ToggleFullScreen();
	3054	+ frame.validate();
2963	3055
2964	3056	return;
2965	3057	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3069,7 +3161,8 @@
3069	3161	objEditor.refreshContents();
3070	3162	} else if (event.getSource() == stepItem)
3071	3163	{
3072		- cameraView.ONESTEP = true;
	3164	+ //cameraView.ONESTEP = true;
	3165	+ Globals.ONESTEP = true;
3073	3166	cameraView.repaint();
3074	3167	return;
3075	3168	} else if (event.getSource() == stepButton)
..	..	@@ -3208,9 +3301,9 @@
3208	3301	cameraView.RevertCamera();
3209	3302	cameraView.repaint();
3210	3303	return;
3211		- } else if (event.getSource() == textureButton)
3212		- {
3213		- return; // true;
	3304	+// } else if (event.getSource() == textureButton)
	3305	+// {
	3306	+// return; // true;
3214	3307	} else // combos...
3215	3308	if (event.getSource() == texresMenu)
3216	3309	{
..	..	@@ -3226,25 +3319,25 @@
3226	3319
3227	3320	void ToggleAnimation()
3228	3321	{
3229		- if (!CameraPane.ANIMATION)
	3322	+ if (!Globals.ANIMATION)
3230	3323	{
3231	3324	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3232	3325	browser.show();
3233	3326	String filename = browser.getFile();
3234	3327	if (filename != null && filename.length() > 0)
3235	3328	{
3236		- CameraPane.filename = browser.getDirectory() + filename;
	3329	+ Globals.filename = browser.getDirectory() + filename;
3237	3330	//CameraPane.framecount = 0;
3238		- CameraPane.imagecount = 0;
	3331	+ Globals.imagecount = 0;
3239	3332
3240		- CameraPane.ANIMATION ^= true;
	3333	+ Globals.ANIMATION ^= true;
3241	3334
3242	3335	GrafreeD.wav.cursor = 0;
3243	3336	GrafreeD.wav.loop = 0;
3244	3337	}
3245	3338	} else
3246	3339	{
3247		- CameraPane.ANIMATION ^= true;
	3340	+ Globals.ANIMATION ^= true;
3248	3341	}
3249	3342	}
3250	3343
..	..	@@ -3497,7 +3590,13 @@
3497	3590	//System.out.println("PARENT = " + parent);
3498	3591	//if (parent != null)
3499	3592	// parent.applySelf();
3500		- refreshContents();
	3593	+ if (e.getSource() == normalpushField)
	3594	+ {
	3595	+ objEditor.refreshContents();
	3596	+ //Refresh();
	3597	+ }
	3598	+ else
	3599	+ refreshContents();
3501	3600	// ??? client.refreshEditWindow();
3502	3601	}
3503	3602	//else
..	..	@@ -3509,7 +3608,7 @@
3509	3608	//group.name = nameField.getText();
3510	3609	//objEditor.applySelf();
3511	3610
3512		- assert (objEditor == this);
	3611	+ // OCT2018: assert (objEditor == this);
3513	3612	if (copy.selection == null \|\| copy.selection.size() == 0)
3514	3613	//super.applySelf()
3515	3614	; else
..	..	@@ -3533,12 +3632,18 @@
3533	3632	objEditor.copy = keep;
3534	3633	}
3535	3634	}
	3635	+
	3636	+ if (normalpushField != null)
	3637	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3536	3638	}
3537	3639
3538	3640	void SnapObject()
3539	3641	{
3540		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3541		- SnapObject(obj);
	3642	+ if (copy.selection.size() > 0)
	3643	+ {
	3644	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3645	+ SnapObject(obj);
	3646	+ }
3542	3647	}
3543	3648
3544	3649	void SnapObject(Object3D obj)
..	..	@@ -3652,7 +3757,7 @@
3652	3757
3653	3758	if (obj.parent != null)
3654	3759	{
3655		- obj.parent.TransformToWorld(interest);
	3760	+// obj.parent.TransformToWorld(interest);
3656	3761	}
3657	3762
3658	3763	if (!CameraPane.TRACK)
..	..	@@ -4432,7 +4537,8 @@
4432	4537	MenuItem revertCameraItem;
4433	4538	CheckboxMenuItem toggleLiveItem;
4434	4539	MenuItem stepItem;
4435		- CheckboxMenuItem toggleFullItem;
	4540	+ CheckboxMenuItem toggleFullScreenItem;
	4541	+ CheckboxMenuItem toggleTimelineItem;
4436	4542	CheckboxMenuItem toggleRenderItem;
4437	4543	CheckboxMenuItem toggleDebugItem;
4438	4544	CheckboxMenuItem toggleFrustumItem;
..	..	@@ -4455,15 +4561,18 @@
4455	4561	JScrollPane infoPanel;
4456	4562	JPanel optionsPanel;
4457	4563	JTabbedPane objectPanel;
4458		- JPanel XYZPanel;
	4564	+ cGridBag XYZPanel;
4459	4565	JSplitPane gridPanel;
4460	4566	JSplitPane bigPanel;
4461		- JPanel bigThree;
4462		- JTabbedPane jtp;
4463		- JPanel cameraPanel;
	4567	+ cGridBag bigThree;
	4568	+ cGridBag scenePanel;
	4569	+ cGridBag centralPanel;
	4570	+ JSplitPane cameraPanel;
	4571	+ JPanel timelinePanel;
	4572	+ JMenuBar timelineMenubar;
4464	4573	JSplitPane framePanel;
4465	4574	JTextArea/Field/ nameField;
4466		- cButton textureButton;
	4575	+ //cButton textureButton;
4467	4576	cButton okButton;
4468	4577	cButton applyButton;
4469	4578	cButton cancelButton;
..	..	@@ -4571,4 +4680,6 @@
4571	4680	NumberSlider opacityPowerField;
4572	4681	JTree jTree;
4573	4682	//ObjectUI parent;
	4683	+
	4684	+ NumberSlider normalpushField;
4574	4685	}