~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
..	..	@@ -37,6 +41,51 @@
37	41	JFrame frame;
38	42
39	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	+ }
40	89
41	90	// SCRIPT
42	91
..	..	@@ -147,7 +196,7 @@
147	196
148	197	objEditor.ctrlPanel.remove(namePanel);
149	198
150		- if (!GroupEditor.allparams)
	199	+ if (!allparams)
151	200	return;
152	201
153	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +220,7 @@
171	220
172	221	objEditor.ctrlPanel.remove(setupPanel);
173	222	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	224	objEditor.ctrlPanel.remove(pushPanel);
176	225	//objEditor.ctrlPanel.remove(fillPanel);
177	226
..	..	@@ -219,6 +268,12 @@
219	268	client = inClient;
220	269	copy = client;
221	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
222	277	// "this" is not called: SetupUI2(objEditor);
223	278	}
224	279
..	..	@@ -232,6 +287,12 @@
232	287	client = inClient;
233	288	copy = client;
234	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
235	296	SetupUI2(callee.GetEditor());
236	297	}
237	298
..	..	@@ -246,7 +307,7 @@
246	307	//localCopy.parent = null;
247	308
248	309	frame = new JFrame();
249		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
250	311	objEditor = this;
251	312	this.callee = callee;
252	313
..	..	@@ -264,6 +325,12 @@
264	325	copy = localCopy;
265	326	copy.editWindow = this;
266	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
267	334	SetupMenu();
268	335
269	336	//SetupName(objEditor); // new
..	..	@@ -277,12 +344,17 @@
277	344	return frame.action(event, obj);
278	345	}
279	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	+
280	352	void SetupMenu()
281	353	{
282	354	frame.setMenuBar(menuBar = new MenuBar());
283	355	menuBar.add(fileMenu = new Menu("File"));
284	356	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	358
287	359	//oe.menuBar.add(menu = new Menu("Include"));
288	360	Menu menu = new Menu("Import");
..	..	@@ -314,7 +386,7 @@
314	386	}
315	387
316	388	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
318	390	saveItem.addActionListener(this);
319	391	saveAsItem.addActionListener(this);
320	392	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +395,68 @@
323	395	closeItem.addActionListener(this);
324	396
325	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	+
326	424	toolbarPanel = new JPanel();
327	425	toolbarPanel.setName("Toolbar");
	426	+
328	427	treePanel = new cGridBag();
329	428	treePanel.setName("Tree");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
330	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- 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	+
332	442	materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
	444	+
334	445	/JTextPane/
335	446	infoarea = createTextPane();
336	447	doc = infoarea.getStyledDocument();
337	448
338	449	infoarea.setEditable(true);
339	450	SetText();
	451	+
340	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	453	// infoarea.setOpaque(false);
342	454	// //infoarea.setForeground(textcolor);
343	455	// TEXTAREA infoarea.setLineWrap(true);
344	456	// TEXTAREA infoarea.setWrapStyleWord(true);
345	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
348	460	//infoPanel.setLayout(new BorderLayout());
349	461	//infoPanel.add(createTextPane());
350	462
..	..	@@ -355,7 +467,14 @@
355	467	mainPanel.setDividerSize(9);
356	468	mainPanel.setDividerLocation(0.5); //1.0);
357	469	mainPanel.setResizeWeight(0.5);
358		-
	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	+
359	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	479	//mainPanel.setLayout(new GridBagLayout());
361	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +705,8 @@
586	705	}
587	706	}
588	707
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	710
592	711	Rectangle keeprect;
593	712	cRadio radio;
..	..	@@ -603,13 +722,24 @@
603	722
604	723	boolean maximized;
605	724
	725	+ cButton fullscreenLayout;
	726	+
