~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -28,7 +28,12 @@
28	28	iSendInfo
29	29	//KeyListener
30	30	{
	31	+ boolean timeline;
	32	+ boolean wasFullScreen;
31	33
	34	+ GroupEditor callee;
	35	+ JFrame frame;
	36	+
32	37	// SCRIPT
33	38
34	39	transient JFrame textpanel = null;
..	..	@@ -119,14 +124,13 @@
119	124	void keyPressed(int key, int modifiers)
120	125	{
121	126	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	127	+ Globals.theRenderer.keyPressed(key, modifiers);
123	128	}
124	129	*/
125	130
126	131	static GridBagConstraints aConstraints;
127	132	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	133	+
130	134	static int GRIDWIDTH = 100; // 4;
131	135
132	136	public void closeUI()
..	..	@@ -158,12 +162,16 @@
158	162	objEditor.ctrlPanel.remove(slowerButton);
159	163	objEditor.ctrlPanel.remove(fasterButton);
160	164	objEditor.ctrlPanel.remove(remarkButton);
	165	+
	166	+ Remove(normalpushField);
161	167	}
162	168
163	169	public ObjEditor GetEditor()
164	170	{
165	171	return objEditor; //.GetEditor();
166	172	}
	173	+
	174	+ // Sometimes myself, sometimes my callee's.
167	175	ObjEditor objEditor;
168	176
169	177	/*
..	..	@@ -238,7 +246,7 @@
238	246	//if (!isDisplayable())
239	247	//setUndecorated(true);
240	248
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	249	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	250	client = inClient;
243	251	copy = localCopy;
244	252	copy.editWindow = this;
..	..	@@ -292,16 +300,18 @@
292	300	//normalLensItem.addActionListener(this);
293	301	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	302	revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
	303	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	304	+ toggleTimelineItem.addItemListener(this);
	305	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	306	+ toggleFullScreenItem.addItemListener(this);
	307	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298	308	cameraMenu.add("-");
299	309	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300	310	toggleTextureItem.addItemListener(this);
301	311	toggleTextureItem.setState(CameraPane.textureon);
302	312	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303	313	toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
	314	+ toggleLiveItem.setState(Globals.isLIVE());
305	315	cameraMenu.add(stepItem = new MenuItem("Step"));
306	316	stepItem.addActionListener(this);
307	317	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -594,6 +604,22 @@
594	604	}
595	605	}
596	606
	607	+ void ToggleFullScreen()
	608	+ {
	609	+ if (CameraPane.FULLSCREEN)
	610	+ {
	611	+ frame.getContentPane().remove(/"Center",/bigThree);
	612	+ framePanel.add(bigThree);
	613	+ frame.getContentPane().add(/"Center",/framePanel);
	614	+ } else
	615	+ {
	616	+ frame.getContentPane().remove(/"Center",/framePanel);
	617	+ framePanel.remove(bigThree);
	618	+ frame.getContentPane().add(/"Center",/bigThree);
	619	+ }
	620	+ cameraView.ToggleFullScreen();
	621	+ }
	622	+
597	623	private JTextArea createTextPane()
598	624	{
599	625	String[] initString =
..	..	@@ -794,7 +820,7 @@
794	820
795	821	aConstraints.fill = GridBagConstraints.VERTICAL;
796	822	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
	823	+ aConstraints.gridwidth = 1;
798	824	ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799	825	aConstraints.gridx += 1;
800	826	aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -963,6 +989,9 @@
963	989
964	990	Return();
965	991
	992	+ normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	993	+ Return();
	994	+
966	995	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	996	// ObjEditor.aConstraints.gridx += 1;
968	997
..	..	@@ -1158,10 +1187,21 @@
1158	1187	//JPanel worldPanel =
1159	1188	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1189	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1190	+ centralPanel = new JPanel(new BorderLayout());
	1191	+ timelinePanel = new JPanel(new BorderLayout());
	1192	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1193
	1194	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1195	+ cameraPanel.setContinuousLayout(true);
	1196	+ cameraPanel.setOneTouchExpandable(true);
	1197	+// cameraPanel.setDividerLocation(0.9);
	1198	+// cameraPanel.setDividerSize(9);
	1199	+ cameraPanel.setResizeWeight(1.0);
	1200	+
	1201	+ centralPanel.add(cameraView);
	1202	+ //frame.setJMenuBar(timelineMenubar);
	1203	+ //centralPanel.add(timelinePanel);
	1204	+
1165	1205	//topView.camera = ;
1166	1206	//frontView.camera = new Camera(2);
1167	1207	//sideView.camera = new Camera(3);
..	..	@@ -1191,7 +1231,7 @@
1191	1231	gridPanel.add(cameraView);
1192	1232	gridPanel.add(XYZPanel);
1193	1233	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1234	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1235	gridPanel.setContinuousLayout(true);
1196	1236	gridPanel.setOneTouchExpandable(true);
1197	1237	gridPanel.setDividerLocation(1.0);
..	..	@@ -1244,15 +1284,18 @@
1244	1284	scrollpane.setWheelScrollingEnabled(true);
1245	1285	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1286
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1287	+ /JTabbedPane/ scenePanel = new JTabbedPane();
	1288	+ scenePanel.add(scrollpane);
1249	1289
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1290	+ scenePanel.add(FSPane = new cFileSystemPane(this));
1251	1291
1252	1292	optionsPanel = new JPanel(new GridBagLayout());
1253	1293
1254	1294	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1295	+
	1296	+ AddOptions(optionsPanel, aConstraints);
	1297	+
	1298	+ scenePanel.add(optionsPanel);
1256	1299
1257	1300
1258	1301	/*
..	..	@@ -1275,7 +1318,7 @@
1275	1318	jtp.add(tree);
1276	1319	*/
1277	1320
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1321	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1322	bigPanel.setContinuousLayout(true);
1280	1323	bigPanel.setOneTouchExpandable(true);
1281	1324	bigPanel.setDividerLocation(0.8);
..	..	@@ -1297,13 +1340,13 @@
1297	1340	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1341	aWindowConstraints.weightx = 0;
1299	1342	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1343	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1344	aWindowConstraints.weightx = 1;
1302	1345	aWindowConstraints.gridwidth = 3;
1303	1346	// aConstraints.gridheight = 3;
1304	1347	aWindowConstraints.gridx = 1;
1305	1348	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1349	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1350	aWindowConstraints.weightx = 0;
1308	1351	aWindowConstraints.gridx = 4;
1309	1352	aWindowConstraints.gridwidth = 1;
..	..	@@ -1331,7 +1374,8 @@
1331	1374	//worldPane.add(bigPanel);
1332	1375	//worldPane.add(worldPanel);
1333	1376	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1377	+ //frame.getContentPane().add(/"Center",/framePanel);
	1378	+ frame.add(/"Center",/framePanel);
