~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,53 @@
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	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
	49	+ }
	50	+
	51	+ cToggleButton GetToggleButton(String name, boolean border)
	52	+ {
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
	55	+ }
	56	+
	57	+ cCheckBox GetCheckBox(String name, boolean border)
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
	65	+ try
	66	+ {
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	72	+ Graphics2D g = resized.createGraphics();
	73	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+ g.dispose();
	77	+
	78	+ image = resized;
	79	+ }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
	83	+ }
	84	+ catch (Exception e)
	85	+ {
	86	+ return null;
	87	+ }
	88	+ }
38	89
39	90	// SCRIPT
40	91
..	..	@@ -143,7 +194,9 @@
143	194	//nameField.removeActionListener(this);
144	195	// objEditor.ctrlPanel.remove(nameField);
145	196
146		- if (!GroupEditor.allparams)
	197	+ objEditor.ctrlPanel.remove(namePanel);
	198	+
	199	+ if (!allparams)
147	200	return;
148	201
149	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +218,9 @@
165	218	// objEditor.ctrlPanel.remove(fasterButton);
166	219	// objEditor.ctrlPanel.remove(remarkButton);
167	220
168		- objEditor.ctrlPanel.remove(namePanel);
169	221	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	222	+ objEditor.ctrlPanel.remove(setupPanel2);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	224	objEditor.ctrlPanel.remove(pushPanel);
172	225	//objEditor.ctrlPanel.remove(fillPanel);
173	226
..	..	@@ -215,6 +268,12 @@
215	268	client = inClient;
216	269	copy = client;
217	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
218	277	// "this" is not called: SetupUI2(objEditor);
219	278	}
220	279
..	..	@@ -228,6 +287,12 @@
228	287	client = inClient;
229	288	copy = client;
230	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
231	296	SetupUI2(callee.GetEditor());
232	297	}
233	298
..	..	@@ -242,6 +307,7 @@
242	307	//localCopy.parent = null;
243	308
244	309	frame = new JFrame();
	310	+ frame.setUndecorated(false);
245	311	objEditor = this;
246	312	this.callee = callee;
247	313
..	..	@@ -259,6 +325,12 @@
259	325	copy = localCopy;
260	326	copy.editWindow = this;
261	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
262	334	SetupMenu();
263	335
264	336	//SetupName(objEditor); // new
..	..	@@ -272,28 +344,49 @@
272	344	return frame.action(event, obj);
273	345	}
274	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
275	352	void SetupMenu()
276	353	{
277	354	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	355	+ menuBar.add(fileMenu = new Menu("File"));
	356	+ fileMenu.add(newItem = new MenuItem("New"));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
	358	+
	359	+ //oe.menuBar.add(menu = new Menu("Include"));
	360	+ Menu menu = new Menu("Import");
	361	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	362	+ importOBJItem.addActionListener(this);
	363	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	364	+ import3DSItem.addActionListener(this);
	365	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	366	+ importVRMLX3DItem.addActionListener(this);
	367	+ menu.add("-");
	368	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	369	+ importGFDItem.addActionListener(this);
	370	+ fileMenu.add(menu);
	371	+ fileMenu.add("-");
	372	+
	373	+ fileMenu.add(saveItem = new MenuItem("Save"));
	374	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	375	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	376	+ fileMenu.add("-");
	377	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	378	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	379	+ fileMenu.add("-");
288	380	if (client.parent != null)
289	381	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	382	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	383	} else
292	384	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	385	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	386	}
295	387
296		- loadItem.addActionListener(this);
	388	+ newItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
297	390	saveItem.addActionListener(this);
298	391	saveAsItem.addActionListener(this);
299	392	exportAsItem.addActionListener(this);
..	..	@@ -301,82 +394,69 @@
301	394	//povItem.addActionListener(this);
302	395	closeItem.addActionListener(this);
303	396
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
360	424	toolbarPanel = new JPanel();
361	425	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	426	+
	427	+ treePanel = new cGridBag();
363	428	treePanel.setName("Tree");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
364	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	434	+
	435	+ editCommandsPanel = new cGridBag();
	436	+ editPanel.add(editCommandsPanel);
	437	+ editPanel.add(ctrlPanel);
	438	+
	439	+ toolboxPanel = new cGridBag().setVertical(false);
	440	+ //toolboxPanel.setName("Toolbox");
	441	+
366	442	materialPanel = new cGridBag().setVertical(true);
367		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
	444	+
368	445	/JTextPane/
369	446	infoarea = createTextPane();
	447	+ doc = infoarea.getStyledDocument();
	448	+
370	449	infoarea.setEditable(true);
371	450	SetText();
	451	+
372	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	453	// infoarea.setOpaque(false);
374	454	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	455	+// TEXTAREA infoarea.setLineWrap(true);
	456	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378		- infoPanel.setPreferredSize(new Dimension(50, 200));
379		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
380	460	//infoPanel.setLayout(new BorderLayout());
381	461	//infoPanel.add(createTextPane());
382	462
..	..	@@ -384,14 +464,21 @@
384	464	mainPanel.setName("Main");
385	465	mainPanel.setContinuousLayout(true);
386	466	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	467	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	468	+ mainPanel.setDividerLocation(0.5); //1.0);
	469	+ mainPanel.setResizeWeight(0.5);
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
391	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	479	//mainPanel.setLayout(new GridBagLayout());
393	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	481	+// treePanel.setLayout(new GridBagLayout());
395	482	//ctrlPanel.setLayout(new GridBagLayout());
396	483	//materialPanel.setLayout(new GridBagLayout());
397	484
..	..	@@ -432,7 +519,7 @@
432	519	static String newline = "\n";
433	520	protected static final String buttonString = "JButton";
434	521	StyledDocument doc;
435		- JTextArea infoarea;
	522	+ JTextPane infoarea;
436	523
437	524	void ClearInfo()
438	525	{
..	..	@@ -455,10 +542,10 @@
455	542	e.printStackTrace();
456	543	}
457	544
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- Toolkit.getDefaultToolkit().getSystemClipboard();
	545	+// String selection = infoarea.getText();
	546	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	547	+// java.awt.datatransfer.Clipboard clipboard =
	548	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	549	//clipboard.setContents(data, data);
