~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,100 +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		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- if (Globals.ADVANCED)
323		- {
324		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325		- toggleLiveItem.addItemListener(this);
326		- toggleLiveItem.setState(Globals.isLIVE());
327		-
328		- cameraMenu.add(stepItem = new MenuItem("Step"));
329		- stepItem.addActionListener(this);
330		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
331		- // toggleDLItem.addItemListener(this);
332		- // toggleDLItem.setState(false);
333		-
334		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
335		- toggleRenderItem.addItemListener(this);
336		- toggleRenderItem.setState(!CameraPane.frozen);
337		-
338		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
339		- toggleDebugItem.addItemListener(this);
340		- toggleDebugItem.setState(CameraPane.DEBUG);
341		-
342		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
343		- toggleFrustumItem.addItemListener(this);
344		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
345		-
346		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
347		- toggleFootContactItem.addItemListener(this);
348		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
349		-
350		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351		- toggleTimelineItem.addItemListener(this);
352		- }
353		-
354		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355		- toggleSwitchItem.addItemListener(this);
356		- toggleSwitchItem.setState(CameraPane.SWITCH);
357		-
358		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359		- toggleHandleItem.addItemListener(this);
360		- toggleHandleItem.setState(CameraPane.HANDLES);
361		-
362		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363		- togglePaintItem.addItemListener(this);
364		- togglePaintItem.setState(CameraPane.PAINTMODE);
365		-
366		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367		-// toggleRootItem.addItemListener(this);
368		-// toggleRootItem.setState(false);
369		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
370		-// animationItem.addItemListener(this);
371		-// animationItem.setState(CameraPane.ANIMATION);
372		- cameraMenu.add("-");
373		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
374		- editCameraItem.addActionListener(this);
375		-
376	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	+
377	424	toolbarPanel = new JPanel();
378	425	toolbarPanel.setName("Toolbar");
	426	+
379	427	treePanel = new cGridBag();
380	428	treePanel.setName("Tree");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
381	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382		- 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	+
383	442	materialPanel = new cGridBag().setVertical(true);
384		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
	444	+
385	445	/JTextPane/
386	446	infoarea = createTextPane();
387	447	doc = infoarea.getStyledDocument();
388	448
389	449	infoarea.setEditable(true);
390	450	SetText();
	451	+
391	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
392	453	// infoarea.setOpaque(false);
393	454	// //infoarea.setForeground(textcolor);
394	455	// TEXTAREA infoarea.setLineWrap(true);
395	456	// TEXTAREA infoarea.setWrapStyleWord(true);
396	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
397		- infoPanel.setPreferredSize(new Dimension(50, 200));
398		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
399	460	//infoPanel.setLayout(new BorderLayout());
400	461	//infoPanel.add(createTextPane());
401	462
..	..	@@ -406,7 +467,14 @@
406	467	mainPanel.setDividerSize(9);
407	468	mainPanel.setDividerLocation(0.5); //1.0);
408	469	mainPanel.setResizeWeight(0.5);
409		-
	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	+
