~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
..	..	@@ -145,7 +196,7 @@
145	196
146	197	objEditor.ctrlPanel.remove(namePanel);
147	198
148		- if (!GroupEditor.allparams)
	199	+ if (!allparams)
149	200	return;
150	201
151	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +219,8 @@
168	219	// objEditor.ctrlPanel.remove(remarkButton);
169	220
170	221	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	222	+ objEditor.ctrlPanel.remove(setupPanel2);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	224	objEditor.ctrlPanel.remove(pushPanel);
173	225	//objEditor.ctrlPanel.remove(fillPanel);
174	226
..	..	@@ -216,6 +268,12 @@
216	268	client = inClient;
217	269	copy = client;
218	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
219	277	// "this" is not called: SetupUI2(objEditor);
220	278	}
221	279
..	..	@@ -229,6 +287,12 @@
229	287	client = inClient;
230	288	copy = client;
231	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
232	296	SetupUI2(callee.GetEditor());
233	297	}
234	298
..	..	@@ -243,6 +307,7 @@
243	307	//localCopy.parent = null;
244	308
245	309	frame = new JFrame();
	310	+ frame.setUndecorated(false);
246	311	objEditor = this;
247	312	this.callee = callee;
248	313
..	..	@@ -260,6 +325,12 @@
260	325	copy = localCopy;
261	326	copy.editWindow = this;
262	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
263	334	SetupMenu();
264	335
265	336	//SetupName(objEditor); // new
..	..	@@ -273,28 +344,49 @@
273	344	return frame.action(event, obj);
274	345	}
275	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	+
276	352	void SetupMenu()
277	353	{
278	354	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	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..."));
284	375	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	376	+ fileMenu.add("-");
	377	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	378	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	379	+ fileMenu.add("-");
289	380	if (client.parent != null)
290	381	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	382	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	383	} else
293	384	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	385	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	386	}
296	387
297		- loadItem.addActionListener(this);
	388	+ newItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
298	390	saveItem.addActionListener(this);
299	391	saveAsItem.addActionListener(this);
300	392	exportAsItem.addActionListener(this);
..	..	@@ -302,84 +394,69 @@
302	394	//povItem.addActionListener(this);
303	395	closeItem.addActionListener(this);
304	396
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313		- toggleTimelineItem.addItemListener(this);
314		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315		- toggleFullScreenItem.addItemListener(this);
316		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317		- cameraMenu.add("-");
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322		- toggleLiveItem.addItemListener(this);
323		- toggleLiveItem.setState(Globals.isLIVE());
324		- cameraMenu.add(stepItem = new MenuItem("Step"));
325		- stepItem.addActionListener(this);
326		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327		-// toggleDLItem.addItemListener(this);
328		-// toggleDLItem.setState(false);
329		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330		- toggleRenderItem.addItemListener(this);
331		- toggleRenderItem.setState(!CameraPane.frozen);
332		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333		- toggleDebugItem.addItemListener(this);
334		- toggleDebugItem.setState(CameraPane.DEBUG);
335		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336		- toggleFrustumItem.addItemListener(this);
337		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339		- toggleFootContactItem.addItemListener(this);
340		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342		- toggleRandomItem.addItemListener(this);
343		- toggleRandomItem.setState(CameraPane.RANDOM);
344		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345		- toggleHandleItem.addItemListener(this);
346		- toggleHandleItem.setState(CameraPane.HANDLES);
347		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348		- togglePaintItem.addItemListener(this);
349		- togglePaintItem.setState(CameraPane.PAINTMODE);
350		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351		-// toggleRootItem.addItemListener(this);
352		-// toggleRootItem.setState(false);
353		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354		-// animationItem.addItemListener(this);
355		-// animationItem.setState(CameraPane.ANIMATION);
356		- cameraMenu.add("-");
357		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358		- editCameraItem.addActionListener(this);
359		-
360	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	+
361	424	toolbarPanel = new JPanel();
362	425	toolbarPanel.setName("Toolbar");
	426	+
363	427	treePanel = new cGridBag();
364	428	treePanel.setName("Tree");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
365	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- 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	+
367	442	materialPanel = new cGridBag().setVertical(true);
368		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
	444	+
369	445	/JTextPane/
370	446	infoarea = createTextPane();
371	447	doc = infoarea.getStyledDocument();
372	448
373	449	infoarea.setEditable(true);
374	450	SetText();
	451	+
