~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -35,6 +36,67 @@
35	36
36	37	GroupEditor callee;
37	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
38	100
39	101	// SCRIPT
40	102
..	..	@@ -168,7 +230,8 @@
168	230	// objEditor.ctrlPanel.remove(remarkButton);
169	231
170	232	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	235	objEditor.ctrlPanel.remove(pushPanel);
173	236	//objEditor.ctrlPanel.remove(fillPanel);
174	237
..	..	@@ -243,6 +306,7 @@
243	306	//localCopy.parent = null;
244	307
245	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
246	310	objEditor = this;
247	311	this.callee = callee;
248	312
..	..	@@ -276,24 +340,40 @@
276	340	void SetupMenu()
277	341	{
278	342	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	363	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
289	368	if (client.parent != null)
290	369	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	371	} else
293	372	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	374	}
296	375
	376	+ newItem.addActionListener(this);
297	377	loadItem.addActionListener(this);
298	378	saveItem.addActionListener(this);
299	379	saveAsItem.addActionListener(this);
..	..	@@ -302,87 +382,48 @@
302	382	//povItem.addActionListener(this);
303	383	closeItem.addActionListener(this);
304	384
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	385	objectPanel = new JTabbedPane();
	386	+
	387	+ ChangeListener changeListener = new ChangeListener()
	388	+ {
	389	+ public void stateChanged(ChangeEvent changeEvent)
	390	+ {
	391	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	392	+// {
	393	+// if (latestObject != null)
	394	+// {
	395	+// refreshContents(true);
	396	+// SetMaterial(latestObject);
	397	+// }
	398	+//
	399	+// materialFlushed = true;
	400	+// }
	401	+
	402	+ refreshContents(false); // To refresh Info tab
	403	+ }
	404	+ };
	405	+ objectPanel.addChangeListener(changeListener);
	406	+
378	407	toolbarPanel = new JPanel();
379	408	toolbarPanel.setName("Toolbar");
380	409	treePanel = new cGridBag();
381	410	treePanel.setName("Tree");
	411	+
	412	+ editPanel = new cGridBag().setVertical(true);
	413	+ editPanel.setName("Edit");
	414	+
382	415	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
	416	+
	417	+ editCommandsPanel = new cGridBag();
	418	+ editPanel.add(editCommandsPanel);
	419	+ editPanel.add(ctrlPanel);
	420	+
	421	+ toolboxPanel = new cGridBag().setVertical(false);
	422	+ toolboxPanel.setName("Toolbox");
	423	+
384	424	materialPanel = new cGridBag().setVertical(true);
385	425	materialPanel.setName("Material");
	426	+
386	427	/JTextPane/
387	428	infoarea = createTextPane();
388	429	doc = infoarea.getStyledDocument();
..	..	@@ -475,10 +516,10 @@
475	516	e.printStackTrace();
476	517	}
477	518
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- Toolkit.getDefaultToolkit().getSystemClipboard();
	519	+// String selection = infoarea.getText();
	520	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	521	+// java.awt.datatransfer.Clipboard clipboard =
	522	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	523	//clipboard.setContents(data, data);
483	524	}
484	525
..	..	@@ -638,19 +679,91 @@
638	679	}
639	680	}
640	681
	682	+static GraphicsDevice device = GraphicsEnvironment
	683	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	684	+
	685	+ Rectangle keeprect;
	686	+ cRadio radio;
	687	+
	688	+cButton keepButton;
	689	+ cButton twoButton; // Full 3D
	690	+ cButton sixButton;
	691	+ cButton threeButton;
	692	+ cButton sevenButton;
	693	+ cButton fourButton; // full panel
	694	+ cButton oneButton; // full XYZ
	695	+ //cButton currentLayout;
	696	+
	697	+ boolean maximized;
	698	+
	699	+ cButton fullscreenLayout;
	700	+
	701	+ void Minimize()
	702	+ {
	703	+ frame.setState(Frame.ICONIFIED);
	704	+ }
	705	+
	706	+ void Maximize()
	707	+ {
	708	+ if (maximized)
	709	+ {
	710	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	711	+ }
	712	+ else
	713	+ {
	714	+ keeprect = frame.getBounds();
	715	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	716	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	717	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	718	+// frame.setState(Frame.MAXIMIZED_BOTH);
	719	+ }
	720	+
	721	+ maximized ^= true;
	722	+ }
	723	+