410	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
411	479	//mainPanel.setLayout(new GridBagLayout());
412	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -474,10 +542,10 @@
474	542	e.printStackTrace();
475	543	}
476	544
477		- String selection = infoarea.getText();
478		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
479		- java.awt.datatransfer.Clipboard clipboard =
480		- 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();
481	549	//clipboard.setContents(data, data);
482	550	}
483	551
..	..	@@ -500,13 +568,13 @@
500	568	//SendInfo("Name:", "bold");
501	569	if (sel.GetTextures() != null \|\| debug)
502	570	{
503		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505	573	if (sel.Size() > 0)
506	574	{
507	575	si.SendInfo("#children = " + sel.Size(), "regular");
508	576	}
509		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510	578	if (debug)
511	579	{
512	580	try
..	..	@@ -548,7 +616,7 @@
548	616	}
549	617	if (sel.support != null)
550	618	{
551		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552	620	}
553	621	if (sel.scriptnode != null)
554	622	{
..	..	@@ -637,21 +705,144 @@
637	705	}
638	706	}
639	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	+
640	766	void ToggleFullScreen()
641	767	{
642		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
643	773	{
644		- frame.getContentPane().remove(/"Center",/bigThree);
645		- framePanel.add(bigThree);
646		- 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	+
647	797	} else
648	798	{
649		- frame.getContentPane().remove(/"Center",/framePanel);
650		- framePanel.remove(bigThree);
651		- 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);
652	821	}
653		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
654	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	+ }
655	846
656	847	private JTextPane createTextPane()
657	848	{
..	..	@@ -751,7 +942,7 @@
751	942	protected static ImageIcon createImageIcon(String path,
752	943	String description)
753	944	{
754		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	945	+ java.net.URL imgURL = Grafreed.class.getResource(path);
755	946	if (imgURL != null)
756	947	{
757	948	return new ImageIcon(imgURL, description);
..	..	@@ -783,6 +974,7 @@
783	974	// NumberSlider vDivsField;
784	975	// JCheckBox endcaps;
785	976	JCheckBox liveCB;
	977	+ JCheckBox selectableCB;
786	978	JCheckBox hideCB;
787	979	JCheckBox link2masterCB;
788	980	JCheckBox markCB;
..	..	@@ -790,7 +982,12 @@
790	982	JCheckBox speedupCB;
791	983	JCheckBox rewindCB;
792	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
793	989	JComboBox texresMenu;
	990	+
794	991	JButton resetButton;
795	992	JButton stepButton;
796	993	JButton stepAllButton;
..	..	@@ -799,9 +996,13 @@
799	996	JButton fasterButton;
800	997	JButton remarkButton;
801	998
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
802	1002	cGridBag namePanel;
803	1003	cGridBag setupPanel;
804		- cGridBag commandsPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
805	1006	cGridBag pushPanel;
806	1007	cGridBag fillPanel;
807	1008
..	..	@@ -973,61 +1174,69 @@
973	1174	namePanel = new cGridBag();
974	1175
975	1176	nameField = AddText(namePanel, copy.GetName());
976		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
977	1178	oe.ctrlPanel.add(namePanel);
978	1179
979	1180	oe.ctrlPanel.Return();
980	1181
981		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
982	1183	return;
983	1184
984	1185	setupPanel = new cGridBag().setVertical(false);
985	1186
986	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987	1188	liveCB.setToolTipText("Animate object");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
	1191	+// Return();
	1192	+
988	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	1194	hideCB.setToolTipText("Hide object");
990		-// Return();
991	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992		- markCB.setToolTipText("Set the animation target transform");
	1196	+ markCB.setToolTipText("As animation target transform");
993	1197
994		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1198	+ setupPanel2 = new cGridBag().setVertical(false);
	1199	+
	1200	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
995	1201	rewindCB.setToolTipText("Rewind animation");
996	1202
997		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998		- randomCB.setToolTipText("Option for switch node");
	1203	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1204	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
999	1205
	1206	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1207	+ link2masterCB.setToolTipText("Attach to support");
	1208	+
1000	1209	if (Globals.ADVANCED)
1001	1210	{
1002		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1003		- link2masterCB.setToolTipText("Attach to support");
1004		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1211	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1005	1212	speedupCB.setToolTipText("Option motion capture");
1006	1213	}
1007	1214
1008	1215	oe.ctrlPanel.add(setupPanel);
1009	1216	oe.ctrlPanel.Return();
	1217	+ oe.ctrlPanel.add(setupPanel2);
	1218	+ oe.ctrlPanel.Return();
1010	1219
1011		- commandsPanel = new cGridBag().setVertical(false);
	1220	+ objectCommandsPanel = new cGridBag().setVertical(false);
1012	1221
1013		- resetButton = AddButton(commandsPanel, "Reset");
	1222	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1014	1223	resetButton.setToolTipText("Jump to frame zero");
1015		- stepButton = AddButton(commandsPanel, "Step");
	1224	+ stepButton = AddButton(objectCommandsPanel, "Step");
1016	1225	stepButton.setToolTipText("Step one frame");
1017	1226	// resetAllButton = AddButton(oe, "Reset All");
1018	1227	// stepAllButton = AddButton(oe, "Step All");
1019	1228	// Return();
1020		- slowerButton = AddButton(commandsPanel, "Slow");
	1229	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1021	1230	slowerButton.setToolTipText("Decrease animation speed");
1022		- fasterButton = AddButton(commandsPanel, "Fast");
	1231	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1023	1232	fasterButton.setToolTipText("Increase animation speed");
1024		- remarkButton = AddButton(commandsPanel, "Remark");
	1233	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1025	1234	remarkButton.setToolTipText("Set the current transform as the target");
1026	1235
1027		- oe.ctrlPanel.add(commandsPanel);
	1236	+ oe.ctrlPanel.add(objectCommandsPanel);
1028	1237	oe.ctrlPanel.Return();
1029	1238
1030		- 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
1031	1240	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	1241	//Return();
1033	1242
..	..	@@ -1230,8 +1439,11 @@
1230	1439	//worldPanel.setName("World");
1231	1440	centralPanel = new cGridBag();
1232	1441	centralPanel.preferredWidth = 20;
1233		- timelinePanel = new JPanel(new BorderLayout());
1234		- 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);
1235	1447
1236	1448	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1237	1449	cameraPanel.setContinuousLayout(true);
..	..	@@ -1240,7 +1452,10 @@
1240	1452	// cameraPanel.setDividerSize(9);
1241	1453	cameraPanel.setResizeWeight(1.0);
1242	1454
	1455	+ }
	1456	+
1243	1457	centralPanel.add(cameraView);
	1458	+ centralPanel.setFocusable(true);
1244	1459	//frame.setJMenuBar(timelineMenubar);
1245	1460	//centralPanel.add(timelinePanel);
1246	1461
..	..	@@ -1266,6 +1481,7 @@
1266	1481	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1267	1482	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1268	1483	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1484	+ //XYZPanel.setName("XYZ");
1269	1485
1270	1486	/*
1271	1487	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1303,12 +1519,23 @@
1303	1519	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1304	1520	//tmp.setName("Edit");
1305	1521	objectPanel.add(materialPanel);
	1522	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1306	1523	// JPanel north = new JPanel(new BorderLayout());
1307	1524	// north.setName("Edit");
1308	1525	// north.add(ctrlPanel, BorderLayout.NORTH);
1309	1526	// objectPanel.add(north);
1310		- objectPanel.add(ctrlPanel);
1311		- 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"));
1312	1539
1313	1540	/*
1314	1541	aConstraints.gridx = 0;
..	..	@@ -1317,7 +1544,7 @@
1317	1544	aConstraints.gridy += 1;
1318	1545	aConstraints.gridwidth = 1;
1319	1546	mainPanel.add(objectPanel, aConstraints);
1320		- */
	1547	+ */
1321	1548
1322	1549	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1323	1550	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1329,14 +1556,12 @@
1329	1556	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1557
1331	1558	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1559	+ scenePanel.preferredWidth = 5;
1333	1560
1334	1561	JTabbedPane tabbedPane = new JTabbedPane();
1335	1562	tabbedPane.add(scrollpane);
1336	1563
1337		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1338		-
1339		- optionsPanel = new cGridBag().setVertical(true);
	1564	+ optionsPanel = new cGridBag().setVertical(false);
1340	1565
1341	1566	optionsPanel.setName("Options");
1342	1567
..	..	@@ -1344,6 +1569,8 @@
1344	1569
1345	1570	tabbedPane.add(optionsPanel);
1346	1571
	1572	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1573	+
1347	1574	scenePanel.add(tabbedPane);
1348	1575
1349	1576	/*
..	..	@@ -1405,9 +1632,9 @@
1405	1632	/**/
1406	1633
1407	1634	bigThree = new cGridBag();
1408		- bigThree.addComponent(scenePanel);
1409	1635	bigThree.addComponent(centralPanel);
1410		- bigThree.addComponent(XYZPanel);
	1636	+ bigThree.addComponent(scenePanel);
	1637	+ //bigThree.addComponent(XYZPanel);
1411	1638
1412	1639	// // SIDE EFFECT!!!
1413	1640	// aConstraints.gridx = 0;
..	..	@@ -1416,9 +1643,9 @@
1416	1643	// aConstraints.gridheight = 1;
1417	1644
1418	1645	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1419		- framePanel.setContinuousLayout(true);
1420		- framePanel.setOneTouchExpandable(true);
1421		- framePanel.setDividerLocation(0.8);
	1646	+ framePanel.setContinuousLayout(false);
	1647	+ framePanel.setOneTouchExpandable(false);
	1648	+ //.setDividerLocation(0.8);
1422	1649	//framePanel.setDividerSize(15);
1423	1650	//framePanel.setResizeWeight(0.15);
1424	1651	framePanel.setName("Frame");
..	..	@@ -1435,10 +1662,15 @@
1435	1662
1436	1663	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1664
1438		- frame.setSize(1024, 768);
1439		- frame.show();
1440		-
	1665	+ frame.setSize(1280, 860);
	1666	+
	1667	+ cameraView.requestFocusInWindow();
	1668	+
1441	1669	gridPanel.setDividerLocation(1.0);
	1670	+
	1671	+ frame.validate();
	1672	+
	1673	+ frame.setVisible(true);
1442	1674
1443	1675	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1444	1676	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1475,19 +1707,19 @@
1475	1707
1476	1708	cGridBag editBar = new cGridBag().setVertical(false);
1477	1709
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1710	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	1711	createMaterialButton.setToolTipText("Create material");
1480	1712
1481	1713	/*
1482	1714	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	1715	*/
1484	1716
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1717	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	1718	clearMaterialButton.setToolTipText("Clear material");
1487	1719
1488	1720	if (Globals.ADVANCED)
1489	1721	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1722	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	1723	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	1724	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	1725	}
..	..	@@ -1524,24 +1756,6 @@
1524	1756	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525	1757	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1526	1758	colorSection.add(texture);
1527		-
1528		- cGridBag anisoU = new cGridBag();
1529		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1530		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1532		- colorSection.add(anisoU);
1533		-
1534		- cGridBag anisoV = new cGridBag();
1535		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1536		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1538		- colorSection.add(anisoV);
1539		-
1540		- cGridBag shadowbias = new cGridBag();
1541		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1542		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1543		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1544		- colorSection.add(shadowbias);
1545	1759
1546	1760	panel.add(new JSeparator());
1547	1761
..	..	@@ -1593,6 +1807,12 @@
1593	1807	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1594	1808	diffuseSection.add(fakedepth);
1595	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	+
1596	1816	panel.add(new JSeparator());
1597	1817
1598	1818	panel.add(diffuseSection);
..	..	@@ -1643,6 +1863,18 @@
1643	1863	// aConstraints.gridy += 1;
1644	1864	// aConstraints.gridwidth = 1;
1645	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	+
1646	1878
1647	1879	panel.add(new JSeparator());
1648	1880
..	..	@@ -1650,35 +1882,35 @@
1650	1882
1651	1883	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1652	1884
1653		- cGridBag globalSection = new cGridBag().setVertical(true);
	1885	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1654	1886