375	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
376	453	// infoarea.setOpaque(false);
377	454	// //infoarea.setForeground(textcolor);
378	455	// TEXTAREA infoarea.setLineWrap(true);
379	456	// TEXTAREA infoarea.setWrapStyleWord(true);
380	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
381		- infoPanel.setPreferredSize(new Dimension(50, 200));
382		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
383	460	//infoPanel.setLayout(new BorderLayout());
384	461	//infoPanel.add(createTextPane());
385	462
..	..	@@ -390,7 +467,14 @@
390	467	mainPanel.setDividerSize(9);
391	468	mainPanel.setDividerLocation(0.5); //1.0);
392	469	mainPanel.setResizeWeight(0.5);
393		-
	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	+
394	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
395	479	//mainPanel.setLayout(new GridBagLayout());
396	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -458,10 +542,10 @@
458	542	e.printStackTrace();
459	543	}
460	544
461		- String selection = infoarea.getText();
462		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463		- java.awt.datatransfer.Clipboard clipboard =
464		- 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();
465	549	//clipboard.setContents(data, data);
466	550	}
467	551
..	..	@@ -484,13 +568,13 @@
484	568	//SendInfo("Name:", "bold");
485	569	if (sel.GetTextures() != null \|\| debug)
486	570	{
487		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	573	if (sel.Size() > 0)
490	574	{
491	575	si.SendInfo("#children = " + sel.Size(), "regular");
492	576	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	578	if (debug)
495	579	{
496	580	try
..	..	@@ -532,7 +616,7 @@
532	616	}
533	617	if (sel.support != null)
534	618	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	620	}
537	621	if (sel.scriptnode != null)
538	622	{
..	..	@@ -621,21 +705,144 @@
621	705	}
622	706	}
623	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	+
624	766	void ToggleFullScreen()
625	767	{
626		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
627	773	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- 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	+
631	797	} else
632	798	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- 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);
636	821	}
637		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
638	823	}
	824	+
	825	+ private byte[] CompressCopy()
	826	+ {
	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	+ }
639	846
640	847	private JTextPane createTextPane()
641	848	{
..	..	@@ -735,7 +942,7 @@
735	942	protected static ImageIcon createImageIcon(String path,
736	943	String description)
737	944	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	945	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	946	if (imgURL != null)
740	947	{
741	948	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +974,7 @@
767	974	// NumberSlider vDivsField;
768	975	// JCheckBox endcaps;
769	976	JCheckBox liveCB;
	977	+ JCheckBox selectableCB;
770	978	JCheckBox hideCB;
771	979	JCheckBox link2masterCB;
772	980	JCheckBox markCB;
..	..	@@ -774,7 +982,12 @@
774	982	JCheckBox speedupCB;
775	983	JCheckBox rewindCB;
776	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
777	989	JComboBox texresMenu;
	990	+
778	991	JButton resetButton;
779	992	JButton stepButton;
780	993	JButton stepAllButton;
..	..	@@ -783,9 +996,13 @@
783	996	JButton fasterButton;
784	997	JButton remarkButton;
785	998
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
786	1002	cGridBag namePanel;
787	1003	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
789	1006	cGridBag pushPanel;
790	1007	cGridBag fillPanel;
791	1008
..	..	@@ -957,61 +1174,69 @@
957	1174	namePanel = new cGridBag();
958	1175
959	1176	nameField = AddText(namePanel, copy.GetName());
960		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
961	1178	oe.ctrlPanel.add(namePanel);
962	1179
963	1180	oe.ctrlPanel.Return();
964	1181
965		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
966	1183	return;
967	1184
968	1185	setupPanel = new cGridBag().setVertical(false);
969	1186
970	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1188	liveCB.setToolTipText("Animate object");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
	1191	+// Return();
	1192	+
972	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1194	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976		- markCB.setToolTipText("Set the animation target transform");
	1196	+ markCB.setToolTipText("As animation target transform");
977	1197
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1198	+ setupPanel2 = new cGridBag().setVertical(false);
	1199	+
	1200	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1201	rewindCB.setToolTipText("Rewind animation");
980	1202
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1203	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1204	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
983	1205
	1206	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1207	+ link2masterCB.setToolTipText("Attach to support");
	1208	+
984	1209	if (Globals.ADVANCED)
985	1210	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
987		- link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1211	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1212	speedupCB.setToolTipText("Option motion capture");
990	1213	}
991	1214
992	1215	oe.ctrlPanel.add(setupPanel);
993	1216	oe.ctrlPanel.Return();
	1217	+ oe.ctrlPanel.add(setupPanel2);
	1218	+ oe.ctrlPanel.Return();
994	1219
995		- commandsPanel = new cGridBag().setVertical(false);
	1220	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1221
997		- resetButton = AddButton(commandsPanel, "Reset");
	1222	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1223	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1224	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1225	stepButton.setToolTipText("Step one frame");
1001	1226	// resetAllButton = AddButton(oe, "Reset All");
1002	1227	// stepAllButton = AddButton(oe, "Step All");
1003	1228	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1229	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1230	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1231	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1232	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1233	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1234	remarkButton.setToolTipText("Set the current transform as the target");
1010	1235
1011		- oe.ctrlPanel.add(commandsPanel);
	1236	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1237	oe.ctrlPanel.Return();
1013	1238
1014		- 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
1015	1240	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1241	//Return();
1017	1242
..	..	@@ -1214,8 +1439,11 @@
1214	1439	//worldPanel.setName("World");
1215	1440	centralPanel = new cGridBag();
1216	1441	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- 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);
1219	1447
1220	1448	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1449	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1452,10 @@
1224	1452	// cameraPanel.setDividerSize(9);
1225	1453	cameraPanel.setResizeWeight(1.0);
1226	1454
	1455	+ }
	1456	+
