~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 selectableCB;
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,74 @@
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	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
968	1191	// Return();
	1192	+
	1193	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1194	+ hideCB.setToolTipText("Hide object");
969	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1196	+ markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ setupPanel2 = new cGridBag().setVertical(false);
	1199	+
	1200	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1201	+ rewindCB.setToolTipText("Rewind animation");
	1202	+
	1203	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1204	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1205
	1206	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1207	+ link2masterCB.setToolTipText("Attach to support");
	1208	+
	1209	+ if (Globals.ADVANCED)
	1210	+ {
	1211	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1212	+ speedupCB.setToolTipText("Option motion capture");
	1213	+ }
	1214	+
973	1215	oe.ctrlPanel.add(setupPanel);
974	1216	oe.ctrlPanel.Return();
	1217	+ oe.ctrlPanel.add(setupPanel2);
	1218	+ oe.ctrlPanel.Return();
975	1219
976		- commandsPanel = new cGridBag().setVertical(false);
	1220	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1221
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1222	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1223	+ resetButton.setToolTipText("Jump to frame zero");
	1224	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1225	+ stepButton.setToolTipText("Step one frame");
980	1226	// resetAllButton = AddButton(oe, "Reset All");
981	1227	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1228	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1229	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1230	+ slowerButton.setToolTipText("Decrease animation speed");
	1231	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1232	+ fasterButton.setToolTipText("Increase animation speed");
	1233	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1234	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1235
988		- oe.ctrlPanel.add(commandsPanel);
	1236	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1237	oe.ctrlPanel.Return();
990	1238
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1239	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1240	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1241	//Return();
994	1242
..	..	@@ -1191,8 +1439,11 @@
1191	1439	//worldPanel.setName("World");
1192	1440	centralPanel = new cGridBag();
1193	1441	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1442	+
	1443	+ if (Globals.ADVANCED)
	1444	+ {
	1445	+ timelinePanel = new JPanel(new BorderLayout());
	1446	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1447
1197	1448	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1449	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1452,10 @@
1201	1452	// cameraPanel.setDividerSize(9);
1202	1453	cameraPanel.setResizeWeight(1.0);
1203	1454
	1455	+ }
	1456	+
1204	1457	centralPanel.add(cameraView);
	1458	+ centralPanel.setFocusable(true);
1205	1459	//frame.setJMenuBar(timelineMenubar);
1206	1460	//centralPanel.add(timelinePanel);
1207	1461
..	..	@@ -1227,6 +1481,7 @@
1227	1481	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1482	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1483	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1484	+ //XYZPanel.setName("XYZ");
1230	1485
1231	1486	/*
1232	1487	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,12 +1519,23 @@
1264	1519	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1520	//tmp.setName("Edit");
1266	1521	objectPanel.add(materialPanel);
	1522	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1267	1523	// JPanel north = new JPanel(new BorderLayout());
1268	1524	// north.setName("Edit");
1269	1525	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1526	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
	1527	+ objectPanel.add(editPanel);
	1528	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1529	+
	1530	+ //if (Globals.ADVANCED)
	1531	+ objectPanel.add(infoPanel);
	1532	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1533	+
	1534	+ objectPanel.add(XYZPanel);
	1535	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1536	+
	1537	+ objectPanel.add(toolboxPanel);
	1538	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1273	1539
1274	1540	/*
1275	1541	aConstraints.gridx = 0;
..	..	@@ -1278,7 +1544,7 @@
1278	1544	aConstraints.gridy += 1;
1279	1545	aConstraints.gridwidth = 1;
1280	1546	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1547	+ */
1282	1548
1283	1549	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1550	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1556,12 @@
1290	1556	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1557
1292	1558	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1559	+ scenePanel.preferredWidth = 5;
1294	1560
1295	1561	JTabbedPane tabbedPane = new JTabbedPane();
1296	1562	tabbedPane.add(scrollpane);
1297	1563
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1564	+ optionsPanel = new cGridBag().setVertical(false);
1301	1565
1302	1566	optionsPanel.setName("Options");
1303	1567
..	..	@@ -1305,6 +1569,8 @@
1305	1569
1306	1570	tabbedPane.add(optionsPanel);
1307	1571
	1572	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1573	+
1308	1574	scenePanel.add(tabbedPane);
1309	1575
1310	1576	/*
..	..	@@ -1366,9 +1632,9 @@
1366	1632	/**/
1367	1633
1368	1634	bigThree = new cGridBag();
1369		- bigThree.addComponent(scenePanel);
1370	1635	bigThree.addComponent(centralPanel);
1371		- bigThree.addComponent(XYZPanel);
	1636	+ bigThree.addComponent(scenePanel);
	1637	+ //bigThree.addComponent(XYZPanel);
1372	1638
1373	1639	// // SIDE EFFECT!!!
1374	1640	// aConstraints.gridx = 0;
..	..	@@ -1377,9 +1643,9 @@
1377	1643	// aConstraints.gridheight = 1;
1378	1644
1379	1645	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1646	+ framePanel.setContinuousLayout(false);
	1647	+ framePanel.setOneTouchExpandable(false);
	1648	+ //.setDividerLocation(0.8);
1383	1649	//framePanel.setDividerSize(15);
1384	1650	//framePanel.setResizeWeight(0.15);
1385	1651	framePanel.setName("Frame");
..	..	@@ -1396,10 +1662,15 @@
1396	1662
1397	1663	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1664
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1665	+ frame.setSize(1280, 860);
	1666	+
	1667	+ cameraView.requestFocusInWindow();
	1668	+