1655	1887	cGridBag camera = new cGridBag();
1656	1888	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1657	1889	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658	1890	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1659		- globalSection.add(camera);
	1891	+ colorSection.add(camera);
1660	1892
1661	1893	cGridBag ambient = new cGridBag();
1662	1894	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1663	1895	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1664	1896	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1665		- globalSection.add(ambient);
	1897	+ colorSection.add(ambient);
1666	1898
1667	1899	cGridBag backlit = new cGridBag();
1668	1900	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1669	1901	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	1902	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1671		- globalSection.add(backlit);
	1903	+ colorSection.add(backlit);
1672	1904
1673	1905	cGridBag opacity = new cGridBag();
1674	1906	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1675	1907	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	1908	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677		- globalSection.add(opacity);
	1909	+ colorSection.add(opacity);
1678	1910
1679		- panel.add(new JSeparator());
	1911	+ //panel.add(new JSeparator());
1680	1912
1681		- panel.add(globalSection);
	1913	+ //panel.add(globalSection);
1682	1914
1683	1915	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1684	1916
..	..	@@ -1785,8 +2017,9 @@
1785	2017	// 3D models
1786	2018	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1787	2019	{
1788		- lastConverter = new com.jmex.model.converters.MaxToJme();
1789		- LoadFile(filename, lastConverter);
	2020	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2021	+ //LoadFile(filename, lastConverter);
	2022	+ LoadObjFile(filename); // New 3ds loader
1790	2023	continue;
1791	2024	}
1792	2025	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1938,7 +2171,7 @@
1938	2171
1939	2172	//? flashIt = false;
1940	2173	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	2174	+ pane.clickStart(location.x, location.y, 0, 0);
1942	2175	pane.clickEnd(location.x, location.y, 0, true);
1943	2176
1944	2177	if (group.selection.size() == 1)
..	..	@@ -1987,6 +2220,7 @@
1987	2220	e2.printStackTrace();
1988	2221	}
1989	2222	}
	2223	+
