~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -143,7 +208,9 @@
143	208	//nameField.removeActionListener(this);
144	209	// objEditor.ctrlPanel.remove(nameField);
145	210
146		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
147	214	return;
148	215
149	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +232,9 @@
165	232	// objEditor.ctrlPanel.remove(fasterButton);
166	233	// objEditor.ctrlPanel.remove(remarkButton);
167	234
168		- objEditor.ctrlPanel.remove(namePanel);
169	235	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	238	objEditor.ctrlPanel.remove(pushPanel);
172	239	//objEditor.ctrlPanel.remove(fillPanel);
173	240
..	..	@@ -215,6 +282,12 @@
215	282	client = inClient;
216	283	copy = client;
217	284
	285	+ if (copy.versions == null)
	286	+ {
	287	+ copy.versions = new byte[100][];
	288	+ copy.versionindex = -1;
	289	+ }
	290	+
218	291	// "this" is not called: SetupUI2(objEditor);
219	292	}
220	293
..	..	@@ -228,6 +301,12 @@
228	301	client = inClient;
229	302	copy = client;
230	303
	304	+ if (copy.versions == null)
	305	+ {
	306	+ copy.versions = new byte[100][];
	307	+ copy.versionindex = -1;
	308	+ }
	309	+
231	310	SetupUI2(callee.GetEditor());
232	311	}
233	312
..	..	@@ -242,6 +321,7 @@
242	321	//localCopy.parent = null;
243	322
244	323	frame = new JFrame();
	324	+ frame.setUndecorated(false);
245	325	objEditor = this;
246	326	this.callee = callee;
247	327
..	..	@@ -259,6 +339,12 @@
259	339	copy = localCopy;
260	340	copy.editWindow = this;
261	341
	342	+ if (copy.versions == null)
	343	+ {
	344	+ copy.versions = new byte[100][];
	345	+ copy.versionindex = -1;
	346	+ }
	347	+
262	348	SetupMenu();
263	349
264	350	//SetupName(objEditor); // new
..	..	@@ -272,28 +358,49 @@
272	358	return frame.action(event, obj);
273	359	}
274	360
	361	+ // Cannot work without static
	362	+ static boolean allparams = true;
	363	+
	364	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	365	+
275	366	void SetupMenu()
276	367	{
277	368	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..."));
	369	+ menuBar.add(fileMenu = new Menu("File"));
	370	+ fileMenu.add(newItem = new MenuItem("New"));
	371	+ fileMenu.add(openItem = new MenuItem("Open..."));
	372	+
	373	+ //oe.menuBar.add(menu = new Menu("Include"));
	374	+ Menu menu = new Menu("Import");
	375	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	376	+ importOBJItem.addActionListener(this);
	377	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	378	+ import3DSItem.addActionListener(this);
	379	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	380	+ importVRMLX3DItem.addActionListener(this);
	381	+ menu.add("-");
	382	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	383	+ importGFDItem.addActionListener(this);
	384	+ fileMenu.add(menu);
	385	+ fileMenu.add("-");
	386	+
	387	+ fileMenu.add(saveItem = new MenuItem("Save"));
	388	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	389	//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("-");
	390	+ fileMenu.add("-");
	391	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	392	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	393	+ fileMenu.add("-");
288	394	if (client.parent != null)
289	395	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	396	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	397	} else
292	398	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	399	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	400	}
295	401
296		- loadItem.addActionListener(this);
	402	+ newItem.addActionListener(this);
	403	+ openItem.addActionListener(this);
297	404	saveItem.addActionListener(this);
298	405	saveAsItem.addActionListener(this);
299	406	exportAsItem.addActionListener(this);
..	..	@@ -301,70 +408,53 @@
301	408	//povItem.addActionListener(this);
302	409	closeItem.addActionListener(this);
303	410
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	411	objectPanel = new JTabbedPane();
	412	+
	413	+ ChangeListener changeListener = new ChangeListener()
	414	+ {
	415	+ public void stateChanged(ChangeEvent changeEvent)
	416	+ {
	417	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	418	+// {
	419	+// if (latestObject != null)
	420	+// {
	421	+// refreshContents(true);
	422	+// SetMaterial(latestObject);
	423	+// }
	424	+//
	425	+// materialFlushed = true;
	426	+// }
	427	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	428	+// {
	429	+// if (listUI.size() == 0)
	430	+// EditSelection(false);
	431	+// }
	432	+
	433	+ refreshContents(false); // To refresh Info tab
	434	+ }
	435	+ };
	436	+ objectPanel.addChangeListener(changeListener);
	437	+
360	438	toolbarPanel = new JPanel();
361	439	toolbarPanel.setName("Toolbar");
362	440	treePanel = new cGridBag();
363	441	treePanel.setName("Tree");
	442	+
	443	+ editPanel = new cGridBag().setVertical(true);
	444	+ editPanel.setName("Edit");
	445	+
364	446	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	447	+
	448	+ editCommandsPanel = new cGridBag();
	449	+ editPanel.add(editCommandsPanel);
	450	+ editPanel.add(ctrlPanel);
	451	+
	452	+ toolboxPanel = new cGridBag().setVertical(false);
	453	+ toolboxPanel.setName("Toolbox");
	454	+
366	455	materialPanel = new cGridBag().setVertical(true);
367	456	materialPanel.setName("Material");
	457	+
368	458	/JTextPane/
369	459	infoarea = createTextPane();
370	460	doc = infoarea.getStyledDocument();
..	..	@@ -377,7 +467,7 @@
377	467	// TEXTAREA infoarea.setLineWrap(true);
378	468	// TEXTAREA infoarea.setWrapStyleWord(true);
379	469	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
380		- infoPanel.setPreferredSize(new Dimension(50, 200));
	470	+ infoPanel.setPreferredSize(new Dimension(1, 1));
381	471	infoPanel.setName("Info");
382	472	//infoPanel.setLayout(new BorderLayout());
383	473	//infoPanel.add(createTextPane());
..	..	@@ -389,7 +479,14 @@
389	479	mainPanel.setDividerSize(9);
390	480	mainPanel.setDividerLocation(0.5); //1.0);
391	481	mainPanel.setResizeWeight(0.5);
392		-
	482	+
	483	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	484	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	485	+ divider.setDividerSize(15);
	486	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	487	+
	488	+ mainPanel.setUI(new BasicSplitPaneUI());
	489	+
393	490	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
394	491	//mainPanel.setLayout(new GridBagLayout());
395	492	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -457,10 +554,10 @@
457	554	e.printStackTrace();
458	555	}
459	556
460		- String selection = infoarea.getText();
461		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
462		- java.awt.datatransfer.Clipboard clipboard =
463		- Toolkit.getDefaultToolkit().getSystemClipboard();
	557	+// String selection = infoarea.getText();
	558	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	559	+// java.awt.datatransfer.Clipboard clipboard =
	560	+// Toolkit.getDefaultToolkit().getSystemClipboard();
