~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 selectCB;
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,68 @@
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	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectCB.setToolTipText("Make object selectable");
	1191	+// Return();
988	1192	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	1193	hideCB.setToolTipText("Hide object");
990		-// Return();
991	1194	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992		- markCB.setToolTipText("Set the animation target transform");
	1195	+ markCB.setToolTipText("As animation target transform");
993	1196
994		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1197	+ setupPanel2 = new cGridBag().setVertical(false);
	1198	+
	1199	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
995	1200	rewindCB.setToolTipText("Rewind animation");
996	1201
997		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998		- randomCB.setToolTipText("Option for switch node");
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1203	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
999	1204
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
1000	1208	if (Globals.ADVANCED)
1001	1209	{
1002		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1003		- link2masterCB.setToolTipText("Attach to support");
1004		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1210	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1005	1211	speedupCB.setToolTipText("Option motion capture");
1006	1212	}
1007	1213
1008	1214	oe.ctrlPanel.add(setupPanel);
1009	1215	oe.ctrlPanel.Return();
	1216	+ oe.ctrlPanel.add(setupPanel2);
	1217	+ oe.ctrlPanel.Return();
1010	1218
1011		- commandsPanel = new cGridBag().setVertical(false);
	1219	+ objectCommandsPanel = new cGridBag().setVertical(false);
1012	1220
1013		- resetButton = AddButton(commandsPanel, "Reset");
	1221	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1014	1222	resetButton.setToolTipText("Jump to frame zero");
1015		- stepButton = AddButton(commandsPanel, "Step");
	1223	+ stepButton = AddButton(objectCommandsPanel, "Step");
1016	1224	stepButton.setToolTipText("Step one frame");
1017	1225	// resetAllButton = AddButton(oe, "Reset All");
1018	1226	// stepAllButton = AddButton(oe, "Step All");
1019	1227	// Return();
1020		- slowerButton = AddButton(commandsPanel, "Slow");
	1228	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1021	1229	slowerButton.setToolTipText("Decrease animation speed");
1022		- fasterButton = AddButton(commandsPanel, "Fast");
	1230	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1023	1231	fasterButton.setToolTipText("Increase animation speed");
1024		- remarkButton = AddButton(commandsPanel, "Remark");
	1232	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1025	1233	remarkButton.setToolTipText("Set the current transform as the target");
1026	1234
1027		- oe.ctrlPanel.add(commandsPanel);
	1235	+ oe.ctrlPanel.add(objectCommandsPanel);
1028	1236	oe.ctrlPanel.Return();
1029	1237
1030		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1238	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1031	1239	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	1240	//Return();
1033	1241
..	..	@@ -1230,8 +1438,11 @@
1230	1438	//worldPanel.setName("World");
1231	1439	centralPanel = new cGridBag();
1232	1440	centralPanel.preferredWidth = 20;
1233		- timelinePanel = new JPanel(new BorderLayout());
1234		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1441	+
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ timelinePanel = new JPanel(new BorderLayout());
	1445	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1235	1446
1236	1447	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1237	1448	cameraPanel.setContinuousLayout(true);
..	..	@@ -1240,7 +1451,10 @@
1240	1451	// cameraPanel.setDividerSize(9);
1241	1452	cameraPanel.setResizeWeight(1.0);
1242	1453
	1454	+ }
	1455	+
1243	1456	centralPanel.add(cameraView);
	1457	+ centralPanel.setFocusable(true);
1244	1458	//frame.setJMenuBar(timelineMenubar);
1245	1459	//centralPanel.add(timelinePanel);
1246	1460
..	..	@@ -1266,6 +1480,7 @@
1266	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1267	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1268	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1269	1484
1270	1485	/*
1271	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1303,12 +1518,23 @@
1303	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1304	1519	//tmp.setName("Edit");
1305	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1306	1522	// JPanel north = new JPanel(new BorderLayout());
1307	1523	// north.setName("Edit");
1308	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1309	1525	// objectPanel.add(north);
1310		- objectPanel.add(ctrlPanel);
1311		- objectPanel.add(infoPanel);
	1526	+ objectPanel.add(editPanel);
	1527	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1528	+
	1529	+ //if (Globals.ADVANCED)
	1530	+ objectPanel.add(infoPanel);
	1531	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1532	+
	1533	+ objectPanel.add(XYZPanel);
	1534	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1535	+
	1536	+ objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1312	1538
1313	1539	/*
1314	1540	aConstraints.gridx = 0;
..	..	@@ -1317,7 +1543,7 @@
1317	1543	aConstraints.gridy += 1;
1318	1544	aConstraints.gridwidth = 1;
1319	1545	mainPanel.add(objectPanel, aConstraints);
1320		- */
	1546	+ */
1321	1547
1322	1548	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1323	1549	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1329,14 +1555,12 @@
1329	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1556
1331	1557	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1558	+ scenePanel.preferredWidth = 5;
1333	1559
1334	1560	JTabbedPane tabbedPane = new JTabbedPane();
1335	1561	tabbedPane.add(scrollpane);
1336	1562
1337		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1338		-
1339		- optionsPanel = new cGridBag().setVertical(true);
	1563	+ optionsPanel = new cGridBag().setVertical(false);
