~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,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -145,7 +224,7 @@
145	224
146	225	objEditor.ctrlPanel.remove(namePanel);
147	226
148		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
149	228	return;
150	229
151	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +247,8 @@
168	247	// objEditor.ctrlPanel.remove(remarkButton);
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	252	objEditor.ctrlPanel.remove(pushPanel);
173	253	//objEditor.ctrlPanel.remove(fillPanel);
174	254
..	..	@@ -216,6 +296,12 @@
216	296	client = inClient;
217	297	copy = client;
218	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
219	305	// "this" is not called: SetupUI2(objEditor);
220	306	}
221	307
..	..	@@ -229,6 +315,12 @@
229	315	client = inClient;
230	316	copy = client;
231	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
232	324	SetupUI2(callee.GetEditor());
233	325	}
234	326
..	..	@@ -243,6 +335,7 @@
243	335	//localCopy.parent = null;
244	336
245	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
246	339	objEditor = this;
247	340	this.callee = callee;
248	341
..	..	@@ -260,6 +353,12 @@
260	353	copy = localCopy;
261	354	copy.editWindow = this;
262	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
263	362	SetupMenu();
264	363
265	364	//SetupName(objEditor); // new
..	..	@@ -273,28 +372,49 @@
273	372	return frame.action(event, obj);
274	373	}
275	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
276	380	void SetupMenu()
277	381	{
278	382	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..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	403	//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("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
289	408	if (client.parent != null)
290	409	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	411	} else
293	412	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	414	}
296	415
297		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
298	418	saveItem.addActionListener(this);
299	419	saveAsItem.addActionListener(this);
300	420	exportAsItem.addActionListener(this);
..	..	@@ -302,101 +422,69 @@
302	422	//povItem.addActionListener(this);
303	423	closeItem.addActionListener(this);
304	424
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	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
378	452	toolbarPanel = new JPanel();
379	453	toolbarPanel.setName("Toolbar");
	454	+
380	455	treePanel = new cGridBag();
381	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
382	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
384	470	materialPanel = new cGridBag().setVertical(true);
385		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
	472	+
386	473	/JTextPane/
387	474	infoarea = createTextPane();
388	475	doc = infoarea.getStyledDocument();
389	476
390	477	infoarea.setEditable(true);
391	478	SetText();
	479	+