464	561	//clipboard.setContents(data, data);
465	562	}
466	563
..	..	@@ -483,13 +580,13 @@
483	580	//SendInfo("Name:", "bold");
484	581	if (sel.GetTextures() != null \|\| debug)
485	582	{
486		- si.SendInfo(sel.toString(), "bold");
	583	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	584	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	585	if (sel.Size() > 0)
489	586	{
490	587	si.SendInfo("#children = " + sel.Size(), "regular");
491	588	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	589	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	590	if (debug)
494	591	{
495	592	try
..	..	@@ -531,7 +628,7 @@
531	628	}
532	629	if (sel.support != null)
533	630	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	631	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	632	}
536	633	if (sel.scriptnode != null)
537	634	{
..	..	@@ -620,21 +717,144 @@
620	717	}
621	718	}
622	719
	720	+//static GraphicsDevice device = GraphicsEnvironment
	721	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	722	+
	723	+ Rectangle keeprect;
	724	+ cRadio radio;
	725	+
	726	+cButton keepButton;
	727	+ cButton twoButton; // Full 3D
	728	+ cButton sixButton;
	729	+ cButton threeButton;
	730	+ cButton sevenButton;
	731	+ cButton fourButton; // full panel
	732	+ cButton oneButton; // full XYZ
	733	+ //cButton currentLayout;
	734	+
	735	+ boolean maximized;
	736	+
	737	+ cButton fullscreenLayout;
	738	+
	739	+ void Minimize()
	740	+ {
	741	+ frame.setState(Frame.ICONIFIED);
	742	+ frame.validate();
	743	+ }
	744	+
	745	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	746	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	747	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	748	+ void Maximize()
	749	+ {
	750	+ if (CameraPane.FULLSCREEN)
	751	+ {
	752	+ ToggleFullScreen();
	753	+ }
	754	+
	755	+ if (maximized)
	756	+ {
	757	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	758	+ }
	759	+ else
	760	+ {
	761	+ keeprect = frame.getBounds();
	762	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	763	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	764	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	765	+// frame.setState(Frame.MAXIMIZED_BOTH);
	766	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	767	+ }
	768	+
	769	+ maximized ^= true;
	770	+
	771	+ frame.validate();
	772	+ }
	773	+
	774	+ cButton minButton;
	775	+ cButton maxButton;
	776	+ cButton fullButton;
	777	+
623	778	void ToggleFullScreen()
624	779	{
625		- if (CameraPane.FULLSCREEN)
	780	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	781	+
	782	+ cameraView.ToggleFullScreen();
	783	+
	784	+ if (!CameraPane.FULLSCREEN)
626	785	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- frame.getContentPane().add(/"Center",/framePanel);
	786	+ device.setFullScreenWindow(null);
	787	+ frame.dispose();
	788	+ frame.setUndecorated(false);
	789	+ frame.validate();
	790	+ frame.setVisible(true);
	791	+
	792	+ //frame.setVisible(false);
	793	+// frame.removeNotify();
	794	+// frame.setUndecorated(false);
	795	+// frame.addNotify();
	796	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	797	+
	798	+// X frame.getContentPane().remove(/"Center",/bigThree);
	799	+// X framePanel.add(bigThree);
	800	+// X frame.getContentPane().add(/"Center",/framePanel);
	801	+ framePanel.setDividerLocation(46);
	802	+
	803	+ //frame.setVisible(true);
	804	+ radio.layout = keepButton;
	805	+ //theFrame = null;
	806	+ keepButton = null;
	807	+ radio.layout.doClick();
	808	+
630	809	} else
631	810	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- frame.getContentPane().add(/"Center",/bigThree);
	811	+ keepButton = radio.layout;
	812	+ //keeprect = frame.getBounds();
	813	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	814	+// frame.getToolkit().getScreenSize().height);
	815	+ //frame.setVisible(false);
	816	+
	817	+ frame.dispose();
	818	+ frame.setUndecorated(true);
	819	+ device.setFullScreenWindow(frame);
	820	+ frame.validate();
	821	+ frame.setVisible(true);
	822	+// frame.removeNotify();
	823	+// frame.setUndecorated(true);
	824	+// frame.addNotify();
	825	+// X frame.getContentPane().remove(/"Center",/framePanel);
	826	+// X framePanel.remove(bigThree);
	827	+// X frame.getContentPane().add(/"Center",/bigThree);
	828	+ framePanel.setDividerLocation(0);
	829	+
	830	+ radio.layout = fullscreenLayout;
	831	+ radio.layout.doClick();
	832	+ //frame.setVisible(true);
635	833	}
636		- cameraView.ToggleFullScreen();
	834	+ frame.validate();
637	835	}
	836	+
	837	+ private byte[] CompressCopy()
	838	+ {
	839	+ boolean temp = CameraPane.SWITCH;
	840	+ CameraPane.SWITCH = false;
	841	+
	842	+ copy.ExtractBigData(versiontable);
	843	+ // if (copy == client)
	844	+
	845	+ byte[] versions[] = copy.versions;
	846	+ copy.versions = null;
	847	+
	848	+ byte[] compress = Compress(copy);
	849	+
	850	+ copy.versions = versions;
	851	+
	852	+ copy.RestoreBigData(versiontable);
	853	+
	854	+ CameraPane.SWITCH = temp;
	855	+
	856	+ return compress;
	857	+ }