1340	1564
1341	1565	optionsPanel.setName("Options");
1342	1566
..	..	@@ -1344,6 +1568,8 @@
1344	1568
1345	1569	tabbedPane.add(optionsPanel);
1346	1570
	1571	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1572	+
1347	1573	scenePanel.add(tabbedPane);
1348	1574
1349	1575	/*
..	..	@@ -1407,7 +1633,7 @@
1407	1633	bigThree = new cGridBag();
1408	1634	bigThree.addComponent(scenePanel);
1409	1635	bigThree.addComponent(centralPanel);
1410		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1411	1637
1412	1638	// // SIDE EFFECT!!!
1413	1639	// aConstraints.gridx = 0;
..	..	@@ -1416,9 +1642,9 @@
1416	1642	// aConstraints.gridheight = 1;
1417	1643
1418	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1419		- framePanel.setContinuousLayout(true);
1420		- framePanel.setOneTouchExpandable(true);
1421		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1422	1648	//framePanel.setDividerSize(15);
1423	1649	//framePanel.setResizeWeight(0.15);
1424	1650	framePanel.setName("Frame");
..	..	@@ -1435,10 +1661,15 @@
1435	1661
1436	1662	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1663
1438		- frame.setSize(1024, 768);
1439		- frame.show();
1440		-
	1664	+ frame.setSize(1280, 860);
	1665	+
	1666	+ cameraView.requestFocusInWindow();
	1667	+
1441	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1442	1673
1443	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1444	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1475,19 +1706,19 @@
1475	1706
1476	1707	cGridBag editBar = new cGridBag().setVertical(false);
1477	1708
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1709	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	1710	createMaterialButton.setToolTipText("Create material");
1480	1711
1481	1712	/*
1482	1713	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	1714	*/
1484	1715
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1716	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	1717	clearMaterialButton.setToolTipText("Clear material");
1487	1718
1488	1719	if (Globals.ADVANCED)
1489	1720	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1721	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	1722	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	1723	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	1724	}
..	..	@@ -1524,24 +1755,6 @@
1524	1755	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525	1756	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1526	1757	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	1758
1546	1759	panel.add(new JSeparator());
1547	1760
..	..	@@ -1593,6 +1806,12 @@
1593	1806	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1594	1807	diffuseSection.add(fakedepth);
1595	1808
	1809	+ cGridBag shadowbias = new cGridBag();
	1810	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1811	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ diffuseSection.add(shadowbias);
	1814	+
1596	1815	panel.add(new JSeparator());
1597	1816
1598	1817	panel.add(diffuseSection);
..	..	@@ -1643,6 +1862,18 @@
1643	1862	// aConstraints.gridy += 1;
1644	1863	// aConstraints.gridwidth = 1;
1645	1864
	1865	+ cGridBag anisoU = new cGridBag();
	1866	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1867	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1869	+ specularSection.add(anisoU);
	1870	+
	1871	+ cGridBag anisoV = new cGridBag();
	1872	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1873	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1875	+ specularSection.add(anisoV);
	1876	+
1646	1877
1647	1878	panel.add(new JSeparator());
1648	1879
..	..	@@ -1650,35 +1881,35 @@
1650	1881
1651	1882	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1652	1883
1653		- cGridBag globalSection = new cGridBag().setVertical(true);
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1654	1885
1655	1886	cGridBag camera = new cGridBag();
1656	1887	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1657	1888	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658	1889	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1659		- globalSection.add(camera);
	1890	+ colorSection.add(camera);
1660	1891
1661	1892	cGridBag ambient = new cGridBag();
1662	1893	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1663	1894	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1664	1895	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1665		- globalSection.add(ambient);
	1896	+ colorSection.add(ambient);
1666	1897
1667	1898	cGridBag backlit = new cGridBag();
1668	1899	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1669	1900	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	1901	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1671		- globalSection.add(backlit);
	1902	+ colorSection.add(backlit);
1672	1903
1673	1904	cGridBag opacity = new cGridBag();
1674	1905	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1675	1906	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	1907	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677		- globalSection.add(opacity);
	1908	+ colorSection.add(opacity);
1678	1909
1679		- panel.add(new JSeparator());
	1910	+ //panel.add(new JSeparator());
1680	1911
1681		- panel.add(globalSection);
	1912	+ //panel.add(globalSection);
1682	1913
1683	1914	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1684	1915
..	..	@@ -1785,8 +2016,9 @@
1785	2016	// 3D models
1786	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1787	2018	{
1788		- lastConverter = new com.jmex.model.converters.MaxToJme();
1789		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1790	2022	continue;
1791	2023	}
1792	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1938,7 +2170,7 @@
1938	2170
1939	2171	//? flashIt = false;
1940	2172	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	2173	+ pane.clickStart(location.x, location.y, 0, 0);
1942	2174	pane.clickEnd(location.x, location.y, 0, true);
1943	2175
1944	2176	if (group.selection.size() == 1)
..	..	@@ -1987,6 +2219,7 @@
1987	2219	e2.printStackTrace();
1988	2220	}
1989	2221	}
	2222	+