392	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
393	481	// infoarea.setOpaque(false);
394	482	// //infoarea.setForeground(textcolor);
395	483	// TEXTAREA infoarea.setLineWrap(true);
396	484	// TEXTAREA infoarea.setWrapStyleWord(true);
397	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
399		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
400	488	//infoPanel.setLayout(new BorderLayout());
401	489	//infoPanel.add(createTextPane());
402	490
..	..	@@ -407,7 +495,14 @@
407	495	mainPanel.setDividerSize(9);
408	496	mainPanel.setDividerLocation(0.5); //1.0);
409	497	mainPanel.setResizeWeight(0.5);
410		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
411	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	507	//mainPanel.setLayout(new GridBagLayout());
413	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +570,10 @@
475	570	e.printStackTrace();
476	571	}
477	572
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();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	577	//clipboard.setContents(data, data);
483	578	}
484	579
..	..	@@ -501,13 +596,13 @@
501	596	//SendInfo("Name:", "bold");
502	597	if (sel.GetTextures() != null \|\| debug)
503	598	{
504		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506	601	if (sel.Size() > 0)
507	602	{
508	603	si.SendInfo("#children = " + sel.Size(), "regular");
509	604	}
510		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511	606	if (debug)
512	607	{
513	608	try
..	..	@@ -549,7 +644,7 @@
549	644	}
550	645	if (sel.support != null)
551	646	{
552		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553	648	}
554	649	if (sel.scriptnode != null)
555	650	{
..	..	@@ -638,21 +733,145 @@
638	733	}
639	734	}
640	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
641	794	void ToggleFullScreen()
642	795	{
643		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
644	801	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
648	825	} else
649	826	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
653	849	}
654		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
655	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versions = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
656	875
657	876	private JTextPane createTextPane()
658	877	{
..	..	@@ -752,7 +971,7 @@
752	971	protected static ImageIcon createImageIcon(String path,
753	972	String description)
754	973	{
755		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	974	+ java.net.URL imgURL = Grafreed.class.getResource(path);
756	975	if (imgURL != null)
757	976	{
758	977	return new ImageIcon(imgURL, description);
..	..	@@ -784,6 +1003,7 @@
784	1003	// NumberSlider vDivsField;
785	1004	// JCheckBox endcaps;
786	1005	JCheckBox liveCB;
	1006	+ JCheckBox selectableCB;
787	1007	JCheckBox hideCB;
788	1008	JCheckBox link2masterCB;
789	1009	JCheckBox markCB;
..	..	@@ -791,7 +1011,12 @@
791	1011	JCheckBox speedupCB;
792	1012	JCheckBox rewindCB;
793	1013	JCheckBox flipVCB;
	1014	+
	1015	+ cCheckBox toggleTextureCB;
	1016	+ cCheckBox toggleSwitchCB;
	1017	+
794	1018	JComboBox texresMenu;
	1019	+
795	1020	JButton resetButton;
796	1021	JButton stepButton;
797	1022	JButton stepAllButton;
..	..	@@ -800,9 +1025,13 @@
800	1025	JButton fasterButton;
801	1026	JButton remarkButton;
802	1027
	1028	+ cGridBag editPanel;
	1029	+ cGridBag editCommandsPanel;
	1030	+
803	1031	cGridBag namePanel;
804	1032	cGridBag setupPanel;
805		- cGridBag commandsPanel;
	1033	+ cGridBag setupPanel2;
	1034	+ cGridBag objectCommandsPanel;
806	1035	cGridBag pushPanel;
807	1036	cGridBag fillPanel;
808	1037
..	..	@@ -974,61 +1203,71 @@
974	1203	namePanel = new cGridBag();
975	1204
976	1205	nameField = AddText(namePanel, copy.GetName());
977		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
978	1207	oe.ctrlPanel.add(namePanel);
979	1208
980	1209	oe.ctrlPanel.Return();
981	1210
982		- if (!GroupEditor.allparams)
	1211	+ if (!allparams)
983	1212	return;
984	1213
985	1214	setupPanel = new cGridBag().setVertical(false);
986	1215
987	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988	1217	liveCB.setToolTipText("Animate object");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
	1220	+// Return();
	1221	+
989	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990	1223	hideCB.setToolTipText("Hide object");
991		-// Return();
992	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
994	1226
995		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1228	+
	1229	+ setupPanel2 = new cGridBag().setVertical(false);
	1230	+
	1231	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
996	1232	rewindCB.setToolTipText("Rewind animation");
997	1233
998		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999		- randomCB.setToolTipText("Option for switch node");
	1234	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1235	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1000	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
1001	1240	if (Globals.ADVANCED)
1002	1241	{
1003		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1004		- link2masterCB.setToolTipText("Attach to support");
1005		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1242	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1006	1243	speedupCB.setToolTipText("Option motion capture");
1007	1244	}
1008	1245
1009	1246	oe.ctrlPanel.add(setupPanel);
1010	1247	oe.ctrlPanel.Return();
	1248	+ oe.ctrlPanel.add(setupPanel2);
	1249	+ oe.ctrlPanel.Return();
1011	1250
1012		- commandsPanel = new cGridBag().setVertical(false);
	1251	+ objectCommandsPanel = new cGridBag().setVertical(false);
1013	1252
1014		- resetButton = AddButton(commandsPanel, "Reset");
	1253	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1015	1254	resetButton.setToolTipText("Jump to frame zero");
1016		- stepButton = AddButton(commandsPanel, "Step");
	1255	+ stepButton = AddButton(objectCommandsPanel, "Step");
1017	1256	stepButton.setToolTipText("Step one frame");
1018	1257	// resetAllButton = AddButton(oe, "Reset All");
1019	1258	// stepAllButton = AddButton(oe, "Step All");
1020	1259	// Return();
1021		- slowerButton = AddButton(commandsPanel, "Slow");
	1260	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1022	1261	slowerButton.setToolTipText("Decrease animation speed");
1023		- fasterButton = AddButton(commandsPanel, "Fast");
	1262	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1024	1263	fasterButton.setToolTipText("Increase animation speed");
1025		- remarkButton = AddButton(commandsPanel, "Remark");
	1264	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1026	1265	remarkButton.setToolTipText("Set the current transform as the target");
1027	1266
1028		- oe.ctrlPanel.add(commandsPanel);
	1267	+ oe.ctrlPanel.add(objectCommandsPanel);
1029	1268	oe.ctrlPanel.Return();
1030	1269
1031		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1270	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032	1271	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033	1272	//Return();
1034	1273
..	..	@@ -1231,8 +1470,11 @@
1231	1470	//worldPanel.setName("World");
1232	1471	centralPanel = new cGridBag();
1233	1472	centralPanel.preferredWidth = 20;
1234		- timelinePanel = new JPanel(new BorderLayout());
1235		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1473	+
	1474	+ if (Globals.ADVANCED)
	1475	+ {
	1476	+ timelinePanel = new JPanel(new BorderLayout());
	1477	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1236	1478
1237	1479	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1238	1480	cameraPanel.setContinuousLayout(true);
..	..	@@ -1241,7 +1483,10 @@
1241	1483	// cameraPanel.setDividerSize(9);
1242	1484	cameraPanel.setResizeWeight(1.0);
1243	1485
	1486	+ }
	1487	+
1244	1488	centralPanel.add(cameraView);
	1489	+ centralPanel.setFocusable(true);
1245	1490	//frame.setJMenuBar(timelineMenubar);
1246	1491	//centralPanel.add(timelinePanel);
1247	1492
..	..	@@ -1267,6 +1512,7 @@
1267	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1268	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1269	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1270	1516
1271	1517	/*
1272	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1304,12 +1550,29 @@
1304	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1305	1551	//tmp.setName("Edit");
1306	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1307	1556	// JPanel north = new JPanel(new BorderLayout());
1308	1557	// north.setName("Edit");
1309	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1310	1559	// objectPanel.add(north);
1311		- objectPanel.add(ctrlPanel);
1312		- objectPanel.add(infoPanel);
	1560	+ objectPanel.add(editPanel);
	1561	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1562	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1563	+
	1564	+ //if (Globals.ADVANCED)
	1565	+ objectPanel.add(infoPanel);
	1566	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1567	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1568	+
	1569	+ objectPanel.add(XYZPanel);
	1570	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1571	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1572	+
	1573	+ objectPanel.add(toolboxPanel);
	1574	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1575	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1313	1576
1314	1577	/*
1315	1578	aConstraints.gridx = 0;
..	..	@@ -1318,7 +1581,7 @@
1318	1581	aConstraints.gridy += 1;
1319	1582	aConstraints.gridwidth = 1;
1320	1583	mainPanel.add(objectPanel, aConstraints);
1321		- */
	1584	+ */
1322	1585
1323	1586	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1324	1587	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1330,14 +1593,12 @@
1330	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1331	1594
1332	1595	/JTabbedPane/ scenePanel = new cGridBag();
1333		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1334	1597
1335	1598	JTabbedPane tabbedPane = new JTabbedPane();
1336	1599	tabbedPane.add(scrollpane);
1337	1600
1338		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1339		-
1340		- optionsPanel = new cGridBag().setVertical(true);
	1601	+ optionsPanel = new cGridBag().setVertical(false);
1341	1602
1342	1603	optionsPanel.setName("Options");
1343	1604
..	..	@@ -1345,6 +1606,8 @@
1345	1606
1346	1607	tabbedPane.add(optionsPanel);
1347	1608
	1609	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1610	+
1348	1611	scenePanel.add(tabbedPane);
1349	1612
1350	1613	/*
..	..	@@ -1408,7 +1671,7 @@
1408	1671	bigThree = new cGridBag();
1409	1672	bigThree.addComponent(scenePanel);
1410	1673	bigThree.addComponent(centralPanel);
1411		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1412	1675
1413	1676	// // SIDE EFFECT!!!
1414	1677	// aConstraints.gridx = 0;
..	..	@@ -1417,9 +1680,9 @@
1417	1680	// aConstraints.gridheight = 1;
1418	1681
1419	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1420		- framePanel.setContinuousLayout(true);
1421		- framePanel.setOneTouchExpandable(true);
1422		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1423	1686	//framePanel.setDividerSize(15);
1424	1687	//framePanel.setResizeWeight(0.15);
1425	1688	framePanel.setName("Frame");
..	..	@@ -1437,14 +1700,18 @@
1437	1700	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1438	1701
1439	1702	frame.setSize(1280, 860);
1440		- frame.setVisible(true);
1441		-
	1703	+
	1704	+ cameraView.requestFocusInWindow();
	1705	+
1442	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1443	1711
1444	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1445	1713	frame.addWindowListener(new WindowAdapter()
1446	1714	{
1447		-
1448	1715	public void windowClosing(WindowEvent e)
1449	1716	{
1450	1717	Close();
..	..	@@ -1476,19 +1743,19 @@
1476	1743
1477	1744	cGridBag editBar = new cGridBag().setVertical(false);
1478	1745
1479		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1746	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1480	1747	createMaterialButton.setToolTipText("Create material");
1481	1748
1482	1749	/*
1483	1750	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1484	1751	*/
1485	1752
1486		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1753	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1487	1754	clearMaterialButton.setToolTipText("Clear material");
1488	1755
1489	1756	if (Globals.ADVANCED)
1490	1757	{
1491		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1758	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1492	1759	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493	1760	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494	1761	}
..	..	@@ -1506,45 +1773,48 @@
1506	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1507	1774
1508	1775	cGridBag colorSection = new cGridBag().setVertical(true);
	1776	+
	1777	+ cGridBag huepanel = new cGridBag();
	1778	+ cGridBag huelabel = new cGridBag();
	1779	+ huelabel.add(GetLabel("icons/hue.png", false));
	1780	+ huelabel.preferredWidth = 20;
	1781	+ huepanel.add(new cGridBag()); // Label
	1782	+ huepanel.add(huelabel); // Field/slider
	1783	+
	1784	+ huepanel.preferredHeight = 7;
	1785	+
	1786	+ colorSection.add(huepanel);
1509	1787
1510	1788	cGridBag color = new cGridBag();
1511		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1512		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1789	+
	1790	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1791	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1793	+
1514	1794	//colorField.preferredWidth = 200;
1515	1795	colorSection.add(color);
1516	1796
1517	1797	cGridBag modulation = new cGridBag();
1518	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1519	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1520		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1521	1801	colorSection.add(modulation);
1522	1802
	1803	+ cGridBag opacity = new cGridBag();
	1804	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1805	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1806	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1807	+ colorSection.add(opacity);
	1808	+
	1809	+ colorSection.add(GetSeparator());
	1810	+
1523	1811	cGridBag texture = new cGridBag();
1524	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1525	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1526	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1527	1815	colorSection.add(texture);
1528	1816
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		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1548	1818
1549	1819	panel.add(colorSection);
1550	1820
..	..	@@ -1594,7 +1864,13 @@
1594	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1595	1865	diffuseSection.add(fakedepth);
1596	1866
1597		- panel.add(new JSeparator());
	1867	+ cGridBag shadowbias = new cGridBag();
	1868	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1869	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1871	+ diffuseSection.add(shadowbias);
	1872	+
	1873	+ panel.add(GetSeparator());
1598	1874
1599	1875	panel.add(diffuseSection);
1600	1876
..	..	@@ -1644,42 +1920,48 @@
1644	1920	// aConstraints.gridy += 1;
1645	1921	// aConstraints.gridwidth = 1;
1646	1922
	1923	+ cGridBag anisoU = new cGridBag();
	1924	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1925	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1926	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1927	+ specularSection.add(anisoU);
1647	1928
1648		- panel.add(new JSeparator());
	1929	+ cGridBag anisoV = new cGridBag();
	1930	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1931	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1932	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1933	+ specularSection.add(anisoV);
	1934	+
	1935	+
	1936	+ panel.add(GetSeparator());
1649	1937
1650	1938	panel.add(specularSection);
1651	1939
1652	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1653	1941
1654		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1655	1943
1656	1944	cGridBag camera = new cGridBag();
1657	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1658	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1659	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1660		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1661	1949
1662	1950	cGridBag ambient = new cGridBag();
1663	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1664	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1666		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1667	1955
1668	1956	cGridBag backlit = new cGridBag();
1669	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1670	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1672		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1673	1961
1674		- cGridBag opacity = new cGridBag();
1675		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1676		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1678		- globalSection.add(opacity);
1679		-
1680		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1681	1963
1682		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1683	1965
1684	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1685	1967
..	..	@@ -1721,7 +2003,7 @@
1721	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1722	2004	textureSection.add(opacityPower);
1723	2005
1724		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1725	2007
1726	2008	panel.add(textureSection);
1727	2009
..	..	@@ -1786,8 +2068,9 @@
1786	2068	// 3D models
1787	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1788	2070	{
1789		- lastConverter = new com.jmex.model.converters.MaxToJme();
1790		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1791	2074	continue;
1792	2075	}
1793	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1988,6 +2271,7 @@
1988	2271	e2.printStackTrace();
1989	2272	}
1990	2273	}
	2274	+
1991	2275	LoadJMEThread loadThread;
1992	2276
1993	2277	class LoadJMEThread extends Thread
..	..	@@ -2045,6 +2329,7 @@
2045	2329	//LoadFile0(filename, converter);
2046	2330	}
2047	2331	}
	2332	+