638	858
639	859	private JTextPane createTextPane()
640	860	{
..	..	@@ -734,7 +954,7 @@
734	954	protected static ImageIcon createImageIcon(String path,
735	955	String description)
736	956	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	957	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	958	if (imgURL != null)
739	959	{
740	960	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +986,7 @@
766	986	// NumberSlider vDivsField;
767	987	// JCheckBox endcaps;
768	988	JCheckBox liveCB;
	989	+ JCheckBox selectCB;
769	990	JCheckBox hideCB;
770	991	JCheckBox link2masterCB;
771	992	JCheckBox markCB;
..	..	@@ -773,7 +994,12 @@
773	994	JCheckBox speedupCB;
774	995	JCheckBox rewindCB;
775	996	JCheckBox flipVCB;
	997	+
	998	+ cCheckBox toggleTextureCB;
	999	+ cCheckBox toggleSwitchCB;
	1000	+
776	1001	JComboBox texresMenu;
	1002	+
777	1003	JButton resetButton;
778	1004	JButton stepButton;
779	1005	JButton stepAllButton;
..	..	@@ -782,9 +1008,13 @@
782	1008	JButton fasterButton;
783	1009	JButton remarkButton;
784	1010
	1011	+ cGridBag editPanel;
	1012	+ cGridBag editCommandsPanel;
	1013	+
785	1014	cGridBag namePanel;
786	1015	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	1016	+ cGridBag setupPanel2;
	1017	+ cGridBag objectCommandsPanel;
788	1018	cGridBag pushPanel;
789	1019	cGridBag fillPanel;
790	1020
..	..	@@ -951,52 +1181,73 @@
951	1181
952	1182	void SetupUI2(ObjEditor oe)
953	1183	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958	1184	//SetupName(oe);
959	1185
960	1186	namePanel = new cGridBag();
961	1187
962	1188	nameField = AddText(namePanel, copy.GetName());
963		- namePanel.add(nameField);
	1189	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
964	1190	oe.ctrlPanel.add(namePanel);
965	1191
966	1192	oe.ctrlPanel.Return();
967	1193
968		- if (!GroupEditor.allparams)
	1194	+ if (!allparams)
969	1195	return;
970	1196
971	1197	setupPanel = new cGridBag().setVertical(false);
972	1198
973	1199	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1200	+ liveCB.setToolTipText("Animate object");
	1201	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1202	+ selectCB.setToolTipText("Make object selectable");
976	1203	// Return();
	1204	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1205	+ hideCB.setToolTipText("Hide object");
977	1206	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1207	+ markCB.setToolTipText("As animation target transform");
	1208	+
	1209	+ setupPanel2 = new cGridBag().setVertical(false);
	1210	+
	1211	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1212	+ rewindCB.setToolTipText("Rewind animation");
	1213	+
	1214	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1215	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
980	1216
	1217	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1218	+ link2masterCB.setToolTipText("Attach to support");
	1219	+
	1220	+ if (Globals.ADVANCED)
	1221	+ {
	1222	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1223	+ speedupCB.setToolTipText("Option motion capture");
	1224	+ }
	1225	+
981	1226	oe.ctrlPanel.add(setupPanel);
982	1227	oe.ctrlPanel.Return();
	1228	+ oe.ctrlPanel.add(setupPanel2);
	1229	+ oe.ctrlPanel.Return();
983	1230
984		- commandsPanel = new cGridBag().setVertical(false);
	1231	+ objectCommandsPanel = new cGridBag().setVertical(false);
985	1232
986		- resetButton = AddButton(commandsPanel, "Reset");
987		- stepButton = AddButton(commandsPanel, "Step");
	1233	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1234	+ resetButton.setToolTipText("Jump to frame zero");
	1235	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1236	+ stepButton.setToolTipText("Step one frame");
988	1237	// resetAllButton = AddButton(oe, "Reset All");
989	1238	// stepAllButton = AddButton(oe, "Step All");
990		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
991	1239	// Return();
992		- slowerButton = AddButton(commandsPanel, "Slow");
993		- fasterButton = AddButton(commandsPanel, "Fast");
994		- remarkButton = AddButton(commandsPanel, "Remark");
	1240	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1241	+ slowerButton.setToolTipText("Decrease animation speed");
	1242	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1243	+ fasterButton.setToolTipText("Increase animation speed");
	1244	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1245	+ remarkButton.setToolTipText("Set the current transform as the target");
995	1246
996		- oe.ctrlPanel.add(commandsPanel);
	1247	+ oe.ctrlPanel.add(objectCommandsPanel);
997	1248	oe.ctrlPanel.Return();
998	1249
999		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1250	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1000	1251	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001	1252	//Return();
1002	1253
..	..	@@ -1199,8 +1450,11 @@
1199	1450	//worldPanel.setName("World");
1200	1451	centralPanel = new cGridBag();
1201	1452	centralPanel.preferredWidth = 20;
1202		- timelinePanel = new JPanel(new BorderLayout());
1203		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1453	+
	1454	+ if (Globals.ADVANCED)
	1455	+ {
	1456	+ timelinePanel = new JPanel(new BorderLayout());
	1457	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1204	1458
1205	1459	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206	1460	cameraPanel.setContinuousLayout(true);
..	..	@@ -1209,7 +1463,10 @@
1209	1463	// cameraPanel.setDividerSize(9);
1210	1464	cameraPanel.setResizeWeight(1.0);
1211	1465
	1466	+ }
	1467	+
1212	1468	centralPanel.add(cameraView);
	1469	+ centralPanel.setFocusable(true);
1213	1470	//frame.setJMenuBar(timelineMenubar);
1214	1471	//centralPanel.add(timelinePanel);
1215	1472
..	..	@@ -1276,8 +1533,12 @@
1276	1533	// north.setName("Edit");
1277	1534	// north.add(ctrlPanel, BorderLayout.NORTH);
1278	1535	// objectPanel.add(north);
1279		- objectPanel.add(ctrlPanel);
1280		- objectPanel.add(infoPanel);
	1536	+ objectPanel.add(editPanel);
	1537	+
	1538	+ //if (Globals.ADVANCED)
	1539	+ objectPanel.add(infoPanel);
	1540	+
	1541	+ objectPanel.add(toolboxPanel);
1281	1542
1282	1543	/*
1283	1544	aConstraints.gridx = 0;
..	..	@@ -1286,7 +1547,7 @@
1286	1547	aConstraints.gridy += 1;
1287	1548	aConstraints.gridwidth = 1;
1288	1549	mainPanel.add(objectPanel, aConstraints);
1289		- */
	1550	+ */
1290	1551
1291	1552	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1292	1553	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1298,14 +1559,12 @@
1298	1559	scrollpane.addMouseWheelListener(this); // Default not fast enough
1299	1560
1300	1561	/JTabbedPane/ scenePanel = new cGridBag();
1301		- scenePanel.preferredWidth = 7;
	1562	+ scenePanel.preferredWidth = 6;
1302	1563
1303	1564	JTabbedPane tabbedPane = new JTabbedPane();
1304	1565	tabbedPane.add(scrollpane);
1305	1566
1306		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1307		-
1308		- optionsPanel = new cGridBag().setVertical(true);
	1567	+ optionsPanel = new cGridBag().setVertical(false);
1309	1568
1310	1569	optionsPanel.setName("Options");
1311	1570
..	..	@@ -1313,6 +1572,8 @@
1313	1572
1314	1573	tabbedPane.add(optionsPanel);
1315	1574
	1575	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1576	+
1316	1577	scenePanel.add(tabbedPane);
1317	1578
1318	1579	/*
..	..	@@ -1385,9 +1646,9 @@
1385	1646	// aConstraints.gridheight = 1;
1386	1647
1387	1648	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1388		- framePanel.setContinuousLayout(true);
1389		- framePanel.setOneTouchExpandable(true);
1390		- framePanel.setDividerLocation(0.8);
	1649	+ framePanel.setContinuousLayout(false);
	1650	+ framePanel.setOneTouchExpandable(false);
	1651	+ //.setDividerLocation(0.8);
1391	1652	//framePanel.setDividerSize(15);
1392	1653	//framePanel.setResizeWeight(0.15);
1393	1654	framePanel.setName("Frame");
..	..	@@ -1404,10 +1665,15 @@
1404	1665
1405	1666	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1406	1667
1407		- frame.setSize(1024, 768);
1408		- frame.show();
1409		-
	1668	+ frame.setSize(1280, 860);
	1669	+
	1670	+ cameraView.requestFocusInWindow();
	1671	+
1410	1672	gridPanel.setDividerLocation(1.0);
	1673	+
	1674	+ frame.validate();
	1675	+
	1676	+ frame.setVisible(true);
1411	1677
1412	1678	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1413	1679	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1444,19 +1710,22 @@
1444	1710
1445	1711	cGridBag editBar = new cGridBag().setVertical(false);
1446	1712
1447		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1713	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1448	1714	createMaterialButton.setToolTipText("Create material");
1449	1715
1450	1716	/*
1451	1717	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1452	1718	*/
1453	1719
1454		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1720	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1455	1721	clearMaterialButton.setToolTipText("Clear material");
1456	1722
1457		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1723	+ if (Globals.ADVANCED)
	1724	+ {
	1725	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1726	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1727	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1728	+ }
1460	1729
1461	1730	editBar.preferredHeight = 15;
1462	1731
..	..	@@ -1490,24 +1759,6 @@
1490	1759	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491	1760	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492	1761	colorSection.add(texture);
1493		-
1494		- cGridBag anisoU = new cGridBag();
1495		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1496		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1498		- colorSection.add(anisoU);
1499		-
1500		- cGridBag anisoV = new cGridBag();
1501		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1502		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1504		- colorSection.add(anisoV);
1505		-
1506		- cGridBag shadowbias = new cGridBag();
1507		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1508		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1510		- colorSection.add(shadowbias);
1511	1762
1512	1763	panel.add(new JSeparator());
1513	1764
..	..	@@ -1559,6 +1810,12 @@
1559	1810	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1560	1811	diffuseSection.add(fakedepth);
1561	1812
	1813	+ cGridBag shadowbias = new cGridBag();
	1814	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1815	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1816	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1817	+ diffuseSection.add(shadowbias);
	1818	+
1562	1819	panel.add(new JSeparator());
1563	1820
1564	1821	panel.add(diffuseSection);
..	..	@@ -1609,6 +1866,18 @@
1609	1866	// aConstraints.gridy += 1;
1610	1867	// aConstraints.gridwidth = 1;
1611	1868
	1869	+ cGridBag anisoU = new cGridBag();
	1870	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1871	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1872	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1873	+ specularSection.add(anisoU);
	1874	+
	1875	+ cGridBag anisoV = new cGridBag();
	1876	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1877	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1878	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1879	+ specularSection.add(anisoV);
	1880	+
1612	1881
1613	1882	panel.add(new JSeparator());
1614	1883
..	..	@@ -1616,35 +1885,35 @@
1616	1885
1617	1886	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1618	1887
1619		- cGridBag globalSection = new cGridBag().setVertical(true);
	1888	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1620	1889
1621	1890	cGridBag camera = new cGridBag();
1622	1891	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1623	1892	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1893	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(camera);
	1894	+ colorSection.add(camera);
1626	1895
1627	1896	cGridBag ambient = new cGridBag();
1628	1897	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1629	1898	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1899	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1631		- globalSection.add(ambient);
	1900	+ colorSection.add(ambient);
1632	1901
1633	1902	cGridBag backlit = new cGridBag();
1634	1903	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1635	1904	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1636	1905	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1637		- globalSection.add(backlit);
	1906	+ colorSection.add(backlit);
1638	1907
1639	1908	cGridBag opacity = new cGridBag();
1640	1909	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1641	1910	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642	1911	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1643		- globalSection.add(opacity);
	1912	+ colorSection.add(opacity);
1644	1913
1645		- panel.add(new JSeparator());
	1914	+ //panel.add(new JSeparator());
1646	1915
1647		- panel.add(globalSection);
	1916	+ //panel.add(globalSection);
1648	1917
1649	1918	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1650	1919
..	..	@@ -1725,12 +1994,15 @@
1725	1994	opacityPowerField.addChangeListener(this);
1726	1995	/**/
1727	1996
1728		- resetSlidersButton.addActionListener(this);
1729	1997	clearMaterialButton.addActionListener(this);
1730	1998	createMaterialButton.addActionListener(this);
1731		-
1732		- propagateToggle.addItemListener(this);
1733		- multiplyToggle.addItemListener(this);
	1999	+
	2000	+ if (Globals.ADVANCED)
	2001	+ {
	2002	+ resetSlidersButton.addActionListener(this);
	2003	+ propagateToggle.addItemListener(this);
	2004	+ multiplyToggle.addItemListener(this);
	2005	+ }
1734	2006	}
1735	2007
1736	2008	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1748,8 +2020,9 @@
1748	2020	// 3D models
1749	2021	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1750	2022	{
1751		- lastConverter = new com.jmex.model.converters.MaxToJme();
1752		- LoadFile(filename, lastConverter);
	2023	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2024	+ //LoadFile(filename, lastConverter);
	2025	+ LoadObjFile(filename); // New 3ds loader
1753	2026	continue;
1754	2027	}
1755	2028	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1901,7 +2174,7 @@
1901	2174
1902	2175	//? flashIt = false;
1903	2176	CameraPane pane = (CameraPane) cameraView;
1904		- pane.clickStart(location.x, location.y, 0);
	2177	+ pane.clickStart(location.x, location.y, 0, 0);
1905	2178	pane.clickEnd(location.x, location.y, 0, true);
1906	2179
1907	2180	if (group.selection.size() == 1)
..	..	@@ -1950,6 +2223,7 @@
1950	2223	e2.printStackTrace();
1951	2224	}
1952	2225	}
	2226	+
