~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,27 +340,48 @@
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(loadItem = 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
	384	+ newItem.addActionListener(this);
297	385	loadItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.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(50, 200));
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(1);
	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()
..	..	@@ -784,6 +946,7 @@
784	946	// NumberSlider vDivsField;
785	947	// JCheckBox endcaps;
786	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
787	950	JCheckBox hideCB;
788	951	JCheckBox link2masterCB;
789	952	JCheckBox markCB;
..	..	@@ -791,7 +954,12 @@
791	954	JCheckBox speedupCB;
792	955	JCheckBox rewindCB;
793	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
794	961	JComboBox texresMenu;
	962	+
795	963	JButton resetButton;
796	964	JButton stepButton;
797	965	JButton stepAllButton;
..	..	@@ -800,9 +968,13 @@
800	968	JButton fasterButton;
801	969	JButton remarkButton;
802	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
803	974	cGridBag namePanel;
804	975	cGridBag setupPanel;
805		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
806	978	cGridBag pushPanel;
807	979	cGridBag fillPanel;
808	980
..	..	@@ -974,61 +1146,67 @@
974	1146	namePanel = new cGridBag();
975	1147
976	1148	nameField = AddText(namePanel, copy.GetName());
977		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
978	1150	oe.ctrlPanel.add(namePanel);
979	1151
980	1152	oe.ctrlPanel.Return();
981	1153
982		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
983	1155	return;
984	1156
985	1157	setupPanel = new cGridBag().setVertical(false);
986	1158
987	1159	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988	1160	liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
	1163	+// Return();
989	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990	1165	hideCB.setToolTipText("Hide object");
991		-// Return();
992	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
994	1168
995		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
996	1172	rewindCB.setToolTipText("Rewind animation");
997	1173
998		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999		- randomCB.setToolTipText("Option for switch node");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1000	1176
1001	1177	if (Globals.ADVANCED)
1002	1178	{
1003		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1004	1180	link2masterCB.setToolTipText("Attach to support");
1005		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1006	1182	speedupCB.setToolTipText("Option motion capture");
1007	1183	}
1008	1184
1009	1185	oe.ctrlPanel.add(setupPanel);
1010	1186	oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
1011	1189
1012		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
1013	1191
1014		- resetButton = AddButton(commandsPanel, "Reset");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1015	1193	resetButton.setToolTipText("Jump to frame zero");
1016		- stepButton = AddButton(commandsPanel, "Step");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
1017	1195	stepButton.setToolTipText("Step one frame");
1018	1196	// resetAllButton = AddButton(oe, "Reset All");
1019	1197	// stepAllButton = AddButton(oe, "Step All");
1020	1198	// Return();
1021		- slowerButton = AddButton(commandsPanel, "Slow");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1022	1200	slowerButton.setToolTipText("Decrease animation speed");
1023		- fasterButton = AddButton(commandsPanel, "Fast");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1024	1202	fasterButton.setToolTipText("Increase animation speed");
1025		- remarkButton = AddButton(commandsPanel, "Remark");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1026	1204	remarkButton.setToolTipText("Set the current transform as the target");
1027	1205
1028		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
1029	1207	oe.ctrlPanel.Return();
1030	1208
1031		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1209	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032	1210	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033	1211	//Return();
1034	1212
..	..	@@ -1231,8 +1409,11 @@
1231	1409	//worldPanel.setName("World");
1232	1410	centralPanel = new cGridBag();
1233	1411	centralPanel.preferredWidth = 20;
1234		- timelinePanel = new JPanel(new BorderLayout());
1235		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1236	1417
1237	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1238	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1241,7 +1422,10 @@
1241	1422	// cameraPanel.setDividerSize(9);
1242	1423	cameraPanel.setResizeWeight(1.0);
1243	1424
	1425	+ }
	1426	+
1244	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1245	1429	//frame.setJMenuBar(timelineMenubar);
1246	1430	//centralPanel.add(timelinePanel);
1247	1431
..	..	@@ -1308,8 +1492,9 @@
1308	1492	// north.setName("Edit");
1309	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1310	1494	// objectPanel.add(north);
1311		- objectPanel.add(ctrlPanel);
	1495	+ objectPanel.add(editPanel);