1227	1457	centralPanel.add(cameraView);
	1458	+ centralPanel.setFocusable(true);
1228	1459	//frame.setJMenuBar(timelineMenubar);
1229	1460	//centralPanel.add(timelinePanel);
1230	1461
..	..	@@ -1250,6 +1481,7 @@
1250	1481	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1251	1482	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1252	1483	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1484	+ //XYZPanel.setName("XYZ");
1253	1485
1254	1486	/*
1255	1487	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1287,12 +1519,23 @@
1287	1519	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1288	1520	//tmp.setName("Edit");
1289	1521	objectPanel.add(materialPanel);
	1522	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1290	1523	// JPanel north = new JPanel(new BorderLayout());
1291	1524	// north.setName("Edit");
1292	1525	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1526	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
1295		- 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"));
1296	1539
1297	1540	/*
1298	1541	aConstraints.gridx = 0;
..	..	@@ -1301,7 +1544,7 @@
1301	1544	aConstraints.gridy += 1;
1302	1545	aConstraints.gridwidth = 1;
1303	1546	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1547	+ */
1305	1548
1306	1549	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1550	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1556,12 @@
1313	1556	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1557
1315	1558	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1559	+ scenePanel.preferredWidth = 5;
1317	1560
1318	1561	JTabbedPane tabbedPane = new JTabbedPane();
1319	1562	tabbedPane.add(scrollpane);
1320	1563
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1564	+ optionsPanel = new cGridBag().setVertical(false);
1324	1565
1325	1566	optionsPanel.setName("Options");
1326	1567
..	..	@@ -1328,6 +1569,8 @@
1328	1569
1329	1570	tabbedPane.add(optionsPanel);
1330	1571
	1572	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1573	+
1331	1574	scenePanel.add(tabbedPane);
1332	1575
1333	1576	/*
..	..	@@ -1389,9 +1632,9 @@
1389	1632	/**/
1390	1633
1391	1634	bigThree = new cGridBag();
1392		- bigThree.addComponent(scenePanel);
1393	1635	bigThree.addComponent(centralPanel);
1394		- bigThree.addComponent(XYZPanel);
	1636	+ bigThree.addComponent(scenePanel);
	1637	+ //bigThree.addComponent(XYZPanel);
1395	1638
1396	1639	// // SIDE EFFECT!!!
1397	1640	// aConstraints.gridx = 0;
..	..	@@ -1400,9 +1643,9 @@
1400	1643	// aConstraints.gridheight = 1;
1401	1644
1402	1645	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1403		- framePanel.setContinuousLayout(true);
1404		- framePanel.setOneTouchExpandable(true);
1405		- framePanel.setDividerLocation(0.8);
	1646	+ framePanel.setContinuousLayout(false);
	1647	+ framePanel.setOneTouchExpandable(false);
	1648	+ //.setDividerLocation(0.8);
1406	1649	//framePanel.setDividerSize(15);
1407	1650	//framePanel.setResizeWeight(0.15);
1408	1651	framePanel.setName("Frame");
..	..	@@ -1419,10 +1662,15 @@
1419	1662
1420	1663	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1664
1422		- frame.setSize(1024, 768);
1423		- frame.show();
1424		-
	1665	+ frame.setSize(1280, 860);
	1666	+
	1667	+ cameraView.requestFocusInWindow();
	1668	+
1425	1669	gridPanel.setDividerLocation(1.0);
	1670	+
	1671	+ frame.validate();
	1672	+
	1673	+ frame.setVisible(true);