1953	2227	LoadJMEThread loadThread;
1954	2228
1955	2229	class LoadJMEThread extends Thread
..	..	@@ -2007,6 +2281,7 @@
2007	2281	//LoadFile0(filename, converter);
2008	2282	}
2009	2283	}
	2284	+
2010	2285	LoadOBJThread loadObjThread;
2011	2286
2012	2287	class LoadOBJThread extends Thread
..	..	@@ -2085,19 +2360,19 @@
2085	2360
2086	2361	void LoadObjFile(String fullname)
2087	2362	{
2088		- /*
	2363	+ System.out.println("Loading " + fullname);
	2364	+ /**/
2089	2365	//lastFilename = fullname;
2090	2366	if(loadObjThread == null)
2091	2367	{
2092		- loadObjThread = new LoadOBJThread();
2093		- loadObjThread.start();
	2368	+ loadObjThread = new LoadOBJThread();
	2369	+ loadObjThread.start();
2094	2370	}
2095	2371
2096	2372	loadObjThread.add(fullname);
2097		- */
	2373	+ /**/
2098	2374
2099		- System.out.println("Loading " + fullname);
2100		- makeSomething(new FileObject(fullname, true), true);
	2375	+ //makeSomething(new FileObject(fullname, true), true);
2101	2376	}
2102	2377
2103	2378	void LoadGFDFile(String fullname)
..	..	@@ -2358,11 +2633,11 @@
2358	2633
2359	2634	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2360	2635	{
2361		- if (GrafreeD.standAlone)
	2636	+ if (Grafreed.standAlone)
2362	2637	{
2363	2638	/**/
2364	2639	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365		- browser.show();
	2640	+ browser.setVisible(true);
2366	2641	String filename = browser.getFile();
2367	2642	if (filename != null && filename.length() > 0)
2368	2643	{
..	..	@@ -2473,6 +2748,7 @@
2473	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2474	2749	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2475	2750	}
	2751	+
2476	2752	//cJME.count++;
2477	2753	//cJME.count %= 12;
2478	2754	if (gc)
..	..	@@ -2656,6 +2932,7 @@
2656	2932	}
2657	2933	}
2658	2934	}
	2935	+
2659	2936	cFileSystemPane FSPane;
2660	2937
2661	2938	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2709,11 +2986,14 @@
2709	2986	}
2710	2987	}
2711	2988	}
	2989	+
2712	2990	freezematerial = false;
2713	2991	}
2714	2992
2715	2993	void SetMaterial(Object3D object)
2716	2994	{
	2995	+ latestObject = object;
	2996	+
2717	2997	cMaterial mat = object.material;
2718	2998
2719	2999	if (mat == null)
..	..	@@ -2722,7 +3002,8 @@
2722	3002	return;
2723	3003	}
2724	3004
2725		- multiplyToggle.setSelected(mat.multiply);
	3005	+ if (multiplyToggle != null)
	3006	+ multiplyToggle.setSelected(mat.multiply);
2726	3007
2727	3008	assert (object.projectedVertices != null);
2728	3009
..	..	@@ -2824,12 +3105,17 @@
2824	3105	// }
2825	3106
2826	3107	/**/
2827		- if (deselect)
	3108	+ if (deselect \|\| child == null)
2828	3109	{
2829	3110	//group.deselectAll();
2830	3111	//freeze = true;
2831	3112	GetTree().clearSelection();
2832	3113	//freeze = false;
	3114	+
	3115	+ if (child == null)
	3116	+ {
	3117	+ return;
	3118	+ }
2833	3119	}
2834	3120
2835	3121	//group.addSelectee(child);
..	..	@@ -2898,7 +3184,7 @@
2898	3184	cameraView.ToggleDL();
2899	3185	cameraView.repaint();
2900	3186	return;
2901		- } else if (event.getSource() == toggleTextureItem)
	3187	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2902	3188	{
2903	3189	cameraView.ToggleTexture();
2904	3190	// june 2013 copy.HardTouch();
..	..	@@ -2937,9 +3223,9 @@
2937	3223	frame.validate();
2938	3224
2939	3225	return;
2940		- } else if (event.getSource() == toggleRandomItem)
	3226	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2941	3227	{
2942		- cameraView.ToggleRandom();
	3228	+ cameraView.ToggleSwitch();
2943	3229	cameraView.repaint();
2944	3230	return;
2945	3231	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2968,6 +3254,10 @@
2968	3254	{
2969	3255	copy.live ^= true;
2970	3256	return;
	3257	+ } else if (event.getSource() == selectCB)
	3258	+ {
	3259	+ copy.dontselect ^= true;
	3260	+ return;
2971	3261	} else if (event.getSource() == hideCB)
2972	3262	{
2973	3263	copy.hide ^= true;
..	..	@@ -2982,6 +3272,7 @@
2982	3272	if (event.getSource() == randomCB)
2983	3273	{
2984	3274	copy.random ^= true;
	3275	+ objEditor.refreshContents();
2985	3276	return;
2986	3277	}
2987	3278	if (event.getSource() == speedupCB)
..	..	@@ -3005,8 +3296,9 @@
3005	3296
3006	3297	public void actionPerformed(ActionEvent event)
3007	3298	{
	3299	+ Object source = event.getSource();
3008	3300	// SCRIPT DIALOG
3009		- if (event.getSource() == okbutton)
	3301	+ if (source == okbutton)
3010	3302	{
3011	3303	textpanel.setVisible(false);
3012	3304	textpanel.remove(textarea);
..	..	@@ -3018,7 +3310,7 @@
3018	3310	textarea = null;
3019	3311	textpanel = null;
3020	3312	}
3021		- if (event.getSource() == cancelbutton)
	3313	+ if (source == cancelbutton)
3022	3314	{
3023	3315	textpanel.setVisible(false);
3024	3316	textpanel.remove(textarea);
..	..	@@ -3030,50 +3322,50 @@
3030	3322	//applySelf();
3031	3323	//client.refreshEditWindow();
3032	3324	//refreshContents();
3033		- if (event.getSource() == nameField)
	3325	+ if (source == nameField)
3034	3326	{
3035	3327	//System.out.println("ObjEditor " + event);
3036	3328	applySelf0(true);
3037	3329	//parent.applySelf();
3038	3330	objEditor.refreshContents();
3039		- } else if (event.getSource() == resetButton)
	3331	+ } else if (source == resetButton)
3040	3332	{
3041	3333	CameraPane.fullreset = true;
3042	3334	copy.Reset(); // ResetMeshes();
3043	3335	copy.Touch();
3044	3336	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepItem)
	3337	+ } else if (source == stepItem)
3046	3338	{
3047	3339	//cameraView.ONESTEP = true;
3048	3340	Globals.ONESTEP = true;
3049	3341	cameraView.repaint();
3050	3342	return;
3051		- } else if (event.getSource() == stepButton)
	3343	+ } else if (source == stepButton)
3052	3344	{
3053	3345	copy.Step();
3054	3346	copy.Touch();
3055	3347	objEditor.refreshContents();
3056		- } else if (event.getSource() == slowerButton)
	3348	+ } else if (source == slowerButton)