1990	2223	LoadJMEThread loadThread;
1991	2224
1992	2225	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +2277,7 @@
2044	2277	//LoadFile0(filename, converter);
2045	2278	}
2046	2279	}
	2280	+
2047	2281	LoadOBJThread loadObjThread;
2048	2282
2049	2283	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2356,19 @@
2122	2356
2123	2357	void LoadObjFile(String fullname)
2124	2358	{
2125		- /*
	2359	+ System.out.println("Loading " + fullname);
	2360	+ /**/
2126	2361	//lastFilename = fullname;
2127	2362	if(loadObjThread == null)
2128	2363	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2364	+ loadObjThread = new LoadOBJThread();
	2365	+ loadObjThread.start();
2131	2366	}
2132	2367
2133	2368	loadObjThread.add(fullname);
2134		- */
	2369	+ /**/
2135	2370
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2371	+ //makeSomething(new FileObject(fullname, true), true);
2138	2372	}
2139	2373
2140	2374	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +2629,11 @@
2395	2629
2396	2630	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2631	{
2398		- if (GrafreeD.standAlone)
	2632	+ if (Grafreed.standAlone)
2399	2633	{
2400	2634	/**/
2401	2635	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2636	+ browser.setVisible(true);
2403	2637	String filename = browser.getFile();
2404	2638	if (filename != null && filename.length() > 0)
2405	2639	{
..	..	@@ -2510,6 +2744,7 @@
2510	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2511	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2512	2746	}
	2747	+
2513	2748	//cJME.count++;
2514	2749	//cJME.count %= 12;
2515	2750	if (gc)
..	..	@@ -2693,6 +2928,7 @@
2693	2928	}
2694	2929	}
2695	2930	}
	2931	+
2696	2932	cFileSystemPane FSPane;
2697	2933
2698	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2746,11 +2982,14 @@
2746	2982	}
2747	2983	}
2748	2984	}
	2985	+