1426	1674
1427	1675	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1428	1676	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1459,19 +1707,22 @@
1459	1707
1460	1708	cGridBag editBar = new cGridBag().setVertical(false);
1461	1709
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1710	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1711	createMaterialButton.setToolTipText("Create material");
1464	1712
1465	1713	/*
1466	1714	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1715	*/
1468	1716
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1717	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1718	clearMaterialButton.setToolTipText("Clear material");
1471	1719
1472		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	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	+ }
1475	1726
1476	1727	editBar.preferredHeight = 15;
1477	1728
..	..	@@ -1505,24 +1756,6 @@
1505	1756	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506	1757	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1507	1758	colorSection.add(texture);
1508		-
1509		- cGridBag anisoU = new cGridBag();
1510		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1511		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1513		- colorSection.add(anisoU);
1514		-
1515		- cGridBag anisoV = new cGridBag();
1516		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1517		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1518		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1519		- colorSection.add(anisoV);
1520		-
1521		- cGridBag shadowbias = new cGridBag();
1522		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1523		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1524		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1525		- colorSection.add(shadowbias);
1526	1759
1527	1760	panel.add(new JSeparator());
1528	1761
..	..	@@ -1574,6 +1807,12 @@
1574	1807	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1575	1808	diffuseSection.add(fakedepth);
1576	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	+
1577	1816	panel.add(new JSeparator());
1578	1817
1579	1818	panel.add(diffuseSection);
..	..	@@ -1624,6 +1863,18 @@
1624	1863	// aConstraints.gridy += 1;
1625	1864	// aConstraints.gridwidth = 1;
1626	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	+
1627	1878
1628	1879	panel.add(new JSeparator());
1629	1880
..	..	@@ -1631,35 +1882,35 @@
1631	1882
1632	1883	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1633	1884
1634		- cGridBag globalSection = new cGridBag().setVertical(true);
	1885	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1635	1886
1636	1887	cGridBag camera = new cGridBag();
1637	1888	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1638	1889	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639	1890	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1640		- globalSection.add(camera);
	1891	+ colorSection.add(camera);
1641	1892
1642	1893	cGridBag ambient = new cGridBag();
1643	1894	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1644	1895	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1645	1896	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1646		- globalSection.add(ambient);
	1897	+ colorSection.add(ambient);
1647	1898
1648	1899	cGridBag backlit = new cGridBag();
1649	1900	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1650	1901	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651	1902	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1652		- globalSection.add(backlit);
	1903	+ colorSection.add(backlit);
1653	1904
1654	1905	cGridBag opacity = new cGridBag();
1655	1906	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1656	1907	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657	1908	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1658		- globalSection.add(opacity);
	1909	+ colorSection.add(opacity);
1659	1910
1660		- panel.add(new JSeparator());
	1911	+ //panel.add(new JSeparator());
1661	1912
1662		- panel.add(globalSection);
	1913	+ //panel.add(globalSection);
1663	1914
1664	1915	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1665	1916
..	..	@@ -1740,12 +1991,15 @@
1740	1991	opacityPowerField.addChangeListener(this);
1741	1992	/**/
1742	1993
1743		- resetSlidersButton.addActionListener(this);
1744	1994	clearMaterialButton.addActionListener(this);
1745	1995	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1996	+
	1997	+ if (Globals.ADVANCED)
	1998	+ {
	1999	+ resetSlidersButton.addActionListener(this);
	2000	+ propagateToggle.addItemListener(this);
	2001	+ multiplyToggle.addItemListener(this);
	2002	+ }
1749	2003	}
1750	2004
1751	2005	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1763,8 +2017,9 @@
1763	2017	// 3D models
1764	2018	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1765	2019	{
1766		- lastConverter = new com.jmex.model.converters.MaxToJme();
1767		- LoadFile(filename, lastConverter);
	2020	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2021	+ //LoadFile(filename, lastConverter);
	2022	+ LoadObjFile(filename); // New 3ds loader
1768	2023	continue;
1769	2024	}
1770	2025	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1916,7 +2171,7 @@
1916	2171
1917	2172	//? flashIt = false;
1918	2173	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2174	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2175	pane.clickEnd(location.x, location.y, 0, true);
1921	2176
1922	2177	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2220,7 @@
1965	2220	e2.printStackTrace();
1966	2221	}
1967	2222	}
	2223	+
1968	2224	LoadJMEThread loadThread;
1969	2225
1970	2226	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2278,7 @@
2022	2278	//LoadFile0(filename, converter);
2023	2279	}
2024	2280	}
	2281	+
2025	2282	LoadOBJThread loadObjThread;
2026	2283
2027	2284	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2357,19 @@
2100	2357
2101	2358	void LoadObjFile(String fullname)
2102	2359	{
2103		- /*
	2360	+ System.out.println("Loading " + fullname);
	2361	+ /**/
2104	2362	//lastFilename = fullname;
2105	2363	if(loadObjThread == null)
2106	2364	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2365	+ loadObjThread = new LoadOBJThread();
	2366	+ loadObjThread.start();
2109	2367	}
2110	2368
2111	2369	loadObjThread.add(fullname);
2112		- */
	2370	+ /**/