3057	3349	{
3058	3350	copy.Slower();
3059	3351	copy.Touch();
3060	3352	objEditor.refreshContents();
3061		- } else if (event.getSource() == fasterButton)
	3353	+ } else if (source == fasterButton)
3062	3354	{
3063	3355	copy.Faster();
3064	3356	copy.Touch();
3065	3357	objEditor.refreshContents();
3066		- } else if (event.getSource() == remarkButton)
	3358	+ } else if (source == remarkButton)
3067	3359	{
3068	3360	copy.Remark();
3069	3361	copy.Touch();
3070	3362	objEditor.refreshContents();
3071		- } else if (event.getSource() == stepAllButton)
	3363	+ } else if (source == stepAllButton)
3072	3364	{
3073	3365	copy.StepAll();
3074	3366	copy.Touch();
3075	3367	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetAllButton)
	3368	+ } else if (source == resetAllButton)
3077	3369	{
3078	3370	//CameraPane.fullreset = true;
3079	3371	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3106,53 +3398,79 @@
3106	3398	// Close();
3107	3399	// }
3108	3400	// else
3109		- if (event.getSource() == resetSlidersButton)
	3401	+ if (source == resetSlidersButton)
3110	3402	{
3111	3403	ResetSliders();
3112		- } else if (event.getSource() == clearMaterialButton)
	3404	+ } else if (source == clearMaterialButton)
3113	3405	{
3114	3406	ClearMaterial();
3115		- } else if (event.getSource() == createMaterialButton)
	3407	+ } else if (source == createMaterialButton)
3116	3408	{
3117	3409	CreateMaterial();
3118		- } else if (event.getSource() == clearPanelButton)
	3410	+ } else if (source == clearPanelButton)
3119	3411	{
3120	3412	copy.ClearUI();
3121	3413	refreshContents(true);
3122		- } /*
3123		- }
3124		-
3125		- public boolean action(Event event, Object arg)
3126		- {
3127		- */ else if (event.getSource() == closeItem)
	3414	+ } else if (source == importGFDItem)
	3415	+ {
	3416	+ ImportGFD();
	3417	+ } else
	3418	+ if (source == importVRMLX3DItem)
	3419	+ {
	3420	+ ImportVRMLX3D();
	3421	+ } else
	3422	+ if (source == import3DSItem)
	3423	+ {
	3424	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3425	+ } else
	3426	+ if (source == importOBJItem)
	3427	+ {
	3428	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3429	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3430	+ browser.setVisible(true);
	3431	+ String filename = browser.getFile();
	3432	+ if (filename != null && filename.length() > 0)
	3433	+ {
	3434	+ String fullname = browser.getDirectory() + filename;
	3435	+ makeSomething(ReadOBJ(fullname), true);
	3436	+ }
	3437	+ } else
	3438	+ if (source == closeItem)
3128	3439	{
3129	3440	Close();
3130	3441	//return true;
3131		- } else if (event.getSource() == loadItem)
	3442	+ } else if (source == openItem)
3132	3443	{
3133		- load();
	3444	+ Open();
3134	3445	//return true;
3135		- } else if (event.getSource() == saveItem)
	3446	+ } else if (source == newItem)
	3447	+ {
	3448	+ New();
	3449	+ } else if (source == saveItem)
3136	3450	{
3137	3451	save();
3138	3452	//return true;
3139		- } else if (event.getSource() == saveAsItem)
	3453	+ } else if (source == saveAsItem)
3140	3454	{
3141	3455	saveAs();
3142	3456	//return true;
3143		- } else if (event.getSource() == reexportItem)
	3457	+ } else if (source == reexportItem)
3144	3458	{
3145	3459	reexport();
3146	3460	//return true;
3147		- } else if (event.getSource() == exportAsItem)
	3461	+ } else if (source == exportAsItem)
3148	3462	{
3149	3463	export();
3150	3464	//return true;
3151		- } else if (event.getSource() == povItem)
	3465	+ } else if (source == povItem)
3152	3466	{
3153	3467	generatePOV();
3154	3468	//return true;
3155		- } else if (event.getSource() == zBufferItem)
	3469	+ } else if (event.getSource() == archiveItem)
	3470	+ {
	3471	+ cTools.Archive(frame);
	3472	+ return;
	3473	+ } else if (source == zBufferItem)