1990	2224	LoadJMEThread loadThread;
1991	2225
1992	2226	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +2278,7 @@
2044	2278	//LoadFile0(filename, converter);
2045	2279	}
2046	2280	}
	2281	+
2047	2282	LoadOBJThread loadObjThread;
2048	2283
2049	2284	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2357,19 @@
2122	2357
2123	2358	void LoadObjFile(String fullname)
2124	2359	{
2125		- /*
	2360	+ System.out.println("Loading " + fullname);
	2361	+ /**/
2126	2362	//lastFilename = fullname;
2127	2363	if(loadObjThread == null)
2128	2364	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2365	+ loadObjThread = new LoadOBJThread();
	2366	+ loadObjThread.start();
2131	2367	}
2132	2368
2133	2369	loadObjThread.add(fullname);
2134		- */
	2370	+ /**/
2135	2371
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2372	+ //makeSomething(new FileObject(fullname, true), true);
2138	2373	}
2139	2374
2140	2375	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +2630,11 @@
2395	2630
2396	2631	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2632	{
2398		- if (GrafreeD.standAlone)
	2633	+ if (Grafreed.standAlone)
2399	2634	{
2400	2635	/**/
2401	2636	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2637	+ browser.setVisible(true);
2403	2638	String filename = browser.getFile();
2404	2639	if (filename != null && filename.length() > 0)
2405	2640	{
..	..	@@ -2510,6 +2745,7 @@
2510	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2511	2746	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2512	2747	}
	2748	+
2513	2749	//cJME.count++;
2514	2750	//cJME.count %= 12;
2515	2751	if (gc)
..	..	@@ -2693,6 +2929,7 @@
2693	2929	}
2694	2930	}
2695	2931	}
	2932	+