2113	2371
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2372	+ //makeSomething(new FileObject(fullname, true), true);
2116	2373	}
2117	2374
2118	2375	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2630,11 @@
2373	2630
2374	2631	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2632	{
2376		- if (GrafreeD.standAlone)
	2633	+ if (Grafreed.standAlone)
2377	2634	{
2378	2635	/**/
2379	2636	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2637	+ browser.setVisible(true);
2381	2638	String filename = browser.getFile();
2382	2639	if (filename != null && filename.length() > 0)
2383	2640	{
..	..	@@ -2488,6 +2745,7 @@
2488	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2489	2746	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2490	2747	}
	2748	+
2491	2749	//cJME.count++;
2492	2750	//cJME.count %= 12;
2493	2751	if (gc)
..	..	@@ -2671,6 +2929,7 @@
2671	2929	}
2672	2930	}
2673	2931	}
	2932	+
2674	2933	cFileSystemPane FSPane;
2675	2934
2676	2935	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2724,11 +2983,14 @@
2724	2983	}
2725	2984	}
2726	2985	}
	2986	+
2727	2987	freezematerial = false;
2728	2988	}
2729	2989
2730	2990	void SetMaterial(Object3D object)
2731	2991	{
	2992	+ latestObject = object;
	2993	+
2732	2994	cMaterial mat = object.material;
2733	2995
2734	2996	if (mat == null)
..	..	@@ -2737,7 +2999,8 @@
2737	2999	return;
2738	3000	}
2739	3001
2740		- multiplyToggle.setSelected(mat.multiply);
	3002	+ if (multiplyToggle != null)
	3003	+ multiplyToggle.setSelected(mat.multiply);
2741	3004
2742	3005	assert (object.projectedVertices != null);
2743	3006
..	..	@@ -2839,12 +3102,17 @@
2839	3102	// }
2840	3103
2841	3104	/**/
2842		- if (deselect)
	3105	+ if (deselect \|\| child == null)