1312	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1313	1498
1314	1499	/*
1315	1500	aConstraints.gridx = 0;
..	..	@@ -1318,7 +1503,7 @@
1318	1503	aConstraints.gridy += 1;
1319	1504	aConstraints.gridwidth = 1;
1320	1505	mainPanel.add(objectPanel, aConstraints);
1321		- */
	1506	+ */
1322	1507
1323	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1324	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1335,9 +1520,7 @@
1335	1520	JTabbedPane tabbedPane = new JTabbedPane();
1336	1521	tabbedPane.add(scrollpane);
1337	1522
1338		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1339		-
1340		- optionsPanel = new cGridBag().setVertical(true);
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1341	1524
1342	1525	optionsPanel.setName("Options");
1343	1526
..	..	@@ -1345,6 +1528,8 @@
1345	1528
1346	1529	tabbedPane.add(optionsPanel);
1347	1530
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1532	+
1348	1533	scenePanel.add(tabbedPane);
1349	1534
1350	1535	/*
..	..	@@ -1437,9 +1622,14 @@
1437	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1438	1623
1439	1624	frame.setSize(1280, 860);
1440		- frame.setVisible(true);
1441		-
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1442	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1443	1633
1444	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1445	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1526,24 +1716,6 @@
1526	1716	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1527	1717	colorSection.add(texture);
1528	1718
1529		- cGridBag anisoU = new cGridBag();
1530		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1531		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1533		- colorSection.add(anisoU);
1534		-
1535		- cGridBag anisoV = new cGridBag();
1536		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1537		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1538		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1539		- colorSection.add(anisoV);
1540		-
1541		- cGridBag shadowbias = new cGridBag();
1542		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1543		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1544		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1545		- colorSection.add(shadowbias);
1546		-
1547	1719	panel.add(new JSeparator());
1548	1720
1549	1721	panel.add(colorSection);
..	..	@@ -1593,6 +1765,12 @@
1593	1765	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594	1766	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1595	1767	diffuseSection.add(fakedepth);
	1768	+
	1769	+ cGridBag shadowbias = new cGridBag();
	1770	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1771	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1772	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1773	+ diffuseSection.add(shadowbias);
1596	1774
1597	1775	panel.add(new JSeparator());
1598	1776
..	..	@@ -1644,6 +1822,18 @@
1644	1822	// aConstraints.gridy += 1;
1645	1823	// aConstraints.gridwidth = 1;
1646	1824
	1825	+ cGridBag anisoU = new cGridBag();
	1826	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1827	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1828	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1829	+ specularSection.add(anisoU);
	1830	+
	1831	+ cGridBag anisoV = new cGridBag();
	1832	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1833	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1834	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1835	+ specularSection.add(anisoV);
	1836	+
1647	1837
1648	1838	panel.add(new JSeparator());
1649	1839
..	..	@@ -1651,35 +1841,35 @@
1651	1841
1652	1842	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1653	1843
1654		- cGridBag globalSection = new cGridBag().setVertical(true);
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1655	1845
1656	1846	cGridBag camera = new cGridBag();
1657	1847	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1658	1848	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1659	1849	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1660		- globalSection.add(camera);
	1850	+ colorSection.add(camera);
1661	1851
1662	1852	cGridBag ambient = new cGridBag();
1663	1853	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1664	1854	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665	1855	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1666		- globalSection.add(ambient);
	1856	+ colorSection.add(ambient);
1667	1857
1668	1858	cGridBag backlit = new cGridBag();
1669	1859	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1670	1860	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671	1861	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1672		- globalSection.add(backlit);
	1862	+ colorSection.add(backlit);
1673	1863
1674	1864	cGridBag opacity = new cGridBag();
1675	1865	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1676	1866	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677	1867	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1678		- globalSection.add(opacity);
	1868	+ colorSection.add(opacity);
1679	1869
1680		- panel.add(new JSeparator());
	1870	+ //panel.add(new JSeparator());
1681	1871
1682		- panel.add(globalSection);
	1872	+ //panel.add(globalSection);
1683	1873
1684	1874	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1685	1875
..	..	@@ -1988,6 +2178,7 @@
1988	2178	e2.printStackTrace();
1989	2179	}
1990	2180	}
	2181	+
1991	2182	LoadJMEThread loadThread;
1992	2183
1993	2184	class LoadJMEThread extends Thread
..	..	@@ -2045,6 +2236,7 @@
2045	2236	//LoadFile0(filename, converter);
2046	2237	}
2047	2238	}
	2239	+
2048	2240	LoadOBJThread loadObjThread;
2049	2241
2050	2242	class LoadOBJThread extends Thread
..	..	@@ -2123,19 +2315,19 @@
2123	2315
2124	2316	void LoadObjFile(String fullname)
2125	2317	{
2126		- /*
	2318	+ System.out.println("Loading " + fullname);
	2319	+ /**/