2749	2986	freezematerial = false;
2750	2987	}
2751	2988
2752	2989	void SetMaterial(Object3D object)
2753	2990	{
	2991	+ latestObject = object;
	2992	+
2754	2993	cMaterial mat = object.material;
2755	2994
2756	2995	if (mat == null)
..	..	@@ -2862,12 +3101,17 @@
2862	3101	// }
2863	3102
2864	3103	/**/
2865		- if (deselect)
	3104	+ if (deselect \|\| child == null)
2866	3105	{
2867	3106	//group.deselectAll();
2868	3107	//freeze = true;
2869	3108	GetTree().clearSelection();
2870	3109	//freeze = false;
	3110	+
	3111	+ if (child == null)
	3112	+ {
	3113	+ return;
	3114	+ }
2871	3115	}
2872	3116
2873	3117	//group.addSelectee(child);
..	..	@@ -2936,7 +3180,7 @@
2936	3180	cameraView.ToggleDL();
2937	3181	cameraView.repaint();
2938	3182	return;
2939		- } else if (event.getSource() == toggleTextureItem)
	3183	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2940	3184	{
2941	3185	cameraView.ToggleTexture();
2942	3186	// june 2013 copy.HardTouch();
..	..	@@ -2975,9 +3219,9 @@
2975	3219	frame.validate();
2976	3220
2977	3221	return;
2978		- } else if (event.getSource() == toggleSwitchItem)
	3222	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2979	3223	{
2980		- cameraView.ToggleRandom();
	3224	+ cameraView.ToggleSwitch();
2981	3225	cameraView.repaint();
2982	3226	return;
2983	3227	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3249,10 @@
3005	3249	} else if (event.getSource() == liveCB)
3006	3250	{
3007	3251	copy.live ^= true;
	3252	+ return;
	3253	+ } else if (event.getSource() == selectCB)
	3254	+ {
	3255	+ copy.dontselect ^= true;
3008	3256	return;
3009	3257	} else if (event.getSource() == hideCB)
3010	3258	{
..	..	@@ -3044,8 +3292,9 @@
3044	3292
3045	3293	public void actionPerformed(ActionEvent event)
3046	3294	{
	3295	+ Object source = event.getSource();
3047	3296	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3297	+ if (source == okbutton)
3049	3298	{
3050	3299	textpanel.setVisible(false);
3051	3300	textpanel.remove(textarea);
..	..	@@ -3057,7 +3306,7 @@
3057	3306	textarea = null;
3058	3307	textpanel = null;
3059	3308	}
3060		- if (event.getSource() == cancelbutton)
	3309	+ if (source == cancelbutton)
3061	3310	{
3062	3311	textpanel.setVisible(false);
3063	3312	textpanel.remove(textarea);
..	..	@@ -3069,50 +3318,50 @@
3069	3318	//applySelf();
3070	3319	//client.refreshEditWindow();
3071	3320	//refreshContents();
3072		- if (event.getSource() == nameField)
	3321	+ if (source == nameField)
3073	3322	{
3074	3323	//System.out.println("ObjEditor " + event);
3075	3324	applySelf0(true);
3076	3325	//parent.applySelf();
3077	3326	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3327	+ } else if (source == resetButton)
3079	3328	{
3080	3329	CameraPane.fullreset = true;
3081	3330	copy.Reset(); // ResetMeshes();
3082	3331	copy.Touch();
3083	3332	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3333	+ } else if (source == stepItem)
3085	3334	{
3086	3335	//cameraView.ONESTEP = true;
3087	3336	Globals.ONESTEP = true;
3088	3337	cameraView.repaint();
3089	3338	return;
3090		- } else if (event.getSource() == stepButton)
	3339	+ } else if (source == stepButton)
3091	3340	{
3092	3341	copy.Step();
3093	3342	copy.Touch();
3094	3343	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3344	+ } else if (source == slowerButton)
3096	3345	{
3097	3346	copy.Slower();
3098	3347	copy.Touch();
3099	3348	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3349	+ } else if (source == fasterButton)
3101	3350	{
3102	3351	copy.Faster();
3103	3352	copy.Touch();
3104	3353	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3354	+ } else if (source == remarkButton)
3106	3355	{
3107	3356	copy.Remark();
3108	3357	copy.Touch();
3109	3358	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3359	+ } else if (source == stepAllButton)
3111	3360	{
3112	3361	copy.StepAll();
3113	3362	copy.Touch();
3114	3363	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3364	+ } else if (source == resetAllButton)
3116	3365	{
3117	3366	//CameraPane.fullreset = true;
3118	3367	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3394,79 @@
3145	3394	// Close();
3146	3395	// }
3147	3396	// else
3148		- if (event.getSource() == resetSlidersButton)
	3397	+ if (source == resetSlidersButton)
3149	3398	{
3150	3399	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3400	+ } else if (source == clearMaterialButton)
3152	3401	{
3153	3402	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3403	+ } else if (source == createMaterialButton)
3155	3404	{
3156	3405	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3406	+ } else if (source == clearPanelButton)
3158	3407	{
3159	3408	copy.ClearUI();
3160	3409	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ else if (event.getSource() == closeItem)
	3410	+ } else if (source == importGFDItem)
	3411	+ {
	3412	+ ImportGFD();
	3413	+ } else
	3414	+ if (source == importVRMLX3DItem)
	3415	+ {
	3416	+ ImportVRMLX3D();
	3417	+ } else
	3418	+ if (source == import3DSItem)
	3419	+ {
	3420	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3421	+ } else
	3422	+ if (source == importOBJItem)
	3423	+ {
	3424	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3425	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3426	+ browser.setVisible(true);
	3427	+ String filename = browser.getFile();
	3428	+ if (filename != null && filename.length() > 0)
	3429	+ {
	3430	+ String fullname = browser.getDirectory() + filename;
	3431	+ makeSomething(ReadOBJ(fullname), true);
	3432	+ }
	3433	+ } else
	3434	+ if (source == closeItem)
3167	3435	{
3168	3436	Close();
3169	3437	//return true;
3170		- } else if (event.getSource() == loadItem)
	3438	+ } else if (source == openItem)
3171	3439	{
3172		- load();
	3440	+ Open();
3173	3441	//return true;
3174		- } else if (event.getSource() == saveItem)
	3442	+ } else if (source == newItem)
	3443	+ {
	3444	+ New();
	3445	+ } else if (source == saveItem)
3175	3446	{
3176	3447	save();
3177	3448	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3449	+ } else if (source == saveAsItem)
3179	3450	{
3180	3451	saveAs();
3181	3452	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3453	+ } else if (source == reexportItem)
3183	3454	{
3184	3455	reexport();
3185	3456	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3457	+ } else if (source == exportAsItem)
3187	3458	{
3188	3459	export();
3189	3460	//return true;
3190		- } else if (event.getSource() == povItem)
	3461	+ } else if (source == povItem)
3191	3462	{
3192	3463	generatePOV();
3193	3464	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
	3469	+ } else if (source == zBufferItem)
3195	3470	{
3196	3471	try
3197	3472	{
..	..	@@ -3213,21 +3488,8 @@
3213	3488	cameraView.repaint();
3214	3489	//return true;
3215	3490	}
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)
	3491	+ */ else // combos...
	3492	+ if (source == texresMenu)