2048	2333	LoadOBJThread loadObjThread;
2049	2334
2050	2335	class LoadOBJThread extends Thread
..	..	@@ -2123,19 +2408,19 @@
2123	2408
2124	2409	void LoadObjFile(String fullname)
2125	2410	{
2126		- /*
	2411	+ System.out.println("Loading " + fullname);
	2412	+ /**/
2127	2413	//lastFilename = fullname;
2128	2414	if(loadObjThread == null)
2129	2415	{
2130		- loadObjThread = new LoadOBJThread();
2131		- loadObjThread.start();
	2416	+ loadObjThread = new LoadOBJThread();
	2417	+ loadObjThread.start();
2132	2418	}
2133	2419
2134	2420	loadObjThread.add(fullname);
2135		- */
	2421	+ /**/
2136	2422
2137		- System.out.println("Loading " + fullname);
2138		- makeSomething(new FileObject(fullname, true), true);
	2423	+ //makeSomething(new FileObject(fullname, true), true);
2139	2424	}
2140	2425
2141	2426	void LoadGFDFile(String fullname)
..	..	@@ -2396,7 +2681,7 @@
2396	2681
2397	2682	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2398	2683	{
2399		- if (GrafreeD.standAlone)
	2684	+ if (Grafreed.standAlone)
2400	2685	{
2401	2686	/**/
2402	2687	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
..	..	@@ -2511,6 +2796,7 @@
2511	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2512	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2513	2798	}
	2799	+
2514	2800	//cJME.count++;
2515	2801	//cJME.count %= 12;
2516	2802	if (gc)
..	..	@@ -2694,6 +2980,7 @@
2694	2980	}
2695	2981	}
2696	2982	}
	2983	+