2127	2320	//lastFilename = fullname;
2128	2321	if(loadObjThread == null)
2129	2322	{
2130		- loadObjThread = new LoadOBJThread();
2131		- loadObjThread.start();
	2323	+ loadObjThread = new LoadOBJThread();
	2324	+ loadObjThread.start();
2132	2325	}
2133	2326
2134	2327	loadObjThread.add(fullname);
2135		- */
	2328	+ /**/
2136	2329
2137		- System.out.println("Loading " + fullname);
2138		- makeSomething(new FileObject(fullname, true), true);
	2330	+ //makeSomething(new FileObject(fullname, true), true);
2139	2331	}
2140	2332
2141	2333	void LoadGFDFile(String fullname)
..	..	@@ -2752,6 +2944,8 @@
2752	2944
2753	2945	void SetMaterial(Object3D object)
2754	2946	{
	2947	+ latestObject = object;
	2948	+
2755	2949	cMaterial mat = object.material;
2756	2950
2757	2951	if (mat == null)
..	..	@@ -2863,12 +3057,17 @@
2863	3057	// }
2864	3058
2865	3059	/**/
2866		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2867	3061	{
2868	3062	//group.deselectAll();
2869	3063	//freeze = true;
2870	3064	GetTree().clearSelection();
2871	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2872	3071	}
2873	3072
2874	3073	//group.addSelectee(child);
..	..	@@ -2937,7 +3136,7 @@
2937	3136	cameraView.ToggleDL();
2938	3137	cameraView.repaint();
2939	3138	return;
2940		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2941	3140	{
2942	3141	cameraView.ToggleTexture();
2943	3142	// june 2013 copy.HardTouch();
..	..	@@ -2976,9 +3175,9 @@
2976	3175	frame.validate();
2977	3176
2978	3177	return;
2979		- } else if (event.getSource() == toggleSwitchItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2980	3179	{
2981		- cameraView.ToggleRandom();
	3180	+ cameraView.ToggleSwitch();
2982	3181	cameraView.repaint();
2983	3182	return;
2984	3183	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3006,6 +3205,10 @@
3006	3205	} else if (event.getSource() == liveCB)
3007	3206	{
3008	3207	copy.live ^= true;
	3208	+ return;
	3209	+ } else if (event.getSource() == selectCB)
	3210	+ {
	3211	+ copy.dontselect ^= true;
3009	3212	return;
3010	3213	} else if (event.getSource() == hideCB)
3011	3214	{
..	..	@@ -3045,8 +3248,9 @@
3045	3248
3046	3249	public void actionPerformed(ActionEvent event)
3047	3250	{
	3251	+ Object source = event.getSource();
3048	3252	// SCRIPT DIALOG
3049		- if (event.getSource() == okbutton)
	3253	+ if (source == okbutton)
3050	3254	{
3051	3255	textpanel.setVisible(false);
3052	3256	textpanel.remove(textarea);
..	..	@@ -3058,7 +3262,7 @@
3058	3262	textarea = null;
3059	3263	textpanel = null;
3060	3264	}
3061		- if (event.getSource() == cancelbutton)
	3265	+ if (source == cancelbutton)
3062	3266	{
3063	3267	textpanel.setVisible(false);
3064	3268	textpanel.remove(textarea);
..	..	@@ -3070,50 +3274,50 @@
3070	3274	//applySelf();
3071	3275	//client.refreshEditWindow();
3072	3276	//refreshContents();
3073		- if (event.getSource() == nameField)
	3277	+ if (source == nameField)
3074	3278	{
3075	3279	//System.out.println("ObjEditor " + event);
3076	3280	applySelf0(true);
3077	3281	//parent.applySelf();
3078	3282	objEditor.refreshContents();
3079		- } else if (event.getSource() == resetButton)
	3283	+ } else if (source == resetButton)
3080	3284	{
3081	3285	CameraPane.fullreset = true;
3082	3286	copy.Reset(); // ResetMeshes();
3083	3287	copy.Touch();
3084	3288	objEditor.refreshContents();
3085		- } else if (event.getSource() == stepItem)
	3289	+ } else if (source == stepItem)
3086	3290	{
3087	3291	//cameraView.ONESTEP = true;
3088	3292	Globals.ONESTEP = true;
3089	3293	cameraView.repaint();
3090	3294	return;
3091		- } else if (event.getSource() == stepButton)
	3295	+ } else if (source == stepButton)
3092	3296	{
3093	3297	copy.Step();
3094	3298	copy.Touch();
3095	3299	objEditor.refreshContents();
3096		- } else if (event.getSource() == slowerButton)
	3300	+ } else if (source == slowerButton)
3097	3301	{
3098	3302	copy.Slower();
3099	3303	copy.Touch();
3100	3304	objEditor.refreshContents();
3101		- } else if (event.getSource() == fasterButton)
	3305	+ } else if (source == fasterButton)