3156	3474	{
3157	3475	try
3158	3476	{
..	..	@@ -3174,21 +3492,8 @@
3174	3492	cameraView.repaint();
3175	3493	//return true;
3176	3494	}
3177		- */ else if (event.getSource() == editCameraItem)
3178		- {
3179		- cameraView.ProtectCamera();
3180		- cameraView.repaint();
3181		- return;
3182		- } else if (event.getSource() == revertCameraItem)
3183		- {
3184		- cameraView.RevertCamera();
3185		- cameraView.repaint();
3186		- return;
3187		-// } else if (event.getSource() == textureButton)
3188		-// {
3189		-// return; // true;
3190		- } else // combos...
3191		- if (event.getSource() == texresMenu)
	3495	+ */ else // combos...
	3496	+ if (source == texresMenu)
3192	3497	{
3193	3498	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3194	3499	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3200,6 +3505,403 @@
3200	3505	}
3201	3506	}
3202	3507
	3508	+ void New()
	3509	+ {
	3510	+ while (copy.Size() > 1)
	3511	+ {
	3512	+ copy.remove(1);
	3513	+ }
	3514	+
	3515	+ ResetModel();
	3516	+ objEditor.refreshContents();
	3517	+ }
	3518	+
	3519	+ static public byte[] Compress(Object3D o)
	3520	+ {
	3521	+ try
	3522	+ {
	3523	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3524	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3525	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3526	+
	3527	+ Object3D parent = o.parent;
	3528	+ o.parent = null;
	3529	+
	3530	+ out.writeObject(o);
	3531	+
	3532	+ o.parent = parent;
	3533	+
	3534	+ out.flush();
	3535	+
	3536	+ baos //zstream
	3537	+ .close();
	3538	+ out.close();
	3539	+
	3540	+ byte[] bytes = baos.toByteArray();
	3541	+
	3542	+ System.out.println("save #bytes = " + bytes.length);
	3543	+ return bytes;
	3544	+ } catch (Exception e)
	3545	+ {
	3546	+ System.err.println(e);
	3547	+ return null;
	3548	+ }
	3549	+ }
	3550	+
	3551	+ static public Object Uncompress(byte[] bytes)
	3552	+ {
	3553	+ System.out.println("restore #bytes = " + bytes.length);
	3554	+ try
	3555	+ {
	3556	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3557	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3558	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3559	+ Object obj = in.readObject();
	3560	+
	3561	+ bais //istream
	3562	+ .close();
	3563	+ in.close();
	3564	+
	3565	+ return obj;
	3566	+ } catch (Exception e)
	3567	+ {
	3568	+ System.err.println(e);
	3569	+ return null;
	3570	+ }
	3571	+ }
	3572	+
	3573	+ static public Object clone(Object o)
	3574	+ {
	3575	+ try
	3576	+ {
	3577	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3578	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3579	+
	3580	+ out.writeObject(o);
	3581	+
	3582	+ out.flush();
	3583	+ out.close();
	3584	+
	3585	+ byte[] bytes = baos.toByteArray();
	3586	+
	3587	+ System.out.println("clone = " + bytes.length);
	3588	+
	3589	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3590	+ ObjectInputStream in = new ObjectInputStream(bais);
	3591	+ Object obj = in.readObject();
	3592	+ in.close();
	3593	+
	3594	+ return obj;
	3595	+ } catch (Exception e)
	3596	+ {
	3597	+ System.err.println(e);
	3598	+ return null;
	3599	+ }
	3600	+ }
	3601	+
	3602	+ cRadio GetCurrentTab()
	3603	+ {
	3604	+ cRadio ab;
	3605	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3606	+ {
	3607	+ ab = (cRadio)e.nextElement();
	3608	+ if(ab.GetObject() == copy)
	3609	+ {
	3610	+ return ab;
	3611	+ }
	3612	+ }
	3613	+
	3614	+ return null;
	3615	+ }
	3616	+
	3617	+
	3618	+ public void Save()
	3619	+ {
	3620	+ //Save(true);
	3621	+ Replace();
	3622	+ }
	3623	+
	3624	+ private boolean Equal(byte[] compress, byte[] name)
	3625	+ {
	3626	+ if (compress.length != name.length)
	3627	+ {
	3628	+ return false;
	3629	+ }
	3630	+
	3631	+ for (int i=compress.length; --i>=0;)
	3632	+ {
	3633	+ if (compress[i] != name[i])
	3634	+ return false;
	3635	+ }
	3636	+
	3637	+ return true;
	3638	+ }
	3639	+
	3640	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3641	+
	3642	+ public boolean Save(boolean user)
	3643	+ {
	3644	+ System.err.println("Save");
	3645	+
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ byte[] compress = CompressCopy();
	3649	+
	3650	+ boolean thesame = false;
	3651	+
	3652	+ // Quick heuristic using length. Works only when stream is compressed.
	3653	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3654	+ {
	3655	+ thesame = true;
	3656	+ }
	3657	+
	3658	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3659	+ if (!thesame)
	3660	+ {
	3661	+ //tab.user[tab.versionindex] = user;
	3662	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3663	+
	3664	+ copy.versions[++copy.versionindex] = compress;
	3665	+
	3666	+ // if (increment)
	3667	+ // tab.versionindex++;
	3668	+ }
	3669	+
	3670	+ //copy.RestoreBigData(versiontable);
	3671	+
	3672	+ //assert(hashtable.isEmpty());
	3673	+
	3674	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3675	+ {
	3676	+ //tab.user[i] = false;
	3677	+ copy.versions[i] = null;
	3678	+ }
	3679	+
	3680	+ SetUndoStates();
	3681	+
	3682	+ // test save
	3683	+ if (false)
	3684	+ {
	3685	+ try
	3686	+ {
	3687	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3688	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3689	+
	3690	+ p.writeObject(copy);
	3691	+
	3692	+ p.flush();
	3693	+
	3694	+ ostream.close();
	3695	+ } catch (Exception e)
	3696	+ {
	3697	+ e.printStackTrace();
	3698	+ }
	3699	+ }
	3700	+
	3701	+ return !thesame;
	3702	+ }
	3703	+
	3704	+ void CopyChanged(Object3D obj)
	3705	+ {
	3706	+ SetUndoStates();
	3707	+
	3708	+ boolean temp = CameraPane.SWITCH;
	3709	+ CameraPane.SWITCH = false;
	3710	+
	3711	+ copy.ExtractBigData(versiontable);
	3712	+
	3713	+ copy.clear();
	3714	+
	3715	+ for (int i=0; i<obj.Size(); i++)
	3716	+ {
	3717	+ copy.add(obj.get(i));
	3718	+ }
	3719	+
	3720	+ copy.RestoreBigData(versiontable);
	3721	+
	3722	+ CameraPane.SWITCH = temp;
	3723	+
	3724	+ //assert(hashtable.isEmpty());
	3725	+
	3726	+ copy.Touch();
	3727	+
	3728	+ ResetModel();
	3729	+ copy.HardTouch(); // recompile?
	3730	+
	3731	+ cRadio ab;
	3732	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3733	+ {
	3734	+ ab = (cRadio)e.nextElement();
	3735	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3736	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3737	+ if (test != null)
	3738	+ {
	3739	+ test.editWindow = ab.object.editWindow;
	3740	+ ab.object = test;
	3741	+ }
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ }
	3746	+
	3747	+ cButton undoButton;
	3748	+ cButton restoreButton;
	3749	+ cButton replaceButton;
	3750	+ cButton redoButton;
	3751	+
	3752	+ boolean muteSlider;
	3753	+
	3754	+ int VersionCount()
	3755	+ {
	3756	+ int count = 0;
	3757	+
	3758	+ for (int i = copy.versions.length; --i >= 0;)
	3759	+ {
	3760	+ if (copy.versions[i] != null)
	3761	+ count++;
	3762	+ }
	3763	+
	3764	+ return count;
	3765	+ }
	3766	+
	3767	+ void SetUndoStates()
	3768	+ {
	3769	+ cRadio tab = GetCurrentTab();
	3770	+
	3771	+ restoreButton.setEnabled(copy.versionindex != -1);
	3772	+ replaceButton.setEnabled(copy.versionindex != -1);
	3773	+
	3774	+ undoButton.setEnabled(copy.versionindex > 0);
	3775	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3776	+
	3777	+ muteSlider = true;
	3778	+ versionSlider.setMaximum(VersionCount() - 1);
	3779	+ versionSlider.setInteger(copy.versionindex);
	3780	+ muteSlider = false;
	3781	+ }
	3782	+
	3783	+ public boolean Undo()
	3784	+ {
	3785	+ // Option?
	3786	+ Replace();
	3787	+
	3788	+ System.err.println("Undo");
	3789	+
	3790	+ cRadio tab = GetCurrentTab();
	3791	+
	3792	+ if (copy.versionindex == 0)
	3793	+ {
	3794	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3795	+ return false;
	3796	+ }
	3797	+
	3798	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3799	+// {
	3800	+// if (Save(false))
	3801	+// tab.versionindex -= 1;
	3802	+// else
	3803	+// {
	3804	+// if (tab.versionindex <= 0)
	3805	+// return false;
	3806	+// else
	3807	+// tab.versionindex -= 1;
	3808	+// }
	3809	+// }
	3810	+
	3811	+ copy.versionindex -= 1;
	3812	+
	3813	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3814	+
	3815	+ return true;
	3816	+ }
	3817	+
	3818	+ public boolean Restore()
	3819	+ {
	3820	+ System.err.println("Restore");
	3821	+
	3822	+ cRadio tab = GetCurrentTab();
	3823	+
	3824	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3825	+ {
	3826	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3827	+ return false;
	3828	+ }
	3829	+
	3830	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3831	+
	3832	+ return true;
	3833	+ }
	3834	+
	3835	+ public boolean Replace()
	3836	+ {
	3837	+ System.err.println("Replace");
	3838	+
	3839	+ cRadio tab = GetCurrentTab();
	3840	+
	3841	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3842	+ {
	3843	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3844	+ return false;
	3845	+ }
	3846	+
	3847	+ copy.versions[copy.versionindex] = CompressCopy();
	3848	+
	3849	+ return true;
	3850	+ }
	3851	+
	3852	+ public void Redo()
	3853	+ {
	3854	+ // Option?
	3855	+ Replace();
	3856	+
	3857	+ cRadio tab = GetCurrentTab();
	3858	+
	3859	+ if (copy.versions[copy.versionindex + 1] == null)
	3860	+ {
	3861	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3862	+ return;
	3863	+ }
	3864	+
	3865	+ copy.versionindex += 1;
	3866	+
	3867	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3868	+
	3869	+ //if (!tab.user[tab.versionindex])
	3870	+ // tab.graphs[tab.versionindex] = null;
	3871	+ }
	3872	+
	3873	+ void ImportGFD()
	3874	+ {
	3875	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3876	+ browser.show();
	3877	+ String filename = browser.getFile();
	3878	+ if (filename != null && filename.length() > 0)
	3879	+ {
	3880	+ String fullname = browser.getDirectory() + filename;
	3881	+
	3882	+ //Object3D readobj =
	3883	+ objEditor.ReadGFD(fullname, objEditor);
	3884	+ //makeSomething(readobj);
	3885	+ }
	3886	+ }
	3887	+
	3888	+ void ImportVRMLX3D()
	3889	+ {
	3890	+ if (Grafreed.standAlone)
	3891	+ {
	3892	+ /**/
	3893	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3894	+ browser.show();
	3895	+ String filename = browser.getFile();
	3896	+ if (filename != null && filename.length() > 0)
	3897	+ {
	3898	+ String fullname = browser.getDirectory() + filename;
	3899	+ LoadVRMLX3D(fullname);
	3900	+ }
	3901	+ /**/
	3902	+ }
	3903	+ }
	3904	+
3203	3905	void ToggleAnimation()
3204	3906	{
3205	3907	if (!Globals.ANIMATION)
..	..	@@ -3215,8 +3917,8 @@
3215	3917
3216	3918	Globals.ANIMATION ^= true;
3217	3919
3218		- GrafreeD.wav.cursor = 0;
3219		- GrafreeD.wav.loop = 0;
	3920	+ Grafreed.wav.cursor = 0;
	3921	+ Grafreed.wav.loop = 0;
3220	3922	}
3221	3923	} else
3222	3924	{
..	..	@@ -3237,7 +3939,6 @@
3237	3939	callee.refreshContents();
3238	3940	} else
3239	3941	{
3240		- new Exception().printStackTrace();
3241	3942	System.exit(0);
3242	3943	}
3243	3944	}
..	..	@@ -3267,7 +3968,7 @@
3267	3968	void CreateMaterial()
3268	3969	{
3269	3970	//copy.ClearMaterial(); // PATCH
3270		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3971	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3271	3972	if (copy.selection.size() > 0)
3272	3973	//SetMaterial(copy);
3273	3974	{
..	..	@@ -3318,7 +4019,7 @@
3318	4019	assert false;
3319	4020	}
3320	4021
3321		- void EditSelection()
	4022	+ void EditSelection(boolean newWindow)
3322	4023	{
3323	4024	}
3324	4025
..	..	@@ -3326,11 +4027,11 @@
3326	4027	{
3327	4028	copy.ResetBlockLoop(); // temporary problem
3328	4029
3329		- boolean random = CameraPane.RANDOM;
3330		- CameraPane.RANDOM = false; // parse everything
	4030	+ boolean random = CameraPane.SWITCH;
	4031	+ CameraPane.SWITCH = false; // parse everything
3331	4032	copy.ResetDisplayList();
3332	4033	copy.HardTouch();
3333		- CameraPane.RANDOM = random;
	4034	+ CameraPane.SWITCH = random;
3334	4035	}
3335	4036
3336	4037	// public void applySelf()
..	..	@@ -3404,6 +4105,36 @@
3404	4105	{
3405	4106	//System.out.println("Propagate = " + propagate);
3406	4107	copy.UpdateMaterial(anchor, current, propagate);
	4108	+
	4109	+ if (copy.material != null)
	4110	+ {
	4111	+ cMaterial mat = copy.material;
	4112	+
	4113	+ colorField.SetToolTipValue((mat.color));
	4114	+ modulationField.SetToolTipValue((mat.modulation));
	4115	+ metalnessField.SetToolTipValue((mat.metalness));
	4116	+ diffuseField.SetToolTipValue((mat.diffuse));
	4117	+ specularField.SetToolTipValue((mat.specular));
	4118	+ shininessField.SetToolTipValue((mat.shininess));
	4119	+ shiftField.SetToolTipValue((mat.shift));
	4120	+ ambientField.SetToolTipValue((mat.ambient));
	4121	+ lightareaField.SetToolTipValue((mat.lightarea));
	4122	+ diffusenessField.SetToolTipValue((mat.factor));
	4123	+ velvetField.SetToolTipValue((mat.velvet));
	4124	+ sheenField.SetToolTipValue((mat.sheen));
	4125	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4126	+ backlitField.SetToolTipValue((mat.bump));
	4127	+ anisoField.SetToolTipValue((mat.aniso));
	4128	+ anisoVField.SetToolTipValue((mat.anisoV));
	4129	+ cameraField.SetToolTipValue((mat.cameralight));
	4130	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4131	+ shadowField.SetToolTipValue((mat.shadow));
	4132	+ textureField.SetToolTipValue((mat.texture));
	4133	+ opacityField.SetToolTipValue((mat.opacity));
	4134	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4135	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4136	+ }
	4137	+
3407	4138	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3408	4139	{
3409	4140	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3432,9 +4163,25 @@
3432	4163	//copy.Touch();
3433	4164	}
3434	4165
	4166	+ cNumberSlider versionSlider;
	4167	+
3435	4168	public void stateChanged(ChangeEvent e)
3436	4169	{
3437	4170	// assert(false);
	4171	+ if (e.getSource() == versionSlider)
	4172	+ {
	4173	+ if (muteSlider)
	4174	+ return;
	4175	+
	4176	+ int version = versionSlider.getInteger();
	4177	+
	4178	+ if (copy.versions[version] != null)
	4179	+ {
	4180	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4181	+ }
	4182	+
	4183	+ return;
	4184	+ }
3438	4185
3439	4186	if (freezematerial)
3440	4187	{
..	..	@@ -3519,7 +4266,7 @@
3519	4266	}
3520	4267
3521	4268	if (normalpushField != null)
3522		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4269	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3523	4270	}
3524	4271
3525	4272	void SnapObject()
..	..	@@ -3783,6 +4530,8 @@
3783	4530
3784	4531	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3785	4532	{
	4533	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4534	+ Save();
3786	4535	//Tween.set(thing, 0).target(1).start(tweenManager);
3787	4536	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3788	4537	// if (thing instanceof GenericJointDemo)
..	..	@@ -3869,6 +4618,12 @@
3869	4618	{
3870	4619	ResetModel();
3871	4620	Select(thing.GetTreePath(), true, false); // unselect... false);
	4621	+
	4622	+ if (thing.Size() == 0)
	4623	+ {
	4624	+ //EditSelection(false);
	4625	+ }
	4626	+
3872	4627	refreshContents();
3873	4628	}
3874	4629
..	..	@@ -3986,6 +4741,7 @@
3986	4741	}
3987	4742	}
3988	4743	}
	4744	+