2843	3106	{
2844	3107	//group.deselectAll();
2845	3108	//freeze = true;
2846	3109	GetTree().clearSelection();
2847	3110	//freeze = false;
	3111	+
	3112	+ if (child == null)
	3113	+ {
	3114	+ return;
	3115	+ }
2848	3116	}
2849	3117
2850	3118	//group.addSelectee(child);
..	..	@@ -2913,7 +3181,7 @@
2913	3181	cameraView.ToggleDL();
2914	3182	cameraView.repaint();
2915	3183	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3184	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3185	{
2918	3186	cameraView.ToggleTexture();
2919	3187	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3220,9 @@
2952	3220	frame.validate();
2953	3221
2954	3222	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3223	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3224	{
2957		- cameraView.ToggleRandom();
	3225	+ cameraView.ToggleSwitch();
2958	3226	cameraView.repaint();
2959	3227	return;
2960	3228	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3250,10 @@
2982	3250	} else if (event.getSource() == liveCB)
2983	3251	{
2984	3252	copy.live ^= true;
	3253	+ return;
	3254	+ } else if (event.getSource() == selectableCB)
	3255	+ {
	3256	+ copy.dontselect ^= true;
2985	3257	return;
2986	3258	} else if (event.getSource() == hideCB)
2987	3259	{
..	..	@@ -3021,8 +3293,9 @@
3021	3293
3022	3294	public void actionPerformed(ActionEvent event)
3023	3295	{
	3296	+ Object source = event.getSource();
3024	3297	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3298	+ if (source == okbutton)
3026	3299	{
3027	3300	textpanel.setVisible(false);
3028	3301	textpanel.remove(textarea);
..	..	@@ -3034,7 +3307,7 @@
3034	3307	textarea = null;
3035	3308	textpanel = null;
3036	3309	}
3037		- if (event.getSource() == cancelbutton)
	3310	+ if (source == cancelbutton)
3038	3311	{
3039	3312	textpanel.setVisible(false);
3040	3313	textpanel.remove(textarea);
..	..	@@ -3046,50 +3319,50 @@
3046	3319	//applySelf();
3047	3320	//client.refreshEditWindow();
3048	3321	//refreshContents();
3049		- if (event.getSource() == nameField)
	3322	+ if (source == nameField)
3050	3323	{
3051	3324	//System.out.println("ObjEditor " + event);
3052	3325	applySelf0(true);
3053	3326	//parent.applySelf();
3054	3327	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3328	+ } else if (source == resetButton)
3056	3329	{
3057	3330	CameraPane.fullreset = true;
3058	3331	copy.Reset(); // ResetMeshes();
3059	3332	copy.Touch();
3060	3333	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3334	+ } else if (source == stepItem)
3062	3335	{
3063	3336	//cameraView.ONESTEP = true;
3064	3337	Globals.ONESTEP = true;
3065	3338	cameraView.repaint();
3066	3339	return;
3067		- } else if (event.getSource() == stepButton)
	3340	+ } else if (source == stepButton)
3068	3341	{
3069	3342	copy.Step();
3070	3343	copy.Touch();
3071	3344	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3345	+ } else if (source == slowerButton)
3073	3346	{
3074	3347	copy.Slower();
3075	3348	copy.Touch();
3076	3349	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3350	+ } else if (source == fasterButton)
3078	3351	{
3079	3352	copy.Faster();
3080	3353	copy.Touch();
3081	3354	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3355	+ } else if (source == remarkButton)
3083	3356	{
3084	3357	copy.Remark();
3085	3358	copy.Touch();
3086	3359	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3360	+ } else if (source == stepAllButton)
3088	3361	{
3089	3362	copy.StepAll();
3090	3363	copy.Touch();
3091	3364	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3365	+ } else if (source == resetAllButton)
3093	3366	{
3094	3367	//CameraPane.fullreset = true;
3095	3368	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3395,79 @@
3122	3395	// Close();
3123	3396	// }
3124	3397	// else
3125		- if (event.getSource() == resetSlidersButton)
	3398	+ if (source == resetSlidersButton)
3126	3399	{
3127	3400	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3401	+ } else if (source == clearMaterialButton)
3129	3402	{
3130	3403	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3404	+ } else if (source == createMaterialButton)
3132	3405	{
3133	3406	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3407	+ } else if (source == clearPanelButton)
3135	3408	{
3136	3409	copy.ClearUI();
3137	3410	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ 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)
3144	3436	{
3145	3437	Close();
3146	3438	//return true;
3147		- } else if (event.getSource() == loadItem)
	3439	+ } else if (source == openItem)
3148	3440	{
3149		- load();
	3441	+ Open();
3150	3442	//return true;
3151		- } else if (event.getSource() == saveItem)
	3443	+ } else if (source == newItem)
	3444	+ {
	3445	+ New();
	3446	+ } else if (source == saveItem)
3152	3447	{
3153	3448	save();
3154	3449	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3450	+ } else if (source == saveAsItem)
3156	3451	{
3157	3452	saveAs();
3158	3453	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3454	+ } else if (source == reexportItem)
3160	3455	{
3161	3456	reexport();
3162	3457	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3458	+ } else if (source == exportAsItem)
3164	3459	{
3165	3460	export();
3166	3461	//return true;
3167		- } else if (event.getSource() == povItem)
	3462	+ } else if (source == povItem)
3168	3463	{
3169	3464	generatePOV();
3170	3465	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3466	+ } else if (event.getSource() == archiveItem)
	3467	+ {
	3468	+ cTools.Archive(frame);
	3469	+ return;
	3470	+ } else if (source == zBufferItem)
3172	3471	{
3173	3472	try
3174	3473	{
..	..	@@ -3190,21 +3489,8 @@
3190	3489	cameraView.repaint();
3191	3490	//return true;
3192	3491	}
3193		- */ else if (event.getSource() == editCameraItem)
3194		- {
3195		- cameraView.ProtectCamera();
3196		- cameraView.repaint();
3197		- return;
3198		- } else if (event.getSource() == revertCameraItem)
3199		- {
3200		- cameraView.RevertCamera();
3201		- cameraView.repaint();
3202		- return;
3203		-// } else if (event.getSource() == textureButton)
3204		-// {
3205		-// return; // true;
3206		- } else // combos...
3207		- if (event.getSource() == texresMenu)
	3492	+ */ else // combos...
	3493	+ if (source == texresMenu)
3208	3494	{
3209	3495	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3496	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3502,403 @@
3216	3502	}
3217	3503	}
3218	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	+
3219	3902	void ToggleAnimation()
3220	3903	{
3221	3904	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3914,8 @@
3231	3914
3232	3915	Globals.ANIMATION ^= true;
3233	3916
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3917	+ Grafreed.wav.cursor = 0;
	3918	+ Grafreed.wav.loop = 0;
3236	3919	}
3237	3920	} else
3238	3921	{
..	..	@@ -3253,7 +3936,6 @@
3253	3936	callee.refreshContents();
3254	3937	} else
3255	3938	{
3256		- new Exception().printStackTrace();
3257	3939	System.exit(0);
3258	3940	}
3259	3941	}
..	..	@@ -3283,7 +3965,7 @@
3283	3965	void CreateMaterial()
3284	3966	{
3285	3967	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3968	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3969	if (copy.selection.size() > 0)
3288	3970	//SetMaterial(copy);
3289	3971	{
..	..	@@ -3334,7 +4016,7 @@
3334	4016	assert false;
3335	4017	}
3336	4018
3337		- void EditSelection()
	4019	+ void EditSelection(boolean newWindow)
3338	4020	{
3339	4021	}
3340	4022
..	..	@@ -3342,11 +4024,11 @@
3342	4024	{
3343	4025	copy.ResetBlockLoop(); // temporary problem
3344	4026
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	4027	+ boolean random = CameraPane.SWITCH;
	4028	+ CameraPane.SWITCH = false; // parse everything
3347	4029	copy.ResetDisplayList();
3348	4030	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	4031	+ CameraPane.SWITCH = random;
3350	4032	}
3351	4033
3352	4034	// public void applySelf()
..	..	@@ -3420,6 +4102,36 @@
3420	4102	{
3421	4103	//System.out.println("Propagate = " + propagate);
3422	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	+
3423	4135	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	4136	{
3425	4137	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3448,9 +4160,25 @@
3448	4160	//copy.Touch();
3449	4161	}
3450	4162
	4163	+ cNumberSlider versionSlider;
	4164	+
3451	4165	public void stateChanged(ChangeEvent e)
3452	4166	{
3453	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	+ }
3454	4182
3455	4183	if (freezematerial)
3456	4184	{
..	..	@@ -3535,7 +4263,7 @@
3535	4263	}
3536	4264
3537	4265	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4266	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4267	}
3540	4268
3541	4269	void SnapObject()
..	..	@@ -3799,6 +4527,8 @@
3799	4527
3800	4528	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4529	{
	4530	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4531	+ Save();
3802	4532	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4533	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4534	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4615,12 @@
3885	4615	{
3886	4616	ResetModel();
3887	4617	Select(thing.GetTreePath(), true, false); // unselect... false);
	4618	+
	4619	+ if (thing.Size() == 0)
	4620	+ {
	4621	+ //EditSelection(false);
	4622	+ }
	4623	+
3888	4624	refreshContents();
3889	4625	}
3890	4626
..	..	@@ -4002,6 +4738,7 @@
4002	4738	}
4003	4739	}
4004	4740	}
	4741	+