3102	3306	{
3103	3307	copy.Faster();
3104	3308	copy.Touch();
3105	3309	objEditor.refreshContents();
3106		- } else if (event.getSource() == remarkButton)
	3310	+ } else if (source == remarkButton)
3107	3311	{
3108	3312	copy.Remark();
3109	3313	copy.Touch();
3110	3314	objEditor.refreshContents();
3111		- } else if (event.getSource() == stepAllButton)
	3315	+ } else if (source == stepAllButton)
3112	3316	{
3113	3317	copy.StepAll();
3114	3318	copy.Touch();
3115	3319	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetAllButton)
	3320	+ } else if (source == resetAllButton)
3117	3321	{
3118	3322	//CameraPane.fullreset = true;
3119	3323	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3146,53 +3350,75 @@
3146	3350	// Close();
3147	3351	// }
3148	3352	// else
3149		- if (event.getSource() == resetSlidersButton)
	3353	+ if (source == resetSlidersButton)
3150	3354	{
3151	3355	ResetSliders();
3152		- } else if (event.getSource() == clearMaterialButton)
	3356	+ } else if (source == clearMaterialButton)
3153	3357	{
3154	3358	ClearMaterial();
3155		- } else if (event.getSource() == createMaterialButton)
	3359	+ } else if (source == createMaterialButton)
3156	3360	{
3157	3361	CreateMaterial();
3158		- } else if (event.getSource() == clearPanelButton)
	3362	+ } else if (source == clearPanelButton)
3159	3363	{
3160	3364	copy.ClearUI();
3161	3365	refreshContents(true);
3162		- } /*
3163		- }
3164		-
3165		- public boolean action(Event event, Object arg)
3166		- {
3167		- */ else if (event.getSource() == closeItem)
	3366	+ } else if (source == importGFDItem)
	3367	+ {
	3368	+ ImportGFD();
	3369	+ } else
	3370	+ if (source == importVRMLX3DItem)
	3371	+ {
	3372	+ ImportVRMLX3D();
	3373	+ } else
	3374	+ if (source == import3DSItem)
	3375	+ {
	3376	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3377	+ } else
	3378	+ if (source == importOBJItem)
	3379	+ {
	3380	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3381	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3382	+ browser.setVisible(true);
	3383	+ String filename = browser.getFile();
	3384	+ if (filename != null && filename.length() > 0)
	3385	+ {
	3386	+ String fullname = browser.getDirectory() + filename;
	3387	+ makeSomething(ReadOBJ(fullname), true);
	3388	+ }
	3389	+ } else
	3390	+ if (source == closeItem)