1402	1669	gridPanel.setDividerLocation(1.0);
	1670	+
	1671	+ frame.validate();
	1672	+
	1673	+ frame.setVisible(true);
1403	1674
1404	1675	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1676	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1436,17 +1707,25 @@
1436	1707
1437	1708	cGridBag editBar = new cGridBag().setVertical(false);
1438	1709
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1710	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1711	+ createMaterialButton.setToolTipText("Create material");
1440	1712
1441	1713	/*
1442	1714	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1715	*/
1444	1716
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);
	1717	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1718	+ clearMaterialButton.setToolTipText("Clear material");
	1719	+
	1720	+ if (Globals.ADVANCED)
	1721	+ {
	1722	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1723	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1724	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1725	+ }
1449	1726
	1727	+ editBar.preferredHeight = 15;
	1728	+
1450	1729	panel.add(editBar);
1451	1730
1452	1731	/**/
..	..	@@ -1477,24 +1756,6 @@
1477	1756	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	1757	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	1758	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	1759
1499	1760	panel.add(new JSeparator());
1500	1761
..	..	@@ -1546,6 +1807,12 @@
1546	1807	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	1808	diffuseSection.add(fakedepth);
1548	1809
	1810	+ cGridBag shadowbias = new cGridBag();
	1811	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1812	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1814	+ diffuseSection.add(shadowbias);
	1815	+
1549	1816	panel.add(new JSeparator());
1550	1817
1551	1818	panel.add(diffuseSection);
..	..	@@ -1596,6 +1863,18 @@
1596	1863	// aConstraints.gridy += 1;
1597	1864	// aConstraints.gridwidth = 1;
1598	1865
	1866	+ cGridBag anisoU = new cGridBag();
	1867	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1868	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1870	+ specularSection.add(anisoU);
	1871	+
	1872	+ cGridBag anisoV = new cGridBag();
	1873	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1874	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1876	+ specularSection.add(anisoV);
	1877	+
1599	1878
1600	1879	panel.add(new JSeparator());
1601	1880
..	..	@@ -1603,35 +1882,35 @@
1603	1882
1604	1883	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	1884
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	1885	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	1886
1608	1887	cGridBag camera = new cGridBag();
1609	1888	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	1889	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	1890	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	1891	+ colorSection.add(camera);
1613	1892
1614	1893	cGridBag ambient = new cGridBag();
1615	1894	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	1895	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	1896	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	1897	+ colorSection.add(ambient);
1619	1898
1620	1899	cGridBag backlit = new cGridBag();
1621	1900	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	1901	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1902	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	1903	+ colorSection.add(backlit);
1625	1904
1626	1905	cGridBag opacity = new cGridBag();
1627	1906	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628	1907	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629	1908	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630		- globalSection.add(opacity);
	1909	+ colorSection.add(opacity);
1631	1910
1632		- panel.add(new JSeparator());
	1911	+ //panel.add(new JSeparator());
1633	1912
1634		- panel.add(globalSection);
	1913	+ //panel.add(globalSection);
1635	1914
1636	1915	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	1916
..	..	@@ -1712,12 +1991,15 @@
1712	1991	opacityPowerField.addChangeListener(this);
1713	1992	/**/
1714	1993
1715		- resetSlidersButton.addActionListener(this);
1716	1994	clearMaterialButton.addActionListener(this);
1717	1995	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1996	+
	1997	+ if (Globals.ADVANCED)
	1998	+ {
	1999	+ resetSlidersButton.addActionListener(this);
	2000	+ propagateToggle.addItemListener(this);
	2001	+ multiplyToggle.addItemListener(this);
	2002	+ }
1721	2003	}
1722	2004
1723	2005	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +2017,9 @@
1735	2017	// 3D models
1736	2018	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	2019	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	2020	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2021	+ //LoadFile(filename, lastConverter);
	2022	+ LoadObjFile(filename); // New 3ds loader
1740	2023	continue;
1741	2024	}
1742	2025	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2171,7 @@
1888	2171
1889	2172	//? flashIt = false;
1890	2173	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2174	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2175	pane.clickEnd(location.x, location.y, 0, true);
1893	2176
1894	2177	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2220,7 @@
1937	2220	e2.printStackTrace();
1938	2221	}
1939	2222	}
	2223	+
1940	2224	LoadJMEThread loadThread;
1941	2225
1942	2226	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2278,7 @@
1994	2278	//LoadFile0(filename, converter);
1995	2279	}
1996	2280	}
	2281	+
1997	2282	LoadOBJThread loadObjThread;
1998	2283
1999	2284	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2357,19 @@
2072	2357
2073	2358	void LoadObjFile(String fullname)
2074	2359	{
2075		- /*
	2360	+ System.out.println("Loading " + fullname);
	2361	+ /**/
2076	2362	//lastFilename = fullname;
2077	2363	if(loadObjThread == null)
2078	2364	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2365	+ loadObjThread = new LoadOBJThread();
	2366	+ loadObjThread.start();
2081	2367	}
2082	2368
2083	2369	loadObjThread.add(fullname);
2084		- */
	2370	+ /**/