2697	2984	cFileSystemPane FSPane;
2698	2985
2699	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2747,11 +3034,14 @@
2747	3034	}
2748	3035	}
2749	3036	}
	3037	+
2750	3038	freezematerial = false;
2751	3039	}
2752	3040
2753	3041	void SetMaterial(Object3D object)
2754	3042	{
	3043	+ latestObject = object;
	3044	+
2755	3045	cMaterial mat = object.material;
2756	3046
2757	3047	if (mat == null)
..	..	@@ -2863,12 +3153,17 @@
2863	3153	// }
2864	3154
2865	3155	/**/
2866		- if (deselect)
	3156	+ if (deselect \|\| child == null)
2867	3157	{
2868	3158	//group.deselectAll();
2869	3159	//freeze = true;
2870	3160	GetTree().clearSelection();
2871	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
2872	3167	}
2873	3168
2874	3169	//group.addSelectee(child);
..	..	@@ -2937,7 +3232,7 @@
2937	3232	cameraView.ToggleDL();
2938	3233	cameraView.repaint();
2939	3234	return;
2940		- } else if (event.getSource() == toggleTextureItem)
	3235	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2941	3236	{
2942	3237	cameraView.ToggleTexture();
2943	3238	// june 2013 copy.HardTouch();
..	..	@@ -2976,9 +3271,9 @@
2976	3271	frame.validate();
2977	3272
2978	3273	return;
2979		- } else if (event.getSource() == toggleSwitchItem)
	3274	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2980	3275	{
2981		- cameraView.ToggleRandom();
	3276	+ cameraView.ToggleSwitch();
2982	3277	cameraView.repaint();
2983	3278	return;
2984	3279	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3006,6 +3301,10 @@
3006	3301	} else if (event.getSource() == liveCB)
3007	3302	{
3008	3303	copy.live ^= true;
	3304	+ return;
	3305	+ } else if (event.getSource() == selectableCB)
	3306	+ {
	3307	+ copy.dontselect ^= true;
3009	3308	return;
3010	3309	} else if (event.getSource() == hideCB)
3011	3310	{
..	..	@@ -3045,8 +3344,9 @@
3045	3344
3046	3345	public void actionPerformed(ActionEvent event)
3047	3346	{
	3347	+ Object source = event.getSource();
3048	3348	// SCRIPT DIALOG
3049		- if (event.getSource() == okbutton)
	3349	+ if (source == okbutton)
3050	3350	{
3051	3351	textpanel.setVisible(false);
3052	3352	textpanel.remove(textarea);
..	..	@@ -3058,7 +3358,7 @@
3058	3358	textarea = null;
3059	3359	textpanel = null;
3060	3360	}
3061		- if (event.getSource() == cancelbutton)
	3361	+ if (source == cancelbutton)
3062	3362	{
3063	3363	textpanel.setVisible(false);
3064	3364	textpanel.remove(textarea);
..	..	@@ -3070,50 +3370,50 @@
3070	3370	//applySelf();
3071	3371	//client.refreshEditWindow();
3072	3372	//refreshContents();
3073		- if (event.getSource() == nameField)
	3373	+ if (source == nameField)
3074	3374	{
3075	3375	//System.out.println("ObjEditor " + event);
3076	3376	applySelf0(true);
3077	3377	//parent.applySelf();
3078	3378	objEditor.refreshContents();
3079		- } else if (event.getSource() == resetButton)
	3379	+ } else if (source == resetButton)
3080	3380	{
3081	3381	CameraPane.fullreset = true;
3082	3382	copy.Reset(); // ResetMeshes();
3083	3383	copy.Touch();
3084	3384	objEditor.refreshContents();
3085		- } else if (event.getSource() == stepItem)
	3385	+ } else if (source == stepItem)
3086	3386	{
3087	3387	//cameraView.ONESTEP = true;
3088	3388	Globals.ONESTEP = true;
3089	3389	cameraView.repaint();
3090	3390	return;
3091		- } else if (event.getSource() == stepButton)
	3391	+ } else if (source == stepButton)
3092	3392	{
3093	3393	copy.Step();
3094	3394	copy.Touch();
3095	3395	objEditor.refreshContents();
3096		- } else if (event.getSource() == slowerButton)
	3396	+ } else if (source == slowerButton)
3097	3397	{
3098	3398	copy.Slower();
3099	3399	copy.Touch();
3100	3400	objEditor.refreshContents();
3101		- } else if (event.getSource() == fasterButton)
	3401	+ } else if (source == fasterButton)
3102	3402	{
3103	3403	copy.Faster();
3104	3404	copy.Touch();
3105	3405	objEditor.refreshContents();
3106		- } else if (event.getSource() == remarkButton)
	3406	+ } else if (source == remarkButton)
3107	3407	{
3108	3408	copy.Remark();
3109	3409	copy.Touch();
3110	3410	objEditor.refreshContents();
3111		- } else if (event.getSource() == stepAllButton)
	3411	+ } else if (source == stepAllButton)
3112	3412	{
3113	3413	copy.StepAll();
3114	3414	copy.Touch();
3115	3415	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetAllButton)
	3416	+ } else if (source == resetAllButton)
3117	3417	{
3118	3418	//CameraPane.fullreset = true;
3119	3419	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3146,53 +3446,79 @@
3146	3446	// Close();
3147	3447	// }
3148	3448	// else
3149		- if (event.getSource() == resetSlidersButton)
	3449	+ if (source == resetSlidersButton)
3150	3450	{
3151	3451	ResetSliders();
3152		- } else if (event.getSource() == clearMaterialButton)
	3452	+ } else if (source == clearMaterialButton)
3153	3453	{
3154	3454	ClearMaterial();
3155		- } else if (event.getSource() == createMaterialButton)
	3455	+ } else if (source == createMaterialButton)
3156	3456	{
3157	3457	CreateMaterial();
3158		- } else if (event.getSource() == clearPanelButton)
	3458	+ } else if (source == clearPanelButton)