1335	1379	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1380
1337	1381	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1352,6 +1396,10 @@
1352	1396	});
1353	1397	}
1354	1398
	1399	+ void AddOptions(JPanel panel, GridBagConstraints constraints)
	1400	+ {
	1401	+ }
	1402	+
1355	1403	JTree GetTree()
1356	1404	{
1357	1405	return objEditor.jTree;
..	..	@@ -1422,7 +1470,7 @@
1422	1470	aConstraints.gridx += 1;
1423	1471	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424	1472	//aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1473	+ ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1426	1474	aConstraints.gridx = 0;
1427	1475	aConstraints.gridy += 1;
1428	1476	aConstraints.gridwidth = 1;
..	..	@@ -1432,7 +1480,7 @@
1432	1480	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433	1481	aConstraints.gridx += 1;
1434	1482	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1483	+ ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1436	1484	aConstraints.gridx = 0;
1437	1485	aConstraints.gridy += 1;
1438	1486	aConstraints.gridwidth = 1;
..	..	@@ -1442,7 +1490,7 @@
1442	1490	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443	1491	aConstraints.gridx += 1;
1444	1492	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1493	+ ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1446	1494	aConstraints.gridx = 0;
1447	1495	aConstraints.gridy += 1;
1448	1496	aConstraints.gridwidth = 1;
..	..	@@ -1452,7 +1500,7 @@
1452	1500	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453	1501	aConstraints.gridx += 1;
1454	1502	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1503	+ ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1456	1504	aConstraints.gridx = 0;
1457	1505	aConstraints.gridy += 1;
1458	1506	aConstraints.gridwidth = 1;
..	..	@@ -1462,7 +1510,7 @@
1462	1510	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463	1511	aConstraints.gridx += 1;
1464	1512	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1513	+ ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1466	1514	aConstraints.gridx = 0;
1467	1515	aConstraints.gridy += 1;
1468	1516	aConstraints.gridwidth = 1;
..	..	@@ -1531,7 +1579,7 @@
1531	1579	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532	1580	aConstraints.gridx += 1;
1533	1581	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1582	+ ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1535	1583	aConstraints.gridx = 0;
1536	1584	aConstraints.gridy += 1;
1537	1585	aConstraints.gridwidth = 1;
..	..	@@ -1600,7 +1648,7 @@
1600	1648	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601	1649	aConstraints.gridx += 1;
1602	1650	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1651	+ ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1604	1652	aConstraints.gridx = 0;
1605	1653	aConstraints.gridy += 1;
1606	1654	aConstraints.gridwidth = 1;
..	..	@@ -1671,7 +1719,7 @@
1671	1719	aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672	1720	aConstraints.gridx += 1;
1673	1721	aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
	1722	+ ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1675	1723	aConstraints.gridx = 0;
1676	1724	aConstraints.gridy += 1;
1677	1725	aConstraints.gridwidth = 1;
..	..	@@ -2958,20 +3006,37 @@
2958	3006	// june 2013 copy.HardTouch();
2959	3007	cameraView.repaint();
2960	3008	return;
2961		- } else if (event.getSource() == toggleFullItem)
	3009	+ } else if (event.getSource() == toggleTimelineItem)