3168	3391	{
3169	3392	Close();
3170	3393	//return true;
3171		- } else if (event.getSource() == loadItem)
	3394	+ } else if (source == loadItem)
3172	3395	{
3173	3396	load();
3174	3397	//return true;
3175		- } else if (event.getSource() == saveItem)
	3398	+ } else if (source == newItem)
	3399	+ {
	3400	+ New();
	3401	+ } else if (source == saveItem)
3176	3402	{
3177	3403	save();
3178	3404	//return true;
3179		- } else if (event.getSource() == saveAsItem)
	3405	+ } else if (source == saveAsItem)
3180	3406	{
3181	3407	saveAs();
3182	3408	//return true;
3183		- } else if (event.getSource() == reexportItem)
	3409	+ } else if (source == reexportItem)
3184	3410	{
3185	3411	reexport();
3186	3412	//return true;
3187		- } else if (event.getSource() == exportAsItem)
	3413	+ } else if (source == exportAsItem)
3188	3414	{
3189	3415	export();
3190	3416	//return true;
3191		- } else if (event.getSource() == povItem)
	3417	+ } else if (source == povItem)
3192	3418	{
3193	3419	generatePOV();
3194	3420	//return true;
3195		- } else if (event.getSource() == zBufferItem)
	3421	+ } else if (source == zBufferItem)