463	550	}
464	551
..	..	@@ -481,13 +568,13 @@
481	568	//SendInfo("Name:", "bold");
482	569	if (sel.GetTextures() != null \|\| debug)
483	570	{
484		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	573	if (sel.Size() > 0)
487	574	{
488	575	si.SendInfo("#children = " + sel.Size(), "regular");
489	576	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	578	if (debug)
492	579	{
493	580	try
..	..	@@ -499,7 +586,10 @@
499	586	}
500	587
501	588	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	589	+ {
	590	+ si.SendInfo(" BBox min: " + minima, "regular");
	591	+ si.SendInfo(" BBox max: " + maxima, "regular");
	592	+ }
503	593
504	594	if (sel.bRep != null)
505	595	{
..	..	@@ -526,7 +616,7 @@
526	616	}
527	617	if (sel.support != null)
528	618	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	620	}
531	621	if (sel.scriptnode != null)
532	622	{
..	..	@@ -597,6 +687,9 @@
597	687	{
598	688	CameraPane.pointflow = (PointFlow) sel;
599	689	}
	690	+
	691	+ si.SendInfo("_____________________", "regular");
	692	+ si.SendInfo("", "regular");
600	693	}
601	694	}
602	695
..	..	@@ -612,68 +705,191 @@
612	705	}
613	706	}
614	707
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	710	+
	711	+ Rectangle keeprect;
	712	+ cRadio radio;
	713	+
	714	+cButton keepButton;
	715	+ cButton twoButton; // Full 3D
	716	+ cButton sixButton;
	717	+ cButton threeButton;
	718	+ cButton sevenButton;
	719	+ cButton fourButton; // full panel
	720	+ cButton oneButton; // full XYZ
	721	+ //cButton currentLayout;
	722	+
	723	+ boolean maximized;
	724	+
	725	+ cButton fullscreenLayout;
	726	+
	727	+ void Minimize()
	728	+ {
	729	+ frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
	731	+ }
	732	+
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	736	+ void Maximize()
	737	+ {
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
	743	+ if (maximized)
	744	+ {
	745	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+ }
	747	+ else
	748	+ {
	749	+ keeprect = frame.getBounds();
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	753	+// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	755	+ }
	756	+
	757	+ maximized ^= true;
	758	+
	759	+ frame.validate();
	760	+ }
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
	765	+
615	766	void ToggleFullScreen()
616	767	{
617		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
618	773	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	774	+ device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
	780	+ //frame.setVisible(false);
	781	+// frame.removeNotify();
	782	+// frame.setUndecorated(false);
	783	+// frame.addNotify();
	784	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	785	+
	786	+// X frame.getContentPane().remove(/"Center",/bigThree);
	787	+// X framePanel.add(bigThree);
	788	+// X frame.getContentPane().add(/"Center",/framePanel);
	789	+ framePanel.setDividerLocation(46);
	790	+
	791	+ //frame.setVisible(true);
	792	+ radio.layout = keepButton;
	793	+ //theFrame = null;
	794	+ keepButton = null;
	795	+ radio.layout.doClick();
	796	+
622	797	} else
623	798	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	799	+ keepButton = radio.layout;
	800	+ //keeprect = frame.getBounds();
	801	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	802	+// frame.getToolkit().getScreenSize().height);
	803	+ //frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
	807	+ device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
	810	+// frame.removeNotify();
	811	+// frame.setUndecorated(true);
	812	+// frame.addNotify();
	813	+// X frame.getContentPane().remove(/"Center",/framePanel);
	814	+// X framePanel.remove(bigThree);
	815	+// X frame.getContentPane().add(/"Center",/bigThree);
	816	+ framePanel.setDividerLocation(0);
	817	+
	818	+ radio.layout = fullscreenLayout;
	819	+ radio.layout.doClick();
	820	+ //frame.setVisible(true);
627	821	}
628		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
629	823	}
630	824
631		- private JTextArea createTextPane()
	825	+ private byte[] CompressCopy()
632	826	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
648	846
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
	847	+ private JTextPane createTextPane()
	848	+ {
	849	+// TEXTAREA String[] initString =
	850	+// {
	851	+// "This is an editable JTextPane, ", //regular
	852	+// "another ", //italic
	853	+// "styled ", //bold
	854	+// "text ", //small
	855	+// "component, ", //large
	856	+// "which supports embedded components..." + newline,//regular
	857	+// " " + newline, //button
	858	+// "...and embedded icons..." + newline, //regular
	859	+// " ", //icon
	860	+// newline + "JTextPane is a subclass of JEditorPane that "
	861	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	862	+// + "cover methods for interacting with those objects."
	863	+// };
	864	+//
	865	+// String[] initStyles =
	866	+// {
	867	+// "regular", "italic", "bold", "small", "large",
	868	+// "regular", "button", "regular", "icon",
	869	+// "regular"
	870	+// };
	871	+//
	872	+// JTextPane textPane = new JTextPane();
	873	+// textPane.setEditable(true);
	874	+// /StyledDocument/ doc = textPane.getStyledDocument();
	875	+// addStylesToDocument(doc);
	876	+//
	877	+// try
	878	+// {
	879	+// for (int j = 0; j < 2; j++)
	880	+// {
	881	+// for (int i = 0; i < initString.length; i++)
	882	+// {
	883	+// doc.insertString(doc.getLength(), initString[i],
	884	+// doc.getStyle(initStyles[i]));
	885	+// }
	886	+// }
	887	+// } catch (BadLocationException ble)
	888	+// {
	889	+// System.err.println("Couldn't insert initial text into text pane.");
	890	+// }
655	891
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	892	+ return new JTextPane(); // textPane;
677	893	}
678	894
679	895	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +942,7 @@
726	942	protected static ImageIcon createImageIcon(String path,
727	943	String description)
728	944	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	945	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	946	if (imgURL != null)
731	947	{
732	948	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +974,7 @@
758	974	// NumberSlider vDivsField;
759	975	// JCheckBox endcaps;
760	976	JCheckBox liveCB;
	977	+ JCheckBox selectCB;
761	978	JCheckBox hideCB;
762	979	JCheckBox link2masterCB;
763	980	JCheckBox markCB;
..	..	@@ -765,7 +982,12 @@
765	982	JCheckBox speedupCB;
766	983	JCheckBox rewindCB;
767	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
768	989	JComboBox texresMenu;
	990	+
769	991	JButton resetButton;
770	992	JButton stepButton;
771	993	JButton stepAllButton;
..	..	@@ -774,9 +996,13 @@
774	996	JButton fasterButton;
775	997	JButton remarkButton;
776	998
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
777	1002	cGridBag namePanel;
778	1003	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
780	1006	cGridBag pushPanel;
781	1007	cGridBag fillPanel;
782	1008
..	..	@@ -943,52 +1169,73 @@
943	1169
944	1170	void SetupUI2(ObjEditor oe)
945	1171	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1172	//SetupName(oe);
951	1173
952	1174	namePanel = new cGridBag();
953	1175
954	1176	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1178	oe.ctrlPanel.add(namePanel);
957	1179
958	1180	oe.ctrlPanel.Return();
959	1181
960		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
961	1183	return;
962	1184
963	1185	setupPanel = new cGridBag().setVertical(false);
964	1186
965	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1188	+ liveCB.setToolTipText("Animate object");
	1189	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectCB.setToolTipText("Make object selectable");
968	1191	// Return();
	1192	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1193	+ hideCB.setToolTipText("Hide object");
969	1194	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1195	+ markCB.setToolTipText("As animation target transform");
	1196	+
	1197	+ setupPanel2 = new cGridBag().setVertical(false);
	1198	+
	1199	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1200	+ rewindCB.setToolTipText("Rewind animation");
	1201	+
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1203	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1204
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
	1208	+ if (Globals.ADVANCED)
	1209	+ {
	1210	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1211	+ speedupCB.setToolTipText("Option motion capture");
	1212	+ }
	1213	+
973	1214	oe.ctrlPanel.add(setupPanel);
974	1215	oe.ctrlPanel.Return();
	1216	+ oe.ctrlPanel.add(setupPanel2);
	1217	+ oe.ctrlPanel.Return();
975	1218
976		- commandsPanel = new cGridBag().setVertical(false);
	1219	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1220
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1221	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1222	+ resetButton.setToolTipText("Jump to frame zero");
	1223	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1224	+ stepButton.setToolTipText("Step one frame");
980	1225	// resetAllButton = AddButton(oe, "Reset All");
981	1226	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1227	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1228	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1229	+ slowerButton.setToolTipText("Decrease animation speed");
	1230	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1231	+ fasterButton.setToolTipText("Increase animation speed");
	1232	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1233	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1234
988		- oe.ctrlPanel.add(commandsPanel);
	1235	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1236	oe.ctrlPanel.Return();
990	1237
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1238	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1239	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1240	//Return();
994	1241
..	..	@@ -1191,8 +1438,11 @@
1191	1438	//worldPanel.setName("World");
1192	1439	centralPanel = new cGridBag();
1193	1440	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1441	+
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ timelinePanel = new JPanel(new BorderLayout());
	1445	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1446
1197	1447	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1448	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1451,10 @@
1201	1451	// cameraPanel.setDividerSize(9);
1202	1452	cameraPanel.setResizeWeight(1.0);
1203	1453
	1454	+ }
	1455	+