3159	3459	{
3160	3460	copy.ClearUI();
3161	3461	refreshContents(true);
3162		- } /*
3163		- }
3164		-
3165		- public boolean action(Event event, Object arg)
3166		- {
3167		- */ else if (event.getSource() == closeItem)
	3462	+ } else if (source == importGFDItem)
	3463	+ {
	3464	+ ImportGFD();
	3465	+ } else
	3466	+ if (source == importVRMLX3DItem)
	3467	+ {
	3468	+ ImportVRMLX3D();
	3469	+ } else
	3470	+ if (source == import3DSItem)
	3471	+ {
	3472	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3473	+ } else
	3474	+ if (source == importOBJItem)
	3475	+ {
	3476	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3477	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3478	+ browser.setVisible(true);
	3479	+ String filename = browser.getFile();
	3480	+ if (filename != null && filename.length() > 0)
	3481	+ {
	3482	+ String fullname = browser.getDirectory() + filename;
	3483	+ makeSomething(ReadOBJ(fullname), true);
	3484	+ }
	3485	+ } else
	3486	+ if (source == closeItem)
3168	3487	{
3169	3488	Close();
3170	3489	//return true;
3171		- } else if (event.getSource() == loadItem)
	3490	+ } else if (source == openItem)
3172	3491	{
3173		- load();
	3492	+ Open();
3174	3493	//return true;
3175		- } else if (event.getSource() == saveItem)
	3494	+ } else if (source == newItem)
	3495	+ {
	3496	+ New();
	3497	+ } else if (source == saveItem)
3176	3498	{
3177	3499	save();
3178	3500	//return true;
3179		- } else if (event.getSource() == saveAsItem)
	3501	+ } else if (source == saveAsItem)
3180	3502	{
3181	3503	saveAs();
3182	3504	//return true;
3183		- } else if (event.getSource() == reexportItem)
	3505	+ } else if (source == reexportItem)
3184	3506	{
3185	3507	reexport();
3186	3508	//return true;
3187		- } else if (event.getSource() == exportAsItem)
	3509	+ } else if (source == exportAsItem)
3188	3510	{
3189	3511	export();
3190	3512	//return true;
3191		- } else if (event.getSource() == povItem)
	3513	+ } else if (source == povItem)
3192	3514	{
3193	3515	generatePOV();
3194	3516	//return true;
3195		- } else if (event.getSource() == zBufferItem)
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
	3521	+ } else if (source == zBufferItem)
3196	3522	{
3197	3523	try
3198	3524	{
..	..	@@ -3214,21 +3540,8 @@
3214	3540	cameraView.repaint();
3215	3541	//return true;
3216	3542	}
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)
	3543	+ */ else // combos...
	3544	+ if (source == texresMenu)