3231	3493	{
3232	3494	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3495	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3501,403 @@
3239	3501	}
3240	3502	}
3241	3503
	3504	+ void New()
	3505	+ {
	3506	+ while (copy.Size() > 1)
	3507	+ {
	3508	+ copy.remove(1);
	3509	+ }
	3510	+
	3511	+ ResetModel();
	3512	+ objEditor.refreshContents();
	3513	+ }
	3514	+
	3515	+ static public byte[] Compress(Object3D o)
	3516	+ {
	3517	+ try
	3518	+ {
	3519	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3522	+
	3523	+ Object3D parent = o.parent;
	3524	+ o.parent = null;
	3525	+
	3526	+ out.writeObject(o);
	3527	+
	3528	+ o.parent = parent;
	3529	+
	3530	+ out.flush();
	3531	+
	3532	+ baos //zstream
	3533	+ .close();
	3534	+ out.close();
	3535	+
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
	3540	+ } catch (Exception e)
	3541	+ {
	3542	+ System.err.println(e);
	3543	+ return null;
	3544	+ }
	3545	+ }
	3546	+
	3547	+ static public Object Uncompress(byte[] bytes)
	3548	+ {
	3549	+ System.out.println("restore #bytes = " + bytes.length);
	3550	+ try
	3551	+ {
	3552	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3555	+ Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
	3559	+ in.close();
	3560	+
	3561	+ return obj;
	3562	+ } catch (Exception e)
	3563	+ {
	3564	+ System.err.println(e);
	3565	+ return null;
	3566	+ }
	3567	+ }
	3568	+
	3569	+ static public Object clone(Object o)
	3570	+ {
	3571	+ try
	3572	+ {
	3573	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3575	+
	3576	+ out.writeObject(o);
	3577	+
	3578	+ out.flush();
	3579	+ out.close();
	3580	+
	3581	+ byte[] bytes = baos.toByteArray();
	3582	+
	3583	+ System.out.println("clone = " + bytes.length);
	3584	+
	3585	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3586	+ ObjectInputStream in = new ObjectInputStream(bais);
	3587	+ Object obj = in.readObject();
	3588	+ in.close();
	3589	+
	3590	+ return obj;
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ System.err.println(e);
	3594	+ return null;
	3595	+ }
	3596	+ }
	3597	+
	3598	+ cRadio GetCurrentTab()
	3599	+ {
	3600	+ cRadio ab;
	3601	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3602	+ {
	3603	+ ab = (cRadio)e.nextElement();
	3604	+ if(ab.GetObject() == copy)
	3605	+ {
	3606	+ return ab;
	3607	+ }
	3608	+ }
	3609	+
	3610	+ return null;
	3611	+ }
	3612	+
	3613	+
	3614	+ public void Save()
	3615	+ {
	3616	+ //Save(true);
	3617	+ Replace();
	3618	+ }
	3619	+
	3620	+ private boolean Equal(byte[] compress, byte[] name)
	3621	+ {
	3622	+ if (compress.length != name.length)
	3623	+ {
	3624	+ return false;
	3625	+ }
	3626	+
	3627	+ for (int i=compress.length; --i>=0;)
	3628	+ {
	3629	+ if (compress[i] != name[i])
	3630	+ return false;
	3631	+ }
	3632	+
	3633	+ return true;
	3634	+ }
	3635	+
	3636	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3637	+
	3638	+ public boolean Save(boolean user)
	3639	+ {
	3640	+ System.err.println("Save");
	3641	+
	3642	+ cRadio tab = GetCurrentTab();
	3643	+
	3644	+ byte[] compress = CompressCopy();
	3645	+
	3646	+ boolean thesame = false;
	3647	+
	3648	+ // Quick heuristic using length. Works only when stream is compressed.
	3649	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3650	+ {
	3651	+ thesame = true;
	3652	+ }
	3653	+
	3654	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3655	+ if (!thesame)
	3656	+ {
	3657	+ //tab.user[tab.versionindex] = user;
	3658	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3659	+
	3660	+ copy.versions[++copy.versionindex] = compress;
	3661	+
	3662	+ // if (increment)
	3663	+ // tab.versionindex++;
	3664	+ }
	3665	+
	3666	+ //copy.RestoreBigData(versiontable);
	3667	+
	3668	+ //assert(hashtable.isEmpty());
	3669	+
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3671	+ {
	3672	+ //tab.user[i] = false;
	3673	+ copy.versions[i] = null;
	3674	+ }
	3675	+
	3676	+ SetUndoStates();
	3677	+
	3678	+ // test save
	3679	+ if (false)
	3680	+ {
	3681	+ try
	3682	+ {
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3684	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3685	+
	3686	+ p.writeObject(copy);
	3687	+
	3688	+ p.flush();
	3689	+
	3690	+ ostream.close();
	3691	+ } catch (Exception e)
	3692	+ {
	3693	+ e.printStackTrace();
	3694	+ }
	3695	+ }
	3696	+
	3697	+ return !thesame;
	3698	+ }
	3699	+
	3700	+ void CopyChanged(Object3D obj)
	3701	+ {
	3702	+ SetUndoStates();
	3703	+
	3704	+ boolean temp = CameraPane.SWITCH;
	3705	+ CameraPane.SWITCH = false;
	3706	+
	3707	+ copy.ExtractBigData(versiontable);
	3708	+
	3709	+ copy.clear();
	3710	+
	3711	+ for (int i=0; i<obj.Size(); i++)
	3712	+ {
	3713	+ copy.add(obj.get(i));
	3714	+ }
	3715	+
	3716	+ copy.RestoreBigData(versiontable);
	3717	+
	3718	+ CameraPane.SWITCH = temp;
	3719	+
	3720	+ //assert(hashtable.isEmpty());
	3721	+
	3722	+ copy.Touch();
	3723	+
	3724	+ ResetModel();
	3725	+ copy.HardTouch(); // recompile?
	3726	+
	3727	+ cRadio ab;
	3728	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3729	+ {
	3730	+ ab = (cRadio)e.nextElement();
	3731	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3732	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3733	+ if (test != null)
	3734	+ {
	3735	+ test.editWindow = ab.object.editWindow;
	3736	+ ab.object = test;
	3737	+ }
	3738	+ }
	3739	+
	3740	+ refreshContents();
	3741	+ }
	3742	+
	3743	+ cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
	3746	+ cButton redoButton;
	3747	+
	3748	+ boolean muteSlider;
	3749	+
	3750	+ int VersionCount()
	3751	+ {
	3752	+ int count = 0;
	3753	+
	3754	+ for (int i = copy.versions.length; --i >= 0;)
	3755	+ {
	3756	+ if (copy.versions[i] != null)
	3757	+ count++;
	3758	+ }
	3759	+
	3760	+ return count;
	3761	+ }
	3762	+
	3763	+ void SetUndoStates()
	3764	+ {
	3765	+ cRadio tab = GetCurrentTab();
	3766	+
	3767	+ restoreButton.setEnabled(copy.versionindex != -1);
	3768	+ replaceButton.setEnabled(copy.versionindex != -1);
	3769	+
	3770	+ undoButton.setEnabled(copy.versionindex > 0);
	3771	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3772	+
	3773	+ muteSlider = true;
	3774	+ versionSlider.setMaximum(VersionCount() - 1);
	3775	+ versionSlider.setInteger(copy.versionindex);
	3776	+ muteSlider = false;
	3777	+ }
	3778	+
	3779	+ public boolean Undo()
	3780	+ {
	3781	+ // Option?
	3782	+ Replace();
	3783	+
	3784	+ System.err.println("Undo");
	3785	+
	3786	+ cRadio tab = GetCurrentTab();
	3787	+
	3788	+ if (copy.versionindex == 0)
	3789	+ {
	3790	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3791	+ return false;
	3792	+ }
	3793	+
	3794	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3795	+// {
	3796	+// if (Save(false))
	3797	+// tab.versionindex -= 1;
	3798	+// else
	3799	+// {
	3800	+// if (tab.versionindex <= 0)
	3801	+// return false;
	3802	+// else
	3803	+// tab.versionindex -= 1;
	3804	+// }
	3805	+// }
	3806	+
	3807	+ copy.versionindex -= 1;
	3808	+
	3809	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3810	+
	3811	+ return true;
	3812	+ }
	3813	+
	3814	+ public boolean Restore()
	3815	+ {
	3816	+ System.err.println("Restore");
	3817	+
	3818	+ cRadio tab = GetCurrentTab();
	3819	+
	3820	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3821	+ {
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
	3824	+ }
	3825	+
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
	3830	+
	3831	+ public boolean Replace()
	3832	+ {
	3833	+ System.err.println("Replace");
	3834	+
	3835	+ cRadio tab = GetCurrentTab();
	3836	+
	3837	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3838	+ {
	3839	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3840	+ return false;
	3841	+ }
	3842	+
	3843	+ copy.versions[copy.versionindex] = CompressCopy();
	3844	+
	3845	+ return true;
	3846	+ }
	3847	+
	3848	+ public void Redo()
	3849	+ {
	3850	+ // Option?
	3851	+ Replace();
	3852	+
	3853	+ cRadio tab = GetCurrentTab();
	3854	+
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
	3856	+ {
	3857	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3858	+ return;
	3859	+ }
	3860	+
	3861	+ copy.versionindex += 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
	3867	+ }
	3868	+
	3869	+ void ImportGFD()
	3870	+ {
	3871	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3872	+ browser.show();
	3873	+ String filename = browser.getFile();
	3874	+ if (filename != null && filename.length() > 0)
	3875	+ {
	3876	+ String fullname = browser.getDirectory() + filename;
	3877	+
	3878	+ //Object3D readobj =
	3879	+ objEditor.ReadGFD(fullname, objEditor);
	3880	+ //makeSomething(readobj);
	3881	+ }
	3882	+ }
	3883	+
	3884	+ void ImportVRMLX3D()
	3885	+ {
	3886	+ if (Grafreed.standAlone)
	3887	+ {
	3888	+ /**/
	3889	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3890	+ browser.show();
	3891	+ String filename = browser.getFile();
	3892	+ if (filename != null && filename.length() > 0)
	3893	+ {
	3894	+ String fullname = browser.getDirectory() + filename;
	3895	+ LoadVRMLX3D(fullname);
	3896	+ }
	3897	+ /**/
	3898	+ }
	3899	+ }
	3900	+
3242	3901	void ToggleAnimation()
3243	3902	{
3244	3903	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3913,8 @@
3254	3913
3255	3914	Globals.ANIMATION ^= true;
3256	3915
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3916	+ Grafreed.wav.cursor = 0;
	3917	+ Grafreed.wav.loop = 0;
3259	3918	}
3260	3919	} else
3261	3920	{
..	..	@@ -3276,7 +3935,6 @@
3276	3935	callee.refreshContents();
3277	3936	} else
3278	3937	{
3279		- new Exception().printStackTrace();
3280	3938	System.exit(0);
3281	3939	}
3282	3940	}
..	..	@@ -3357,7 +4015,7 @@
3357	4015	assert false;
3358	4016	}
3359	4017
3360		- void EditSelection()
	4018	+ void EditSelection(boolean newWindow)