1204	1456	centralPanel.add(cameraView);
	1457	+ centralPanel.setFocusable(true);
1205	1458	//frame.setJMenuBar(timelineMenubar);
1206	1459	//centralPanel.add(timelinePanel);
1207	1460
..	..	@@ -1227,6 +1480,7 @@
1227	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1230	1484
1231	1485	/*
1232	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,12 +1518,23 @@
1264	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1519	//tmp.setName("Edit");
1266	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1267	1522	// JPanel north = new JPanel(new BorderLayout());
1268	1523	// north.setName("Edit");
1269	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1525	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
	1526	+ objectPanel.add(editPanel);
	1527	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1528	+
	1529	+ //if (Globals.ADVANCED)
	1530	+ objectPanel.add(infoPanel);
	1531	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1532	+
	1533	+ objectPanel.add(XYZPanel);
	1534	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1535	+
	1536	+ objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1273	1538
1274	1539	/*
1275	1540	aConstraints.gridx = 0;
..	..	@@ -1278,7 +1543,7 @@
1278	1543	aConstraints.gridy += 1;
1279	1544	aConstraints.gridwidth = 1;
1280	1545	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1546	+ */
1282	1547
1283	1548	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1549	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1555,12 @@
1290	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1556
1292	1557	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1558	+ scenePanel.preferredWidth = 5;
1294	1559
1295	1560	JTabbedPane tabbedPane = new JTabbedPane();
1296	1561	tabbedPane.add(scrollpane);
1297	1562
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1563	+ optionsPanel = new cGridBag().setVertical(false);
1301	1564
1302	1565	optionsPanel.setName("Options");
1303	1566
..	..	@@ -1305,6 +1568,8 @@
1305	1568
1306	1569	tabbedPane.add(optionsPanel);
1307	1570
	1571	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1572	+
1308	1573	scenePanel.add(tabbedPane);
1309	1574
1310	1575	/*
..	..	@@ -1368,7 +1633,7 @@
1368	1633	bigThree = new cGridBag();
1369	1634	bigThree.addComponent(scenePanel);
1370	1635	bigThree.addComponent(centralPanel);
1371		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1372	1637
1373	1638	// // SIDE EFFECT!!!
1374	1639	// aConstraints.gridx = 0;
..	..	@@ -1377,9 +1642,9 @@
1377	1642	// aConstraints.gridheight = 1;
1378	1643
1379	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1383	1648	//framePanel.setDividerSize(15);
1384	1649	//framePanel.setResizeWeight(0.15);
1385	1650	framePanel.setName("Frame");
..	..	@@ -1396,10 +1661,15 @@
1396	1661
1397	1662	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1663
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1664	+ frame.setSize(1280, 860);
	1665	+
	1666	+ cameraView.requestFocusInWindow();
	1667	+
1402	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1403	1673
1404	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1436,17 +1706,25 @@
1436	1706
1437	1707	cGridBag editBar = new cGridBag().setVertical(false);
1438	1708
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1709	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1710	+ createMaterialButton.setToolTipText("Create material");
1440	1711
1441	1712	/*
1442	1713	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1714	*/
1444	1715
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1716	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1717	+ clearMaterialButton.setToolTipText("Clear material");
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1722	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1723	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1724	+ }
1449	1725
	1726	+ editBar.preferredHeight = 15;
	1727	+
1450	1728	panel.add(editBar);
1451	1729
1452	1730	/**/
..	..	@@ -1477,24 +1755,6 @@
1477	1755	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	1756	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	1757	colorSection.add(texture);
1480		-
1481		- cGridBag anisoU = new cGridBag();
1482		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1483		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1485		- colorSection.add(anisoU);
1486		-
1487		- cGridBag anisoV = new cGridBag();
1488		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1489		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1491		- colorSection.add(anisoV);
1492		-
1493		- cGridBag shadowbias = new cGridBag();
1494		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1497		- colorSection.add(shadowbias);
1498	1758
1499	1759	panel.add(new JSeparator());
1500	1760
..	..	@@ -1546,6 +1806,12 @@
1546	1806	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	1807	diffuseSection.add(fakedepth);
1548	1808
	1809	+ cGridBag shadowbias = new cGridBag();
	1810	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1811	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ diffuseSection.add(shadowbias);
	1814	+
1549	1815	panel.add(new JSeparator());
1550	1816
1551	1817	panel.add(diffuseSection);
..	..	@@ -1596,6 +1862,18 @@
1596	1862	// aConstraints.gridy += 1;
1597	1863	// aConstraints.gridwidth = 1;
1598	1864
	1865	+ cGridBag anisoU = new cGridBag();
	1866	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1867	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1869	+ specularSection.add(anisoU);
	1870	+
	1871	+ cGridBag anisoV = new cGridBag();
	1872	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1873	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1875	+ specularSection.add(anisoV);
	1876	+