3232	3545	{
3233	3546	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3234	3547	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3240,6 +3553,407 @@
3240	3553	}
3241	3554	}
3242	3555
	3556	+ void New()
	3557	+ {
	3558	+ while (copy.Size() > 1)
	3559	+ {
	3560	+ copy.remove(1);
	3561	+ }
	3562	+
	3563	+ ResetModel();
	3564	+ objEditor.refreshContents();
	3565	+ }
	3566	+
	3567	+ static public byte[] Compress(Object3D o)
	3568	+ {
	3569	+ // Slower to actually compress.
	3570	+ try
	3571	+ {
	3572	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3575	+
	3576	+ Object3D parent = o.parent;
	3577	+ o.parent = null;
	3578	+
	3579	+ out.writeObject(o);
	3580	+
	3581	+ o.parent = parent;
	3582	+
	3583	+ out.flush();
	3584	+
	3585	+ baos //zstream
	3586	+ .close();
	3587	+ out.close();
	3588	+
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
	3593	+ } catch (Exception e)
	3594	+ {
	3595	+ System.err.println(e);
	3596	+ return null;
	3597	+ }
	3598	+ }
	3599	+
	3600	+ static public Object Uncompress(byte[] bytes)
	3601	+ {
	3602	+ System.out.println("restore #bytes = " + bytes.length);
	3603	+ try
	3604	+ {
	3605	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3608	+ Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
	3612	+ in.close();
	3613	+
	3614	+ return obj;
	3615	+ } catch (Exception e)
	3616	+ {
	3617	+ System.err.println(e);
	3618	+ return null;
	3619	+ }
	3620	+ }
	3621	+
	3622	+ static public Object clone(Object o)
	3623	+ {
	3624	+ try
	3625	+ {
	3626	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3627	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3628	+
	3629	+ out.writeObject(o);
	3630	+
	3631	+ out.flush();
	3632	+ out.close();
	3633	+
	3634	+ byte[] bytes = baos.toByteArray();
	3635	+
	3636	+ System.out.println("clone = " + bytes.length);
	3637	+
	3638	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3639	+ ObjectInputStream in = new ObjectInputStream(bais);
	3640	+ Object obj = in.readObject();
	3641	+ in.close();
	3642	+
	3643	+ return obj;
	3644	+ } catch (Exception e)
	3645	+ {
	3646	+ System.err.println(e);
	3647	+ return null;
	3648	+ }
	3649	+ }
	3650	+
	3651	+ cRadio GetCurrentTab()
	3652	+ {
	3653	+ cRadio ab;
	3654	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3655	+ {
	3656	+ ab = (cRadio)e.nextElement();
	3657	+ if(ab.GetObject() == copy)
	3658	+ {
	3659	+ return ab;
	3660	+ }
	3661	+ }
	3662	+
	3663	+ return null;
	3664	+ }
	3665	+
	3666	+
	3667	+ public void Save()
	3668	+ {
	3669	+ //Save(true);
	3670	+ Replace();
	3671	+ }
	3672	+
	3673	+ private boolean Equal(byte[] compress, byte[] name)
	3674	+ {
	3675	+ if (compress.length != name.length)
	3676	+ {
	3677	+ return false;
	3678	+ }
	3679	+
	3680	+ for (int i=compress.length; --i>=0;)
	3681	+ {
	3682	+ if (compress[i] != name[i])
	3683	+ return false;
	3684	+ }
	3685	+
	3686	+ return true;
	3687	+ }
	3688	+
	3689	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3690	+
	3691	+ public boolean Save(boolean user)
	3692	+ {
	3693	+ System.err.println("Save");
	3694	+
	3695	+ cRadio tab = GetCurrentTab();
	3696	+
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	3698	+
	3699	+ boolean thesame = false;
	3700	+
	3701	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3702	+// {
	3703	+// thesame = true;
	3704	+// }
	3705	+
	3706	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3707	+ if (!thesame)
	3708	+ {
	3709	+ //tab.user[tab.versionindex] = user;
	3710	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3711	+
	3712	+ copy.versions[++copy.versionindex] = compress;
	3713	+
	3714	+ // if (increment)
	3715	+ // tab.versionindex++;
	3716	+ }
	3717	+
	3718	+ //copy.RestoreBigData(versiontable);
	3719	+
	3720	+ //assert(hashtable.isEmpty());
	3721	+
	3722	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3723	+ {
	3724	+ //tab.user[i] = false;
	3725	+ copy.versions[i] = null;
	3726	+ }
	3727	+
	3728	+ SetUndoStates();
	3729	+
	3730	+ // test save
	3731	+ if (false)
	3732	+ {
	3733	+ try
	3734	+ {
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3736	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3737	+
	3738	+ p.writeObject(copy);
	3739	+
	3740	+ p.flush();
	3741	+
	3742	+ ostream.close();
	3743	+ } catch (Exception e)
	3744	+ {
	3745	+ e.printStackTrace();
	3746	+ }
	3747	+ }
	3748	+
	3749	+ return !thesame;
	3750	+ }
	3751	+
	3752	+ void CopyChanged(Object3D obj)
	3753	+ {
	3754	+ SetUndoStates();
	3755	+
	3756	+ boolean temp = CameraPane.SWITCH;
	3757	+ CameraPane.SWITCH = false;
	3758	+
	3759	+ copy.ExtractBigData(versiontable);
	3760	+
	3761	+ copy.clear();
	3762	+
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
	3766	+ for (int i=0; i<obj.Size(); i++)
	3767	+ {
	3768	+ copy.add(obj.get(i));
	3769	+ }
	3770	+
	3771	+ copy.RestoreBigData(versiontable);
	3772	+
	3773	+ CameraPane.SWITCH = temp;
	3774	+
	3775	+ //assert(hashtable.isEmpty());
	3776	+
	3777	+ copy.Touch();
	3778	+
	3779	+ ResetModel();
	3780	+ copy.HardTouch(); // recompile?
	3781	+
	3782	+ cRadio ab;
	3783	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3784	+ {
	3785	+ ab = (cRadio)e.nextElement();
	3786	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3787	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3788	+ if (test != null)
	3789	+ {
	3790	+ test.editWindow = ab.object.editWindow;
	3791	+ ab.object = test;
	3792	+ }
	3793	+ }
	3794	+
	3795	+ refreshContents();
	3796	+ }
	3797	+
	3798	+ cButton undoButton;
	3799	+ cButton restoreButton;
	3800	+ cButton replaceButton;
	3801	+ cButton redoButton;
	3802	+
	3803	+ boolean muteSlider;
	3804	+
	3805	+ int VersionCount()
	3806	+ {
	3807	+ int count = 0;
	3808	+
	3809	+ for (int i = copy.versions.length; --i >= 0;)
	3810	+ {
	3811	+ if (copy.versions[i] != null)
	3812	+ count++;
	3813	+ }
	3814	+
	3815	+ return count;
	3816	+ }
	3817	+
	3818	+ void SetUndoStates()
	3819	+ {
	3820	+ cRadio tab = GetCurrentTab();
	3821	+
	3822	+ restoreButton.setEnabled(copy.versionindex != -1);
	3823	+ replaceButton.setEnabled(copy.versionindex != -1);
	3824	+
	3825	+ undoButton.setEnabled(copy.versionindex > 0);
	3826	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3827	+
	3828	+ muteSlider = true;
	3829	+ versionSlider.setMaximum(VersionCount() - 1);
	3830	+ versionSlider.setInteger(copy.versionindex);
	3831	+ muteSlider = false;
	3832	+ }
	3833	+
	3834	+ public boolean Undo()
	3835	+ {
	3836	+ // Option?
	3837	+ Replace();
	3838	+
	3839	+ System.err.println("Undo");
	3840	+
	3841	+ cRadio tab = GetCurrentTab();
	3842	+
	3843	+ if (copy.versionindex == 0)
	3844	+ {
	3845	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3846	+ return false;
	3847	+ }
	3848	+
	3849	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3850	+// {
	3851	+// if (Save(false))
	3852	+// tab.versionindex -= 1;
	3853	+// else
	3854	+// {
	3855	+// if (tab.versionindex <= 0)
	3856	+// return false;
	3857	+// else
	3858	+// tab.versionindex -= 1;
	3859	+// }
	3860	+// }
	3861	+
	3862	+ copy.versionindex -= 1;
	3863	+
	3864	+ CopyChanged((Object3D)copy.versions[copy.versionindex]);
	3865	+
	3866	+ return true;
	3867	+ }
	3868	+
	3869	+ public boolean Restore()
	3870	+ {
	3871	+ System.err.println("Restore");
	3872	+
	3873	+ cRadio tab = GetCurrentTab();
	3874	+
	3875	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3876	+ {
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
	3879	+ }
	3880	+
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
	3886	+
	3887	+ public boolean Replace()
	3888	+ {
	3889	+ System.err.println("Replace");
	3890	+
	3891	+ cRadio tab = GetCurrentTab();
	3892	+
	3893	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3894	+ {
	3895	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3896	+ return false;
	3897	+ }
	3898	+
	3899	+ copy.versions[copy.versionindex] = CompressCopy();
	3900	+
	3901	+ return true;
	3902	+ }
	3903	+
	3904	+ public void Redo()
	3905	+ {
	3906	+ // Option?
	3907	+ Replace();
	3908	+
	3909	+ cRadio tab = GetCurrentTab();
	3910	+
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
	3912	+ {
	3913	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3914	+ return;
	3915	+ }
	3916	+
	3917	+ copy.versionindex += 1;
	3918	+
	3919	+ CopyChanged(copy.versions[copy.versionindex]);
	3920	+
	3921	+ //if (!tab.user[tab.versionindex])
	3922	+ // tab.graphs[tab.versionindex] = null;
	3923	+ }
	3924	+
	3925	+ void ImportGFD()
	3926	+ {
	3927	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3928	+ browser.show();
	3929	+ String filename = browser.getFile();
	3930	+ if (filename != null && filename.length() > 0)
	3931	+ {
	3932	+ String fullname = browser.getDirectory() + filename;
	3933	+
	3934	+ //Object3D readobj =
	3935	+ objEditor.ReadGFD(fullname, objEditor);
	3936	+ //makeSomething(readobj);
	3937	+ }
	3938	+ }
	3939	+
	3940	+ void ImportVRMLX3D()
	3941	+ {
	3942	+ if (Grafreed.standAlone)
	3943	+ {
	3944	+ /**/
	3945	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3946	+ browser.show();
	3947	+ String filename = browser.getFile();
	3948	+ if (filename != null && filename.length() > 0)
	3949	+ {
	3950	+ String fullname = browser.getDirectory() + filename;
	3951	+ LoadVRMLX3D(fullname);
	3952	+ }
	3953	+ /**/
	3954	+ }
	3955	+ }
	3956	+
3243	3957	void ToggleAnimation()
3244	3958	{
3245	3959	if (!Globals.ANIMATION)
..	..	@@ -3255,8 +3969,8 @@
3255	3969
3256	3970	Globals.ANIMATION ^= true;
3257	3971
3258		- GrafreeD.wav.cursor = 0;
3259		- GrafreeD.wav.loop = 0;
	3972	+ Grafreed.wav.cursor = 0;
	3973	+ Grafreed.wav.loop = 0;
3260	3974	}
3261	3975	} else
3262	3976	{
..	..	@@ -3357,7 +4071,7 @@
3357	4071	assert false;
3358	4072	}
3359	4073
3360		- void EditSelection()
	4074	+ void EditSelection(boolean newWindow)