2085	2371
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2372	+ //makeSomething(new FileObject(fullname, true), true);
2088	2373	}
2089	2374
2090	2375	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2630,11 @@
2345	2630
2346	2631	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2632	{
2348		- if (GrafreeD.standAlone)
	2633	+ if (Grafreed.standAlone)
2349	2634	{
2350	2635	/**/
2351	2636	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2637	+ browser.setVisible(true);
2353	2638	String filename = browser.getFile();
2354	2639	if (filename != null && filename.length() > 0)
2355	2640	{
..	..	@@ -2460,6 +2745,7 @@
2460	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	2746	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	2747	}
	2748	+
2463	2749	//cJME.count++;
2464	2750	//cJME.count %= 12;
2465	2751	if (gc)
..	..	@@ -2643,6 +2929,7 @@
2643	2929	}
2644	2930	}
2645	2931	}
	2932	+
2646	2933	cFileSystemPane FSPane;
2647	2934
2648	2935	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2696,11 +2983,14 @@
2696	2983	}
2697	2984	}
2698	2985	}
	2986	+
2699	2987	freezematerial = false;
2700	2988	}
2701	2989
2702	2990	void SetMaterial(Object3D object)
2703	2991	{
	2992	+ latestObject = object;
	2993	+
2704	2994	cMaterial mat = object.material;
2705	2995
2706	2996	if (mat == null)
..	..	@@ -2709,7 +2999,8 @@
2709	2999	return;
2710	3000	}
2711	3001
2712		- multiplyToggle.setSelected(mat.multiply);
	3002	+ if (multiplyToggle != null)
	3003	+ multiplyToggle.setSelected(mat.multiply);
2713	3004
2714	3005	assert (object.projectedVertices != null);
2715	3006
..	..	@@ -2811,12 +3102,17 @@
2811	3102	// }
2812	3103
2813	3104	/**/
2814		- if (deselect)
	3105	+ if (deselect \|\| child == null)