2696	2933	cFileSystemPane FSPane;
2697	2934
2698	2935	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2746,11 +2983,14 @@
2746	2983	}
2747	2984	}
2748	2985	}
	2986	+
2749	2987	freezematerial = false;
2750	2988	}
2751	2989
2752	2990	void SetMaterial(Object3D object)
2753	2991	{
	2992	+ latestObject = object;
	2993	+
2754	2994	cMaterial mat = object.material;
2755	2995
2756	2996	if (mat == null)
..	..	@@ -2862,12 +3102,17 @@
2862	3102	// }
2863	3103
2864	3104	/**/
2865		- if (deselect)
	3105	+ if (deselect \|\| child == null)
2866	3106	{
2867	3107	//group.deselectAll();
2868	3108	//freeze = true;
2869	3109	GetTree().clearSelection();
2870	3110	//freeze = false;
	3111	+
	3112	+ if (child == null)
	3113	+ {
	3114	+ return;
	3115	+ }
2871	3116	}
2872	3117
2873	3118	//group.addSelectee(child);
..	..	@@ -2936,7 +3181,7 @@
2936	3181	cameraView.ToggleDL();
2937	3182	cameraView.repaint();
2938	3183	return;
2939		- } else if (event.getSource() == toggleTextureItem)
	3184	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2940	3185	{
2941	3186	cameraView.ToggleTexture();
2942	3187	// june 2013 copy.HardTouch();
..	..	@@ -2975,9 +3220,9 @@
2975	3220	frame.validate();
2976	3221
2977	3222	return;
2978		- } else if (event.getSource() == toggleSwitchItem)
	3223	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2979	3224	{
2980		- cameraView.ToggleRandom();
	3225	+ cameraView.ToggleSwitch();
2981	3226	cameraView.repaint();
2982	3227	return;
2983	3228	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3250,10 @@
3005	3250	} else if (event.getSource() == liveCB)
3006	3251	{
3007	3252	copy.live ^= true;
	3253	+ return;
	3254	+ } else if (event.getSource() == selectableCB)
	3255	+ {
	3256	+ copy.dontselect ^= true;
3008	3257	return;
3009	3258	} else if (event.getSource() == hideCB)
3010	3259	{
..	..	@@ -3044,8 +3293,9 @@
3044	3293
3045	3294	public void actionPerformed(ActionEvent event)
3046	3295	{
	3296	+ Object source = event.getSource();
3047	3297	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3298	+ if (source == okbutton)
3049	3299	{
3050	3300	textpanel.setVisible(false);
3051	3301	textpanel.remove(textarea);
..	..	@@ -3057,7 +3307,7 @@
3057	3307	textarea = null;
3058	3308	textpanel = null;
3059	3309	}
3060		- if (event.getSource() == cancelbutton)
	3310	+ if (source == cancelbutton)
3061	3311	{
3062	3312	textpanel.setVisible(false);
3063	3313	textpanel.remove(textarea);
..	..	@@ -3069,50 +3319,50 @@
3069	3319	//applySelf();
3070	3320	//client.refreshEditWindow();
3071	3321	//refreshContents();
3072		- if (event.getSource() == nameField)
	3322	+ if (source == nameField)
3073	3323	{
3074	3324	//System.out.println("ObjEditor " + event);
3075	3325	applySelf0(true);
3076	3326	//parent.applySelf();
3077	3327	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3328	+ } else if (source == resetButton)
3079	3329	{
3080	3330	CameraPane.fullreset = true;
3081	3331	copy.Reset(); // ResetMeshes();
3082	3332	copy.Touch();
3083	3333	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3334	+ } else if (source == stepItem)
3085	3335	{
3086	3336	//cameraView.ONESTEP = true;
3087	3337	Globals.ONESTEP = true;
3088	3338	cameraView.repaint();
3089	3339	return;
3090		- } else if (event.getSource() == stepButton)
	3340	+ } else if (source == stepButton)
3091	3341	{
3092	3342	copy.Step();
3093	3343	copy.Touch();
3094	3344	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3345	+ } else if (source == slowerButton)
3096	3346	{
3097	3347	copy.Slower();
3098	3348	copy.Touch();
3099	3349	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3350	+ } else if (source == fasterButton)
3101	3351	{
3102	3352	copy.Faster();
3103	3353	copy.Touch();
3104	3354	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3355	+ } else if (source == remarkButton)
3106	3356	{
3107	3357	copy.Remark();
3108	3358	copy.Touch();
3109	3359	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3360	+ } else if (source == stepAllButton)
3111	3361	{
3112	3362	copy.StepAll();
3113	3363	copy.Touch();
3114	3364	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3365	+ } else if (source == resetAllButton)
3116	3366	{
3117	3367	//CameraPane.fullreset = true;
3118	3368	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3395,79 @@
3145	3395	// Close();
3146	3396	// }
3147	3397	// else
3148		- if (event.getSource() == resetSlidersButton)
	3398	+ if (source == resetSlidersButton)
3149	3399	{
3150	3400	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3401	+ } else if (source == clearMaterialButton)
3152	3402	{
3153	3403	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3404	+ } else if (source == createMaterialButton)
3155	3405	{
3156	3406	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3407	+ } else if (source == clearPanelButton)
3158	3408	{
3159	3409	copy.ClearUI();
3160	3410	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ 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)
3167	3436	{
3168	3437	Close();
3169	3438	//return true;
3170		- } else if (event.getSource() == loadItem)
	3439	+ } else if (source == openItem)
3171	3440	{
3172		- load();
	3441	+ Open();
3173	3442	//return true;
3174		- } else if (event.getSource() == saveItem)
	3443	+ } else if (source == newItem)
	3444	+ {
	3445	+ New();
	3446	+ } else if (source == saveItem)
3175	3447	{
3176	3448	save();
3177	3449	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3450	+ } else if (source == saveAsItem)
3179	3451	{
3180	3452	saveAs();
3181	3453	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3454	+ } else if (source == reexportItem)
3183	3455	{
3184	3456	reexport();
3185	3457	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3458	+ } else if (source == exportAsItem)
3187	3459	{
3188	3460	export();
3189	3461	//return true;
3190		- } else if (event.getSource() == povItem)
	3462	+ } else if (source == povItem)