3361	4075	{
3362	4076	}
3363	4077
..	..	@@ -3443,6 +4157,36 @@
3443	4157	{
3444	4158	//System.out.println("Propagate = " + propagate);
3445	4159	copy.UpdateMaterial(anchor, current, propagate);
	4160	+
	4161	+ if (copy.material != null)
	4162	+ {
	4163	+ cMaterial mat = copy.material;
	4164	+
	4165	+ colorField.SetToolTipValue((mat.color));
	4166	+ modulationField.SetToolTipValue((mat.modulation));
	4167	+ metalnessField.SetToolTipValue((mat.metalness));
	4168	+ diffuseField.SetToolTipValue((mat.diffuse));
	4169	+ specularField.SetToolTipValue((mat.specular));
	4170	+ shininessField.SetToolTipValue((mat.shininess));
	4171	+ shiftField.SetToolTipValue((mat.shift));
	4172	+ ambientField.SetToolTipValue((mat.ambient));
	4173	+ lightareaField.SetToolTipValue((mat.lightarea));
	4174	+ diffusenessField.SetToolTipValue((mat.factor));
	4175	+ velvetField.SetToolTipValue((mat.velvet));
	4176	+ sheenField.SetToolTipValue((mat.sheen));
	4177	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4178	+ backlitField.SetToolTipValue((mat.bump));
	4179	+ anisoField.SetToolTipValue((mat.aniso));
	4180	+ anisoVField.SetToolTipValue((mat.anisoV));
	4181	+ cameraField.SetToolTipValue((mat.cameralight));
	4182	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4183	+ shadowField.SetToolTipValue((mat.shadow));
	4184	+ textureField.SetToolTipValue((mat.texture));
	4185	+ opacityField.SetToolTipValue((mat.opacity));
	4186	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4187	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4188	+ }
	4189	+
3446	4190	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	4191	{
3448	4192	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,9 +4215,25 @@
3471	4215	//copy.Touch();
3472	4216	}
3473	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3474	4220	public void stateChanged(ChangeEvent e)
3475	4221	{
3476	4222	// assert(false);
	4223	+ if (e.getSource() == versionSlider)
	4224	+ {
	4225	+ if (muteSlider)
	4226	+ return;
	4227	+
	4228	+ int version = versionSlider.getInteger();
	4229	+
	4230	+ if (copy.versions[version] != null)
	4231	+ {
	4232	+ CopyChanged(copy.versions[copy.versionindex = version]);
	4233	+ }
	4234	+
	4235	+ return;
	4236	+ }
3477	4237
3478	4238	if (freezematerial)
3479	4239	{
..	..	@@ -3558,7 +4318,7 @@
3558	4318	}
3559	4319
3560	4320	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4321	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	4322	}
3563	4323
3564	4324	void SnapObject()
..	..	@@ -3822,6 +4582,8 @@
3822	4582
3823	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4584	{
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4586	+ Save();
3825	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4589	// if (thing instanceof GenericJointDemo)
..	..	@@ -3908,6 +4670,12 @@
3908	4670	{
3909	4671	ResetModel();
3910	4672	Select(thing.GetTreePath(), true, false); // unselect... false);
	4673	+
	4674	+ if (thing.Size() == 0)
	4675	+ {
	4676	+ //EditSelection(false);
	4677	+ }
	4678	+
3911	4679	refreshContents();
3912	4680	}
3913	4681
..	..	@@ -4025,6 +4793,7 @@
4025	4793	}
4026	4794	}
4027	4795	}
	4796	+