2815	3106	{
2816	3107	//group.deselectAll();
2817	3108	//freeze = true;
2818	3109	GetTree().clearSelection();
2819	3110	//freeze = false;
	3111	+
	3112	+ if (child == null)
	3113	+ {
	3114	+ return;
	3115	+ }
2820	3116	}
2821	3117
2822	3118	//group.addSelectee(child);
..	..	@@ -2885,7 +3181,7 @@
2885	3181	cameraView.ToggleDL();
2886	3182	cameraView.repaint();
2887	3183	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3184	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3185	{
2890	3186	cameraView.ToggleTexture();
2891	3187	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3220,9 @@
2924	3220	frame.validate();
2925	3221
2926	3222	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3223	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3224	{
2929		- cameraView.ToggleRandom();
	3225	+ cameraView.ToggleSwitch();
2930	3226	cameraView.repaint();
2931	3227	return;
2932	3228	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3251,10 @@
2955	3251	{
2956	3252	copy.live ^= true;
2957	3253	return;
	3254	+ } else if (event.getSource() == selectableCB)
	3255	+ {
	3256	+ copy.dontselect ^= true;
	3257	+ return;
2958	3258	} else if (event.getSource() == hideCB)
2959	3259	{
2960	3260	copy.hide ^= true;
..	..	@@ -2969,6 +3269,7 @@
2969	3269	if (event.getSource() == randomCB)
2970	3270	{
2971	3271	copy.random ^= true;
	3272	+ objEditor.refreshContents();
2972	3273	return;
2973	3274	}
2974	3275	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3293,9 @@
2992	3293
2993	3294	public void actionPerformed(ActionEvent event)
2994	3295	{
	3296	+ Object source = event.getSource();
2995	3297	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3298	+ if (source == okbutton)
2997	3299	{
2998	3300	textpanel.setVisible(false);
2999	3301	textpanel.remove(textarea);
..	..	@@ -3005,7 +3307,7 @@
3005	3307	textarea = null;
3006	3308	textpanel = null;
3007	3309	}
3008		- if (event.getSource() == cancelbutton)
	3310	+ if (source == cancelbutton)
3009	3311	{
3010	3312	textpanel.setVisible(false);
3011	3313	textpanel.remove(textarea);
..	..	@@ -3017,50 +3319,50 @@
3017	3319	//applySelf();
3018	3320	//client.refreshEditWindow();
3019	3321	//refreshContents();
3020		- if (event.getSource() == nameField)
	3322	+ if (source == nameField)
3021	3323	{
3022	3324	//System.out.println("ObjEditor " + event);
3023	3325	applySelf0(true);
3024	3326	//parent.applySelf();
3025	3327	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3328	+ } else if (source == resetButton)
3027	3329	{
3028	3330	CameraPane.fullreset = true;
3029	3331	copy.Reset(); // ResetMeshes();
3030	3332	copy.Touch();
3031	3333	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3334	+ } else if (source == stepItem)
3033	3335	{
3034	3336	//cameraView.ONESTEP = true;
3035	3337	Globals.ONESTEP = true;
3036	3338	cameraView.repaint();
3037	3339	return;
3038		- } else if (event.getSource() == stepButton)
	3340	+ } else if (source == stepButton)
3039	3341	{
3040	3342	copy.Step();
3041	3343	copy.Touch();
3042	3344	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3345	+ } else if (source == slowerButton)
3044	3346	{
3045	3347	copy.Slower();
3046	3348	copy.Touch();
3047	3349	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3350	+ } else if (source == fasterButton)
3049	3351	{
3050	3352	copy.Faster();
3051	3353	copy.Touch();
3052	3354	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3355	+ } else if (source == remarkButton)
3054	3356	{
3055	3357	copy.Remark();
3056	3358	copy.Touch();
3057	3359	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3360	+ } else if (source == stepAllButton)
3059	3361	{
3060	3362	copy.StepAll();
3061	3363	copy.Touch();
3062	3364	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3365	+ } else if (source == resetAllButton)
3064	3366	{
3065	3367	//CameraPane.fullreset = true;
3066	3368	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3395,79 @@
3093	3395	// Close();
3094	3396	// }
3095	3397	// else
3096		- if (event.getSource() == resetSlidersButton)
	3398	+ if (source == resetSlidersButton)
3097	3399	{
3098	3400	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3401	+ } else if (source == clearMaterialButton)
3100	3402	{
3101	3403	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3404	+ } else if (source == createMaterialButton)
3103	3405	{
3104	3406	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3407	+ } else if (source == clearPanelButton)
3106	3408	{
3107	3409	copy.ClearUI();
3108	3410	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3411	+ } else if (source == importGFDItem)
	3412	+ {
	3413	+ ImportGFD();
	3414	+ } else
	3415	+ if (source == importVRMLX3DItem)
	3416	+ {
	3417	+ ImportVRMLX3D();
	3418	+ } else
	3419	+ if (source == import3DSItem)
	3420	+ {
	3421	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3422	+ } else
	3423	+ if (source == importOBJItem)
	3424	+ {
	3425	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3426	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3427	+ browser.setVisible(true);
	3428	+ String filename = browser.getFile();
	3429	+ if (filename != null && filename.length() > 0)
	3430	+ {
	3431	+ String fullname = browser.getDirectory() + filename;
	3432	+ makeSomething(ReadOBJ(fullname), true);
	3433	+ }
	3434	+ } else
	3435	+ if (source == closeItem)
3115	3436	{
3116	3437	Close();
3117	3438	//return true;
3118		- } else if (event.getSource() == loadItem)
	3439	+ } else if (source == openItem)
3119	3440	{
3120		- load();
	3441	+ Open();
3121	3442	//return true;
3122		- } else if (event.getSource() == saveItem)
	3443	+ } else if (source == newItem)
	3444	+ {
	3445	+ New();
	3446	+ } else if (source == saveItem)
3123	3447	{
3124	3448	save();
3125	3449	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3450	+ } else if (source == saveAsItem)
3127	3451	{
3128	3452	saveAs();
3129	3453	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3454	+ } else if (source == reexportItem)
3131	3455	{
3132	3456	reexport();
3133	3457	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3458	+ } else if (source == exportAsItem)
3135	3459	{
3136	3460	export();
3137	3461	//return true;
3138		- } else if (event.getSource() == povItem)
	3462	+ } else if (source == povItem)
3139	3463	{
3140	3464	generatePOV();
3141	3465	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3466	+ } else if (event.getSource() == archiveItem)
	3467	+ {
	3468	+ cTools.Archive(frame);
	3469	+ return;
	3470	+ } else if (source == zBufferItem)
3143	3471	{
3144	3472	try
3145	3473	{
..	..	@@ -3161,21 +3489,8 @@
3161	3489	cameraView.repaint();
3162	3490	//return true;
3163	3491	}
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)
	3492	+ */ else // combos...
	3493	+ if (source == texresMenu)
3179	3494	{
3180	3495	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3496	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3502,409 @@
3187	3502	}
3188	3503	}
3189	3504
	3505	+ void New()
	3506	+ {
	3507	+ while (copy.Size() > 1)
	3508	+ {
	3509	+ copy.remove(1);
	3510	+ }
	3511	+
	3512	+ ResetModel();
	3513	+ objEditor.refreshContents();
	3514	+ }
	3515	+
	3516	+ static public byte[] Compress(Object3D o)
	3517	+ {
	3518	+ try
	3519	+ {
	3520	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3521	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3522	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3523	+
	3524	+ Object3D parent = o.parent;
	3525	+ o.parent = null;
	3526	+
	3527	+ out.writeObject(o);
	3528	+
	3529	+ o.parent = parent;
	3530	+
	3531	+ out.flush();
	3532	+
	3533	+ baos //zstream
	3534	+ .close();
	3535	+ out.close();
	3536	+
	3537	+ byte[] bytes = baos.toByteArray();
	3538	+
	3539	+ System.out.println("save #bytes = " + bytes.length);
	3540	+ return bytes;
	3541	+ } catch (Exception e)
	3542	+ {
	3543	+ System.err.println(e);
	3544	+ return null;
	3545	+ }
	3546	+ }
	3547	+
	3548	+ static public Object Uncompress(byte[] bytes)
	3549	+ {
	3550	+ System.out.println("restore #bytes = " + bytes.length);
	3551	+ try
	3552	+ {
	3553	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3554	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3555	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3556	+ Object obj = in.readObject();
	3557	+
	3558	+ bais //istream
	3559	+ .close();
	3560	+ in.close();
	3561	+
	3562	+ return obj;
	3563	+ } catch (Exception e)
	3564	+ {
	3565	+ System.err.println(e);
	3566	+ return null;
	3567	+ }
	3568	+ }
	3569	+
	3570	+ static public Object clone(Object o)
	3571	+ {
	3572	+ try
	3573	+ {
	3574	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3575	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3576	+
	3577	+ out.writeObject(o);
	3578	+
	3579	+ out.flush();
	3580	+ out.close();
	3581	+
	3582	+ byte[] bytes = baos.toByteArray();
	3583	+
	3584	+ System.out.println("clone = " + bytes.length);
	3585	+
	3586	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3587	+ ObjectInputStream in = new ObjectInputStream(bais);
	3588	+ Object obj = in.readObject();
	3589	+ in.close();
	3590	+
	3591	+ return obj;
	3592	+ } catch (Exception e)
	3593	+ {
	3594	+ System.err.println(e);
	3595	+ return null;
	3596	+ }
	3597	+ }
	3598	+
	3599	+ cRadio GetCurrentTab()
	3600	+ {
	3601	+ cRadio ab;
	3602	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3603	+ {
	3604	+ ab = (cRadio)e.nextElement();
	3605	+ if(ab.GetObject() == copy)
	3606	+ {
	3607	+ return ab;
	3608	+ }
	3609	+ }
	3610	+
	3611	+ return null;
	3612	+ }
	3613	+
	3614	+
	3615	+ public void Save()
	3616	+ {
	3617	+ //Save(true);
	3618	+ Replace();
	3619	+ }
	3620	+
	3621	+ private boolean Equal(byte[] compress, byte[] name)
	3622	+ {
	3623	+ if (compress.length != name.length)
	3624	+ {
	3625	+ return false;
	3626	+ }
	3627	+
	3628	+ for (int i=compress.length; --i>=0;)
	3629	+ {
	3630	+ if (compress[i] != name[i])
	3631	+ return false;
	3632	+ }
	3633	+
	3634	+ return true;
	3635	+ }
	3636	+
	3637	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3638	+
	3639	+ public boolean Save(boolean user)
	3640	+ {
	3641	+ System.err.println("Save");
	3642	+
	3643	+ cRadio tab = GetCurrentTab();
	3644	+
	3645	+ byte[] compress = CompressCopy();
	3646	+
	3647	+ boolean thesame = false;
	3648	+
	3649	+ // Quick heuristic using length. Works only when stream is compressed.
	3650	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3651	+ {
	3652	+ thesame = true;
	3653	+ }
	3654	+
	3655	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3656	+ if (!thesame)
	3657	+ {
	3658	+ //tab.user[tab.versionindex] = user;
	3659	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3660	+
	3661	+ copy.versions[++copy.versionindex] = compress;
	3662	+
	3663	+ // if (increment)
	3664	+ // tab.versionindex++;
	3665	+ }
	3666	+
	3667	+ //copy.RestoreBigData(versiontable);
	3668	+
	3669	+ //assert(hashtable.isEmpty());
	3670	+
	3671	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3672	+ {
	3673	+ //tab.user[i] = false;
	3674	+ copy.versions[i] = null;
	3675	+ }
	3676	+
	3677	+ SetUndoStates();
	3678	+
	3679	+ // test save
	3680	+ if (false)
	3681	+ {
	3682	+ try
	3683	+ {
	3684	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3685	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3686	+
	3687	+ p.writeObject(copy);
	3688	+
	3689	+ p.flush();
	3690	+
	3691	+ ostream.close();
	3692	+ } catch (Exception e)
	3693	+ {
	3694	+ e.printStackTrace();
	3695	+ }
	3696	+ }
	3697	+
	3698	+ return !thesame;
	3699	+ }
	3700	+
	3701	+ void CopyChanged(Object3D obj)
	3702	+ {
	3703	+ SetUndoStates();
	3704	+
	3705	+ boolean temp = CameraPane.SWITCH;
	3706	+ CameraPane.SWITCH = false;
	3707	+
	3708	+ copy.ExtractBigData(versiontable);
	3709	+
	3710	+ copy.clear();
	3711	+
	3712	+ for (int i=0; i<obj.Size(); i++)
	3713	+ {
	3714	+ copy.add(obj.get(i));
	3715	+ }
	3716	+
	3717	+ copy.RestoreBigData(versiontable);
	3718	+
	3719	+ CameraPane.SWITCH = temp;
	3720	+
	3721	+ //assert(hashtable.isEmpty());
	3722	+
	3723	+ copy.Touch();
	3724	+
	3725	+ ResetModel();
	3726	+ copy.HardTouch(); // recompile?
	3727	+
	3728	+ cRadio ab;
	3729	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3730	+ {
	3731	+ ab = (cRadio)e.nextElement();
	3732	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3733	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3734	+ if (test != null)
	3735	+ {
	3736	+ test.editWindow = ab.object.editWindow;
	3737	+ ab.object = test;
	3738	+ }
	3739	+ }
	3740	+
	3741	+ refreshContents();
	3742	+ }
	3743	+
	3744	+ cButton undoButton;
	3745	+ cButton restoreButton;
	3746	+ cButton replaceButton;
	3747	+ cButton redoButton;
	3748	+
	3749	+ boolean muteSlider;
	3750	+
	3751	+ int VersionCount()
	3752	+ {
	3753	+ int count = 0;
	3754	+
	3755	+ for (int i = copy.versions.length; --i >= 0;)
	3756	+ {
	3757	+ if (copy.versions[i] != null)
	3758	+ count++;
	3759	+ }
	3760	+
	3761	+ return count;
	3762	+ }
	3763	+
	3764	+ void SetUndoStates()
	3765	+ {
	3766	+ cRadio tab = GetCurrentTab();
	3767	+
	3768	+ restoreButton.setEnabled(copy.versionindex != -1);
	3769	+ replaceButton.setEnabled(copy.versionindex != -1);
	3770	+
	3771	+ undoButton.setEnabled(copy.versionindex > 0);
	3772	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3773	+
	3774	+ muteSlider = true;
	3775	+ versionSlider.setMaximum(VersionCount() - 1);
	3776	+ versionSlider.setInteger(copy.versionindex);
	3777	+ muteSlider = false;
	3778	+ }
	3779	+
	3780	+ public boolean Undo()
	3781	+ {
	3782	+ // Option?
	3783	+ Replace();
	3784	+
	3785	+ System.err.println("Undo");
	3786	+
	3787	+ cRadio tab = GetCurrentTab();
	3788	+
	3789	+ if (copy.versionindex == 0)
	3790	+ {
	3791	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3792	+ return false;
	3793	+ }
	3794	+
	3795	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3796	+// {
	3797	+// if (Save(false))
	3798	+// tab.versionindex -= 1;
	3799	+// else
	3800	+// {
	3801	+// if (tab.versionindex <= 0)
	3802	+// return false;
	3803	+// else
	3804	+// tab.versionindex -= 1;
	3805	+// }
	3806	+// }
	3807	+
	3808	+ copy.versionindex -= 1;
	3809	+
	3810	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3811	+
	3812	+ return true;
	3813	+ }
	3814	+
	3815	+ public boolean Restore()
	3816	+ {
	3817	+ System.err.println("Restore");
	3818	+
	3819	+ cRadio tab = GetCurrentTab();
	3820	+
	3821	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3822	+ {
	3823	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3824	+ return false;
	3825	+ }
	3826	+
	3827	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3828	+
	3829	+ return true;
	3830	+ }
	3831	+
	3832	+ public boolean Replace()
	3833	+ {
	3834	+ System.err.println("Replace");
	3835	+
	3836	+ cRadio tab = GetCurrentTab();
	3837	+
	3838	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3839	+ {
	3840	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3841	+ return false;
	3842	+ }
	3843	+
	3844	+ copy.versions[copy.versionindex] = CompressCopy();
	3845	+
	3846	+ return true;
	3847	+ }
	3848	+
	3849	+ public void Redo()
	3850	+ {
	3851	+ // Option?
	3852	+ Replace();
	3853	+
	3854	+ cRadio tab = GetCurrentTab();
	3855	+
	3856	+ if (copy.versions[copy.versionindex + 1] == null)
	3857	+ {
	3858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3859	+ return;
	3860	+ }
	3861	+
	3862	+ copy.versionindex += 1;
	3863	+
	3864	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3865	+
	3866	+ //if (!tab.user[tab.versionindex])
	3867	+ // tab.graphs[tab.versionindex] = null;
	3868	+ }
	3869	+
	3870	+ void ImportGFD()
	3871	+ {
	3872	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3873	+ browser.show();
	3874	+ String filename = browser.getFile();
	3875	+ if (filename != null && filename.length() > 0)
	3876	+ {
	3877	+ String fullname = browser.getDirectory() + filename;
	3878	+
	3879	+ //Object3D readobj =
	3880	+ objEditor.ReadGFD(fullname, objEditor);
	3881	+ //makeSomething(readobj);
	3882	+ }
	3883	+ }
	3884	+
	3885	+ void ImportVRMLX3D()
	3886	+ {
	3887	+ if (Grafreed.standAlone)
	3888	+ {
	3889	+ /**/
	3890	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3891	+ browser.show();
	3892	+ String filename = browser.getFile();
	3893	+ if (filename != null && filename.length() > 0)
	3894	+ {
	3895	+ String fullname = browser.getDirectory() + filename;
	3896	+ LoadVRMLX3D(fullname);
	3897	+ }
	3898	+ /**/
	3899	+ }
	3900	+ }
	3901	+
3190	3902	void ToggleAnimation()
3191	3903	{
3192	3904	if (!Globals.ANIMATION)
3193	3905	{
3194	3906	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3907	+ browser.setVisible(true);
3196	3908	String filename = browser.getFile();
3197	3909	if (filename != null && filename.length() > 0)
3198	3910	{
..	..	@@ -3202,8 +3914,8 @@
3202	3914
3203	3915	Globals.ANIMATION ^= true;
3204	3916
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3917	+ Grafreed.wav.cursor = 0;
	3918	+ Grafreed.wav.loop = 0;
3207	3919	}
3208	3920	} else
3209	3921	{
..	..	@@ -3224,7 +3936,6 @@
3224	3936	callee.refreshContents();
3225	3937	} else
3226	3938	{
3227		- new Exception().printStackTrace();
3228	3939	System.exit(0);
3229	3940	}
3230	3941	}
..	..	@@ -3254,7 +3965,7 @@
3254	3965	void CreateMaterial()
3255	3966	{
3256	3967	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3968	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3969	if (copy.selection.size() > 0)
3259	3970	//SetMaterial(copy);
3260	3971	{
..	..	@@ -3305,7 +4016,7 @@
3305	4016	assert false;
3306	4017	}
3307	4018
3308		- void EditSelection()
	4019	+ void EditSelection(boolean newWindow)
3309	4020	{
3310	4021	}
3311	4022
..	..	@@ -3313,11 +4024,11 @@
3313	4024	{
3314	4025	copy.ResetBlockLoop(); // temporary problem
3315	4026
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4027	+ boolean random = CameraPane.SWITCH;
	4028	+ CameraPane.SWITCH = false; // parse everything
3318	4029	copy.ResetDisplayList();
3319	4030	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4031	+ CameraPane.SWITCH = random;
3321	4032	}
3322	4033
3323	4034	// public void applySelf()
..	..	@@ -3391,6 +4102,36 @@
3391	4102	{
3392	4103	//System.out.println("Propagate = " + propagate);
3393	4104	copy.UpdateMaterial(anchor, current, propagate);
	4105	+
	4106	+ if (copy.material != null)
	4107	+ {
	4108	+ cMaterial mat = copy.material;
	4109	+
	4110	+ colorField.SetToolTipValue((mat.color));
	4111	+ modulationField.SetToolTipValue((mat.modulation));
	4112	+ metalnessField.SetToolTipValue((mat.metalness));
	4113	+ diffuseField.SetToolTipValue((mat.diffuse));
	4114	+ specularField.SetToolTipValue((mat.specular));
	4115	+ shininessField.SetToolTipValue((mat.shininess));
	4116	+ shiftField.SetToolTipValue((mat.shift));
	4117	+ ambientField.SetToolTipValue((mat.ambient));
	4118	+ lightareaField.SetToolTipValue((mat.lightarea));
	4119	+ diffusenessField.SetToolTipValue((mat.factor));
	4120	+ velvetField.SetToolTipValue((mat.velvet));
	4121	+ sheenField.SetToolTipValue((mat.sheen));
	4122	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4123	+ backlitField.SetToolTipValue((mat.bump));
	4124	+ anisoField.SetToolTipValue((mat.aniso));
	4125	+ anisoVField.SetToolTipValue((mat.anisoV));
	4126	+ cameraField.SetToolTipValue((mat.cameralight));
	4127	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4128	+ shadowField.SetToolTipValue((mat.shadow));
	4129	+ textureField.SetToolTipValue((mat.texture));
	4130	+ opacityField.SetToolTipValue((mat.opacity));
	4131	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4132	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4133	+ }
	4134	+
3394	4135	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4136	{
3396	4137	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4160,25 @@
3419	4160	//copy.Touch();
3420	4161	}
3421	4162
	4163	+ cNumberSlider versionSlider;
	4164	+
3422	4165	public void stateChanged(ChangeEvent e)
3423	4166	{
3424	4167	// assert(false);
	4168	+ if (e.getSource() == versionSlider)
	4169	+ {
	4170	+ if (muteSlider)
	4171	+ return;
	4172	+
	4173	+ int version = versionSlider.getInteger();
	4174	+
	4175	+ if (copy.versions[version] != null)
	4176	+ {
	4177	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4178	+ }
	4179	+
	4180	+ return;
	4181	+ }
3425	4182
3426	4183	if (freezematerial)
3427	4184	{
..	..	@@ -3506,7 +4263,7 @@
3506	4263	}
3507	4264
3508	4265	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4266	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4267	}
3511	4268
3512	4269	void SnapObject()
..	..	@@ -3770,6 +4527,8 @@
3770	4527
3771	4528	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4529	{
	4530	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4531	+ Save();
3773	4532	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4533	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4534	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4615,12 @@
3856	4615	{
3857	4616	ResetModel();
3858	4617	Select(thing.GetTreePath(), true, false); // unselect... false);
	4618	+
	4619	+ if (thing.Size() == 0)
	4620	+ {
	4621	+ //EditSelection(false);
	4622	+ }
	4623	+
3859	4624	refreshContents();
3860	4625	}
3861	4626
..	..	@@ -3973,6 +4738,7 @@
3973	4738	}
3974	4739	}
3975	4740	}
	4741	+
3976	4742	LoadGFDThread loadGFDThread;
3977	4743
3978	4744	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4758,10 @@
3992	4758
3993	4759	try
3994	4760	{
	4761	+ // Try compressed version first.
3995	4762	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4763	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4764	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4765
3998	4766	readobj = (Object3D) p.readObject();
3999	4767	istream.close();
..	..	@@ -4001,7 +4769,22 @@
4001	4769	readobj.ResetDisplayList();
4002	4770	} catch (Exception e)
4003	4771	{
4004		- e.printStackTrace();
	4772	+ if (!e.toString().contains("GZIP"))
	4773	+ e.printStackTrace();
	4774	+
	4775	+ try
	4776	+ {
	4777	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4778	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4779	+
	4780	+ readobj = (Object3D) p.readObject();
	4781	+ istream.close();
	4782	+
	4783	+ readobj.ResetDisplayList();
	4784	+ } catch (Exception e2)
	4785	+ {
	4786	+ e2.printStackTrace();
	4787	+ }
4005	4788	}
4006	4789	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4790	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4830,12 @@
4047	4830
4048	4831	void LoadIt(Object obj)
4049	4832	{
	4833	+ if (obj == null)
	4834	+ {
	4835	+ // Invalid file
	4836	+ return;
	4837	+ }
	4838	+
4050	4839	System.out.println("Loaded " + obj);
4051	4840	//new Exception().printStackTrace();
4052	4841	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4845,8 @@
4056	4845
4057	4846	if (readobj != null)
4058	4847	{
	4848	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4849	+ // Save();
4059	4850	try
4060	4851	{
4061	4852	//readobj.deepCopySelf(copy);
..	..	@@ -4100,6 +4891,7 @@
4100	4891	}
4101	4892	} catch (ClassCastException e)
4102	4893	{
	4894	+ e.printStackTrace();
4103	4895	assert (false);
4104	4896	Composite c = (Composite) copy;
4105	4897	c.children.clear();
..	..	@@ -4110,15 +4902,26 @@
4110	4902	c.addChild(csg);
4111	4903	}
4112	4904
	4905	+ copy.versions = readobj.versions;
	4906	+ copy.versionindex = readobj.versionindex;
	4907	+
	4908	+ if (copy.versions == null)
	4909	+ {
	4910	+ copy.versions = new byte[100][];
	4911	+ copy.versionindex = -1;
	4912	+ }
	4913	+
	4914	+ //? SetUndoStates();
	4915	+
4113	4916	ResetModel();
4114	4917	copy.HardTouch(); // recompile?
4115	4918	refreshContents();
4116	4919	}
4117	4920	}
4118	4921
4119		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4120	4923	{
4121		- if (GrafreeD.standAlone)
	4924	+ if (Grafreed.standAlone)
4122	4925	{
4123	4926	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4927	browser.show();
..	..	@@ -4205,11 +5008,13 @@
4205	5008	try
4206	5009	{
4207	5010	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5011	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5012	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	5013
4210	5014	p.writeObject(copy);
4211	5015	p.flush();
4212	5016
	5017	+ zstream.close();
4213	5018	ostream.close();
4214	5019
4215	5020	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4217,19 +5022,23 @@
4217	5022	//ps.print(buffer.toString());
4218	5023	} catch (IOException e)
4219	5024	{
	5025	+ e.printStackTrace();
4220	5026	}
4221	5027	}
	5028	+
4222	5029	String lastname;
4223	5030
4224	5031	void saveAs()
4225	5032	{
4226		- if (GrafreeD.standAlone)
	5033	+ if (Grafreed.standAlone)
4227	5034	{
4228	5035	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	5036	browser.setVisible(true);
4230	5037	String filename = browser.getFile();
4231	5038	if (filename != null && filename.length() > 0)
4232	5039	{
	5040	+ if (!filename.endsWith(".gfd"))
	5041	+ filename += ".gfd";
4233	5042	lastname = browser.getDirectory() + filename;
4234	5043	save();
4235	5044	}
..	..	@@ -4328,13 +5137,13 @@
4328	5137	try
4329	5138	{
4330	5139	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5140	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5141	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5142
4334	5143	Object3D objectparent = obj.parent;
4335	5144	obj.parent = null;
4336	5145
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5146	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5147
4339	5148	obj.parent = objectparent;
4340	5149
..	..	@@ -4346,8 +5155,8 @@
4346	5155	p.writeObject(object);
4347	5156	p.flush();
4348	5157
	5158	+ zstream.close();
4349	5159	ostream.close();
4350		- // zstream.close();
4351	5160
4352	5161	// group.selection.get(0).parent = parent;
4353	5162	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5177,7 @@
4368	5177	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5178	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5179	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5180	+ if (Grafreed.standAlone)
4372	5181	{
4373	5182	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5183	browser.show();
..	..	@@ -4394,19 +5203,18 @@
4394	5203	Object3D client;
4395	5204	Object3D copy;
4396	5205	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5206	+ Menu fileMenu;
	5207	+ MenuItem newItem;
	5208	+ MenuItem openItem;
4399	5209	MenuItem saveItem;
4400	5210	MenuItem saveAsItem;
4401	5211	MenuItem exportAsItem;
4402	5212	MenuItem reexportItem;
4403	5213	MenuItem povItem;
4404	5214	MenuItem closeItem;
4405		- Menu cameraMenu;
	5215	+
4406	5216	CheckboxMenuItem zBufferItem;
4407	5217	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5218	MenuItem stepItem;
4411	5219	CheckboxMenuItem toggleLiveItem;
4412	5220	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5225,39 @@
4417	5225	CheckboxMenuItem toggleFootContactItem;
4418	5226	CheckboxMenuItem toggleDLItem;
4419	5227	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5228	+ CheckboxMenuItem toggleSwitchItem;
4421	5229	CheckboxMenuItem toggleRootItem;
4422	5230	CheckboxMenuItem animationItem;
	5231	+ MenuItem archiveItem;
4423	5232	CheckboxMenuItem toggleHandleItem;
4424	5233	CheckboxMenuItem togglePaintItem;
4425	5234	JSplitPane mainPanel;
4426	5235	JScrollPane scrollpane;
	5236	+
4427	5237	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5238	+
	5239	+ cGridBag treePanel;
	5240	+
4429	5241	JPanel radioPanel;
4430	5242	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5243	+
	5244	+ cGridBag toolboxPanel;
4432	5245	cGridBag materialPanel;
	5246	+ cGridBag ctrlPanel;
	5247	+
4433	5248	JScrollPane infoPanel;
	5249	+
4434	5250	cGridBag optionsPanel;
	5251	+
4435	5252	JTabbedPane objectPanel;
	5253	+ boolean materialFlushed;
	5254	+ Object3D latestObject;
	5255	+
4436	5256	cGridBag XYZPanel;
	5257	+
4437	5258	JSplitPane gridPanel;
4438	5259	JSplitPane bigPanel;
	5260	+
4439	5261	cGridBag bigThree;
4440	5262	cGridBag scenePanel;
4441	5263	cGridBag centralPanel;
..	..	@@ -4550,8 +5372,13 @@
4550	5372	cNumberSlider fogField;
4551	5373	JLabel opacityPowerLabel;
4552	5374	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5375	+ cTree jTree;
4554	5376	//ObjectUI parent;
4555	5377
4556	5378	cNumberSlider normalpushField;
	5379	+
	5380	+ private MenuItem importGFDItem;
	5381	+ private MenuItem importVRMLX3DItem;
	5382	+ private MenuItem import3DSItem;
	5383	+ private MenuItem importOBJItem;
4557	5384	}