4005	4742	LoadGFDThread loadGFDThread;
4006	4743
4007	4744	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4758,10 @@
4021	4758
4022	4759	try
4023	4760	{
	4761	+ // Try compressed version first.
4024	4762	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- 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);
4026	4765
4027	4766	readobj = (Object3D) p.readObject();
4028	4767	istream.close();
..	..	@@ -4030,7 +4769,22 @@
4030	4769	readobj.ResetDisplayList();
4031	4770	} catch (Exception e)
4032	4771	{
4033		- 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	+ }
4034	4788	}
4035	4789	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4790	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4830,12 @@
4076	4830
4077	4831	void LoadIt(Object obj)
4078	4832	{
	4833	+ if (obj == null)
	4834	+ {
	4835	+ // Invalid file
	4836	+ return;
	4837	+ }
	4838	+
4079	4839	System.out.println("Loaded " + obj);
4080	4840	//new Exception().printStackTrace();
4081	4841	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4845,8 @@
4085	4845
4086	4846	if (readobj != null)
4087	4847	{
	4848	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4849	+ // Save();
4088	4850	try
4089	4851	{
4090	4852	//readobj.deepCopySelf(copy);
..	..	@@ -4129,6 +4891,7 @@
4129	4891	}
4130	4892	} catch (ClassCastException e)
4131	4893	{
	4894	+ e.printStackTrace();
4132	4895	assert (false);
4133	4896	Composite c = (Composite) copy;
4134	4897	c.children.clear();
..	..	@@ -4139,15 +4902,26 @@
4139	4902	c.addChild(csg);
4140	4903	}
4141	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	+
4142	4916	ResetModel();
4143	4917	copy.HardTouch(); // recompile?
4144	4918	refreshContents();
4145	4919	}
4146	4920	}
4147	4921
4148		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4149	4923	{
4150		- if (GrafreeD.standAlone)
	4924	+ if (Grafreed.standAlone)
4151	4925	{
4152	4926	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4927	browser.show();
..	..	@@ -4234,11 +5008,13 @@
4234	5008	try
4235	5009	{
4236	5010	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5011	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5012	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	5013
4239	5014	p.writeObject(copy);
4240	5015	p.flush();
4241	5016
	5017	+ zstream.close();
4242	5018	ostream.close();
4243	5019
4244	5020	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4246,19 +5022,23 @@
4246	5022	//ps.print(buffer.toString());
4247	5023	} catch (IOException e)
4248	5024	{
	5025	+ e.printStackTrace();
4249	5026	}
4250	5027	}
	5028	+
4251	5029	String lastname;
4252	5030
4253	5031	void saveAs()
4254	5032	{
4255		- if (GrafreeD.standAlone)
	5033	+ if (Grafreed.standAlone)
4256	5034	{
4257	5035	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	5036	browser.setVisible(true);
4259	5037	String filename = browser.getFile();
4260	5038	if (filename != null && filename.length() > 0)
4261	5039	{
	5040	+ if (!filename.endsWith(".gfd"))
	5041	+ filename += ".gfd";
4262	5042	lastname = browser.getDirectory() + filename;
4263	5043	save();
4264	5044	}
..	..	@@ -4357,13 +5137,13 @@
4357	5137	try
4358	5138	{
4359	5139	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5140	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5141	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	5142
4363	5143	Object3D objectparent = obj.parent;
4364	5144	obj.parent = null;
4365	5145
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5146	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	5147
4368	5148	obj.parent = objectparent;
4369	5149
..	..	@@ -4375,8 +5155,8 @@
4375	5155	p.writeObject(object);
4376	5156	p.flush();
4377	5157
	5158	+ zstream.close();
4378	5159	ostream.close();
4379		- // zstream.close();
4380	5160
4381	5161	// group.selection.get(0).parent = parent;
4382	5162	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +5177,7 @@
4397	5177	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	5178	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	5179	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	5180	+ if (Grafreed.standAlone)
4401	5181	{
4402	5182	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	5183	browser.show();
..	..	@@ -4423,19 +5203,18 @@
4423	5203	Object3D client;
4424	5204	Object3D copy;
4425	5205	MenuBar menuBar;
4426		- Menu windowMenu;
4427		- MenuItem loadItem;
	5206	+ Menu fileMenu;
	5207	+ MenuItem newItem;
	5208	+ MenuItem openItem;
4428	5209	MenuItem saveItem;
4429	5210	MenuItem saveAsItem;
4430	5211	MenuItem exportAsItem;
4431	5212	MenuItem reexportItem;
4432	5213	MenuItem povItem;
4433	5214	MenuItem closeItem;
4434		- Menu cameraMenu;
	5215	+
4435	5216	CheckboxMenuItem zBufferItem;
4436	5217	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	5218	MenuItem stepItem;
4440	5219	CheckboxMenuItem toggleLiveItem;
4441	5220	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +5225,39 @@
4446	5225	CheckboxMenuItem toggleFootContactItem;
4447	5226	CheckboxMenuItem toggleDLItem;
4448	5227	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	5228	+ CheckboxMenuItem toggleSwitchItem;
4450	5229	CheckboxMenuItem toggleRootItem;
4451	5230	CheckboxMenuItem animationItem;
	5231	+ MenuItem archiveItem;
4452	5232	CheckboxMenuItem toggleHandleItem;
4453	5233	CheckboxMenuItem togglePaintItem;
4454	5234	JSplitPane mainPanel;
4455	5235	JScrollPane scrollpane;
	5236	+
4456	5237	JPanel toolbarPanel;
	5238	+
4457	5239	cGridBag treePanel;
	5240	+
4458	5241	JPanel radioPanel;
4459	5242	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	5243	+
	5244	+ cGridBag toolboxPanel;
4461	5245	cGridBag materialPanel;
	5246	+ cGridBag ctrlPanel;
	5247	+
4462	5248	JScrollPane infoPanel;
	5249	+
4463	5250	cGridBag optionsPanel;
	5251	+
4464	5252	JTabbedPane objectPanel;
	5253	+ boolean materialFlushed;
	5254	+ Object3D latestObject;
	5255	+
4465	5256	cGridBag XYZPanel;
	5257	+
4466	5258	JSplitPane gridPanel;
4467	5259	JSplitPane bigPanel;
	5260	+
4468	5261	cGridBag bigThree;
4469	5262	cGridBag scenePanel;
4470	5263	cGridBag centralPanel;
..	..	@@ -4579,8 +5372,13 @@
4579	5372	cNumberSlider fogField;
4580	5373	JLabel opacityPowerLabel;
4581	5374	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5375	+ cTree jTree;
4583	5376	//ObjectUI parent;
4584	5377
4585	5378	cNumberSlider normalpushField;
	5379	+
	5380	+ private MenuItem importGFDItem;
	5381	+ private MenuItem importVRMLX3DItem;
	5382	+ private MenuItem import3DSItem;
	5383	+ private MenuItem importOBJItem;
4586	5384	}