~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.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,28 +340,49 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	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..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
289	376	if (client.parent != null)
290	377	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	379	} else
293	380	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	382	}
296	383
297		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.addActionListener(this);
300	388	exportAsItem.addActionListener(this);
..	..	@@ -302,87 +390,53 @@
302	390	//povItem.addActionListener(this);
303	391	closeItem.addActionListener(this);
304	392
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	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
378	420	toolbarPanel = new JPanel();
379	421	toolbarPanel.setName("Toolbar");
380	422	treePanel = new cGridBag();
381	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
382	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
384	437	materialPanel = new cGridBag().setVertical(true);
385	438	materialPanel.setName("Material");
	439	+
386	440	/JTextPane/
387	441	infoarea = createTextPane();
388	442	doc = infoarea.getStyledDocument();
..	..	@@ -395,7 +449,7 @@
395	449	// TEXTAREA infoarea.setLineWrap(true);
396	450	// TEXTAREA infoarea.setWrapStyleWord(true);
397	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
399	453	infoPanel.setName("Info");
400	454	//infoPanel.setLayout(new BorderLayout());
401	455	//infoPanel.add(createTextPane());
..	..	@@ -407,7 +461,14 @@
407	461	mainPanel.setDividerSize(9);
408	462	mainPanel.setDividerLocation(0.5); //1.0);
409	463	mainPanel.setResizeWeight(0.5);
410		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
411	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	473	//mainPanel.setLayout(new GridBagLayout());
413	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +536,10 @@
475	536	e.printStackTrace();
476	537	}
477	538
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();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	543	//clipboard.setContents(data, data);
483	544	}
484	545
..	..	@@ -638,20 +699,121 @@
638	699	}
639	700	}
640	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
641	760	void ToggleFullScreen()
642	761	{
643		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
644	767	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
648	791	} else
649	792	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
653	815	}
654		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
655	817	}
656	818
657	819	private JTextPane createTextPane()
..	..	@@ -792,7 +954,12 @@
792	954	JCheckBox speedupCB;
793	955	JCheckBox rewindCB;
794	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
795	961	JComboBox texresMenu;
	962	+
796	963	JButton resetButton;
797	964	JButton stepButton;
798	965	JButton stepAllButton;
..	..	@@ -801,9 +968,13 @@
801	968	JButton fasterButton;
802	969	JButton remarkButton;
803	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
804	974	cGridBag namePanel;
805	975	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
807	978	cGridBag pushPanel;
808	979	cGridBag fillPanel;
809	980
..	..	@@ -975,12 +1146,12 @@
975	1146	namePanel = new cGridBag();
976	1147
977	1148	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1150	oe.ctrlPanel.add(namePanel);
980	1151
981	1152	oe.ctrlPanel.Return();
982	1153
983		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
984	1155	return;
985	1156
986	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -993,42 +1164,47 @@
993	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1165	hideCB.setToolTipText("Hide object");
995	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
997	1168
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1172	rewindCB.setToolTipText("Rewind animation");
1000	1173
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1176
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
1004	1180	if (Globals.ADVANCED)
1005	1181	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1007		- link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1182	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1183	speedupCB.setToolTipText("Option motion capture");
1010	1184	}
1011	1185
1012	1186	oe.ctrlPanel.add(setupPanel);
1013	1187	oe.ctrlPanel.Return();
	1188	+ oe.ctrlPanel.add(setupPanel2);
	1189	+ oe.ctrlPanel.Return();
1014	1190
1015		- commandsPanel = new cGridBag().setVertical(false);
	1191	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1192
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1193	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1194	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1195	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1196	stepButton.setToolTipText("Step one frame");
1021	1197	// resetAllButton = AddButton(oe, "Reset All");
1022	1198	// stepAllButton = AddButton(oe, "Step All");
1023	1199	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1200	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1201	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1202	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1203	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1204	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1205	remarkButton.setToolTipText("Set the current transform as the target");
1030	1206
1031		- oe.ctrlPanel.add(commandsPanel);
	1207	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1208	oe.ctrlPanel.Return();