1599	1877
1600	1878	panel.add(new JSeparator());
1601	1879
..	..	@@ -1603,35 +1881,35 @@
1603	1881
1604	1882	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	1883
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	1885
1608	1886	cGridBag camera = new cGridBag();
1609	1887	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	1888	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	1889	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	1890	+ colorSection.add(camera);
1613	1891
1614	1892	cGridBag ambient = new cGridBag();
1615	1893	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	1894	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	1895	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	1896	+ colorSection.add(ambient);
1619	1897
1620	1898	cGridBag backlit = new cGridBag();
1621	1899	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	1900	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1901	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	1902	+ colorSection.add(backlit);
1625	1903
1626	1904	cGridBag opacity = new cGridBag();
1627	1905	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628	1906	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629	1907	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630		- globalSection.add(opacity);
	1908	+ colorSection.add(opacity);
1631	1909
1632		- panel.add(new JSeparator());
	1910	+ //panel.add(new JSeparator());
1633	1911
1634		- panel.add(globalSection);
	1912	+ //panel.add(globalSection);
1635	1913
1636	1914	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	1915
..	..	@@ -1712,12 +1990,15 @@
1712	1990	opacityPowerField.addChangeListener(this);
1713	1991	/**/
1714	1992
1715		- resetSlidersButton.addActionListener(this);
1716	1993	clearMaterialButton.addActionListener(this);
1717	1994	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1995	+
	1996	+ if (Globals.ADVANCED)
	1997	+ {
	1998	+ resetSlidersButton.addActionListener(this);
	1999	+ propagateToggle.addItemListener(this);
	2000	+ multiplyToggle.addItemListener(this);
	2001	+ }
1721	2002	}
1722	2003
1723	2004	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +2016,9 @@
1735	2016	// 3D models
1736	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	2018	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1740	2022	continue;
1741	2023	}
1742	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2170,7 @@
1888	2170
1889	2171	//? flashIt = false;
1890	2172	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2173	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2174	pane.clickEnd(location.x, location.y, 0, true);
1893	2175
1894	2176	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2219,7 @@
1937	2219	e2.printStackTrace();
1938	2220	}
1939	2221	}
	2222	+
1940	2223	LoadJMEThread loadThread;
1941	2224
1942	2225	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2277,7 @@
1994	2277	//LoadFile0(filename, converter);
1995	2278	}
1996	2279	}
	2280	+
1997	2281	LoadOBJThread loadObjThread;
1998	2282
1999	2283	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2356,19 @@
2072	2356
2073	2357	void LoadObjFile(String fullname)
2074	2358	{
2075		- /*
	2359	+ System.out.println("Loading " + fullname);
	2360	+ /**/
2076	2361	//lastFilename = fullname;
2077	2362	if(loadObjThread == null)
2078	2363	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2364	+ loadObjThread = new LoadOBJThread();
	2365	+ loadObjThread.start();
2081	2366	}
2082	2367
2083	2368	loadObjThread.add(fullname);
2084		- */
	2369	+ /**/
2085	2370
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2371	+ //makeSomething(new FileObject(fullname, true), true);
2088	2372	}
2089	2373
2090	2374	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2629,11 @@
2345	2629
2346	2630	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2631	{
2348		- if (GrafreeD.standAlone)
	2632	+ if (Grafreed.standAlone)
2349	2633	{
2350	2634	/**/
2351	2635	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2636	+ browser.setVisible(true);
2353	2637	String filename = browser.getFile();
2354	2638	if (filename != null && filename.length() > 0)
2355	2639	{
..	..	@@ -2460,6 +2744,7 @@
2460	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	2746	}
	2747	+
2463	2748	//cJME.count++;
2464	2749	//cJME.count %= 12;
2465	2750	if (gc)
..	..	@@ -2643,6 +2928,7 @@
2643	2928	}
2644	2929	}
2645	2930	}
	2931	+
2646	2932	cFileSystemPane FSPane;
2647	2933
2648	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2696,11 +2982,14 @@
2696	2982	}
2697	2983	}
2698	2984	}
	2985	+
2699	2986	freezematerial = false;
2700	2987	}
2701	2988
2702	2989	void SetMaterial(Object3D object)
2703	2990	{
	2991	+ latestObject = object;
	2992	+
2704	2993	cMaterial mat = object.material;
2705	2994
2706	2995	if (mat == null)
..	..	@@ -2709,7 +2998,8 @@
2709	2998	return;
2710	2999	}
2711	3000
2712		- multiplyToggle.setSelected(mat.multiply);
	3001	+ if (multiplyToggle != null)
	3002	+ multiplyToggle.setSelected(mat.multiply);
2713	3003
2714	3004	assert (object.projectedVertices != null);
2715	3005
..	..	@@ -2811,12 +3101,17 @@
2811	3101	// }
2812	3102
2813	3103	/**/
2814		- if (deselect)
	3104	+ if (deselect \|\| child == null)