3191	3463	{
3192	3464	generatePOV();
3193	3465	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3466	+ } else if (event.getSource() == archiveItem)
	3467	+ {
	3468	+ cTools.Archive(frame);
	3469	+ return;
	3470	+ } else if (source == zBufferItem)
3195	3471	{
3196	3472	try
3197	3473	{
..	..	@@ -3213,21 +3489,8 @@
3213	3489	cameraView.repaint();
3214	3490	//return true;
3215	3491	}
3216		- */ else if (event.getSource() == editCameraItem)
3217		- {
3218		- cameraView.ProtectCamera();
3219		- cameraView.repaint();
3220		- return;
3221		- } else if (event.getSource() == revertCameraItem)
3222		- {
3223		- cameraView.RevertCamera();
3224		- cameraView.repaint();
3225		- return;
3226		-// } else if (event.getSource() == textureButton)
3227		-// {
3228		-// return; // true;
3229		- } else // combos...
3230		- if (event.getSource() == texresMenu)
	3492	+ */ else // combos...
	3493	+ if (source == texresMenu)
3231	3494	{
3232	3495	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3496	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3502,403 @@
3239	3502	}
3240	3503	}
3241	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	+
3242	3902	void ToggleAnimation()
3243	3903	{
3244	3904	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3914,8 @@
3254	3914
3255	3915	Globals.ANIMATION ^= true;
3256	3916
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3917	+ Grafreed.wav.cursor = 0;
	3918	+ Grafreed.wav.loop = 0;
3259	3919	}
3260	3920	} else
3261	3921	{
..	..	@@ -3276,7 +3936,6 @@
3276	3936	callee.refreshContents();
3277	3937	} else
3278	3938	{
3279		- new Exception().printStackTrace();
3280	3939	System.exit(0);
3281	3940	}
3282	3941	}
..	..	@@ -3357,7 +4016,7 @@
3357	4016	assert false;
3358	4017	}
3359	4018
3360		- void EditSelection()
	4019	+ void EditSelection(boolean newWindow)