2962	3010	{
2963		- if (CameraPane.FULLSCREEN)
	3011	+ timeline ^= true;
	3012	+
	3013	+ if (timeline)
2964	3014	{
2965		- frame.getContentPane().remove(/"Center",/bigThree);
2966		- framePanel.add(bigThree);
2967		- frame.getContentPane().add(/"Center",/framePanel);
2968		- } else
2969		- {
2970		- frame.getContentPane().remove(/"Center",/framePanel);
2971		- frame.getContentPane().add(/"Center",/bigThree);
	3015	+ centralPanel.remove(cameraView);
	3016	+ cameraPanel.add(cameraView);
	3017	+ centralPanel.add(cameraPanel);
	3018	+ frame.setJMenuBar(timelineMenubar);
	3019	+ wasFullScreen = CameraPane.FULLSCREEN;
	3020	+ if (!CameraPane.FULLSCREEN)
	3021	+ ToggleFullScreen();
	3022	+ toggleFullScreenItem.setEnabled(false);
2972	3023	}
	3024	+ else
	3025	+ {
	3026	+ centralPanel.remove(cameraPanel);
	3027	+ centralPanel.add(cameraView);
	3028	+ frame.setJMenuBar(null);
	3029	+ if (!wasFullScreen)
	3030	+ ToggleFullScreen();
	3031	+ toggleFullScreenItem.setEnabled(true);
	3032	+ }
	3033	+
2973	3034	frame.validate();
2974		- cameraView.ToggleFullScreen();
	3035	+ return;
	3036	+ } else if (event.getSource() == toggleFullScreenItem)
	3037	+ {
	3038	+ ToggleFullScreen();
	3039	+ frame.validate();
2975	3040
2976	3041	return;
2977	3042	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3081,7 +3146,8 @@
3081	3146	objEditor.refreshContents();
3082	3147	} else if (event.getSource() == stepItem)
3083	3148	{
3084		- cameraView.ONESTEP = true;
	3149	+ //cameraView.ONESTEP = true;
	3150	+ Globals.ONESTEP = true;
3085	3151	cameraView.repaint();
3086	3152	return;
3087	3153	} else if (event.getSource() == stepButton)
..	..	@@ -3220,9 +3286,9 @@
3220	3286	cameraView.RevertCamera();
3221	3287	cameraView.repaint();
3222	3288	return;
3223		- } else if (event.getSource() == textureButton)
3224		- {
3225		- return; // true;
	3289	+// } else if (event.getSource() == textureButton)
	3290	+// {
	3291	+// return; // true;
3226	3292	} else // combos...
3227	3293	if (event.getSource() == texresMenu)
3228	3294	{
..	..	@@ -3238,25 +3304,25 @@
3238	3304
3239	3305	void ToggleAnimation()
3240	3306	{
3241		- if (!CameraPane.ANIMATION)
	3307	+ if (!Globals.ANIMATION)
3242	3308	{
3243	3309	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3244	3310	browser.show();
3245	3311	String filename = browser.getFile();
3246	3312	if (filename != null && filename.length() > 0)
3247	3313	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3314	+ Globals.filename = browser.getDirectory() + filename;
3249	3315	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3316	+ Globals.imagecount = 0;
3251	3317
3252		- CameraPane.ANIMATION ^= true;
	3318	+ Globals.ANIMATION ^= true;
3253	3319
3254	3320	GrafreeD.wav.cursor = 0;
3255	3321	GrafreeD.wav.loop = 0;
3256	3322	}
3257	3323	} else
3258	3324	{
3259		- CameraPane.ANIMATION ^= true;
	3325	+ Globals.ANIMATION ^= true;
3260	3326	}
3261	3327	}
3262	3328
..	..	@@ -3509,7 +3575,13 @@
3509	3575	//System.out.println("PARENT = " + parent);
3510	3576	//if (parent != null)
3511	3577	// parent.applySelf();
3512		- refreshContents();
	3578	+ if (e.getSource() == normalpushField)
	3579	+ {
	3580	+ objEditor.refreshContents();
	3581	+ //Refresh();
	3582	+ }
	3583	+ else
	3584	+ refreshContents();