3989	4745	LoadGFDThread loadGFDThread;
3990	4746
3991	4747	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4005,8 +4761,10 @@
4005	4761
4006	4762	try
4007	4763	{
	4764	+ // Try compressed version first.
4008	4765	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4009		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4766	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4767	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4010	4768
4011	4769	readobj = (Object3D) p.readObject();
4012	4770	istream.close();
..	..	@@ -4014,7 +4772,20 @@
4014	4772	readobj.ResetDisplayList();
4015	4773	} catch (Exception e)
4016	4774	{
4017		- e.printStackTrace();
	4775	+ //e.printStackTrace();
	4776	+ try
	4777	+ {
	4778	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4779	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4780	+
	4781	+ readobj = (Object3D) p.readObject();
	4782	+ istream.close();
	4783	+
	4784	+ readobj.ResetDisplayList();
	4785	+ } catch (Exception e2)
	4786	+ {
	4787	+ e2.printStackTrace();
	4788	+ }
4018	4789	}
4019	4790	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4020	4791	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4060,6 +4831,12 @@
4060	4831
4061	4832	void LoadIt(Object obj)
4062	4833	{
	4834	+ if (obj == null)
	4835	+ {
	4836	+ // Invalid file
	4837	+ return;
	4838	+ }
	4839	+
4063	4840	System.out.println("Loaded " + obj);
4064	4841	//new Exception().printStackTrace();
4065	4842	Object3D readobj = (Object3D) obj;
..	..	@@ -4069,6 +4846,8 @@
4069	4846
4070	4847	if (readobj != null)
4071	4848	{
	4849	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4850	+ // Save();
4072	4851	try
4073	4852	{
4074	4853	//readobj.deepCopySelf(copy);
..	..	@@ -4123,15 +4902,26 @@
4123	4902	c.addChild(csg);
4124	4903	}
4125	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	+
4126	4916	ResetModel();
4127	4917	copy.HardTouch(); // recompile?
4128	4918	refreshContents();
4129	4919	}
4130	4920	}
4131	4921
4132		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4133	4923	{
4134		- if (GrafreeD.standAlone)
	4924	+ if (Grafreed.standAlone)
4135	4925	{
4136	4926	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4137	4927	browser.show();
..	..	@@ -4218,11 +5008,13 @@
4218	5008	try
4219	5009	{
4220	5010	FileOutputStream ostream = new FileOutputStream(lastname);
4221		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5011	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5012	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4222	5013
4223	5014	p.writeObject(copy);
4224	5015	p.flush();
4225	5016
	5017	+ zstream.close();
4226	5018	ostream.close();
4227	5019
4228	5020	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4232,17 +5024,20 @@
4232	5024	{
4233	5025	}
4234	5026	}
	5027	+
4235	5028	String lastname;
4236	5029
4237	5030	void saveAs()
4238	5031	{
4239		- if (GrafreeD.standAlone)
	5032	+ if (Grafreed.standAlone)
4240	5033	{
4241	5034	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4242	5035	browser.setVisible(true);
4243	5036	String filename = browser.getFile();
4244	5037	if (filename != null && filename.length() > 0)
4245	5038	{
	5039	+ if (!filename.endsWith(".gfd"))
	5040	+ filename += ".gfd";
4246	5041	lastname = browser.getDirectory() + filename;
4247	5042	save();
4248	5043	}
..	..	@@ -4341,13 +5136,13 @@
4341	5136	try
4342	5137	{
4343	5138	FileOutputStream ostream = new FileOutputStream(filename);
4344		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4345		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5139	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5140	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4346	5141
4347	5142	Object3D objectparent = obj.parent;
4348	5143	obj.parent = null;
4349	5144
4350		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5145	+ Object3D object = (Object3D) Grafreed.clone(obj);
4351	5146
4352	5147	obj.parent = objectparent;
4353	5148
..	..	@@ -4359,8 +5154,8 @@
4359	5154	p.writeObject(object);
4360	5155	p.flush();
4361	5156
	5157	+ zstream.close();
4362	5158	ostream.close();
4363		- // zstream.close();
4364	5159
4365	5160	// group.selection.get(0).parent = parent;
4366	5161	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4381,7 +5176,7 @@
4381	5176	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4382	5177	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4383	5178	copy.generatePOV(buffer);
4384		- if (GrafreeD.standAlone)
	5179	+ if (Grafreed.standAlone)
4385	5180	{
4386	5181	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4387	5182	browser.show();
..	..	@@ -4407,19 +5202,18 @@
4407	5202	Object3D client;
4408	5203	Object3D copy;
4409	5204	MenuBar menuBar;
4410		- Menu windowMenu;
4411		- MenuItem loadItem;
	5205	+ Menu fileMenu;
	5206	+ MenuItem newItem;
	5207	+ MenuItem openItem;
4412	5208	MenuItem saveItem;
4413	5209	MenuItem saveAsItem;
4414	5210	MenuItem exportAsItem;
4415	5211	MenuItem reexportItem;
4416	5212	MenuItem povItem;
4417	5213	MenuItem closeItem;
4418		- Menu cameraMenu;
	5214	+
4419	5215	CheckboxMenuItem zBufferItem;
4420	5216	//MenuItem normalLensItem;
4421		- MenuItem editCameraItem;
4422		- MenuItem revertCameraItem;
4423	5217	MenuItem stepItem;
4424	5218	CheckboxMenuItem toggleLiveItem;
4425	5219	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4430,25 +5224,39 @@
4430	5224	CheckboxMenuItem toggleFootContactItem;
4431	5225	CheckboxMenuItem toggleDLItem;
4432	5226	CheckboxMenuItem toggleTextureItem;
4433		- CheckboxMenuItem toggleRandomItem;
	5227	+ CheckboxMenuItem toggleSwitchItem;
4434	5228	CheckboxMenuItem toggleRootItem;
4435	5229	CheckboxMenuItem animationItem;
	5230	+ MenuItem archiveItem;
4436	5231	CheckboxMenuItem toggleHandleItem;
4437	5232	CheckboxMenuItem togglePaintItem;
4438	5233	JSplitPane mainPanel;
4439	5234	JScrollPane scrollpane;
	5235	+
4440	5236	JPanel toolbarPanel;
	5237	+
4441	5238	cGridBag treePanel;
	5239	+
4442	5240	JPanel radioPanel;
4443	5241	ButtonGroup buttonGroup;
4444		- cGridBag ctrlPanel;
	5242	+
	5243	+ cGridBag toolboxPanel;
4445	5244	cGridBag materialPanel;
	5245	+ cGridBag ctrlPanel;
	5246	+
4446	5247	JScrollPane infoPanel;
	5248	+
4447	5249	cGridBag optionsPanel;
	5250	+
4448	5251	JTabbedPane objectPanel;
	5252	+ boolean materialFlushed;
	5253	+ Object3D latestObject;
	5254	+
4449	5255	cGridBag XYZPanel;
	5256	+
4450	5257	JSplitPane gridPanel;
4451	5258	JSplitPane bigPanel;
	5259	+
4452	5260	cGridBag bigThree;
4453	5261	cGridBag scenePanel;
4454	5262	cGridBag centralPanel;
..	..	@@ -4563,8 +5371,13 @@
4563	5371	cNumberSlider fogField;
4564	5372	JLabel opacityPowerLabel;
4565	5373	cNumberSlider opacityPowerField;
4566		- JTree jTree;
	5374	+ cTree jTree;
4567	5375	//ObjectUI parent;
4568	5376
4569	5377	cNumberSlider normalpushField;
	5378	+
	5379	+ private MenuItem importGFDItem;
	5380	+ private MenuItem importVRMLX3DItem;
	5381	+ private MenuItem import3DSItem;
	5382	+ private MenuItem importOBJItem;
4570	5383	}