3361	4020	{
3362	4021	}
3363	4022
..	..	@@ -3443,6 +4102,36 @@
3443	4102	{
3444	4103	//System.out.println("Propagate = " + propagate);
3445	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	+
3446	4135	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	4136	{
3448	4137	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,9 +4160,25 @@
3471	4160	//copy.Touch();
3472	4161	}
3473	4162
	4163	+ cNumberSlider versionSlider;
	4164	+
3474	4165	public void stateChanged(ChangeEvent e)
3475	4166	{
3476	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	+ }
3477	4182
3478	4183	if (freezematerial)
3479	4184	{
..	..	@@ -3558,7 +4263,7 @@
3558	4263	}
3559	4264
3560	4265	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4266	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	4267	}
3563	4268
3564	4269	void SnapObject()
..	..	@@ -3822,6 +4527,8 @@
3822	4527
3823	4528	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4529	{
	4530	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4531	+ Save();
3825	4532	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4533	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4534	// if (thing instanceof GenericJointDemo)
..	..	@@ -3908,6 +4615,12 @@
3908	4615	{
3909	4616	ResetModel();
3910	4617	Select(thing.GetTreePath(), true, false); // unselect... false);
	4618	+
	4619	+ if (thing.Size() == 0)
	4620	+ {
	4621	+ //EditSelection(false);
	4622	+ }
	4623	+
3911	4624	refreshContents();
3912	4625	}
3913	4626
..	..	@@ -4025,6 +4738,7 @@
4025	4738	}
4026	4739	}
4027	4740	}
	4741	+