2815	3105	{
2816	3106	//group.deselectAll();
2817	3107	//freeze = true;
2818	3108	GetTree().clearSelection();
2819	3109	//freeze = false;
	3110	+
	3111	+ if (child == null)
	3112	+ {
	3113	+ return;
	3114	+ }
2820	3115	}
2821	3116
2822	3117	//group.addSelectee(child);
..	..	@@ -2885,7 +3180,7 @@
2885	3180	cameraView.ToggleDL();
2886	3181	cameraView.repaint();
2887	3182	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3183	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3184	{
2890	3185	cameraView.ToggleTexture();
2891	3186	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3219,9 @@
2924	3219	frame.validate();
2925	3220
2926	3221	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3222	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3223	{
2929		- cameraView.ToggleRandom();
	3224	+ cameraView.ToggleSwitch();
2930	3225	cameraView.repaint();
2931	3226	return;
2932	3227	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3250,10 @@
2955	3250	{
2956	3251	copy.live ^= true;
2957	3252	return;
	3253	+ } else if (event.getSource() == selectCB)
	3254	+ {
	3255	+ copy.dontselect ^= true;
	3256	+ return;
2958	3257	} else if (event.getSource() == hideCB)
2959	3258	{
2960	3259	copy.hide ^= true;
..	..	@@ -2969,6 +3268,7 @@
2969	3268	if (event.getSource() == randomCB)
2970	3269	{
2971	3270	copy.random ^= true;
	3271	+ objEditor.refreshContents();
2972	3272	return;
2973	3273	}
2974	3274	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3292,9 @@
2992	3292
2993	3293	public void actionPerformed(ActionEvent event)
2994	3294	{
	3295	+ Object source = event.getSource();
2995	3296	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3297	+ if (source == okbutton)
2997	3298	{
2998	3299	textpanel.setVisible(false);
2999	3300	textpanel.remove(textarea);
..	..	@@ -3005,7 +3306,7 @@
3005	3306	textarea = null;
3006	3307	textpanel = null;
3007	3308	}
3008		- if (event.getSource() == cancelbutton)
	3309	+ if (source == cancelbutton)
3009	3310	{
3010	3311	textpanel.setVisible(false);
3011	3312	textpanel.remove(textarea);
..	..	@@ -3017,50 +3318,50 @@
3017	3318	//applySelf();
3018	3319	//client.refreshEditWindow();
3019	3320	//refreshContents();
3020		- if (event.getSource() == nameField)
	3321	+ if (source == nameField)
3021	3322	{
3022	3323	//System.out.println("ObjEditor " + event);
3023	3324	applySelf0(true);
3024	3325	//parent.applySelf();
3025	3326	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3327	+ } else if (source == resetButton)
3027	3328	{
3028	3329	CameraPane.fullreset = true;
3029	3330	copy.Reset(); // ResetMeshes();
3030	3331	copy.Touch();
3031	3332	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3333	+ } else if (source == stepItem)
3033	3334	{
3034	3335	//cameraView.ONESTEP = true;
3035	3336	Globals.ONESTEP = true;
3036	3337	cameraView.repaint();
3037	3338	return;
3038		- } else if (event.getSource() == stepButton)
	3339	+ } else if (source == stepButton)
3039	3340	{
3040	3341	copy.Step();
3041	3342	copy.Touch();
3042	3343	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3344	+ } else if (source == slowerButton)
3044	3345	{
3045	3346	copy.Slower();
3046	3347	copy.Touch();
3047	3348	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3349	+ } else if (source == fasterButton)
3049	3350	{
3050	3351	copy.Faster();
3051	3352	copy.Touch();
3052	3353	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3354	+ } else if (source == remarkButton)
3054	3355	{
3055	3356	copy.Remark();
3056	3357	copy.Touch();
3057	3358	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3359	+ } else if (source == stepAllButton)
3059	3360	{
3060	3361	copy.StepAll();
3061	3362	copy.Touch();
3062	3363	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3364	+ } else if (source == resetAllButton)
3064	3365	{
3065	3366	//CameraPane.fullreset = true;
3066	3367	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3394,79 @@
3093	3394	// Close();
3094	3395	// }
3095	3396	// else
3096		- if (event.getSource() == resetSlidersButton)
	3397	+ if (source == resetSlidersButton)
3097	3398	{
3098	3399	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3400	+ } else if (source == clearMaterialButton)
3100	3401	{
3101	3402	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3403	+ } else if (source == createMaterialButton)
3103	3404	{
3104	3405	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3406	+ } else if (source == clearPanelButton)
3106	3407	{
3107	3408	copy.ClearUI();
3108	3409	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3410	+ } else if (source == importGFDItem)
	3411	+ {
	3412	+ ImportGFD();
	3413	+ } else
	3414	+ if (source == importVRMLX3DItem)
	3415	+ {
	3416	+ ImportVRMLX3D();
	3417	+ } else
	3418	+ if (source == import3DSItem)
	3419	+ {
	3420	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3421	+ } else
	3422	+ if (source == importOBJItem)
	3423	+ {
	3424	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3425	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3426	+ browser.setVisible(true);
	3427	+ String filename = browser.getFile();
	3428	+ if (filename != null && filename.length() > 0)
	3429	+ {
	3430	+ String fullname = browser.getDirectory() + filename;
	3431	+ makeSomething(ReadOBJ(fullname), true);
	3432	+ }
	3433	+ } else
	3434	+ if (source == closeItem)
3115	3435	{
3116	3436	Close();
3117	3437	//return true;
3118		- } else if (event.getSource() == loadItem)
	3438	+ } else if (source == openItem)
3119	3439	{
3120		- load();
	3440	+ Open();
3121	3441	//return true;
3122		- } else if (event.getSource() == saveItem)
	3442	+ } else if (source == newItem)
	3443	+ {
	3444	+ New();
	3445	+ } else if (source == saveItem)
3123	3446	{
3124	3447	save();
3125	3448	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3449	+ } else if (source == saveAsItem)
3127	3450	{
3128	3451	saveAs();
3129	3452	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3453	+ } else if (source == reexportItem)
3131	3454	{
3132	3455	reexport();
3133	3456	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3457	+ } else if (source == exportAsItem)
3135	3458	{
3136	3459	export();
3137	3460	//return true;
3138		- } else if (event.getSource() == povItem)
	3461	+ } else if (source == povItem)
3139	3462	{
3140	3463	generatePOV();
3141	3464	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
	3469	+ } else if (source == zBufferItem)
3143	3470	{
3144	3471	try
3145	3472	{
..	..	@@ -3161,21 +3488,8 @@
3161	3488	cameraView.repaint();
3162	3489	//return true;
3163	3490	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3491	+ */ else // combos...
	3492	+ if (source == texresMenu)
3179	3493	{
3180	3494	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3495	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3501,409 @@
3187	3501	}
3188	3502	}
3189	3503
	3504	+ void New()
	3505	+ {
	3506	+ while (copy.Size() > 1)
	3507	+ {
	3508	+ copy.remove(1);
	3509	+ }
	3510	+
	3511	+ ResetModel();
	3512	+ objEditor.refreshContents();
	3513	+ }
	3514	+
	3515	+ static public byte[] Compress(Object3D o)
	3516	+ {
	3517	+ try
	3518	+ {
	3519	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3522	+
	3523	+ Object3D parent = o.parent;
	3524	+ o.parent = null;
	3525	+
	3526	+ out.writeObject(o);
	3527	+
	3528	+ o.parent = parent;
	3529	+
	3530	+ out.flush();
	3531	+
	3532	+ baos //zstream
	3533	+ .close();
	3534	+ out.close();
	3535	+
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
	3540	+ } catch (Exception e)
	3541	+ {
	3542	+ System.err.println(e);
	3543	+ return null;
	3544	+ }
	3545	+ }
	3546	+
	3547	+ static public Object Uncompress(byte[] bytes)
	3548	+ {
	3549	+ System.out.println("restore #bytes = " + bytes.length);
	3550	+ try
	3551	+ {
	3552	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3555	+ Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
	3559	+ in.close();
	3560	+
	3561	+ return obj;
	3562	+ } catch (Exception e)
	3563	+ {
	3564	+ System.err.println(e);
	3565	+ return null;
	3566	+ }
	3567	+ }
	3568	+
	3569	+ static public Object clone(Object o)
	3570	+ {
	3571	+ try
	3572	+ {
	3573	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3575	+
	3576	+ out.writeObject(o);
	3577	+
	3578	+ out.flush();
	3579	+ out.close();
	3580	+
	3581	+ byte[] bytes = baos.toByteArray();
	3582	+
	3583	+ System.out.println("clone = " + bytes.length);
	3584	+
	3585	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3586	+ ObjectInputStream in = new ObjectInputStream(bais);
	3587	+ Object obj = in.readObject();
	3588	+ in.close();
	3589	+
	3590	+ return obj;
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ System.err.println(e);
	3594	+ return null;
	3595	+ }
	3596	+ }
	3597	+
	3598	+ cRadio GetCurrentTab()
	3599	+ {
	3600	+ cRadio ab;
	3601	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3602	+ {
	3603	+ ab = (cRadio)e.nextElement();
	3604	+ if(ab.GetObject() == copy)
	3605	+ {
	3606	+ return ab;
	3607	+ }
	3608	+ }
	3609	+
	3610	+ return null;
	3611	+ }
	3612	+
	3613	+
	3614	+ public void Save()
	3615	+ {
	3616	+ //Save(true);
	3617	+ Replace();
	3618	+ }
	3619	+
	3620	+ private boolean Equal(byte[] compress, byte[] name)
	3621	+ {
	3622	+ if (compress.length != name.length)
	3623	+ {
	3624	+ return false;
	3625	+ }
	3626	+
	3627	+ for (int i=compress.length; --i>=0;)
	3628	+ {
	3629	+ if (compress[i] != name[i])
	3630	+ return false;
	3631	+ }
	3632	+
	3633	+ return true;
	3634	+ }
	3635	+
	3636	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3637	+
	3638	+ public boolean Save(boolean user)
	3639	+ {
	3640	+ System.err.println("Save");
	3641	+
	3642	+ cRadio tab = GetCurrentTab();
	3643	+
	3644	+ byte[] compress = CompressCopy();
	3645	+
	3646	+ boolean thesame = false;
	3647	+
	3648	+ // Quick heuristic using length. Works only when stream is compressed.
	3649	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3650	+ {
	3651	+ thesame = true;
	3652	+ }
	3653	+
	3654	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3655	+ if (!thesame)
	3656	+ {
	3657	+ //tab.user[tab.versionindex] = user;
	3658	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3659	+
	3660	+ copy.versions[++copy.versionindex] = compress;
	3661	+
	3662	+ // if (increment)
	3663	+ // tab.versionindex++;
	3664	+ }
	3665	+
	3666	+ //copy.RestoreBigData(versiontable);
	3667	+
	3668	+ //assert(hashtable.isEmpty());
	3669	+
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3671	+ {
	3672	+ //tab.user[i] = false;
	3673	+ copy.versions[i] = null;
	3674	+ }
	3675	+
	3676	+ SetUndoStates();
	3677	+
	3678	+ // test save
	3679	+ if (false)
	3680	+ {
	3681	+ try
	3682	+ {
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3684	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3685	+
	3686	+ p.writeObject(copy);
	3687	+
	3688	+ p.flush();
	3689	+
	3690	+ ostream.close();
	3691	+ } catch (Exception e)
	3692	+ {
	3693	+ e.printStackTrace();
	3694	+ }
	3695	+ }
	3696	+
	3697	+ return !thesame;
	3698	+ }
	3699	+
	3700	+ void CopyChanged(Object3D obj)
	3701	+ {
	3702	+ SetUndoStates();
	3703	+
	3704	+ boolean temp = CameraPane.SWITCH;
	3705	+ CameraPane.SWITCH = false;
	3706	+
	3707	+ copy.ExtractBigData(versiontable);
	3708	+
	3709	+ copy.clear();
	3710	+
	3711	+ for (int i=0; i<obj.Size(); i++)
	3712	+ {
	3713	+ copy.add(obj.get(i));
	3714	+ }
	3715	+
	3716	+ copy.RestoreBigData(versiontable);
	3717	+
	3718	+ CameraPane.SWITCH = temp;
	3719	+
	3720	+ //assert(hashtable.isEmpty());
	3721	+
	3722	+ copy.Touch();
	3723	+
	3724	+ ResetModel();
	3725	+ copy.HardTouch(); // recompile?
	3726	+
	3727	+ cRadio ab;
	3728	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3729	+ {
	3730	+ ab = (cRadio)e.nextElement();
	3731	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3732	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3733	+ if (test != null)
	3734	+ {
	3735	+ test.editWindow = ab.object.editWindow;
	3736	+ ab.object = test;
	3737	+ }
	3738	+ }
	3739	+
	3740	+ refreshContents();
	3741	+ }
	3742	+
	3743	+ cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
	3746	+ cButton redoButton;
	3747	+
	3748	+ boolean muteSlider;
	3749	+
	3750	+ int VersionCount()
	3751	+ {
	3752	+ int count = 0;
	3753	+
	3754	+ for (int i = copy.versions.length; --i >= 0;)
	3755	+ {
	3756	+ if (copy.versions[i] != null)
	3757	+ count++;
	3758	+ }
	3759	+
	3760	+ return count;
	3761	+ }
	3762	+
	3763	+ void SetUndoStates()
	3764	+ {
	3765	+ cRadio tab = GetCurrentTab();
	3766	+
	3767	+ restoreButton.setEnabled(copy.versionindex != -1);
	3768	+ replaceButton.setEnabled(copy.versionindex != -1);
	3769	+
	3770	+ undoButton.setEnabled(copy.versionindex > 0);
	3771	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3772	+
	3773	+ muteSlider = true;
	3774	+ versionSlider.setMaximum(VersionCount() - 1);
	3775	+ versionSlider.setInteger(copy.versionindex);
	3776	+ muteSlider = false;
	3777	+ }
	3778	+
	3779	+ public boolean Undo()
	3780	+ {
	3781	+ // Option?
	3782	+ Replace();
	3783	+
	3784	+ System.err.println("Undo");
	3785	+
	3786	+ cRadio tab = GetCurrentTab();
	3787	+
	3788	+ if (copy.versionindex == 0)
	3789	+ {
	3790	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3791	+ return false;
	3792	+ }
	3793	+
	3794	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3795	+// {
	3796	+// if (Save(false))
	3797	+// tab.versionindex -= 1;
	3798	+// else
	3799	+// {
	3800	+// if (tab.versionindex <= 0)
	3801	+// return false;
	3802	+// else
	3803	+// tab.versionindex -= 1;
	3804	+// }
	3805	+// }
	3806	+
	3807	+ copy.versionindex -= 1;
	3808	+
	3809	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3810	+
	3811	+ return true;
	3812	+ }
	3813	+
	3814	+ public boolean Restore()
	3815	+ {
	3816	+ System.err.println("Restore");
	3817	+
	3818	+ cRadio tab = GetCurrentTab();
	3819	+
	3820	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3821	+ {
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
	3824	+ }
	3825	+
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
	3830	+
	3831	+ public boolean Replace()
	3832	+ {
	3833	+ System.err.println("Replace");
	3834	+
	3835	+ cRadio tab = GetCurrentTab();
	3836	+
	3837	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3838	+ {
	3839	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3840	+ return false;
	3841	+ }
	3842	+
	3843	+ copy.versions[copy.versionindex] = CompressCopy();
	3844	+
	3845	+ return true;
	3846	+ }
	3847	+
	3848	+ public void Redo()
	3849	+ {
	3850	+ // Option?
	3851	+ Replace();
	3852	+
	3853	+ cRadio tab = GetCurrentTab();
	3854	+
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
	3856	+ {
	3857	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3858	+ return;
	3859	+ }
	3860	+
	3861	+ copy.versionindex += 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
	3867	+ }
	3868	+
	3869	+ void ImportGFD()
	3870	+ {
	3871	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3872	+ browser.show();
	3873	+ String filename = browser.getFile();
	3874	+ if (filename != null && filename.length() > 0)
	3875	+ {
	3876	+ String fullname = browser.getDirectory() + filename;
	3877	+
	3878	+ //Object3D readobj =
	3879	+ objEditor.ReadGFD(fullname, objEditor);
	3880	+ //makeSomething(readobj);
	3881	+ }
	3882	+ }
	3883	+
	3884	+ void ImportVRMLX3D()
	3885	+ {
	3886	+ if (Grafreed.standAlone)
	3887	+ {
	3888	+ /**/
	3889	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3890	+ browser.show();
	3891	+ String filename = browser.getFile();
	3892	+ if (filename != null && filename.length() > 0)
	3893	+ {
	3894	+ String fullname = browser.getDirectory() + filename;
	3895	+ LoadVRMLX3D(fullname);
	3896	+ }
	3897	+ /**/
	3898	+ }
	3899	+ }
	3900	+
3190	3901	void ToggleAnimation()
3191	3902	{
3192	3903	if (!Globals.ANIMATION)
3193	3904	{
3194	3905	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3906	+ browser.setVisible(true);
3196	3907	String filename = browser.getFile();
3197	3908	if (filename != null && filename.length() > 0)
3198	3909	{
..	..	@@ -3202,8 +3913,8 @@
3202	3913
3203	3914	Globals.ANIMATION ^= true;
3204	3915
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3916	+ Grafreed.wav.cursor = 0;
	3917	+ Grafreed.wav.loop = 0;
3207	3918	}
3208	3919	} else
3209	3920	{
..	..	@@ -3224,7 +3935,6 @@
3224	3935	callee.refreshContents();
3225	3936	} else
3226	3937	{
3227		- new Exception().printStackTrace();
3228	3938	System.exit(0);
3229	3939	}
3230	3940	}
..	..	@@ -3254,7 +3964,7 @@
3254	3964	void CreateMaterial()
3255	3965	{
3256	3966	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3967	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3968	if (copy.selection.size() > 0)
3259	3969	//SetMaterial(copy);
3260	3970	{
..	..	@@ -3305,7 +4015,7 @@
3305	4015	assert false;
3306	4016	}
3307	4017
3308		- void EditSelection()
	4018	+ void EditSelection(boolean newWindow)
3309	4019	{
3310	4020	}
3311	4021
..	..	@@ -3313,11 +4023,11 @@
3313	4023	{
3314	4024	copy.ResetBlockLoop(); // temporary problem
3315	4025
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4026	+ boolean random = CameraPane.SWITCH;
	4027	+ CameraPane.SWITCH = false; // parse everything
3318	4028	copy.ResetDisplayList();
3319	4029	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4030	+ CameraPane.SWITCH = random;
3321	4031	}
3322	4032
3323	4033	// public void applySelf()
..	..	@@ -3391,6 +4101,36 @@
3391	4101	{
3392	4102	//System.out.println("Propagate = " + propagate);
3393	4103	copy.UpdateMaterial(anchor, current, propagate);
	4104	+
	4105	+ if (copy.material != null)
	4106	+ {
	4107	+ cMaterial mat = copy.material;
	4108	+
	4109	+ colorField.SetToolTipValue((mat.color));
	4110	+ modulationField.SetToolTipValue((mat.modulation));
	4111	+ metalnessField.SetToolTipValue((mat.metalness));
	4112	+ diffuseField.SetToolTipValue((mat.diffuse));
	4113	+ specularField.SetToolTipValue((mat.specular));
	4114	+ shininessField.SetToolTipValue((mat.shininess));
	4115	+ shiftField.SetToolTipValue((mat.shift));
	4116	+ ambientField.SetToolTipValue((mat.ambient));
	4117	+ lightareaField.SetToolTipValue((mat.lightarea));
	4118	+ diffusenessField.SetToolTipValue((mat.factor));
	4119	+ velvetField.SetToolTipValue((mat.velvet));
	4120	+ sheenField.SetToolTipValue((mat.sheen));
	4121	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4122	+ backlitField.SetToolTipValue((mat.bump));
	4123	+ anisoField.SetToolTipValue((mat.aniso));
	4124	+ anisoVField.SetToolTipValue((mat.anisoV));
	4125	+ cameraField.SetToolTipValue((mat.cameralight));
	4126	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4127	+ shadowField.SetToolTipValue((mat.shadow));
	4128	+ textureField.SetToolTipValue((mat.texture));
	4129	+ opacityField.SetToolTipValue((mat.opacity));
	4130	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4131	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4132	+ }
	4133	+
3394	4134	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4135	{
3396	4136	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4159,25 @@
3419	4159	//copy.Touch();
3420	4160	}
3421	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3422	4164	public void stateChanged(ChangeEvent e)
3423	4165	{
3424	4166	// assert(false);
	4167	+ if (e.getSource() == versionSlider)
	4168	+ {
	4169	+ if (muteSlider)
	4170	+ return;
	4171	+
	4172	+ int version = versionSlider.getInteger();
	4173	+
	4174	+ if (copy.versions[version] != null)
	4175	+ {
	4176	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4177	+ }
	4178	+
	4179	+ return;
	4180	+ }
3425	4181
3426	4182	if (freezematerial)
3427	4183	{
..	..	@@ -3506,7 +4262,7 @@
3506	4262	}
3507	4263
3508	4264	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4265	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4266	}
3511	4267
3512	4268	void SnapObject()
..	..	@@ -3770,6 +4526,8 @@
3770	4526
3771	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4528	{
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4530	+ Save();
3773	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4533	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4614,12 @@
3856	4614	{
3857	4615	ResetModel();
3858	4616	Select(thing.GetTreePath(), true, false); // unselect... false);
	4617	+
	4618	+ if (thing.Size() == 0)
	4619	+ {
	4620	+ //EditSelection(false);
	4621	+ }
	4622	+
3859	4623	refreshContents();
3860	4624	}
3861	4625
..	..	@@ -3973,6 +4737,7 @@
3973	4737	}
3974	4738	}
3975	4739	}
	4740	+
3976	4741	LoadGFDThread loadGFDThread;
3977	4742
3978	4743	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4757,10 @@
3992	4757
3993	4758	try
3994	4759	{
	4760	+ // Try compressed version first.
3995	4761	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4762	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4763	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4764
3998	4765	readobj = (Object3D) p.readObject();
3999	4766	istream.close();
..	..	@@ -4001,7 +4768,20 @@
4001	4768	readobj.ResetDisplayList();
4002	4769	} catch (Exception e)
4003	4770	{
4004		- e.printStackTrace();
	4771	+ //e.printStackTrace();
	4772	+ try
	4773	+ {
	4774	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4775	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4776	+
	4777	+ readobj = (Object3D) p.readObject();
	4778	+ istream.close();
	4779	+
	4780	+ readobj.ResetDisplayList();
	4781	+ } catch (Exception e2)
	4782	+ {
	4783	+ e2.printStackTrace();
	4784	+ }
4005	4785	}
4006	4786	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4787	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4827,12 @@
4047	4827
4048	4828	void LoadIt(Object obj)
4049	4829	{
	4830	+ if (obj == null)
	4831	+ {
	4832	+ // Invalid file
	4833	+ return;
	4834	+ }
	4835	+
4050	4836	System.out.println("Loaded " + obj);
4051	4837	//new Exception().printStackTrace();
4052	4838	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4842,8 @@
4056	4842
4057	4843	if (readobj != null)
4058	4844	{
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4059	4847	try
4060	4848	{
4061	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4110,15 +4898,26 @@
4110	4898	c.addChild(csg);
4111	4899	}
4112	4900
	4901	+ copy.versions = readobj.versions;
	4902	+ copy.versionindex = readobj.versionindex;
	4903	+
	4904	+ if (copy.versions == null)
	4905	+ {
	4906	+ copy.versions = new byte[100][];
	4907	+ copy.versionindex = -1;
	4908	+ }
	4909	+
	4910	+ //? SetUndoStates();
	4911	+
4113	4912	ResetModel();
4114	4913	copy.HardTouch(); // recompile?
4115	4914	refreshContents();
4116	4915	}
4117	4916	}
4118	4917
4119		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4120	4919	{
4121		- if (GrafreeD.standAlone)
	4920	+ if (Grafreed.standAlone)
4122	4921	{
4123	4922	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4923	browser.show();
..	..	@@ -4205,11 +5004,13 @@
4205	5004	try
4206	5005	{
4207	5006	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5007	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5008	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	5009
4210	5010	p.writeObject(copy);
4211	5011	p.flush();
4212	5012
	5013	+ zstream.close();
4213	5014	ostream.close();
4214	5015
4215	5016	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,17 +5020,20 @@
4219	5020	{
4220	5021	}
4221	5022	}
	5023	+
4222	5024	String lastname;
4223	5025
4224	5026	void saveAs()
4225	5027	{
4226		- if (GrafreeD.standAlone)
	5028	+ if (Grafreed.standAlone)
4227	5029	{
4228	5030	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	5031	browser.setVisible(true);
4230	5032	String filename = browser.getFile();
4231	5033	if (filename != null && filename.length() > 0)
4232	5034	{
	5035	+ if (!filename.endsWith(".gfd"))
	5036	+ filename += ".gfd";
4233	5037	lastname = browser.getDirectory() + filename;
4234	5038	save();
4235	5039	}
..	..	@@ -4328,13 +5132,13 @@
4328	5132	try
4329	5133	{
4330	5134	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5135	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5136	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5137
4334	5138	Object3D objectparent = obj.parent;
4335	5139	obj.parent = null;
4336	5140
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5141	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5142
4339	5143	obj.parent = objectparent;
4340	5144
..	..	@@ -4346,8 +5150,8 @@
4346	5150	p.writeObject(object);
4347	5151	p.flush();
4348	5152
	5153	+ zstream.close();
4349	5154	ostream.close();
4350		- // zstream.close();
4351	5155
4352	5156	// group.selection.get(0).parent = parent;
4353	5157	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5172,7 @@
4368	5172	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5173	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5174	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5175	+ if (Grafreed.standAlone)
4372	5176	{
4373	5177	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5178	browser.show();
..	..	@@ -4394,19 +5198,18 @@
4394	5198	Object3D client;
4395	5199	Object3D copy;
4396	5200	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5201	+ Menu fileMenu;
	5202	+ MenuItem newItem;
	5203	+ MenuItem openItem;
4399	5204	MenuItem saveItem;
4400	5205	MenuItem saveAsItem;
4401	5206	MenuItem exportAsItem;
4402	5207	MenuItem reexportItem;
4403	5208	MenuItem povItem;
4404	5209	MenuItem closeItem;
4405		- Menu cameraMenu;
	5210	+
4406	5211	CheckboxMenuItem zBufferItem;
4407	5212	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5213	MenuItem stepItem;
4411	5214	CheckboxMenuItem toggleLiveItem;
4412	5215	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5220,39 @@
4417	5220	CheckboxMenuItem toggleFootContactItem;
4418	5221	CheckboxMenuItem toggleDLItem;
4419	5222	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5223	+ CheckboxMenuItem toggleSwitchItem;
4421	5224	CheckboxMenuItem toggleRootItem;
4422	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4423	5227	CheckboxMenuItem toggleHandleItem;
4424	5228	CheckboxMenuItem togglePaintItem;
4425	5229	JSplitPane mainPanel;
4426	5230	JScrollPane scrollpane;
	5231	+
4427	5232	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5233	+
	5234	+ cGridBag treePanel;
	5235	+
4429	5236	JPanel radioPanel;
4430	5237	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5238	+
	5239	+ cGridBag toolboxPanel;
4432	5240	cGridBag materialPanel;
	5241	+ cGridBag ctrlPanel;
	5242	+
4433	5243	JScrollPane infoPanel;
	5244	+
4434	5245	cGridBag optionsPanel;
	5246	+
4435	5247	JTabbedPane objectPanel;
	5248	+ boolean materialFlushed;
	5249	+ Object3D latestObject;
	5250	+
4436	5251	cGridBag XYZPanel;
	5252	+
4437	5253	JSplitPane gridPanel;
4438	5254	JSplitPane bigPanel;
	5255	+
4439	5256	cGridBag bigThree;
4440	5257	cGridBag scenePanel;
4441	5258	cGridBag centralPanel;
..	..	@@ -4550,8 +5367,13 @@
4550	5367	cNumberSlider fogField;
4551	5368	JLabel opacityPowerLabel;
4552	5369	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5370	+ cTree jTree;
4554	5371	//ObjectUI parent;
4555	5372
4556	5373	cNumberSlider normalpushField;
	5374	+
	5375	+ private MenuItem importGFDItem;
	5376	+ private MenuItem importVRMLX3DItem;
	5377	+ private MenuItem import3DSItem;
	5378	+ private MenuItem importOBJItem;
4557	5379	}