606	727	void Minimize()
607	728	{
608	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
609	731	}
610	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={}
611	736	void Maximize()
612	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
613	743	if (maximized)
614	744	{
615	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +747,36 @@
617	747	else
618	748	{
619	749	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	755	}
625	756
626	757	maximized ^= true;
	758	+
	759	+ frame.validate();
627	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
628	765
629	766	void ToggleFullScreen()
630	767	{
631		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
632	773	{
633	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
634	780	//frame.setVisible(false);
635	781	// frame.removeNotify();
636	782	// frame.setUndecorated(false);
..	..	@@ -640,7 +786,7 @@
640	786	// X frame.getContentPane().remove(/"Center",/bigThree);
641	787	// X framePanel.add(bigThree);
642	788	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
644	790
645	791	//frame.setVisible(true);
646	792	radio.layout = keepButton;
..	..	@@ -655,7 +801,12 @@
655	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	802	// frame.getToolkit().getScreenSize().height);
657	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
658	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
659	810	// frame.removeNotify();
660	811	// frame.setUndecorated(true);
661	812	// frame.addNotify();
..	..	@@ -664,13 +815,34 @@
664	815	// X frame.getContentPane().add(/"Center",/bigThree);
665	816	framePanel.setDividerLocation(0);
666	817
667		- radio.layout = twoButton;
	818	+ radio.layout = fullscreenLayout;
668	819	radio.layout.doClick();
669	820	//frame.setVisible(true);
670	821	}
671		-
672		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
673	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	+ }
674	846
675	847	private JTextPane createTextPane()
676	848	{
..	..	@@ -810,7 +982,12 @@
810	982	JCheckBox speedupCB;
811	983	JCheckBox rewindCB;
812	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
813	989	JComboBox texresMenu;
	990	+
814	991	JButton resetButton;
815	992	JButton stepButton;
816	993	JButton stepAllButton;
..	..	@@ -819,10 +996,13 @@
819	996	JButton fasterButton;
820	997	JButton remarkButton;
821	998
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
822	1002	cGridBag namePanel;
823	1003	cGridBag setupPanel;
824	1004	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1005	+ cGridBag objectCommandsPanel;
826	1006	cGridBag pushPanel;
827	1007	cGridBag fillPanel;
828	1008
..	..	@@ -994,12 +1174,12 @@
994	1174	namePanel = new cGridBag();
995	1175
996	1176	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1178	oe.ctrlPanel.add(namePanel);
999	1179
1000	1180	oe.ctrlPanel.Return();
1001	1181
1002		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
1003	1183	return;
1004	1184
1005	1185	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1012,20 +1192,21 @@
1012	1192	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1193	hideCB.setToolTipText("Hide object");
1014	1194	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1195	+ markCB.setToolTipText("As animation target transform");
1016	1196
1017	1197	setupPanel2 = new cGridBag().setVertical(false);
1018	1198
1019	1199	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1200	rewindCB.setToolTipText("Rewind animation");
1021	1201
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1203	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1204
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
1025	1208	if (Globals.ADVANCED)
1026	1209	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1210	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1211	speedupCB.setToolTipText("Option motion capture");
1031	1212	}
..	..	@@ -1035,23 +1216,23 @@
1035	1216	oe.ctrlPanel.add(setupPanel2);
1036	1217	oe.ctrlPanel.Return();
1037	1218
1038		- commandsPanel = new cGridBag().setVertical(false);
	1219	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1220
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1221	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1222	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1223	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1224	stepButton.setToolTipText("Step one frame");
1044	1225	// resetAllButton = AddButton(oe, "Reset All");
1045	1226	// stepAllButton = AddButton(oe, "Step All");
1046	1227	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1228	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1229	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1230	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1231	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1232	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1233	remarkButton.setToolTipText("Set the current transform as the target");
1053	1234
1054		- oe.ctrlPanel.add(commandsPanel);
	1235	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1236	oe.ctrlPanel.Return();
1056	1237
1057	1238	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1299,6 +1480,7 @@
1299	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1302	1484
1303	1485	/*
1304	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1336,12 +1518,23 @@
1336	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1519	//tmp.setName("Edit");
1338	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1339	1522	// JPanel north = new JPanel(new BorderLayout());
1340	1523	// north.setName("Edit");
1341	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1525	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- 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"));
1345	1538
1346	1539	/*
1347	1540	aConstraints.gridx = 0;
..	..	@@ -1350,7 +1543,7 @@
1350	1543	aConstraints.gridy += 1;
1351	1544	aConstraints.gridwidth = 1;
1352	1545	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1546	+ */
1354	1547
1355	1548	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1549	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1555,12 @@
1362	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1556
1364	1557	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1558	+ scenePanel.preferredWidth = 5;
1366	1559
1367	1560	JTabbedPane tabbedPane = new JTabbedPane();
1368	1561	tabbedPane.add(scrollpane);
1369	1562
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1563	+ optionsPanel = new cGridBag().setVertical(false);
1373	1564
1374	1565	optionsPanel.setName("Options");
1375	1566
..	..	@@ -1377,6 +1568,8 @@
1377	1568
1378	1569	tabbedPane.add(optionsPanel);
1379	1570
	1571	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1572	+
1380	1573	scenePanel.add(tabbedPane);
1381	1574
1382	1575	/*
..	..	@@ -1440,7 +1633,7 @@
1440	1633	bigThree = new cGridBag();
1441	1634	bigThree.addComponent(scenePanel);
1442	1635	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1444	1637
1445	1638	// // SIDE EFFECT!!!
1446	1639	// aConstraints.gridx = 0;
..	..	@@ -1449,9 +1642,9 @@
1449	1642	// aConstraints.gridheight = 1;
1450	1643
1451	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1455	1648	//framePanel.setDividerSize(15);
1456	1649	//framePanel.setResizeWeight(0.15);
1457	1650	framePanel.setName("Frame");
..	..	@@ -1469,11 +1662,14 @@
1469	1662	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1663
1471	1664	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1665	+
1474	1666	cameraView.requestFocusInWindow();
1475	1667
1476	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1477	1673
1478	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1560,24 +1756,6 @@
1560	1756	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	1757	colorSection.add(texture);
1562	1758
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581	1759	panel.add(new JSeparator());
1582	1760
1583	1761	panel.add(colorSection);
..	..	@@ -1627,6 +1805,12 @@
1627	1805	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628	1806	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	1807	diffuseSection.add(fakedepth);
	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);
1630	1814
1631	1815	panel.add(new JSeparator());
1632	1816
..	..	@@ -1678,6 +1862,18 @@
1678	1862	// aConstraints.gridy += 1;
1679	1863	// aConstraints.gridwidth = 1;
1680	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	+
1681	1877
1682	1878	panel.add(new JSeparator());
1683	1879
..	..	@@ -1685,35 +1881,35 @@
1685	1881
1686	1882	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	1883
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	1885
1690	1886	cGridBag camera = new cGridBag();
1691	1887	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	1888	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	1889	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	1890	+ colorSection.add(camera);
1695	1891
1696	1892	cGridBag ambient = new cGridBag();
1697	1893	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	1894	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	1895	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	1896	+ colorSection.add(ambient);
1701	1897
1702	1898	cGridBag backlit = new cGridBag();
1703	1899	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	1900	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1901	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	1902	+ colorSection.add(backlit);
1707	1903
1708	1904	cGridBag opacity = new cGridBag();
1709	1905	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710	1906	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1907	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
	1908	+ colorSection.add(opacity);
1713	1909
1714		- panel.add(new JSeparator());
	1910	+ //panel.add(new JSeparator());
1715	1911
1716		- panel.add(globalSection);
	1912	+ //panel.add(globalSection);
1717	1913
1718	1914	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	1915
..	..	@@ -1820,8 +2016,9 @@
1820	2016	// 3D models
1821	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2018	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1825	2022	continue;
1826	2023	}
1827	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +2744,7 @@
2547	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	2746	}
	2747	+
2550	2748	//cJME.count++;
2551	2749	//cJME.count %= 12;
2552	2750	if (gc)
..	..	@@ -2730,6 +2928,7 @@
2730	2928	}
2731	2929	}
2732	2930	}
	2931	+
2733	2932	cFileSystemPane FSPane;
2734	2933
2735	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2783,11 +2982,14 @@
2783	2982	}
2784	2983	}
2785	2984	}
	2985	+
2786	2986	freezematerial = false;
2787	2987	}
2788	2988
2789	2989	void SetMaterial(Object3D object)
2790	2990	{
	2991	+ latestObject = object;
	2992	+
2791	2993	cMaterial mat = object.material;
2792	2994
2793	2995	if (mat == null)
..	..	@@ -2899,12 +3101,17 @@
2899	3101	// }
2900	3102
2901	3103	/**/
2902		- if (deselect)
	3104	+ if (deselect \|\| child == null)
2903	3105	{
2904	3106	//group.deselectAll();
2905	3107	//freeze = true;
2906	3108	GetTree().clearSelection();
2907	3109	//freeze = false;
	3110	+
	3111	+ if (child == null)
	3112	+ {
	3113	+ return;
	3114	+ }
2908	3115	}
2909	3116
2910	3117	//group.addSelectee(child);
..	..	@@ -2973,7 +3180,7 @@
2973	3180	cameraView.ToggleDL();
2974	3181	cameraView.repaint();
2975	3182	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3183	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3184	{
2978	3185	cameraView.ToggleTexture();
2979	3186	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3219,7 @@
3012	3219	frame.validate();
3013	3220
3014	3221	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3222	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3223	{
3017	3224	cameraView.ToggleSwitch();
3018	3225	cameraView.repaint();
..	..	@@ -3228,9 +3435,9 @@
3228	3435	{
3229	3436	Close();
3230	3437	//return true;
3231		- } else if (source == loadItem)
	3438	+ } else if (source == openItem)
3232	3439	{
3233		- load();
	3440	+ Open();
3234	3441	//return true;
3235	3442	} else if (source == newItem)
3236	3443	{
..	..	@@ -3255,6 +3462,10 @@
3255	3462	{
3256	3463	generatePOV();
3257	3464	//return true;
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
3258	3469	} else if (source == zBufferItem)
3259	3470	{
3260	3471	try
..	..	@@ -3306,8 +3517,8 @@
3306	3517	try
3307	3518	{
3308	3519	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	3522
3312	3523	Object3D parent = o.parent;
3313	3524	o.parent = null;
..	..	@@ -3318,10 +3529,14 @@
3318	3529
3319	3530	out.flush();
3320	3531
3321		- zstream.close();
	3532	+ baos //zstream
	3533	+ .close();
3322	3534	out.close();
3323	3535
3324		- return baos.toByteArray();
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
3325	3540	} catch (Exception e)
3326	3541	{
3327	3542	System.err.println(e);
..	..	@@ -3331,13 +3546,16 @@
3331	3546
3332	3547	static public Object Uncompress(byte[] bytes)
3333	3548	{
3334		- System.out.println("#bytes = " + bytes.length);
	3549	+ System.out.println("restore #bytes = " + bytes.length);
3335	3550	try
3336	3551	{
3337	3552	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	3555	Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
3341	3559	in.close();
3342	3560
3343	3561	return obj;
..	..	@@ -3392,37 +3610,77 @@
3392	3610	return null;
3393	3611	}
3394	3612
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	3613
3397	3614	public void Save()
3398	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	+
3399	3642	cRadio tab = GetCurrentTab();
3400	3643
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	3644	+ byte[] compress = CompressCopy();
3403	3645
3404		- copy.ExtractBigData(hashtable);
	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	+ }
3405	3653
3406	3654	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3655	+ if (!thesame)
3416	3656	{
3417		- tab.graphs[i] = null;
	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++;
3418	3664	}
3419	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	+
3420	3678	// test save
3421	3679	if (false)
3422	3680	{
3423	3681	try
3424	3682	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	3684	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	3685
3428	3686	p.writeObject(copy);
..	..	@@ -3435,14 +3693,18 @@
3435	3693	e.printStackTrace();
3436	3694	}
3437	3695	}
	3696	+
	3697	+ return !thesame;
3438	3698	}
3439	3699
3440	3700	void CopyChanged(Object3D obj)
3441	3701	{
	3702	+ SetUndoStates();
	3703	+
3442	3704	boolean temp = CameraPane.SWITCH;
3443	3705	CameraPane.SWITCH = false;
3444	3706
3445		- copy.ExtractBigData(hashtable);
	3707	+ copy.ExtractBigData(versiontable);
3446	3708
3447	3709	copy.clear();
3448	3710
..	..	@@ -3451,7 +3713,7 @@
3451	3713	copy.add(obj.get(i));
3452	3714	}
3453	3715
3454		- copy.RestoreBigData(hashtable);
	3716	+ copy.RestoreBigData(versiontable);
3455	3717
3456	3718	CameraPane.SWITCH = temp;
3457	3719
..	..	@@ -3478,40 +3740,130 @@
3478	3740	refreshContents();
3479	3741	}
3480	3742
3481		- public void Undo()
	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()
3482	3764	{
3483	3765	cRadio tab = GetCurrentTab();
3484	3766
3485		- if (tab.undoindex == 0)
	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)
3486	3789	{
3487	3790	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	3791	+ return false;
3489	3792	}
3490	3793
3491		- if (tab.graphs[tab.undoindex] == null)
	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)
3492	3821	{
3493		- Save();
3494		- tab.undoindex -= 1;
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
3495	3824	}
3496	3825
3497		- tab.undoindex -= 1;
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
3498	3830
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	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;
3500	3846	}
3501	3847
3502	3848	public void Redo()
3503	3849	{
	3850	+ // Option?
	3851	+ Replace();
	3852	+
3504	3853	cRadio tab = GetCurrentTab();
3505	3854
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
3507	3856	{
3508	3857	java.awt.Toolkit.getDefaultToolkit().beep();
3509	3858	return;
3510	3859	}
3511	3860
3512		- tab.undoindex += 1;
	3861	+ copy.versionindex += 1;
3513	3862
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
3515	3867	}
3516	3868
3517	3869	void ImportGFD()
..	..	@@ -3663,7 +4015,7 @@
3663	4015	assert false;
3664	4016	}
3665	4017
3666		- void EditSelection()
	4018	+ void EditSelection(boolean newWindow)