4028	4742	LoadGFDThread loadGFDThread;
4029	4743
4030	4744	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4758,10 @@
4044	4758
4045	4759	try
4046	4760	{
	4761	+ // Try compressed version first.
4047	4762	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- 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);
4049	4765
4050	4766	readobj = (Object3D) p.readObject();
4051	4767	istream.close();
..	..	@@ -4053,7 +4769,22 @@
4053	4769	readobj.ResetDisplayList();
4054	4770	} catch (Exception e)
4055	4771	{
4056		- 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	+ }
4057	4788	}
4058	4789	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4790	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4830,12 @@
4099	4830
4100	4831	void LoadIt(Object obj)
4101	4832	{
	4833	+ if (obj == null)
	4834	+ {
	4835	+ // Invalid file
	4836	+ return;
	4837	+ }
	4838	+
4102	4839	System.out.println("Loaded " + obj);
4103	4840	//new Exception().printStackTrace();
4104	4841	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4845,8 @@
4108	4845
4109	4846	if (readobj != null)
4110	4847	{
	4848	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4849	+ // Save();
4111	4850	try
4112	4851	{
4113	4852	//readobj.deepCopySelf(copy);
..	..	@@ -4152,6 +4891,7 @@
4152	4891	}
4153	4892	} catch (ClassCastException e)
4154	4893	{
	4894	+ e.printStackTrace();
4155	4895	assert (false);
4156	4896	Composite c = (Composite) copy;
4157	4897	c.children.clear();
..	..	@@ -4162,15 +4902,26 @@
4162	4902	c.addChild(csg);
4163	4903	}
4164	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	+
4165	4916	ResetModel();
4166	4917	copy.HardTouch(); // recompile?
4167	4918	refreshContents();
4168	4919	}
4169	4920	}
4170	4921
4171		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4172	4923	{
4173		- if (GrafreeD.standAlone)
	4924	+ if (Grafreed.standAlone)
4174	4925	{
4175	4926	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4927	browser.show();
..	..	@@ -4257,11 +5008,13 @@
4257	5008	try
4258	5009	{
4259	5010	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5011	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5012	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	5013
4262	5014	p.writeObject(copy);
4263	5015	p.flush();
4264	5016
	5017	+ zstream.close();
4265	5018	ostream.close();
4266	5019
4267	5020	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4269,19 +5022,23 @@
4269	5022	//ps.print(buffer.toString());
4270	5023	} catch (IOException e)
4271	5024	{
	5025	+ e.printStackTrace();
4272	5026	}
4273	5027	}
	5028	+
4274	5029	String lastname;
4275	5030
4276	5031	void saveAs()
4277	5032	{
4278		- if (GrafreeD.standAlone)
	5033	+ if (Grafreed.standAlone)
4279	5034	{
4280	5035	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	5036	browser.setVisible(true);
4282	5037	String filename = browser.getFile();
4283	5038	if (filename != null && filename.length() > 0)
4284	5039	{
	5040	+ if (!filename.endsWith(".gfd"))
	5041	+ filename += ".gfd";
4285	5042	lastname = browser.getDirectory() + filename;
4286	5043	save();
4287	5044	}
..	..	@@ -4380,13 +5137,13 @@
4380	5137	try
4381	5138	{
4382	5139	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5140	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5141	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	5142
4386	5143	Object3D objectparent = obj.parent;
4387	5144	obj.parent = null;
4388	5145
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5146	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	5147
4391	5148	obj.parent = objectparent;
4392	5149
..	..	@@ -4398,8 +5155,8 @@
4398	5155	p.writeObject(object);
4399	5156	p.flush();
4400	5157
	5158	+ zstream.close();
4401	5159	ostream.close();
4402		- // zstream.close();
4403	5160
4404	5161	// group.selection.get(0).parent = parent;
4405	5162	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +5177,7 @@
4420	5177	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	5178	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	5179	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	5180	+ if (Grafreed.standAlone)
4424	5181	{
4425	5182	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	5183	browser.show();
..	..	@@ -4446,19 +5203,18 @@
4446	5203	Object3D client;
4447	5204	Object3D copy;
4448	5205	MenuBar menuBar;
4449		- Menu windowMenu;
4450		- MenuItem loadItem;
	5206	+ Menu fileMenu;
	5207	+ MenuItem newItem;
	5208	+ MenuItem openItem;
4451	5209	MenuItem saveItem;
4452	5210	MenuItem saveAsItem;
4453	5211	MenuItem exportAsItem;
4454	5212	MenuItem reexportItem;
4455	5213	MenuItem povItem;
4456	5214	MenuItem closeItem;
4457		- Menu cameraMenu;
	5215	+
4458	5216	CheckboxMenuItem zBufferItem;
4459	5217	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	5218	MenuItem stepItem;
4463	5219	CheckboxMenuItem toggleLiveItem;
4464	5220	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4472,22 +5228,36 @@
4472	5228	CheckboxMenuItem toggleSwitchItem;
4473	5229	CheckboxMenuItem toggleRootItem;
4474	5230	CheckboxMenuItem animationItem;
	5231	+ MenuItem archiveItem;
4475	5232	CheckboxMenuItem toggleHandleItem;
4476	5233	CheckboxMenuItem togglePaintItem;
4477	5234	JSplitPane mainPanel;
4478	5235	JScrollPane scrollpane;
	5236	+
4479	5237	JPanel toolbarPanel;
	5238	+
4480	5239	cGridBag treePanel;
	5240	+
4481	5241	JPanel radioPanel;
4482	5242	ButtonGroup buttonGroup;
4483		- cGridBag ctrlPanel;
	5243	+
	5244	+ cGridBag toolboxPanel;
4484	5245	cGridBag materialPanel;
	5246	+ cGridBag ctrlPanel;
	5247	+
4485	5248	JScrollPane infoPanel;
	5249	+
4486	5250	cGridBag optionsPanel;
	5251	+
4487	5252	JTabbedPane objectPanel;
	5253	+ boolean materialFlushed;
	5254	+ Object3D latestObject;
	5255	+
4488	5256	cGridBag XYZPanel;
	5257	+
4489	5258	JSplitPane gridPanel;
4490	5259	JSplitPane bigPanel;
	5260	+
4491	5261	cGridBag bigThree;
4492	5262	cGridBag scenePanel;
4493	5263	cGridBag centralPanel;
..	..	@@ -4602,8 +5372,13 @@
4602	5372	cNumberSlider fogField;
4603	5373	JLabel opacityPowerLabel;
4604	5374	cNumberSlider opacityPowerField;
4605		- JTree jTree;
	5375	+ cTree jTree;
4606	5376	//ObjectUI parent;
4607	5377
4608	5378	cNumberSlider normalpushField;
	5379	+
	5380	+ private MenuItem importGFDItem;
	5381	+ private MenuItem importVRMLX3DItem;
	5382	+ private MenuItem import3DSItem;
	5383	+ private MenuItem importOBJItem;
4609	5384	}