641	724	void ToggleFullScreen()
642	725	{
643	726	if (CameraPane.FULLSCREEN)
644	727	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	728	+ device.setFullScreenWindow(null);
	729	+ //frame.setVisible(false);
	730	+// frame.removeNotify();
	731	+// frame.setUndecorated(false);
	732	+// frame.addNotify();
	733	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	734	+
	735	+// X frame.getContentPane().remove(/"Center",/bigThree);
	736	+// X framePanel.add(bigThree);
	737	+// X frame.getContentPane().add(/"Center",/framePanel);
	738	+ framePanel.setDividerLocation(1);
	739	+
	740	+ //frame.setVisible(true);
	741	+ radio.layout = keepButton;
	742	+ //theFrame = null;
	743	+ keepButton = null;
	744	+ radio.layout.doClick();
	745	+
648	746	} else
649	747	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	748	+ keepButton = radio.layout;
	749	+ //keeprect = frame.getBounds();
	750	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	751	+// frame.getToolkit().getScreenSize().height);
	752	+ //frame.setVisible(false);
	753	+ device.setFullScreenWindow(frame);
	754	+// frame.removeNotify();
	755	+// frame.setUndecorated(true);
	756	+// frame.addNotify();
	757	+// X frame.getContentPane().remove(/"Center",/framePanel);
	758	+// X framePanel.remove(bigThree);
	759	+// X frame.getContentPane().add(/"Center",/bigThree);
	760	+ framePanel.setDividerLocation(0);
	761	+
	762	+ radio.layout = fullscreenLayout;
	763	+ radio.layout.doClick();
	764	+ //frame.setVisible(true);
653	765	}
	766	+
654	767	cameraView.ToggleFullScreen();
655	768	}
656	769
..	..	@@ -792,7 +905,12 @@
792	905	JCheckBox speedupCB;
793	906	JCheckBox rewindCB;
794	907	JCheckBox flipVCB;
	908	+
	909	+ cCheckBox toggleTextureCB;
	910	+ cCheckBox toggleSwitchCB;
	911	+
795	912	JComboBox texresMenu;
	913	+
796	914	JButton resetButton;
797	915	JButton stepButton;
798	916	JButton stepAllButton;
..	..	@@ -801,9 +919,13 @@
801	919	JButton fasterButton;
802	920	JButton remarkButton;
803	921
	922	+ cGridBag editPanel;
	923	+ cGridBag editCommandsPanel;
	924	+
804	925	cGridBag namePanel;
805	926	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	927	+ cGridBag setupPanel2;
	928	+ cGridBag objectCommandsPanel;
807	929	cGridBag pushPanel;
808	930	cGridBag fillPanel;
809	931
..	..	@@ -995,40 +1117,44 @@
995	1117	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996	1118	markCB.setToolTipText("Set the animation target transform");
997	1119
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1120	+ setupPanel2 = new cGridBag().setVertical(false);
	1121	+
	1122	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1123	rewindCB.setToolTipText("Rewind animation");
1000	1124
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1125	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1126	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1003	1127
1004	1128	if (Globals.ADVANCED)
1005	1129	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1130	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1007	1131	link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1132	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1133	speedupCB.setToolTipText("Option motion capture");
1010	1134	}
1011	1135
1012	1136	oe.ctrlPanel.add(setupPanel);
1013	1137	oe.ctrlPanel.Return();
	1138	+ oe.ctrlPanel.add(setupPanel2);
	1139	+ oe.ctrlPanel.Return();
1014	1140
1015		- commandsPanel = new cGridBag().setVertical(false);
	1141	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1142
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1143	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1144	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1145	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1146	stepButton.setToolTipText("Step one frame");
1021	1147	// resetAllButton = AddButton(oe, "Reset All");
1022	1148	// stepAllButton = AddButton(oe, "Step All");
1023	1149	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1150	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1151	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1152	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1153	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1154	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1155	remarkButton.setToolTipText("Set the current transform as the target");
1030	1156
1031		- oe.ctrlPanel.add(commandsPanel);
	1157	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1158	oe.ctrlPanel.Return();