3667	4019	{
3668	4020	}
3669	4021
..	..	@@ -3807,9 +4159,25 @@
3807	4159	//copy.Touch();
3808	4160	}
3809	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3810	4164	public void stateChanged(ChangeEvent e)
3811	4165	{
3812	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	+ }
3813	4181
3814	4182	if (freezematerial)
3815	4183	{
..	..	@@ -4158,7 +4526,8 @@
4158	4526
4159	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	4528	{
4161		- Save();
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4530	+ Save();
4162	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	4533	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +4614,12 @@
4245	4614	{
4246	4615	ResetModel();
4247	4616	Select(thing.GetTreePath(), true, false); // unselect... false);
	4617	+
	4618	+ if (thing.Size() == 0)
	4619	+ {
	4620	+ //EditSelection(false);
	4621	+ }
	4622	+
4248	4623	refreshContents();
4249	4624	}
4250	4625
..	..	@@ -4467,7 +4842,8 @@
4467	4842
4468	4843	if (readobj != null)
4469	4844	{
4470		- Save();
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4471	4847	try
4472	4848	{
4473	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4522,13 +4898,24 @@
4522	4898	c.addChild(csg);
4523	4899	}
4524	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	+
4525	4912	ResetModel();
4526	4913	copy.HardTouch(); // recompile?
4527	4914	refreshContents();
4528	4915	}
4529	4916	}
4530	4917
4531		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4532	4919	{
4533	4920	if (Grafreed.standAlone)
4534	4921	{
..	..	@@ -4645,6 +5032,8 @@
4645	5032	String filename = browser.getFile();
4646	5033	if (filename != null && filename.length() > 0)
4647	5034	{
	5035	+ if (!filename.endsWith(".gfd"))
	5036	+ filename += ".gfd";
4648	5037	lastname = browser.getDirectory() + filename;
4649	5038	save();
4650	5039	}
..	..	@@ -4811,7 +5200,7 @@
4811	5200	MenuBar menuBar;
4812	5201	Menu fileMenu;
4813	5202	MenuItem newItem;
4814		- MenuItem loadItem;
	5203	+ MenuItem openItem;
4815	5204	MenuItem saveItem;
4816	5205	MenuItem saveAsItem;
4817	5206	MenuItem exportAsItem;
..	..	@@ -4834,22 +5223,36 @@
4834	5223	CheckboxMenuItem toggleSwitchItem;
4835	5224	CheckboxMenuItem toggleRootItem;
4836	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4837	5227	CheckboxMenuItem toggleHandleItem;
4838	5228	CheckboxMenuItem togglePaintItem;
4839	5229	JSplitPane mainPanel;
4840	5230	JScrollPane scrollpane;
	5231	+
4841	5232	JPanel toolbarPanel;
	5233	+
4842	5234	cGridBag treePanel;
	5235	+
4843	5236	JPanel radioPanel;
4844	5237	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5238	+
	5239	+ cGridBag toolboxPanel;
4846	5240	cGridBag materialPanel;
	5241	+ cGridBag ctrlPanel;
	5242	+
4847	5243	JScrollPane infoPanel;
	5244	+
4848	5245	cGridBag optionsPanel;
	5246	+
4849	5247	JTabbedPane objectPanel;
	5248	+ boolean materialFlushed;
	5249	+ Object3D latestObject;
	5250	+
4850	5251	cGridBag XYZPanel;
	5252	+
4851	5253	JSplitPane gridPanel;
4852	5254	JSplitPane bigPanel;
	5255	+
4853	5256	cGridBag bigThree;
4854	5257	cGridBag scenePanel;
4855	5258	cGridBag centralPanel;
..	..	@@ -4964,7 +5367,7 @@
4964	5367	cNumberSlider fogField;
4965	5368	JLabel opacityPowerLabel;
4966	5369	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	5370	+ cTree jTree;
4968	5371	//ObjectUI parent;
4969	5372
4970	5373	cNumberSlider normalpushField;