4028	4797	LoadGFDThread loadGFDThread;
4029	4798
4030	4799	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4813,10 @@
4044	4813
4045	4814	try
4046	4815	{
	4816	+ // Try compressed version first.
4047	4817	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4818	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4819	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4820
4050	4821	readobj = (Object3D) p.readObject();
4051	4822	istream.close();
..	..	@@ -4053,7 +4824,22 @@
4053	4824	readobj.ResetDisplayList();
4054	4825	} catch (Exception e)
4055	4826	{
4056		- e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
	4830	+ try
	4831	+ {
	4832	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4833	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4834	+
	4835	+ readobj = (Object3D) p.readObject();
	4836	+ istream.close();
	4837	+
	4838	+ readobj.ResetDisplayList();
	4839	+ } catch (Exception e2)
	4840	+ {
	4841	+ e2.printStackTrace();
	4842	+ }
4057	4843	}
4058	4844	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4845	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4885,12 @@
4099	4885
4100	4886	void LoadIt(Object obj)
4101	4887	{
	4888	+ if (obj == null)
	4889	+ {
	4890	+ // Invalid file
	4891	+ return;
	4892	+ }
	4893	+
4102	4894	System.out.println("Loaded " + obj);
4103	4895	//new Exception().printStackTrace();
4104	4896	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,10 +4900,14 @@
4108	4900
4109	4901	if (readobj != null)
4110	4902	{
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4111	4905	try
4112	4906	{
4113	4907	//readobj.deepCopySelf(copy);
4114	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4115	4911	for (int i = 0; i < readobj.size(); i++)
4116	4912	{
4117	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4152,6 +4948,7 @@
4152	4948	}
4153	4949	} catch (ClassCastException e)
4154	4950	{
	4951	+ e.printStackTrace();
4155	4952	assert (false);
4156	4953	Composite c = (Composite) copy;
4157	4954	c.children.clear();
..	..	@@ -4162,15 +4959,26 @@
4162	4959	c.addChild(csg);
4163	4960	}
4164	4961
	4962	+ copy.versions = readobj.versions;
	4963	+ copy.versionindex = readobj.versionindex;
	4964	+
	4965	+ if (copy.versions == null)
	4966	+ {
	4967	+ copy.versions = new Object3D[100];
	4968	+ copy.versionindex = -1;
	4969	+ }
	4970	+
	4971	+ //? SetUndoStates();
	4972	+
4165	4973	ResetModel();
4166	4974	copy.HardTouch(); // recompile?
4167	4975	refreshContents();
4168	4976	}
4169	4977	}
4170	4978
4171		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4172	4980	{
4173		- if (GrafreeD.standAlone)
	4981	+ if (Grafreed.standAlone)
4174	4982	{
4175	4983	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4984	browser.show();
..	..	@@ -4257,11 +5065,13 @@
4257	5065	try
4258	5066	{
4259	5067	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5068	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5069	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	5070
4262	5071	p.writeObject(copy);
4263	5072	p.flush();
4264	5073
	5074	+ zstream.close();
4265	5075	ostream.close();
4266	5076
4267	5077	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4269,19 +5079,23 @@
4269	5079	//ps.print(buffer.toString());
4270	5080	} catch (IOException e)
4271	5081	{
	5082	+ e.printStackTrace();
4272	5083	}
4273	5084	}
	5085	+
4274	5086	String lastname;
4275	5087
4276	5088	void saveAs()
4277	5089	{
4278		- if (GrafreeD.standAlone)
	5090	+ if (Grafreed.standAlone)
4279	5091	{
4280	5092	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	5093	browser.setVisible(true);
4282	5094	String filename = browser.getFile();
4283	5095	if (filename != null && filename.length() > 0)
4284	5096	{
	5097	+ if (!filename.endsWith(".gfd"))
	5098	+ filename += ".gfd";
4285	5099	lastname = browser.getDirectory() + filename;
4286	5100	save();
4287	5101	}
..	..	@@ -4380,13 +5194,13 @@
4380	5194	try
4381	5195	{
4382	5196	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5197	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5198	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	5199
4386	5200	Object3D objectparent = obj.parent;
4387	5201	obj.parent = null;
4388	5202
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5203	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	5204
4391	5205	obj.parent = objectparent;
4392	5206
..	..	@@ -4398,8 +5212,8 @@
4398	5212	p.writeObject(object);
4399	5213	p.flush();
4400	5214
	5215	+ zstream.close();
4401	5216	ostream.close();
4402		- // zstream.close();
4403	5217
4404	5218	// group.selection.get(0).parent = parent;
4405	5219	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +5234,7 @@
4420	5234	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	5235	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	5236	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	5237	+ if (Grafreed.standAlone)
4424	5238	{
4425	5239	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	5240	browser.show();
..	..	@@ -4446,19 +5260,18 @@
4446	5260	Object3D client;
4447	5261	Object3D copy;
4448	5262	MenuBar menuBar;
4449		- Menu windowMenu;
4450		- MenuItem loadItem;
	5263	+ Menu fileMenu;
	5264	+ MenuItem newItem;
	5265	+ MenuItem openItem;
4451	5266	MenuItem saveItem;
4452	5267	MenuItem saveAsItem;
4453	5268	MenuItem exportAsItem;
4454	5269	MenuItem reexportItem;
4455	5270	MenuItem povItem;
4456	5271	MenuItem closeItem;
4457		- Menu cameraMenu;
	5272	+
4458	5273	CheckboxMenuItem zBufferItem;
4459	5274	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	5275	MenuItem stepItem;
4463	5276	CheckboxMenuItem toggleLiveItem;
4464	5277	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4472,22 +5285,36 @@
4472	5285	CheckboxMenuItem toggleSwitchItem;
4473	5286	CheckboxMenuItem toggleRootItem;
4474	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4475	5289	CheckboxMenuItem toggleHandleItem;
4476	5290	CheckboxMenuItem togglePaintItem;
4477	5291	JSplitPane mainPanel;
4478	5292	JScrollPane scrollpane;
	5293	+
4479	5294	JPanel toolbarPanel;
	5295	+
4480	5296	cGridBag treePanel;
	5297	+
4481	5298	JPanel radioPanel;
4482	5299	ButtonGroup buttonGroup;
4483		- cGridBag ctrlPanel;
	5300	+
	5301	+ cGridBag toolboxPanel;
4484	5302	cGridBag materialPanel;
	5303	+ cGridBag ctrlPanel;
	5304	+
4485	5305	JScrollPane infoPanel;
	5306	+
4486	5307	cGridBag optionsPanel;
	5308	+
4487	5309	JTabbedPane objectPanel;
	5310	+ boolean materialFlushed;
	5311	+ Object3D latestObject;
	5312	+
4488	5313	cGridBag XYZPanel;
	5314	+
4489	5315	JSplitPane gridPanel;
4490	5316	JSplitPane bigPanel;
	5317	+
4491	5318	cGridBag bigThree;
4492	5319	cGridBag scenePanel;
4493	5320	cGridBag centralPanel;
..	..	@@ -4602,8 +5429,13 @@
4602	5429	cNumberSlider fogField;
4603	5430	JLabel opacityPowerLabel;
4604	5431	cNumberSlider opacityPowerField;
4605		- JTree jTree;
	5432	+ cTree jTree;
4606	5433	//ObjectUI parent;
4607	5434
4608	5435	cNumberSlider normalpushField;
	5436	+
	5437	+ private MenuItem importGFDItem;
	5438	+ private MenuItem importVRMLX3DItem;
	5439	+ private MenuItem import3DSItem;
	5440	+ private MenuItem importOBJItem;
4609	5441	}