1033	1159
1034	1160	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1360,11 @@
1234	1360	//worldPanel.setName("World");
1235	1361	centralPanel = new cGridBag();
1236	1362	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1363	+
	1364	+ if (Globals.ADVANCED)
	1365	+ {
	1366	+ timelinePanel = new JPanel(new BorderLayout());
	1367	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1368
1240	1369	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1370	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1373,10 @@
1244	1373	// cameraPanel.setDividerSize(9);
1245	1374	cameraPanel.setResizeWeight(1.0);
1246	1375
	1376	+ }
	1377	+
1247	1378	centralPanel.add(cameraView);
	1379	+ centralPanel.setFocusable(true);
1248	1380	//frame.setJMenuBar(timelineMenubar);
1249	1381	//centralPanel.add(timelinePanel);
1250	1382
..	..	@@ -1307,11 +1439,12 @@
1307	1439	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1308	1440	//tmp.setName("Edit");
1309	1441	objectPanel.add(materialPanel);
	1442	+ objectPanel.add(toolboxPanel);
1310	1443	// JPanel north = new JPanel(new BorderLayout());
1311	1444	// north.setName("Edit");
1312	1445	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1446	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
	1447	+ objectPanel.add(editPanel);
1315	1448	objectPanel.add(infoPanel);
1316	1449
1317	1450	/*
..	..	@@ -1338,9 +1471,7 @@
1338	1471	JTabbedPane tabbedPane = new JTabbedPane();
1339	1472	tabbedPane.add(scrollpane);
1340	1473
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1474	+ optionsPanel = new cGridBag().setVertical(false);
1344	1475
1345	1476	optionsPanel.setName("Options");
1346	1477
..	..	@@ -1348,6 +1479,8 @@
1348	1479
1349	1480	tabbedPane.add(optionsPanel);
1350	1481
	1482	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1483	+
1351	1484	scenePanel.add(tabbedPane);
1352	1485
1353	1486	/*
..	..	@@ -1440,8 +1573,12 @@
1440	1573	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1574
1442	1575	frame.setSize(1280, 860);
	1576	+
	1577	+ frame.validate();
1443	1578	frame.setVisible(true);
1444	1579
	1580	+ cameraView.requestFocusInWindow();
	1581	+
1445	1582	gridPanel.setDividerLocation(1.0);
1446	1583
1447	1584	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1991,6 +2128,7 @@
1991	2128	e2.printStackTrace();
1992	2129	}
1993	2130	}
	2131	+
1994	2132	LoadJMEThread loadThread;
1995	2133
1996	2134	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2186,7 @@
2048	2186	//LoadFile0(filename, converter);
2049	2187	}
2050	2188	}
	2189	+
2051	2190	LoadOBJThread loadObjThread;
2052	2191
2053	2192	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2265,19 @@
2126	2265
2127	2266	void LoadObjFile(String fullname)
2128	2267	{
2129		- /*
	2268	+ System.out.println("Loading " + fullname);
	2269	+ /**/
2130	2270	//lastFilename = fullname;
2131	2271	if(loadObjThread == null)
2132	2272	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2273	+ loadObjThread = new LoadOBJThread();
	2274	+ loadObjThread.start();
2135	2275	}
2136	2276
2137	2277	loadObjThread.add(fullname);
2138		- */
	2278	+ /**/