3513	3585	// ??? client.refreshEditWindow();
3514	3586	}
3515	3587	//else
..	..	@@ -3521,7 +3593,7 @@
3521	3593	//group.name = nameField.getText();
3522	3594	//objEditor.applySelf();
3523	3595
3524		- assert (objEditor == this);
	3596	+ // OCT2018: assert (objEditor == this);
3525	3597	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	3598	//super.applySelf()
3527	3599	; else
..	..	@@ -3545,12 +3617,18 @@
3545	3617	objEditor.copy = keep;
3546	3618	}
3547	3619	}
	3620	+
	3621	+ if (normalpushField != null)
	3622	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3548	3623	}
3549	3624
3550	3625	void SnapObject()
3551	3626	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	3627	+ if (copy.selection.size() > 0)
	3628	+ {
	3629	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3630	+ SnapObject(obj);
	3631	+ }
3554	3632	}
3555	3633
3556	3634	void SnapObject(Object3D obj)
..	..	@@ -3664,7 +3742,7 @@
3664	3742
3665	3743	if (obj.parent != null)
3666	3744	{
3667		- obj.parent.TransformToWorld(interest);
	3745	+// obj.parent.TransformToWorld(interest);
3668	3746	}
3669	3747
3670	3748	if (!CameraPane.TRACK)
..	..	@@ -4444,7 +4522,8 @@
4444	4522	MenuItem revertCameraItem;
4445	4523	CheckboxMenuItem toggleLiveItem;
4446	4524	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	4525	+ CheckboxMenuItem toggleFullScreenItem;
	4526	+ CheckboxMenuItem toggleTimelineItem;
4448	4527	CheckboxMenuItem toggleRenderItem;
4449	4528	CheckboxMenuItem toggleDebugItem;
4450	4529	CheckboxMenuItem toggleFrustumItem;
..	..	@@ -4471,11 +4550,14 @@
4471	4550	JSplitPane gridPanel;
4472	4551	JSplitPane bigPanel;
4473	4552	JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	4553	+ JTabbedPane scenePanel;
	4554	+ JPanel centralPanel;
	4555	+ JSplitPane cameraPanel;
	4556	+ JPanel timelinePanel;
	4557	+ JMenuBar timelineMenubar;
4476	4558	JSplitPane framePanel;
4477	4559	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	4560	+ //cButton textureButton;
4479	4561	cButton okButton;
4480	4562	cButton applyButton;
4481	4563	cButton cancelButton;
..	..	@@ -4583,4 +4665,6 @@
4583	4665	NumberSlider opacityPowerField;
4584	4666	JTree jTree;
4585	4667	//ObjectUI parent;
	4668	+
	4669	+ NumberSlider normalpushField;
4586	4670	}