3361	4019	{
3362	4020	}
3363	4021
..	..	@@ -3443,6 +4101,36 @@
3443	4101	{
3444	4102	//System.out.println("Propagate = " + propagate);
3445	4103	copy.UpdateMaterial(anchor, current, propagate);
	4104	+
	4105	+ if (copy.material != null)
	4106	+ {
	4107	+ cMaterial mat = copy.material;
	4108	+
	4109	+ colorField.SetToolTipValue((mat.color));
	4110	+ modulationField.SetToolTipValue((mat.modulation));
	4111	+ metalnessField.SetToolTipValue((mat.metalness));
	4112	+ diffuseField.SetToolTipValue((mat.diffuse));
	4113	+ specularField.SetToolTipValue((mat.specular));
	4114	+ shininessField.SetToolTipValue((mat.shininess));
	4115	+ shiftField.SetToolTipValue((mat.shift));
	4116	+ ambientField.SetToolTipValue((mat.ambient));
	4117	+ lightareaField.SetToolTipValue((mat.lightarea));
	4118	+ diffusenessField.SetToolTipValue((mat.factor));
	4119	+ velvetField.SetToolTipValue((mat.velvet));
	4120	+ sheenField.SetToolTipValue((mat.sheen));
	4121	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4122	+ backlitField.SetToolTipValue((mat.bump));
	4123	+ anisoField.SetToolTipValue((mat.aniso));
	4124	+ anisoVField.SetToolTipValue((mat.anisoV));
	4125	+ cameraField.SetToolTipValue((mat.cameralight));
	4126	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4127	+ shadowField.SetToolTipValue((mat.shadow));
	4128	+ textureField.SetToolTipValue((mat.texture));
	4129	+ opacityField.SetToolTipValue((mat.opacity));
	4130	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4131	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4132	+ }
	4133	+
3446	4134	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	4135	{
3448	4136	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,9 +4159,25 @@
3471	4159	//copy.Touch();
3472	4160	}
3473	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3474	4164	public void stateChanged(ChangeEvent e)
3475	4165	{
3476	4166	// assert(false);
	4167	+ if (e.getSource() == versionSlider)
	4168	+ {
	4169	+ if (muteSlider)
	4170	+ return;
	4171	+
	4172	+ int version = versionSlider.getInteger();
	4173	+
	4174	+ if (copy.versions[version] != null)
	4175	+ {
	4176	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4177	+ }
	4178	+
	4179	+ return;
	4180	+ }
3477	4181
3478	4182	if (freezematerial)
3479	4183	{
..	..	@@ -3558,7 +4262,7 @@
3558	4262	}
3559	4263
3560	4264	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4265	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	4266	}
3563	4267
3564	4268	void SnapObject()
..	..	@@ -3822,6 +4526,8 @@
3822	4526
3823	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4528	{
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4530	+ Save();
3825	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4533	// if (thing instanceof GenericJointDemo)
..	..	@@ -3908,6 +4614,12 @@
3908	4614	{
3909	4615	ResetModel();
3910	4616	Select(thing.GetTreePath(), true, false); // unselect... false);
	4617	+
	4618	+ if (thing.Size() == 0)
	4619	+ {
	4620	+ //EditSelection(false);
	4621	+ }
	4622	+
3911	4623	refreshContents();
3912	4624	}
3913	4625
..	..	@@ -4025,6 +4737,7 @@
4025	4737	}
4026	4738	}
4027	4739	}
	4740	+