1033	1209
1034	1210	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1410,11 @@
1234	1410	//worldPanel.setName("World");
1235	1411	centralPanel = new cGridBag();
1236	1412	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1413	+
	1414	+ if (Globals.ADVANCED)
	1415	+ {
	1416	+ timelinePanel = new JPanel(new BorderLayout());
	1417	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1418
1240	1419	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1420	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1423,10 @@
1244	1423	// cameraPanel.setDividerSize(9);
1245	1424	cameraPanel.setResizeWeight(1.0);
1246	1425
	1426	+ }
	1427	+
1247	1428	centralPanel.add(cameraView);
	1429	+ centralPanel.setFocusable(true);
1248	1430	//frame.setJMenuBar(timelineMenubar);
1249	1431	//centralPanel.add(timelinePanel);
1250	1432
..	..	@@ -1311,8 +1493,12 @@
1311	1493	// north.setName("Edit");
1312	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1495	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
1315		- objectPanel.add(infoPanel);
	1496	+ objectPanel.add(editPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1316	1502
1317	1503	/*
1318	1504	aConstraints.gridx = 0;
..	..	@@ -1321,7 +1507,7 @@
1321	1507	aConstraints.gridy += 1;
1322	1508	aConstraints.gridwidth = 1;
1323	1509	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1510	+ */
1325	1511
1326	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1338,9 +1524,7 @@
1338	1524	JTabbedPane tabbedPane = new JTabbedPane();
1339	1525	tabbedPane.add(scrollpane);
1340	1526
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1344	1528
1345	1529	optionsPanel.setName("Options");
1346	1530
..	..	@@ -1348,6 +1532,8 @@
1348	1532
1349	1533	tabbedPane.add(optionsPanel);
1350	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1351	1537	scenePanel.add(tabbedPane);
1352	1538
1353	1539	/*
..	..	@@ -1420,9 +1606,9 @@
1420	1606	// aConstraints.gridheight = 1;
1421	1607
1422	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1423		- framePanel.setContinuousLayout(true);
1424		- framePanel.setOneTouchExpandable(true);
1425		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1426	1612	//framePanel.setDividerSize(15);
1427	1613	//framePanel.setResizeWeight(0.15);
1428	1614	framePanel.setName("Frame");
..	..	@@ -1440,9 +1626,14 @@
1440	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1627
1442	1628	frame.setSize(1280, 860);
1443		- frame.setVisible(true);
1444		-
	1629	+
	1630	+ cameraView.requestFocusInWindow();
	1631	+
1445	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1446	1637
1447	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1448	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1529,24 +1720,6 @@
1529	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	1721	colorSection.add(texture);
1531	1722
1532		- cGridBag anisoU = new cGridBag();
1533		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1534		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1536		- colorSection.add(anisoU);
1537		-
1538		- cGridBag anisoV = new cGridBag();
1539		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1540		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1542		- colorSection.add(anisoV);
1543		-
1544		- cGridBag shadowbias = new cGridBag();
1545		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1546		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548		- colorSection.add(shadowbias);
1549		-
1550	1723	panel.add(new JSeparator());
1551	1724
1552	1725	panel.add(colorSection);
..	..	@@ -1596,6 +1769,12 @@
1596	1769	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1597	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	1771	diffuseSection.add(fakedepth);
	1772	+
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
1599	1778
1600	1779	panel.add(new JSeparator());
1601	1780
..	..	@@ -1647,6 +1826,18 @@
1647	1826	// aConstraints.gridy += 1;
1648	1827	// aConstraints.gridwidth = 1;
1649	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
	1834	+
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
1650	1841
1651	1842	panel.add(new JSeparator());
1652	1843
..	..	@@ -1654,35 +1845,35 @@
1654	1845
1655	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	1847
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	1849
1659	1850	cGridBag camera = new cGridBag();
1660	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1664	1855
1665	1856	cGridBag ambient = new cGridBag();
1666	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1670	1861
1671	1862	cGridBag backlit = new cGridBag();
1672	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1676	1867
1677	1868	cGridBag opacity = new cGridBag();
1678	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1679	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1681		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1682	1873
1683		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1684	1875
1685		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1686	1877
1687	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	1879
..	..	@@ -1789,8 +1980,9 @@
1789	1980	// 3D models
1790	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1791	1982	{
1792		- lastConverter = new com.jmex.model.converters.MaxToJme();
1793		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1794	1986	continue;
1795	1987	}
1796	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1991,6 +2183,7 @@
1991	2183	e2.printStackTrace();
1992	2184	}
1993	2185	}
	2186	+
1994	2187	LoadJMEThread loadThread;
1995	2188
1996	2189	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2241,7 @@
2048	2241	//LoadFile0(filename, converter);
2049	2242	}
2050	2243	}
	2244	+
2051	2245	LoadOBJThread loadObjThread;
2052	2246
2053	2247	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2320,19 @@
2126	2320
2127	2321	void LoadObjFile(String fullname)
2128	2322	{
2129		- /*
	2323	+ System.out.println("Loading " + fullname);
	2324	+ /**/
2130	2325	//lastFilename = fullname;
2131	2326	if(loadObjThread == null)
2132	2327	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2328	+ loadObjThread = new LoadOBJThread();
	2329	+ loadObjThread.start();
2135	2330	}
2136	2331
2137	2332	loadObjThread.add(fullname);
2138		- */
	2333	+ /**/