3196	3422	{
3197	3423	try
3198	3424	{
..	..	@@ -3214,21 +3440,8 @@
3214	3440	cameraView.repaint();
3215	3441	//return true;
3216	3442	}
3217		- */ else if (event.getSource() == editCameraItem)
3218		- {
3219		- cameraView.ProtectCamera();
3220		- cameraView.repaint();
3221		- return;
3222		- } else if (event.getSource() == revertCameraItem)
3223		- {
3224		- cameraView.RevertCamera();
3225		- cameraView.repaint();
3226		- return;
3227		-// } else if (event.getSource() == textureButton)
3228		-// {
3229		-// return; // true;
3230		- } else // combos...
3231		- if (event.getSource() == texresMenu)
	3443	+ */ else // combos...
	3444	+ if (source == texresMenu)
3232	3445	{
3233	3446	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3234	3447	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3240,6 +3453,283 @@
3240	3453	}
3241	3454	}
3242	3455
	3456	+ void New()
	3457	+ {
	3458	+ while (copy.Size() > 1)
	3459	+ {
	3460	+ copy.remove(1);
	3461	+ }
	3462	+
	3463	+ ResetModel();
	3464	+ objEditor.refreshContents();
	3465	+ }
	3466	+
	3467	+ static public byte[] Compress(Object3D o)
	3468	+ {
	3469	+ try
	3470	+ {
	3471	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3472	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3473	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3474	+
	3475	+ Object3D parent = o.parent;
	3476	+ o.parent = null;
	3477	+
	3478	+ out.writeObject(o);
	3479	+
	3480	+ o.parent = parent;
	3481	+
	3482	+ out.flush();
	3483	+
	3484	+ zstream.close();
	3485	+ out.close();
	3486	+
	3487	+ return baos.toByteArray();
	3488	+ } catch (Exception e)
	3489	+ {
	3490	+ System.err.println(e);
	3491	+ return null;
	3492	+ }
	3493	+ }
	3494	+
	3495	+ static public Object Uncompress(byte[] bytes)
	3496	+ {
	3497	+ System.out.println("#bytes = " + bytes.length);
	3498	+ try
	3499	+ {
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3502	+ ObjectInputStream in = new ObjectInputStream(istream);
	3503	+ Object obj = in.readObject();
	3504	+ in.close();
	3505	+
	3506	+ return obj;
	3507	+ } catch (Exception e)
	3508	+ {
	3509	+ System.err.println(e);
	3510	+ return null;
	3511	+ }
	3512	+ }
	3513	+
	3514	+ static public Object clone(Object o)
	3515	+ {
	3516	+ try
	3517	+ {
	3518	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3519	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3520	+
	3521	+ out.writeObject(o);
	3522	+
	3523	+ out.flush();
	3524	+ out.close();
	3525	+
	3526	+ byte[] bytes = baos.toByteArray();
	3527	+
	3528	+ System.out.println("clone = " + bytes.length);
	3529	+
	3530	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3531	+ ObjectInputStream in = new ObjectInputStream(bais);
	3532	+ Object obj = in.readObject();
	3533	+ in.close();
	3534	+
	3535	+ return obj;
	3536	+ } catch (Exception e)
	3537	+ {
	3538	+ System.err.println(e);
	3539	+ return null;
	3540	+ }
	3541	+ }
	3542	+
	3543	+ cRadio GetCurrentTab()
	3544	+ {
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ if(ab.GetObject() == copy)
	3550	+ {
	3551	+ return ab;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ return null;
	3556	+ }
	3557	+
	3558	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3559	+
	3560	+ public void Save()
	3561	+ {
	3562	+ System.err.println("Save");
	3563	+
	3564	+ cRadio tab = GetCurrentTab();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ byte[] compress = Compress(copy);
	3572	+
	3573	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3574	+ tab.graphs[tab.undoindex++] = compress;
	3575	+
	3576	+ copy.RestoreBigData(hashtable);
	3577	+
	3578	+ CameraPane.SWITCH = temp;
	3579	+
	3580	+ //assert(hashtable.isEmpty());
	3581	+
	3582	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3583	+ {
	3584	+ tab.graphs[i] = null;
	3585	+ }
	3586	+
	3587	+ SetUndoStates();
	3588	+
	3589	+ // test save
	3590	+ if (false)
	3591	+ {
	3592	+ try
	3593	+ {
	3594	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3595	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3596	+
	3597	+ p.writeObject(copy);
	3598	+
	3599	+ p.flush();
	3600	+
	3601	+ ostream.close();
	3602	+ } catch (Exception e)
	3603	+ {
	3604	+ e.printStackTrace();
	3605	+ }
	3606	+ }
	3607	+ }
	3608	+
	3609	+ void CopyChanged(Object3D obj)
	3610	+ {
	3611	+ SetUndoStates();
	3612	+
	3613	+ boolean temp = CameraPane.SWITCH;
	3614	+ CameraPane.SWITCH = false;
	3615	+
	3616	+ copy.ExtractBigData(hashtable);
	3617	+
	3618	+ copy.clear();
	3619	+
	3620	+ for (int i=0; i<obj.Size(); i++)
	3621	+ {
	3622	+ copy.add(obj.get(i));
	3623	+ }
	3624	+
	3625	+ copy.RestoreBigData(hashtable);
	3626	+
	3627	+ CameraPane.SWITCH = temp;
	3628	+
	3629	+ //assert(hashtable.isEmpty());
	3630	+
	3631	+ copy.Touch();
	3632	+
	3633	+ ResetModel();
	3634	+ copy.HardTouch(); // recompile?
	3635	+
	3636	+ cRadio ab;
	3637	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3638	+ {
	3639	+ ab = (cRadio)e.nextElement();
	3640	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3641	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3642	+ if (test != null)
	3643	+ {
	3644	+ test.editWindow = ab.object.editWindow;
	3645	+ ab.object = test;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ refreshContents();
	3650	+ }
	3651	+
	3652	+ cButton undoButton;
	3653	+ cButton redoButton;
	3654	+
	3655	+ void SetUndoStates()
	3656	+ {
	3657	+ cRadio tab = GetCurrentTab();
	3658	+
	3659	+ undoButton.setEnabled(tab.undoindex > 0);
	3660	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3661	+ }
	3662	+
	3663	+ public void Undo()
	3664	+ {
	3665	+ System.err.println("Undo");
	3666	+
	3667	+ cRadio tab = GetCurrentTab();
	3668	+
	3669	+ if (tab.undoindex == 0)
	3670	+ {
	3671	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3672	+ return;
	3673	+ }
	3674	+
	3675	+ if (tab.graphs[tab.undoindex] == null)
	3676	+ {
	3677	+ Save();
	3678	+ tab.undoindex -= 1;
	3679	+ }
	3680	+
	3681	+ tab.undoindex -= 1;
	3682	+
	3683	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3684	+ }
	3685	+
	3686	+ public void Redo()
	3687	+ {
	3688	+ cRadio tab = GetCurrentTab();
	3689	+
	3690	+ if (tab.graphs[tab.undoindex + 1] == null)
	3691	+ {
	3692	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3693	+ return;
	3694	+ }
	3695	+
	3696	+ tab.undoindex += 1;
	3697	+
	3698	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3699	+ }
	3700	+
	3701	+ void ImportGFD()
	3702	+ {
	3703	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3704	+ browser.show();
	3705	+ String filename = browser.getFile();
	3706	+ if (filename != null && filename.length() > 0)
	3707	+ {
	3708	+ String fullname = browser.getDirectory() + filename;
	3709	+
	3710	+ //Object3D readobj =
	3711	+ objEditor.ReadGFD(fullname, objEditor);
	3712	+ //makeSomething(readobj);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void ImportVRMLX3D()
	3717	+ {
	3718	+ if (Grafreed.standAlone)
	3719	+ {
	3720	+ /**/
	3721	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3722	+ browser.show();
	3723	+ String filename = browser.getFile();
	3724	+ if (filename != null && filename.length() > 0)
	3725	+ {
	3726	+ String fullname = browser.getDirectory() + filename;
	3727	+ LoadVRMLX3D(fullname);
	3728	+ }
	3729	+ /**/
	3730	+ }
	3731	+ }
	3732	+
3243	3733	void ToggleAnimation()
3244	3734	{
3245	3735	if (!Globals.ANIMATION)
..	..	@@ -3357,7 +3847,7 @@
3357	3847	assert false;
3358	3848	}
3359	3849
3360		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3361	3851	{
3362	3852	}
3363	3853
..	..	@@ -3588,7 +4078,7 @@
3588	4078	}
3589	4079
3590	4080	if (normalpushField != null)
3591		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4081	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3592	4082	}
3593	4083
3594	4084	void SnapObject()
..	..	@@ -3852,6 +4342,8 @@
3852	4342
3853	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3854	4344	{
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
3855	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
3856	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3857	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -3938,6 +4430,12 @@
3938	4430	{
3939	4431	ResetModel();
3940	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
3941	4439	refreshContents();
3942	4440	}
3943	4441
..	..	@@ -4055,6 +4553,7 @@
4055	4553	}
4056	4554	}
4057	4555	}
	4556	+
4058	4557	LoadGFDThread loadGFDThread;
4059	4558
4060	4559	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4074,8 +4573,10 @@
4074	4573
4075	4574	try
4076	4575	{
	4576	+ // Try compressed version first.
4077	4577	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4578	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4579	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4079	4580
4080	4581	readobj = (Object3D) p.readObject();
4081	4582	istream.close();
..	..	@@ -4083,7 +4584,20 @@
4083	4584	readobj.ResetDisplayList();
4084	4585	} catch (Exception e)
4085	4586	{
4086		- e.printStackTrace();
	4587	+ //e.printStackTrace();
	4588	+ try
	4589	+ {
	4590	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4591	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4592	+
	4593	+ readobj = (Object3D) p.readObject();
	4594	+ istream.close();
	4595	+
	4596	+ readobj.ResetDisplayList();
	4597	+ } catch (Exception e2)
	4598	+ {
	4599	+ e2.printStackTrace();
	4600	+ }
4087	4601	}
4088	4602	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4089	4603	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4129,6 +4643,12 @@
4129	4643
4130	4644	void LoadIt(Object obj)
4131	4645	{
	4646	+ if (obj == null)
	4647	+ {
	4648	+ // Invalid file
	4649	+ return;
	4650	+ }
	4651	+
4132	4652	System.out.println("Loaded " + obj);
4133	4653	//new Exception().printStackTrace();
4134	4654	Object3D readobj = (Object3D) obj;
..	..	@@ -4138,6 +4658,8 @@
4138	4658
4139	4659	if (readobj != null)
4140	4660	{
	4661	+ if (Globals.SAVEONMAKE)
	4662	+ Save();
4141	4663	try
4142	4664	{
4143	4665	//readobj.deepCopySelf(copy);
..	..	@@ -4287,11 +4809,13 @@
4287	4809	try
4288	4810	{
4289	4811	FileOutputStream ostream = new FileOutputStream(lastname);
4290		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4812	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4813	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4291	4814
4292	4815	p.writeObject(copy);
4293	4816	p.flush();
4294	4817
	4818	+ zstream.close();
4295	4819	ostream.close();
4296	4820
4297	4821	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4301,6 +4825,7 @@
4301	4825	{
4302	4826	}
4303	4827	}
	4828	+
4304	4829	String lastname;
4305	4830
4306	4831	void saveAs()
..	..	@@ -4312,6 +4837,8 @@
4312	4837	String filename = browser.getFile();
4313	4838	if (filename != null && filename.length() > 0)
4314	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4315	4842	lastname = browser.getDirectory() + filename;
4316	4843	save();
4317	4844	}
..	..	@@ -4410,8 +4937,8 @@
4410	4937	try
4411	4938	{
4412	4939	FileOutputStream ostream = new FileOutputStream(filename);
4413		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4940	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4941	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4415	4942
4416	4943	Object3D objectparent = obj.parent;
4417	4944	obj.parent = null;
..	..	@@ -4428,8 +4955,8 @@
4428	4955	p.writeObject(object);
4429	4956	p.flush();
4430	4957
	4958	+ zstream.close();
4431	4959	ostream.close();
4432		- // zstream.close();
4433	4960
4434	4961	// group.selection.get(0).parent = parent;
4435	4962	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4476,7 +5003,8 @@
4476	5003	Object3D client;
4477	5004	Object3D copy;
4478	5005	MenuBar menuBar;
4479		- Menu windowMenu;
	5006	+ Menu fileMenu;
	5007	+ MenuItem newItem;
4480	5008	MenuItem loadItem;
4481	5009	MenuItem saveItem;
4482	5010	MenuItem saveAsItem;
..	..	@@ -4484,11 +5012,9 @@
4484	5012	MenuItem reexportItem;
4485	5013	MenuItem povItem;
4486	5014	MenuItem closeItem;
4487		- Menu cameraMenu;
	5015	+
4488	5016	CheckboxMenuItem zBufferItem;
4489	5017	//MenuItem normalLensItem;
4490		- MenuItem editCameraItem;
4491		- MenuItem revertCameraItem;
4492	5018	MenuItem stepItem;
4493	5019	CheckboxMenuItem toggleLiveItem;
4494	5020	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4506,18 +5032,31 @@
4506	5032	CheckboxMenuItem togglePaintItem;
4507	5033	JSplitPane mainPanel;
4508	5034	JScrollPane scrollpane;
	5035	+
4509	5036	JPanel toolbarPanel;
	5037	+
4510	5038	cGridBag treePanel;
	5039	+
4511	5040	JPanel radioPanel;
4512	5041	ButtonGroup buttonGroup;
4513		- cGridBag ctrlPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
4514	5044	cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4515	5047	JScrollPane infoPanel;
	5048	+
4516	5049	cGridBag optionsPanel;
	5050	+
4517	5051	JTabbedPane objectPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
4518	5055	cGridBag XYZPanel;
	5056	+
4519	5057	JSplitPane gridPanel;
4520	5058	JSplitPane bigPanel;
	5059	+
4521	5060	cGridBag bigThree;
4522	5061	cGridBag scenePanel;
4523	5062	cGridBag centralPanel;
..	..	@@ -4632,8 +5171,13 @@
4632	5171	cNumberSlider fogField;
4633	5172	JLabel opacityPowerLabel;
4634	5173	cNumberSlider opacityPowerField;
4635		- JTree jTree;
	5174	+ cTree jTree;
4636	5175	//ObjectUI parent;
4637	5176
4638	5177	cNumberSlider normalpushField;
	5178	+
	5179	+ private MenuItem importGFDItem;
	5180	+ private MenuItem importVRMLX3DItem;
	5181	+ private MenuItem import3DSItem;
	5182	+ private MenuItem importOBJItem;
4639	5183	}