4028	4741	LoadGFDThread loadGFDThread;
4029	4742
4030	4743	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4757,10 @@
4044	4757
4045	4758	try
4046	4759	{
	4760	+ // Try compressed version first.
4047	4761	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4762	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4763	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4764
4050	4765	readobj = (Object3D) p.readObject();
4051	4766	istream.close();
..	..	@@ -4053,7 +4768,20 @@
4053	4768	readobj.ResetDisplayList();
4054	4769	} catch (Exception e)
4055	4770	{
4056		- e.printStackTrace();
	4771	+ //e.printStackTrace();
	4772	+ try
	4773	+ {
	4774	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4775	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4776	+
	4777	+ readobj = (Object3D) p.readObject();
	4778	+ istream.close();
	4779	+
	4780	+ readobj.ResetDisplayList();
	4781	+ } catch (Exception e2)
	4782	+ {
	4783	+ e2.printStackTrace();
	4784	+ }
4057	4785	}
4058	4786	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4787	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4827,12 @@
4099	4827
4100	4828	void LoadIt(Object obj)
4101	4829	{
	4830	+ if (obj == null)
	4831	+ {
	4832	+ // Invalid file
	4833	+ return;
	4834	+ }
	4835	+
4102	4836	System.out.println("Loaded " + obj);
4103	4837	//new Exception().printStackTrace();
4104	4838	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4842,8 @@
4108	4842
4109	4843	if (readobj != null)
4110	4844	{
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4111	4847	try
4112	4848	{
4113	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4162,15 +4898,26 @@
4162	4898	c.addChild(csg);
4163	4899	}
4164	4900
	4901	+ copy.versions = readobj.versions;
	4902	+ copy.versionindex = readobj.versionindex;
	4903	+
	4904	+ if (copy.versions == null)
	4905	+ {
	4906	+ copy.versions = new byte[100][];
	4907	+ copy.versionindex = -1;
	4908	+ }
	4909	+
	4910	+ //? SetUndoStates();
	4911	+
4165	4912	ResetModel();
4166	4913	copy.HardTouch(); // recompile?
4167	4914	refreshContents();
4168	4915	}
4169	4916	}
4170	4917
4171		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4172	4919	{
4173		- if (GrafreeD.standAlone)
	4920	+ if (Grafreed.standAlone)
4174	4921	{
4175	4922	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4923	browser.show();
..	..	@@ -4257,11 +5004,13 @@
4257	5004	try
4258	5005	{
4259	5006	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5007	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5008	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	5009
4262	5010	p.writeObject(copy);
4263	5011	p.flush();
4264	5012
	5013	+ zstream.close();
4265	5014	ostream.close();
4266	5015
4267	5016	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,17 +5020,20 @@
4271	5020	{
4272	5021	}
4273	5022	}
	5023	+
4274	5024	String lastname;
4275	5025
4276	5026	void saveAs()
4277	5027	{
4278		- if (GrafreeD.standAlone)
	5028	+ if (Grafreed.standAlone)
4279	5029	{
4280	5030	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	5031	browser.setVisible(true);
4282	5032	String filename = browser.getFile();
4283	5033	if (filename != null && filename.length() > 0)
4284	5034	{
	5035	+ if (!filename.endsWith(".gfd"))
	5036	+ filename += ".gfd";
4285	5037	lastname = browser.getDirectory() + filename;
4286	5038	save();
4287	5039	}
..	..	@@ -4380,13 +5132,13 @@
4380	5132	try
4381	5133	{
4382	5134	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5135	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5136	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	5137
4386	5138	Object3D objectparent = obj.parent;
4387	5139	obj.parent = null;
4388	5140
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5141	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	5142
4391	5143	obj.parent = objectparent;
4392	5144
..	..	@@ -4398,8 +5150,8 @@
4398	5150	p.writeObject(object);
4399	5151	p.flush();
4400	5152
	5153	+ zstream.close();
4401	5154	ostream.close();
4402		- // zstream.close();
4403	5155
4404	5156	// group.selection.get(0).parent = parent;
4405	5157	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +5172,7 @@
4420	5172	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	5173	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	5174	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	5175	+ if (Grafreed.standAlone)
4424	5176	{
4425	5177	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	5178	browser.show();
..	..	@@ -4446,19 +5198,18 @@
4446	5198	Object3D client;
4447	5199	Object3D copy;
4448	5200	MenuBar menuBar;
4449		- Menu windowMenu;
4450		- MenuItem loadItem;
	5201	+ Menu fileMenu;
	5202	+ MenuItem newItem;
	5203	+ MenuItem openItem;
4451	5204	MenuItem saveItem;
4452	5205	MenuItem saveAsItem;
4453	5206	MenuItem exportAsItem;
4454	5207	MenuItem reexportItem;
4455	5208	MenuItem povItem;
4456	5209	MenuItem closeItem;
4457		- Menu cameraMenu;
	5210	+
4458	5211	CheckboxMenuItem zBufferItem;
4459	5212	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	5213	MenuItem stepItem;
4463	5214	CheckboxMenuItem toggleLiveItem;
4464	5215	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4472,22 +5223,36 @@
4472	5223	CheckboxMenuItem toggleSwitchItem;
4473	5224	CheckboxMenuItem toggleRootItem;
4474	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4475	5227	CheckboxMenuItem toggleHandleItem;
4476	5228	CheckboxMenuItem togglePaintItem;
4477	5229	JSplitPane mainPanel;
4478	5230	JScrollPane scrollpane;
	5231	+
4479	5232	JPanel toolbarPanel;
	5233	+
4480	5234	cGridBag treePanel;
	5235	+
4481	5236	JPanel radioPanel;
4482	5237	ButtonGroup buttonGroup;
4483		- cGridBag ctrlPanel;
	5238	+
	5239	+ cGridBag toolboxPanel;
4484	5240	cGridBag materialPanel;
	5241	+ cGridBag ctrlPanel;
	5242	+
4485	5243	JScrollPane infoPanel;
	5244	+
4486	5245	cGridBag optionsPanel;
	5246	+
4487	5247	JTabbedPane objectPanel;
	5248	+ boolean materialFlushed;
	5249	+ Object3D latestObject;
	5250	+
4488	5251	cGridBag XYZPanel;
	5252	+
4489	5253	JSplitPane gridPanel;
4490	5254	JSplitPane bigPanel;
	5255	+
4491	5256	cGridBag bigThree;
4492	5257	cGridBag scenePanel;
4493	5258	cGridBag centralPanel;
..	..	@@ -4602,8 +5367,13 @@
4602	5367	cNumberSlider fogField;
4603	5368	JLabel opacityPowerLabel;
4604	5369	cNumberSlider opacityPowerField;
4605		- JTree jTree;
	5370	+ cTree jTree;
4606	5371	//ObjectUI parent;
4607	5372
4608	5373	cNumberSlider normalpushField;
	5374	+
	5375	+ private MenuItem importGFDItem;
	5376	+ private MenuItem importVRMLX3DItem;
	5377	+ private MenuItem import3DSItem;
	5378	+ private MenuItem importOBJItem;
4609	5379	}