2139	2334
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2335	+ //makeSomething(new FileObject(fullname, true), true);
2142	2336	}
2143	2337
2144	2338	void LoadGFDFile(String fullname)
..	..	@@ -2514,6 +2708,7 @@
2514	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2515	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2516	2710	}
	2711	+
2517	2712	//cJME.count++;
2518	2713	//cJME.count %= 12;
2519	2714	if (gc)
..	..	@@ -2697,6 +2892,7 @@
2697	2892	}
2698	2893	}
2699	2894	}
	2895	+
2700	2896	cFileSystemPane FSPane;
2701	2897
2702	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2750,11 +2946,14 @@
2750	2946	}
2751	2947	}
2752	2948	}
	2949	+
2753	2950	freezematerial = false;
2754	2951	}
2755	2952
2756	2953	void SetMaterial(Object3D object)
2757	2954	{
	2955	+ latestObject = object;
	2956	+
2758	2957	cMaterial mat = object.material;
2759	2958
2760	2959	if (mat == null)
..	..	@@ -2866,12 +3065,17 @@
2866	3065	// }
2867	3066
2868	3067	/**/
2869		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2870	3069	{
2871	3070	//group.deselectAll();
2872	3071	//freeze = true;
2873	3072	GetTree().clearSelection();
2874	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2875	3079	}
2876	3080
2877	3081	//group.addSelectee(child);
..	..	@@ -2940,7 +3144,7 @@
2940	3144	cameraView.ToggleDL();
2941	3145	cameraView.repaint();
2942	3146	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3148	{
2945	3149	cameraView.ToggleTexture();
2946	3150	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3183,9 @@
2979	3183	frame.validate();
2980	3184
2981	3185	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3187	{
2984		- cameraView.ToggleRandom();
	3188	+ cameraView.ToggleSwitch();
2985	3189	cameraView.repaint();
2986	3190	return;
2987	3191	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,8 +3256,9 @@
3052	3256
3053	3257	public void actionPerformed(ActionEvent event)
3054	3258	{
	3259	+ Object source = event.getSource();
3055	3260	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3261	+ if (source == okbutton)
3057	3262	{
3058	3263	textpanel.setVisible(false);
3059	3264	textpanel.remove(textarea);
..	..	@@ -3065,7 +3270,7 @@
3065	3270	textarea = null;
3066	3271	textpanel = null;
3067	3272	}
3068		- if (event.getSource() == cancelbutton)
	3273	+ if (source == cancelbutton)
3069	3274	{
3070	3275	textpanel.setVisible(false);
3071	3276	textpanel.remove(textarea);
..	..	@@ -3077,50 +3282,50 @@
3077	3282	//applySelf();
3078	3283	//client.refreshEditWindow();
3079	3284	//refreshContents();
3080		- if (event.getSource() == nameField)
	3285	+ if (source == nameField)
3081	3286	{
3082	3287	//System.out.println("ObjEditor " + event);
3083	3288	applySelf0(true);
3084	3289	//parent.applySelf();
3085	3290	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3291	+ } else if (source == resetButton)
3087	3292	{
3088	3293	CameraPane.fullreset = true;
3089	3294	copy.Reset(); // ResetMeshes();
3090	3295	copy.Touch();
3091	3296	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3297	+ } else if (source == stepItem)
3093	3298	{
3094	3299	//cameraView.ONESTEP = true;
3095	3300	Globals.ONESTEP = true;
3096	3301	cameraView.repaint();
3097	3302	return;
3098		- } else if (event.getSource() == stepButton)
	3303	+ } else if (source == stepButton)
3099	3304	{
3100	3305	copy.Step();
3101	3306	copy.Touch();
3102	3307	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3308	+ } else if (source == slowerButton)
3104	3309	{
3105	3310	copy.Slower();
3106	3311	copy.Touch();
3107	3312	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3313	+ } else if (source == fasterButton)
3109	3314	{
3110	3315	copy.Faster();
3111	3316	copy.Touch();
3112	3317	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3318	+ } else if (source == remarkButton)
3114	3319	{
3115	3320	copy.Remark();
3116	3321	copy.Touch();
3117	3322	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3323	+ } else if (source == stepAllButton)
3119	3324	{
3120	3325	copy.StepAll();
3121	3326	copy.Touch();
3122	3327	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3328	+ } else if (source == resetAllButton)
3124	3329	{
3125	3330	//CameraPane.fullreset = true;
3126	3331	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3358,79 @@
3153	3358	// Close();
3154	3359	// }
3155	3360	// else
3156		- if (event.getSource() == resetSlidersButton)
	3361	+ if (source == resetSlidersButton)
3157	3362	{
3158	3363	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3364	+ } else if (source == clearMaterialButton)
3160	3365	{
3161	3366	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3367	+ } else if (source == createMaterialButton)
3163	3368	{
3164	3369	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3370	+ } else if (source == clearPanelButton)
3166	3371	{
3167	3372	copy.ClearUI();
3168	3373	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3374	+ } else if (source == importGFDItem)
	3375	+ {
	3376	+ ImportGFD();
	3377	+ } else
	3378	+ if (source == importVRMLX3DItem)
	3379	+ {
	3380	+ ImportVRMLX3D();
	3381	+ } else
	3382	+ if (source == import3DSItem)
	3383	+ {
	3384	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3385	+ } else
	3386	+ if (source == importOBJItem)
	3387	+ {
	3388	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3389	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3390	+ browser.setVisible(true);
	3391	+ String filename = browser.getFile();
	3392	+ if (filename != null && filename.length() > 0)
	3393	+ {
	3394	+ String fullname = browser.getDirectory() + filename;
	3395	+ makeSomething(ReadOBJ(fullname), true);
	3396	+ }
	3397	+ } else
	3398	+ if (source == closeItem)
3175	3399	{
3176	3400	Close();
3177	3401	//return true;
3178		- } else if (event.getSource() == loadItem)
	3402	+ } else if (source == openItem)
3179	3403	{
3180		- load();
	3404	+ Open();
3181	3405	//return true;
3182		- } else if (event.getSource() == saveItem)
	3406	+ } else if (source == newItem)
	3407	+ {
	3408	+ New();
	3409	+ } else if (source == saveItem)
3183	3410	{
3184	3411	save();
3185	3412	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3413	+ } else if (source == saveAsItem)
3187	3414	{
3188	3415	saveAs();
3189	3416	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3417	+ } else if (source == reexportItem)
3191	3418	{
3192	3419	reexport();
3193	3420	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3421	+ } else if (source == exportAsItem)
3195	3422	{
3196	3423	export();
3197	3424	//return true;
3198		- } else if (event.getSource() == povItem)
	3425	+ } else if (source == povItem)
3199	3426	{
3200	3427	generatePOV();
3201	3428	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
	3433	+ } else if (source == zBufferItem)
3203	3434	{
3204	3435	try
3205	3436	{
..	..	@@ -3221,21 +3452,8 @@
3221	3452	cameraView.repaint();
3222	3453	//return true;
3223	3454	}
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)
	3455	+ */ else // combos...
	3456	+ if (source == texresMenu)
3239	3457	{
3240	3458	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3459	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3465,343 @@
3247	3465	}
3248	3466	}
3249	3467
	3468	+ void New()
	3469	+ {
	3470	+ while (copy.Size() > 1)
	3471	+ {
	3472	+ copy.remove(1);
	3473	+ }
	3474	+
	3475	+ ResetModel();
	3476	+ objEditor.refreshContents();
	3477	+ }
	3478	+
	3479	+ static public byte[] Compress(Object3D o)
	3480	+ {
	3481	+ try
	3482	+ {
	3483	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3486	+
	3487	+ Object3D parent = o.parent;
	3488	+ o.parent = null;
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ o.parent = parent;
	3493	+
	3494	+ out.flush();
	3495	+
	3496	+ baos //zstream
	3497	+ .close();
	3498	+ out.close();
	3499	+
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
	3504	+ } catch (Exception e)
	3505	+ {
	3506	+ System.err.println(e);
	3507	+ return null;
	3508	+ }
	3509	+ }
	3510	+
	3511	+ static public Object Uncompress(byte[] bytes)
	3512	+ {
	3513	+ System.out.println("restore #bytes = " + bytes.length);
	3514	+ try
	3515	+ {
	3516	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3519	+ Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
	3523	+ in.close();
	3524	+
	3525	+ return obj;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object clone(Object o)
	3534	+ {
	3535	+ try
	3536	+ {
	3537	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3538	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3539	+
	3540	+ out.writeObject(o);
	3541	+
	3542	+ out.flush();
	3543	+ out.close();
	3544	+
	3545	+ byte[] bytes = baos.toByteArray();
	3546	+
	3547	+ System.out.println("clone = " + bytes.length);
	3548	+
	3549	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3550	+ ObjectInputStream in = new ObjectInputStream(bais);
	3551	+ Object obj = in.readObject();
	3552	+ in.close();
	3553	+
	3554	+ return obj;
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ System.err.println(e);
	3558	+ return null;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ cRadio GetCurrentTab()
	3563	+ {
	3564	+ cRadio ab;
	3565	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3566	+ {
	3567	+ ab = (cRadio)e.nextElement();
	3568	+ if(ab.GetObject() == copy)
	3569	+ {
	3570	+ return ab;
	3571	+ }
	3572	+ }
	3573	+
	3574	+ return null;
	3575	+ }
	3576	+
	3577	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3578	+
	3579	+ public void Save()
	3580	+ {
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
	3604	+ cRadio tab = GetCurrentTab();
	3605	+
	3606	+ boolean temp = CameraPane.SWITCH;
	3607	+ CameraPane.SWITCH = false;
	3608	+
	3609	+ copy.ExtractBigData(hashtable);
	3610	+
	3611	+ byte[] compress = Compress(copy);
	3612	+
	3613	+ CameraPane.SWITCH = temp;
	3614	+
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
	3637	+ //assert(hashtable.isEmpty());
	3638	+
	3639	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3640	+ {
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
	3643	+ }
	3644	+
	3645	+ SetUndoStates();
	3646	+
	3647	+ // test save
	3648	+ if (false)
	3649	+ {
	3650	+ try
	3651	+ {
	3652	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3653	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3654	+
	3655	+ p.writeObject(copy);
	3656	+
	3657	+ p.flush();
	3658	+
	3659	+ ostream.close();
	3660	+ } catch (Exception e)
	3661	+ {
	3662	+ e.printStackTrace();
	3663	+ }
	3664	+ }
	3665	+
	3666	+ return !thesame;
	3667	+ }
	3668	+
	3669	+ void CopyChanged(Object3D obj)
	3670	+ {
	3671	+ SetUndoStates();
	3672	+
	3673	+ boolean temp = CameraPane.SWITCH;
	3674	+ CameraPane.SWITCH = false;
	3675	+
	3676	+ copy.ExtractBigData(hashtable);
	3677	+
	3678	+ copy.clear();
	3679	+
	3680	+ for (int i=0; i<obj.Size(); i++)
	3681	+ {
	3682	+ copy.add(obj.get(i));
	3683	+ }
	3684	+
	3685	+ copy.RestoreBigData(hashtable);
	3686	+
	3687	+ CameraPane.SWITCH = temp;
	3688	+
	3689	+ //assert(hashtable.isEmpty());
	3690	+
	3691	+ copy.Touch();
	3692	+
	3693	+ ResetModel();
	3694	+ copy.HardTouch(); // recompile?
	3695	+
	3696	+ cRadio ab;
	3697	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3698	+ {
	3699	+ ab = (cRadio)e.nextElement();
	3700	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3701	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3702	+ if (test != null)
	3703	+ {
	3704	+ test.editWindow = ab.object.editWindow;
	3705	+ ab.object = test;
	3706	+ }
	3707	+ }
	3708	+
	3709	+ refreshContents();
	3710	+ }
	3711	+
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
	3716	+ {
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
	3727	+ cRadio tab = GetCurrentTab();
	3728	+
	3729	+ if (tab.undoindex == 0)
	3730	+ {
	3731	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
	3736	+ {
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
	3746	+ }
	3747	+
	3748	+ tab.undoindex -= 1;
	3749	+
	3750	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
	3753	+ }
	3754	+
	3755	+ public void Redo()
	3756	+ {
	3757	+ cRadio tab = GetCurrentTab();
	3758	+
	3759	+ if (tab.graphs[tab.undoindex + 1] == null)
	3760	+ {
	3761	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3762	+ return;
	3763	+ }
	3764	+
	3765	+ tab.undoindex += 1;
	3766	+
	3767	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
	3771	+ }
	3772	+
	3773	+ void ImportGFD()
	3774	+ {
	3775	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3776	+ browser.show();
	3777	+ String filename = browser.getFile();
	3778	+ if (filename != null && filename.length() > 0)
	3779	+ {
	3780	+ String fullname = browser.getDirectory() + filename;
	3781	+
	3782	+ //Object3D readobj =
	3783	+ objEditor.ReadGFD(fullname, objEditor);
	3784	+ //makeSomething(readobj);
	3785	+ }
	3786	+ }
	3787	+
	3788	+ void ImportVRMLX3D()
	3789	+ {
	3790	+ if (Grafreed.standAlone)
	3791	+ {
	3792	+ /**/
	3793	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3794	+ browser.show();
	3795	+ String filename = browser.getFile();
	3796	+ if (filename != null && filename.length() > 0)
	3797	+ {
	3798	+ String fullname = browser.getDirectory() + filename;
	3799	+ LoadVRMLX3D(fullname);
	3800	+ }
	3801	+ /**/
	3802	+ }
	3803	+ }
	3804	+
3250	3805	void ToggleAnimation()
3251	3806	{
3252	3807	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +3919,7 @@
3364	3919	assert false;
3365	3920	}
3366	3921
3367		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3368	3923	{
3369	3924	}
3370	3925
..	..	@@ -3859,6 +4414,8 @@
3859	4414
3860	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4416	{
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
3862	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +4502,12 @@
3945	4502	{
3946	4503	ResetModel();
3947	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
3948	4511	refreshContents();
3949	4512	}
3950	4513
..	..	@@ -4062,6 +4625,7 @@
4062	4625	}
4063	4626	}
4064	4627	}
	4628	+
4065	4629	LoadGFDThread loadGFDThread;
4066	4630
4067	4631	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4081,8 +4645,10 @@
4081	4645
4082	4646	try
4083	4647	{
	4648	+ // Try compressed version first.
4084	4649	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4085		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4650	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4086	4652
4087	4653	readobj = (Object3D) p.readObject();
4088	4654	istream.close();
..	..	@@ -4090,7 +4656,20 @@
4090	4656	readobj.ResetDisplayList();
4091	4657	} catch (Exception e)
4092	4658	{
4093		- e.printStackTrace();
	4659	+ //e.printStackTrace();
	4660	+ try
	4661	+ {
	4662	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4663	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4664	+
	4665	+ readobj = (Object3D) p.readObject();
	4666	+ istream.close();
	4667	+
	4668	+ readobj.ResetDisplayList();
	4669	+ } catch (Exception e2)
	4670	+ {
	4671	+ e2.printStackTrace();
	4672	+ }
4094	4673	}
4095	4674	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4096	4675	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4136,6 +4715,12 @@
4136	4715
4137	4716	void LoadIt(Object obj)
4138	4717	{
	4718	+ if (obj == null)
	4719	+ {
	4720	+ // Invalid file
	4721	+ return;
	4722	+ }
	4723	+
4139	4724	System.out.println("Loaded " + obj);
4140	4725	//new Exception().printStackTrace();
4141	4726	Object3D readobj = (Object3D) obj;
..	..	@@ -4145,6 +4730,8 @@
4145	4730
4146	4731	if (readobj != null)
4147	4732	{
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4148	4735	try
4149	4736	{
4150	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4205,7 +4792,7 @@
4205	4792	}
4206	4793	}
4207	4794
4208		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4209	4796	{
4210	4797	if (Grafreed.standAlone)
4211	4798	{
..	..	@@ -4294,11 +4881,13 @@
4294	4881	try
4295	4882	{
4296	4883	FileOutputStream ostream = new FileOutputStream(lastname);
4297		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4884	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4885	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4298	4886
4299	4887	p.writeObject(copy);
4300	4888	p.flush();
4301	4889
	4890	+ zstream.close();
4302	4891	ostream.close();
4303	4892
4304	4893	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4308,6 +4897,7 @@
4308	4897	{
4309	4898	}
4310	4899	}
	4900	+
4311	4901	String lastname;
4312	4902
4313	4903	void saveAs()
..	..	@@ -4319,6 +4909,8 @@
4319	4909	String filename = browser.getFile();
4320	4910	if (filename != null && filename.length() > 0)
4321	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4322	4914	lastname = browser.getDirectory() + filename;
4323	4915	save();
4324	4916	}
..	..	@@ -4417,8 +5009,8 @@
4417	5009	try
4418	5010	{
4419	5011	FileOutputStream ostream = new FileOutputStream(filename);
4420		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4421		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5012	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5013	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4422	5014
4423	5015	Object3D objectparent = obj.parent;
4424	5016	obj.parent = null;
..	..	@@ -4435,8 +5027,8 @@
4435	5027	p.writeObject(object);
4436	5028	p.flush();
4437	5029
	5030	+ zstream.close();
4438	5031	ostream.close();
4439		- // zstream.close();
4440	5032
4441	5033	// group.selection.get(0).parent = parent;
4442	5034	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4483,19 +5075,18 @@
4483	5075	Object3D client;
4484	5076	Object3D copy;
4485	5077	MenuBar menuBar;
4486		- Menu windowMenu;
4487		- MenuItem loadItem;
	5078	+ Menu fileMenu;
	5079	+ MenuItem newItem;
	5080	+ MenuItem openItem;
4488	5081	MenuItem saveItem;
4489	5082	MenuItem saveAsItem;
4490	5083	MenuItem exportAsItem;
4491	5084	MenuItem reexportItem;
4492	5085	MenuItem povItem;
4493	5086	MenuItem closeItem;
4494		- Menu cameraMenu;
	5087	+
4495	5088	CheckboxMenuItem zBufferItem;
4496	5089	//MenuItem normalLensItem;
4497		- MenuItem editCameraItem;
4498		- MenuItem revertCameraItem;
4499	5090	MenuItem stepItem;
4500	5091	CheckboxMenuItem toggleLiveItem;
4501	5092	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4509,22 +5100,36 @@
4509	5100	CheckboxMenuItem toggleSwitchItem;
4510	5101	CheckboxMenuItem toggleRootItem;
4511	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4512	5104	CheckboxMenuItem toggleHandleItem;
4513	5105	CheckboxMenuItem togglePaintItem;
4514	5106	JSplitPane mainPanel;
4515	5107	JScrollPane scrollpane;
	5108	+
4516	5109	JPanel toolbarPanel;
	5110	+
4517	5111	cGridBag treePanel;
	5112	+
4518	5113	JPanel radioPanel;
4519	5114	ButtonGroup buttonGroup;
4520		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4521	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4522	5120	JScrollPane infoPanel;
	5121	+
4523	5122	cGridBag optionsPanel;
	5123	+
4524	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4525	5128	cGridBag XYZPanel;
	5129	+
4526	5130	JSplitPane gridPanel;
4527	5131	JSplitPane bigPanel;
	5132	+
4528	5133	cGridBag bigThree;
4529	5134	cGridBag scenePanel;
4530	5135	cGridBag centralPanel;
..	..	@@ -4639,8 +5244,13 @@
4639	5244	cNumberSlider fogField;
4640	5245	JLabel opacityPowerLabel;
4641	5246	cNumberSlider opacityPowerField;
4642		- JTree jTree;
	5247	+ cTree jTree;
4643	5248	//ObjectUI parent;
4644	5249
4645	5250	cNumberSlider normalpushField;
	5251	+
	5252	+ private MenuItem importGFDItem;
	5253	+ private MenuItem importVRMLX3DItem;
	5254	+ private MenuItem import3DSItem;
	5255	+ private MenuItem importOBJItem;
4646	5256	}