2139	2279
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2280	+ //makeSomething(new FileObject(fullname, true), true);
2142	2281	}
2143	2282
2144	2283	void LoadGFDFile(String fullname)
..	..	@@ -2755,6 +2894,8 @@
2755	2894
2756	2895	void SetMaterial(Object3D object)
2757	2896	{
	2897	+ latestObject = object;
	2898	+
2758	2899	cMaterial mat = object.material;
2759	2900
2760	2901	if (mat == null)
..	..	@@ -2940,7 +3081,7 @@
2940	3081	cameraView.ToggleDL();
2941	3082	cameraView.repaint();
2942	3083	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3084	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3085	{
2945	3086	cameraView.ToggleTexture();
2946	3087	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3120,9 @@
2979	3120	frame.validate();
2980	3121
2981	3122	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3123	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3124	{
2984		- cameraView.ToggleRandom();
	3125	+ cameraView.ToggleSwitch();
2985	3126	cameraView.repaint();
2986	3127	return;
2987	3128	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,8 +3193,9 @@
3052	3193
3053	3194	public void actionPerformed(ActionEvent event)
3054	3195	{
	3196	+ Object source = event.getSource();
3055	3197	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3198	+ if (source == okbutton)
3057	3199	{
3058	3200	textpanel.setVisible(false);
3059	3201	textpanel.remove(textarea);
..	..	@@ -3065,7 +3207,7 @@
3065	3207	textarea = null;
3066	3208	textpanel = null;
3067	3209	}
3068		- if (event.getSource() == cancelbutton)
	3210	+ if (source == cancelbutton)
3069	3211	{
3070	3212	textpanel.setVisible(false);
3071	3213	textpanel.remove(textarea);
..	..	@@ -3077,50 +3219,50 @@
3077	3219	//applySelf();
3078	3220	//client.refreshEditWindow();
3079	3221	//refreshContents();
3080		- if (event.getSource() == nameField)
	3222	+ if (source == nameField)
3081	3223	{
3082	3224	//System.out.println("ObjEditor " + event);
3083	3225	applySelf0(true);
3084	3226	//parent.applySelf();
3085	3227	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3228	+ } else if (source == resetButton)
3087	3229	{
3088	3230	CameraPane.fullreset = true;
3089	3231	copy.Reset(); // ResetMeshes();
3090	3232	copy.Touch();
3091	3233	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3234	+ } else if (source == stepItem)
3093	3235	{
3094	3236	//cameraView.ONESTEP = true;
3095	3237	Globals.ONESTEP = true;
3096	3238	cameraView.repaint();
3097	3239	return;
3098		- } else if (event.getSource() == stepButton)
	3240	+ } else if (source == stepButton)
3099	3241	{
3100	3242	copy.Step();
3101	3243	copy.Touch();
3102	3244	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3245	+ } else if (source == slowerButton)
3104	3246	{
3105	3247	copy.Slower();
3106	3248	copy.Touch();
3107	3249	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3250	+ } else if (source == fasterButton)
3109	3251	{
3110	3252	copy.Faster();
3111	3253	copy.Touch();
3112	3254	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3255	+ } else if (source == remarkButton)
3114	3256	{
3115	3257	copy.Remark();
3116	3258	copy.Touch();
3117	3259	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3260	+ } else if (source == stepAllButton)
3119	3261	{
3120	3262	copy.StepAll();
3121	3263	copy.Touch();
3122	3264	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3265	+ } else if (source == resetAllButton)
3124	3266	{
3125	3267	//CameraPane.fullreset = true;
3126	3268	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3295,75 @@
3153	3295	// Close();
3154	3296	// }
3155	3297	// else
3156		- if (event.getSource() == resetSlidersButton)
	3298	+ if (source == resetSlidersButton)
3157	3299	{
3158	3300	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3301	+ } else if (source == clearMaterialButton)
3160	3302	{
3161	3303	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3304	+ } else if (source == createMaterialButton)
3163	3305	{
3164	3306	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3307	+ } else if (source == clearPanelButton)
3166	3308	{
3167	3309	copy.ClearUI();
3168	3310	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3311	+ } else if (source == importGFDItem)
	3312	+ {
	3313	+ ImportGFD();
	3314	+ } else
	3315	+ if (source == importVRMLX3DItem)
	3316	+ {
	3317	+ ImportVRMLX3D();
	3318	+ } else
	3319	+ if (source == import3DSItem)
	3320	+ {
	3321	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3322	+ } else
	3323	+ if (source == importOBJItem)
	3324	+ {
	3325	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3326	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3327	+ browser.setVisible(true);
	3328	+ String filename = browser.getFile();
	3329	+ if (filename != null && filename.length() > 0)
	3330	+ {
	3331	+ String fullname = browser.getDirectory() + filename;
	3332	+ makeSomething(ReadOBJ(fullname), true);
	3333	+ }
	3334	+ } else
	3335	+ if (source == closeItem)
3175	3336	{
3176	3337	Close();
3177	3338	//return true;
3178		- } else if (event.getSource() == loadItem)
	3339	+ } else if (source == loadItem)
3179	3340	{
3180	3341	load();
3181	3342	//return true;
3182		- } else if (event.getSource() == saveItem)
	3343	+ } else if (source == newItem)
	3344	+ {
	3345	+ New();
	3346	+ } else if (source == saveItem)
3183	3347	{
3184	3348	save();
3185	3349	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3350	+ } else if (source == saveAsItem)
3187	3351	{
3188	3352	saveAs();
3189	3353	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3354	+ } else if (source == reexportItem)
3191	3355	{
3192	3356	reexport();
3193	3357	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3358	+ } else if (source == exportAsItem)
3195	3359	{
3196	3360	export();
3197	3361	//return true;
3198		- } else if (event.getSource() == povItem)
	3362	+ } else if (source == povItem)
3199	3363	{
3200	3364	generatePOV();
3201	3365	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3366	+ } else if (source == zBufferItem)
3203	3367	{
3204	3368	try
3205	3369	{
..	..	@@ -3221,21 +3385,8 @@
3221	3385	cameraView.repaint();
3222	3386	//return true;
3223	3387	}
3224		- */ else if (event.getSource() == editCameraItem)
3225		- {
3226		- cameraView.ProtectCamera();
3227		- cameraView.repaint();
3228		- return;
3229		- } else if (event.getSource() == revertCameraItem)
3230		- {
3231		- cameraView.RevertCamera();
3232		- cameraView.repaint();
3233		- return;
3234		-// } else if (event.getSource() == textureButton)
3235		-// {
3236		-// return; // true;
3237		- } else // combos...
3238		- if (event.getSource() == texresMenu)
	3388	+ */ else // combos...
	3389	+ if (source == texresMenu)
3239	3390	{
3240	3391	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3392	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3398,266 @@
3247	3398	}
3248	3399	}
3249	3400
	3401	+ void New()
	3402	+ {
	3403	+ while (copy.Size() > 1)
	3404	+ {
	3405	+ copy.remove(1);
	3406	+ }
	3407	+
	3408	+ ResetModel();
	3409	+ objEditor.refreshContents();
	3410	+ }
	3411	+
	3412	+ static public byte[] Compress(Object3D o)
	3413	+ {
	3414	+ try
	3415	+ {
	3416	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3417	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3418	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3419	+
	3420	+ Object3D parent = o.parent;
	3421	+ o.parent = null;
	3422	+
	3423	+ out.writeObject(o);
	3424	+
	3425	+ o.parent = parent;
	3426	+
	3427	+ out.flush();
	3428	+
	3429	+ zstream.close();
	3430	+ out.close();
	3431	+
	3432	+ return baos.toByteArray();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ System.err.println(e);
	3436	+ return null;
	3437	+ }
	3438	+ }
	3439	+
	3440	+ static public Object Uncompress(byte[] bytes)
	3441	+ {
	3442	+ System.out.println("#bytes = " + bytes.length);
	3443	+ try
	3444	+ {
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3447	+ ObjectInputStream in = new ObjectInputStream(istream);
	3448	+ Object obj = in.readObject();
	3449	+ in.close();
	3450	+
	3451	+ return obj;
	3452	+ } catch (Exception e)
	3453	+ {
	3454	+ System.err.println(e);
	3455	+ return null;
	3456	+ }
	3457	+ }
	3458	+
	3459	+ static public Object clone(Object o)
	3460	+ {
	3461	+ try
	3462	+ {
	3463	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3464	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3465	+
	3466	+ out.writeObject(o);
	3467	+
	3468	+ out.flush();
	3469	+ out.close();
	3470	+
	3471	+ byte[] bytes = baos.toByteArray();
	3472	+
	3473	+ System.out.println("clone = " + bytes.length);
	3474	+
	3475	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3476	+ ObjectInputStream in = new ObjectInputStream(bais);
	3477	+ Object obj = in.readObject();
	3478	+ in.close();
	3479	+
	3480	+ return obj;
	3481	+ } catch (Exception e)
	3482	+ {
	3483	+ System.err.println(e);
	3484	+ return null;
	3485	+ }
	3486	+ }
	3487	+
	3488	+ cRadio GetCurrentTab()
	3489	+ {
	3490	+ cRadio ab;
	3491	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3492	+ {
	3493	+ ab = (cRadio)e.nextElement();
	3494	+ if(ab.GetObject() == copy)
	3495	+ {
	3496	+ return ab;
	3497	+ }
	3498	+ }
	3499	+
	3500	+ return null;
	3501	+ }
	3502	+
	3503	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3504	+
	3505	+ public void Save()
	3506	+ {
	3507	+ System.err.println("Save");
	3508	+
	3509	+ cRadio tab = GetCurrentTab();
	3510	+
	3511	+ boolean temp = CameraPane.SWITCH;
	3512	+ CameraPane.SWITCH = false;
	3513	+
	3514	+ copy.ExtractBigData(hashtable);
	3515	+
	3516	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3517	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3518	+
	3519	+ copy.RestoreBigData(hashtable);
	3520	+
	3521	+ CameraPane.SWITCH = temp;
	3522	+
	3523	+ //assert(hashtable.isEmpty());
	3524	+
	3525	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3526	+ {
	3527	+ tab.graphs[i] = null;
	3528	+ }
	3529	+
	3530	+ // test save
	3531	+ if (false)
	3532	+ {
	3533	+ try
	3534	+ {
	3535	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3536	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3537	+
	3538	+ p.writeObject(copy);
	3539	+
	3540	+ p.flush();
	3541	+
	3542	+ ostream.close();
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ e.printStackTrace();
	3546	+ }
	3547	+ }
	3548	+ }
	3549	+
	3550	+ void CopyChanged(Object3D obj)
	3551	+ {
	3552	+ boolean temp = CameraPane.SWITCH;
	3553	+ CameraPane.SWITCH = false;
	3554	+
	3555	+ copy.ExtractBigData(hashtable);
	3556	+
	3557	+ copy.clear();
	3558	+
	3559	+ for (int i=0; i<obj.Size(); i++)
	3560	+ {
	3561	+ copy.add(obj.get(i));
	3562	+ }
	3563	+
	3564	+ copy.RestoreBigData(hashtable);
	3565	+
	3566	+ CameraPane.SWITCH = temp;
	3567	+
	3568	+ //assert(hashtable.isEmpty());
	3569	+
	3570	+ copy.Touch();
	3571	+
	3572	+ ResetModel();
	3573	+ copy.HardTouch(); // recompile?
	3574	+
	3575	+ cRadio ab;
	3576	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3577	+ {
	3578	+ ab = (cRadio)e.nextElement();
	3579	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3580	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3581	+ if (test != null)
	3582	+ {
	3583	+ test.editWindow = ab.object.editWindow;
	3584	+ ab.object = test;
	3585	+ }
	3586	+ }
	3587	+
	3588	+ refreshContents();
	3589	+ }
	3590	+
	3591	+ public void Undo()
	3592	+ {
	3593	+ System.err.println("Undo");
	3594	+
	3595	+ cRadio tab = GetCurrentTab();
	3596	+
	3597	+ if (tab.undoindex == 0)
	3598	+ {
	3599	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3600	+ return;
	3601	+ }
	3602	+
	3603	+ if (tab.graphs[tab.undoindex] == null)
	3604	+ {
	3605	+ Save();
	3606	+ tab.undoindex -= 1;
	3607	+ }
	3608	+
	3609	+ tab.undoindex -= 1;
	3610	+
	3611	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3612	+ }
	3613	+
	3614	+ public void Redo()
	3615	+ {
	3616	+ cRadio tab = GetCurrentTab();
	3617	+
	3618	+ if (tab.graphs[tab.undoindex + 1] == null)
	3619	+ {
	3620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3621	+ return;
	3622	+ }
	3623	+
	3624	+ tab.undoindex += 1;
	3625	+
	3626	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3627	+ }
	3628	+
	3629	+ void ImportGFD()
	3630	+ {
	3631	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3632	+ browser.show();
	3633	+ String filename = browser.getFile();
	3634	+ if (filename != null && filename.length() > 0)
	3635	+ {
	3636	+ String fullname = browser.getDirectory() + filename;
	3637	+
	3638	+ //Object3D readobj =
	3639	+ objEditor.ReadGFD(fullname, objEditor);
	3640	+ //makeSomething(readobj);
	3641	+ }
	3642	+ }
	3643	+
	3644	+ void ImportVRMLX3D()
	3645	+ {
	3646	+ if (Grafreed.standAlone)
	3647	+ {
	3648	+ /**/
	3649	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3650	+ browser.show();
	3651	+ String filename = browser.getFile();
	3652	+ if (filename != null && filename.length() > 0)
	3653	+ {
	3654	+ String fullname = browser.getDirectory() + filename;
	3655	+ LoadVRMLX3D(fullname);
	3656	+ }
	3657	+ /**/
	3658	+ }
	3659	+ }
	3660	+
3250	3661	void ToggleAnimation()
3251	3662	{
3252	3663	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +3775,7 @@
3364	3775	assert false;
3365	3776	}
3366	3777
3367		- void EditSelection()
	3778	+ void EditSelection(boolean newWindow)
3368	3779	{
3369	3780	}
3370	3781
..	..	@@ -3859,6 +4270,8 @@
3859	4270
3860	4271	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4272	{
	4273	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4274	+ Save();
3862	4275	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4276	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4277	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +4358,12 @@
3945	4358	{
3946	4359	ResetModel();
3947	4360	Select(thing.GetTreePath(), true, false); // unselect... false);
	4361	+
	4362	+ if (thing.Size() == 0)
	4363	+ {
	4364	+ //EditSelection(false);
	4365	+ }
	4366	+
3948	4367	refreshContents();
3949	4368	}
3950	4369
..	..	@@ -4082,6 +4501,7 @@
4082	4501
4083	4502	try
4084	4503	{
	4504	+ // Try compressed version first.
4085	4505	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4086	4506	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4087	4507	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4151,6 +4571,12 @@
4151	4571
4152	4572	void LoadIt(Object obj)
4153	4573	{
	4574	+ if (obj == null)
	4575	+ {
	4576	+ // Invalid file
	4577	+ return;
	4578	+ }
	4579	+
4154	4580	System.out.println("Loaded " + obj);
4155	4581	//new Exception().printStackTrace();
4156	4582	Object3D readobj = (Object3D) obj;
..	..	@@ -4160,6 +4586,8 @@
4160	4586
4161	4587	if (readobj != null)
4162	4588	{
	4589	+ if (Globals.SAVEONMAKE)
	4590	+ Save();
4163	4591	try
4164	4592	{
4165	4593	//readobj.deepCopySelf(copy);
..	..	@@ -4501,7 +4929,8 @@
4501	4929	Object3D client;
4502	4930	Object3D copy;
4503	4931	MenuBar menuBar;
4504		- Menu windowMenu;
	4932	+ Menu fileMenu;
	4933	+ MenuItem newItem;
4505	4934	MenuItem loadItem;
4506	4935	MenuItem saveItem;
4507	4936	MenuItem saveAsItem;
..	..	@@ -4509,11 +4938,9 @@
4509	4938	MenuItem reexportItem;
4510	4939	MenuItem povItem;
4511	4940	MenuItem closeItem;
4512		- Menu cameraMenu;
	4941	+
4513	4942	CheckboxMenuItem zBufferItem;
4514	4943	//MenuItem normalLensItem;
4515		- MenuItem editCameraItem;
4516		- MenuItem revertCameraItem;
4517	4944	MenuItem stepItem;
4518	4945	CheckboxMenuItem toggleLiveItem;
4519	4946	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4531,18 +4958,31 @@
4531	4958	CheckboxMenuItem togglePaintItem;
4532	4959	JSplitPane mainPanel;
4533	4960	JScrollPane scrollpane;
	4961	+
4534	4962	JPanel toolbarPanel;
	4963	+
4535	4964	cGridBag treePanel;
	4965	+
4536	4966	JPanel radioPanel;
4537	4967	ButtonGroup buttonGroup;
4538		- cGridBag ctrlPanel;
	4968	+
	4969	+ cGridBag toolboxPanel;
4539	4970	cGridBag materialPanel;
	4971	+ cGridBag ctrlPanel;
	4972	+
4540	4973	JScrollPane infoPanel;
	4974	+
4541	4975	cGridBag optionsPanel;
	4976	+
4542	4977	JTabbedPane objectPanel;
	4978	+ boolean materialFlushed;
	4979	+ Object3D latestObject;
	4980	+
4543	4981	cGridBag XYZPanel;
	4982	+
4544	4983	JSplitPane gridPanel;
4545	4984	JSplitPane bigPanel;
	4985	+
4546	4986	cGridBag bigThree;
4547	4987	cGridBag scenePanel;
4548	4988	cGridBag centralPanel;
..	..	@@ -4657,8 +5097,13 @@
4657	5097	cNumberSlider fogField;
4658	5098	JLabel opacityPowerLabel;
4659	5099	cNumberSlider opacityPowerField;
4660		- JTree jTree;
	5100	+ cTree jTree;
4661	5101	//ObjectUI parent;
4662	5102
4663	5103	cNumberSlider normalpushField;
	5104	+
	5105	+ private MenuItem importGFDItem;
	5106	+ private MenuItem importVRMLX3DItem;
	5107	+ private MenuItem import3DSItem;
	5108	+ private MenuItem importOBJItem;
4664	5109	}