~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,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -145,7 +224,7 @@
145	224
146	225	objEditor.ctrlPanel.remove(namePanel);
147	226
148		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
149	228	return;
150	229
151	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -169,7 +248,7 @@
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171	250	objEditor.ctrlPanel.remove(setupPanel2);
172		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
173	252	objEditor.ctrlPanel.remove(pushPanel);
174	253	//objEditor.ctrlPanel.remove(fillPanel);
175	254
..	..	@@ -217,6 +296,12 @@
217	296	client = inClient;
218	297	copy = client;
219	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new byte[100][];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
220	305	// "this" is not called: SetupUI2(objEditor);
221	306	}
222	307
..	..	@@ -230,6 +315,12 @@
230	315	client = inClient;
231	316	copy = client;
232	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new byte[100][];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
233	324	SetupUI2(callee.GetEditor());
234	325	}
235	326
..	..	@@ -244,6 +335,7 @@
244	335	//localCopy.parent = null;
245	336
246	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
247	339	objEditor = this;
248	340	this.callee = callee;
249	341
..	..	@@ -261,6 +353,12 @@
261	353	copy = localCopy;
262	354	copy.editWindow = this;
263	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
264	362	SetupMenu();
265	363
266	364	//SetupName(objEditor); // new
..	..	@@ -274,12 +372,17 @@
274	372	return frame.action(event, obj);
275	373	}
276	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
277	380	void SetupMenu()
278	381	{
279	382	frame.setMenuBar(menuBar = new MenuBar());
280	383	menuBar.add(fileMenu = new Menu("File"));
281	384	fileMenu.add(newItem = new MenuItem("New"));
282		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
283	386
284	387	//oe.menuBar.add(menu = new Menu("Include"));
285	388	Menu menu = new Menu("Import");
..	..	@@ -311,7 +414,7 @@
311	414	}
312	415
313	416	newItem.addActionListener(this);
314		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
315	418	saveItem.addActionListener(this);
316	419	saveAsItem.addActionListener(this);
317	420	exportAsItem.addActionListener(this);
..	..	@@ -320,28 +423,68 @@
320	423	closeItem.addActionListener(this);
321	424
322	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
323	452	toolbarPanel = new JPanel();
324	453	toolbarPanel.setName("Toolbar");
	454	+
325	455	treePanel = new cGridBag();
326	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
327	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328		- ctrlPanel.setName("Edit");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
329	470	materialPanel = new cGridBag().setVertical(true);
330		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
	472	+
331	473	/JTextPane/
332	474	infoarea = createTextPane();
333	475	doc = infoarea.getStyledDocument();
334	476
335	477	infoarea.setEditable(true);
336	478	SetText();
	479	+
337	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
338	481	// infoarea.setOpaque(false);
339	482	// //infoarea.setForeground(textcolor);
340	483	// TEXTAREA infoarea.setLineWrap(true);
341	484	// TEXTAREA infoarea.setWrapStyleWord(true);
342	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
343		- infoPanel.setPreferredSize(new Dimension(50, 200));
344		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
345	488	//infoPanel.setLayout(new BorderLayout());
346	489	//infoPanel.add(createTextPane());
347	490
..	..	@@ -352,7 +495,14 @@
352	495	mainPanel.setDividerSize(9);
353	496	mainPanel.setDividerLocation(0.5); //1.0);
354	497	mainPanel.setResizeWeight(0.5);
355		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
356	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357	507	//mainPanel.setLayout(new GridBagLayout());
358	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -583,21 +733,144 @@
583	733	}
584	734	}
585	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
586	794	void ToggleFullScreen()
587	795	{
588		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
589	801	{
590		- frame.getContentPane().remove(/"Center",/bigThree);
591		- framePanel.add(bigThree);
592		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
593	825	} else
594	826	{
595		- frame.getContentPane().remove(/"Center",/framePanel);
596		- framePanel.remove(bigThree);
597		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
598	849	}
599		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
600	851	}
	852	+
	853	+ private byte[] CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ byte[] versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ byte[] compress = Compress(copy);
	865	+
	866	+ copy.versions = versions;
	867	+
	868	+ copy.RestoreBigData(versiontable);
	869	+
	870	+ CameraPane.SWITCH = temp;
	871	+
	872	+ return compress;
	873	+ }
601	874
602	875	private JTextPane createTextPane()
603	876	{
..	..	@@ -729,7 +1002,7 @@
729	1002	// NumberSlider vDivsField;
730	1003	// JCheckBox endcaps;
731	1004	JCheckBox liveCB;
732		- JCheckBox selectCB;
	1005	+ JCheckBox selectableCB;
733	1006	JCheckBox hideCB;
734	1007	JCheckBox link2masterCB;
735	1008	JCheckBox markCB;
..	..	@@ -737,7 +1010,12 @@
737	1010	JCheckBox speedupCB;
738	1011	JCheckBox rewindCB;
739	1012	JCheckBox flipVCB;
	1013	+
	1014	+ cCheckBox toggleTextureCB;
	1015	+ cCheckBox toggleSwitchCB;
	1016	+
740	1017	JComboBox texresMenu;
	1018	+
741	1019	JButton resetButton;
742	1020	JButton stepButton;
743	1021	JButton stepAllButton;
..	..	@@ -746,10 +1024,13 @@
746	1024	JButton fasterButton;
747	1025	JButton remarkButton;
748	1026
	1027	+ cGridBag editPanel;
	1028	+ cGridBag editCommandsPanel;
	1029	+
749	1030	cGridBag namePanel;
750	1031	cGridBag setupPanel;
751	1032	cGridBag setupPanel2;
752		- cGridBag commandsPanel;
	1033	+ cGridBag objectCommandsPanel;
753	1034	cGridBag pushPanel;
754	1035	cGridBag fillPanel;
755	1036
..	..	@@ -921,38 +1202,42 @@
921	1202	namePanel = new cGridBag();
922	1203
923	1204	nameField = AddText(namePanel, copy.GetName());
924		- namePanel.add(nameField);
	1205	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
925	1206	oe.ctrlPanel.add(namePanel);
926	1207
927	1208	oe.ctrlPanel.Return();
928	1209
929		- if (!GroupEditor.allparams)
	1210	+ if (!allparams)
930	1211	return;
931	1212
932	1213	setupPanel = new cGridBag().setVertical(false);
933	1214
934	1215	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
935	1216	liveCB.setToolTipText("Animate object");
936		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937		- selectCB.setToolTipText("Make object selectable");
	1217	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1218	+ selectableCB.setToolTipText("Make object selectable");
938	1219	// Return();
	1220	+
939	1221	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940	1222	hideCB.setToolTipText("Hide object");
941	1223	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942		- markCB.setToolTipText("Set the animation target transform");
	1224	+ markCB.setToolTipText("As animation target transform");
	1225	+
	1226	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
943	1227
944	1228	setupPanel2 = new cGridBag().setVertical(false);
945	1229
946	1230	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947	1231	rewindCB.setToolTipText("Rewind animation");
948	1232
949		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950		- randomCB.setToolTipText("Rewind or Go back and forth randomly");
	1233	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1234	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
951	1235
	1236	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1237	+ link2masterCB.setToolTipText("Attach to support");
	1238	+
952	1239	if (Globals.ADVANCED)
953	1240	{
954		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955		- link2masterCB.setToolTipText("Attach to support");
956	1241	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957	1242	speedupCB.setToolTipText("Option motion capture");
958	1243	}
..	..	@@ -962,23 +1247,23 @@
962	1247	oe.ctrlPanel.add(setupPanel2);
963	1248	oe.ctrlPanel.Return();
964	1249
965		- commandsPanel = new cGridBag().setVertical(false);
	1250	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1251
967		- resetButton = AddButton(commandsPanel, "Reset");
	1252	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1253	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1254	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1255	stepButton.setToolTipText("Step one frame");
971	1256	// resetAllButton = AddButton(oe, "Reset All");
972	1257	// stepAllButton = AddButton(oe, "Step All");
973	1258	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1259	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1260	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1261	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1262	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1263	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1264	remarkButton.setToolTipText("Set the current transform as the target");
980	1265
981		- oe.ctrlPanel.add(commandsPanel);
	1266	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1267	oe.ctrlPanel.Return();
983	1268
984	1269	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1469,11 @@
1184	1469	//worldPanel.setName("World");
1185	1470	centralPanel = new cGridBag();
1186	1471	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1472	+
	1473	+ if (Globals.ADVANCED)
	1474	+ {
	1475	+ timelinePanel = new JPanel(new BorderLayout());
	1476	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189	1477
1190	1478	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1479	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1482,10 @@
1194	1482	// cameraPanel.setDividerSize(9);
1195	1483	cameraPanel.setResizeWeight(1.0);
1196	1484
	1485	+ }
	1486	+
1197	1487	centralPanel.add(cameraView);
	1488	+ centralPanel.setFocusable(true);
1198	1489	//frame.setJMenuBar(timelineMenubar);
1199	1490	//centralPanel.add(timelinePanel);
1200	1491
..	..	@@ -1220,6 +1511,7 @@
1220	1511	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1221	1512	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1222	1513	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1514	+ //XYZPanel.setName("XYZ");
1223	1515
1224	1516	/*
1225	1517	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1257,12 +1549,29 @@
1257	1549	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1258	1550	//tmp.setName("Edit");
1259	1551	objectPanel.add(materialPanel);
	1552	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1553	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1554	+
1260	1555	// JPanel north = new JPanel(new BorderLayout());
1261	1556	// north.setName("Edit");
1262	1557	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1558	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
1265		- objectPanel.add(infoPanel);
	1559	+ objectPanel.add(editPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1562	+
	1563	+ //if (Globals.ADVANCED)
	1564	+ objectPanel.add(infoPanel);
	1565	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1566	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1567	+
	1568	+ objectPanel.add(XYZPanel);
	1569	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1570	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1571	+
	1572	+ objectPanel.add(toolboxPanel);
	1573	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1574	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1266	1575
1267	1576	/*
1268	1577	aConstraints.gridx = 0;
..	..	@@ -1271,7 +1580,7 @@
1271	1580	aConstraints.gridy += 1;
1272	1581	aConstraints.gridwidth = 1;
1273	1582	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1583	+ */
1275	1584
1276	1585	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1586	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1283,14 +1592,12 @@
1283	1592	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1593
1285	1594	/JTabbedPane/ scenePanel = new cGridBag();
1286		- scenePanel.preferredWidth = 6;
	1595	+ scenePanel.preferredWidth = 5;
1287	1596
1288	1597	JTabbedPane tabbedPane = new JTabbedPane();
1289	1598	tabbedPane.add(scrollpane);
1290	1599
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1600	+ optionsPanel = new cGridBag().setVertical(false);
1294	1601
1295	1602	optionsPanel.setName("Options");
1296	1603
..	..	@@ -1298,6 +1605,8 @@
1298	1605
1299	1606	tabbedPane.add(optionsPanel);
1300	1607
	1608	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1609	+
1301	1610	scenePanel.add(tabbedPane);
1302	1611
1303	1612	/*
..	..	@@ -1361,7 +1670,7 @@
1361	1670	bigThree = new cGridBag();
1362	1671	bigThree.addComponent(scenePanel);
1363	1672	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1673	+ //bigThree.addComponent(XYZPanel);
1365	1674
1366	1675	// // SIDE EFFECT!!!
1367	1676	// aConstraints.gridx = 0;
..	..	@@ -1370,9 +1679,9 @@
1370	1679	// aConstraints.gridheight = 1;
1371	1680
1372	1681	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1682	+ framePanel.setContinuousLayout(false);
	1683	+ framePanel.setOneTouchExpandable(false);
	1684	+ //.setDividerLocation(0.8);
1376	1685	//framePanel.setDividerSize(15);
1377	1686	//framePanel.setResizeWeight(0.15);
1378	1687	framePanel.setName("Frame");
..	..	@@ -1390,14 +1699,18 @@
1390	1699	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1700
1392	1701	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1702	+
	1703	+ cameraView.requestFocusInWindow();
	1704	+
1395	1705	gridPanel.setDividerLocation(1.0);
	1706	+
	1707	+ frame.validate();
	1708	+
	1709	+ frame.setVisible(true);
1396	1710
1397	1711	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1712	frame.addWindowListener(new WindowAdapter()
1399	1713	{
1400		-
1401	1714	public void windowClosing(WindowEvent e)
1402	1715	{
1403	1716	Close();
..	..	@@ -1459,45 +1772,48 @@
1459	1772	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1460	1773
1461	1774	cGridBag colorSection = new cGridBag().setVertical(true);
	1775	+
	1776	+ cGridBag huepanel = new cGridBag();
	1777	+ cGridBag huelabel = new cGridBag();
	1778	+ huelabel.add(GetLabel("icons/hue.png", false));
	1779	+ huelabel.preferredWidth = 20;
	1780	+ huepanel.add(new cGridBag()); // Label
	1781	+ huepanel.add(huelabel); // Field/slider
	1782	+
	1783	+ huepanel.preferredHeight = 7;
	1784	+
	1785	+ colorSection.add(huepanel);
1462	1786
1463	1787	cGridBag color = new cGridBag();
1464		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1465		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1788	+
	1789	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1790	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1792	+
1467	1793	//colorField.preferredWidth = 200;
1468	1794	colorSection.add(color);
1469	1795
1470	1796	cGridBag modulation = new cGridBag();
1471	1797	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1472	1798	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1799	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1474	1800	colorSection.add(modulation);
1475	1801
	1802	+ cGridBag opacity = new cGridBag();
	1803	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1804	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1805	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1806	+ colorSection.add(opacity);
	1807	+
	1808	+ colorSection.add(GetSeparator());
	1809	+
1476	1810	cGridBag texture = new cGridBag();
1477	1811	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1478	1812	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479	1813	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	1814	colorSection.add(texture);
1481	1815
1482		- cGridBag anisoU = new cGridBag();
1483		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1484		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoU);
1487		-
1488		- cGridBag anisoV = new cGridBag();
1489		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1490		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492		- colorSection.add(anisoV);
1493		-
1494		- cGridBag shadowbias = new cGridBag();
1495		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1496		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1498		- colorSection.add(shadowbias);
1499		-
1500		- panel.add(new JSeparator());
	1816	+ panel.add(GetSeparator());
1501	1817
1502	1818	panel.add(colorSection);
1503	1819
..	..	@@ -1547,7 +1863,13 @@
1547	1863	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	1864	diffuseSection.add(fakedepth);
1549	1865
1550		- panel.add(new JSeparator());
	1866	+ cGridBag shadowbias = new cGridBag();
	1867	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1868	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1870	+ diffuseSection.add(shadowbias);
	1871	+
	1872	+ panel.add(GetSeparator());
1551	1873
1552	1874	panel.add(diffuseSection);
1553	1875
..	..	@@ -1597,42 +1919,48 @@
1597	1919	// aConstraints.gridy += 1;
1598	1920	// aConstraints.gridwidth = 1;
1599	1921
	1922	+ cGridBag anisoU = new cGridBag();
	1923	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1924	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1926	+ specularSection.add(anisoU);
1600	1927
1601		- panel.add(new JSeparator());
	1928	+ cGridBag anisoV = new cGridBag();
	1929	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1930	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1932	+ specularSection.add(anisoV);
	1933	+
	1934	+
	1935	+ panel.add(GetSeparator());
1602	1936
1603	1937	panel.add(specularSection);
1604	1938
1605	1939	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	1940
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	1941	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1942
1609	1943	cGridBag camera = new cGridBag();
1610	1944	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1945	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1946	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1947	+ colorSection.add(camera);
1614	1948
1615	1949	cGridBag ambient = new cGridBag();
1616	1950	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1951	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1952	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1953	+ colorSection.add(ambient);
1620	1954
1621	1955	cGridBag backlit = new cGridBag();
1622	1956	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1957	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1958	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1959	+ colorSection.add(backlit);
1626	1960
1627		- cGridBag opacity = new cGridBag();
1628		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
1632		-
1633		- panel.add(new JSeparator());
	1961	+ //panel.add(new JSeparator());
1634	1962
1635		- panel.add(globalSection);
	1963	+ //panel.add(globalSection);
1636	1964
1637	1965	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	1966
..	..	@@ -1674,7 +2002,7 @@
1674	2002	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1675	2003	textureSection.add(opacityPower);
1676	2004
1677		- panel.add(new JSeparator());
	2005	+ panel.add(GetSeparator());
1678	2006
1679	2007	panel.add(textureSection);
1680	2008
..	..	@@ -1739,8 +2067,9 @@
1739	2067	// 3D models
1740	2068	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1741	2069	{
1742		- lastConverter = new com.jmex.model.converters.MaxToJme();
1743		- LoadFile(filename, lastConverter);
	2070	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2071	+ //LoadFile(filename, lastConverter);
	2072	+ LoadObjFile(filename); // New 3ds loader
1744	2073	continue;
1745	2074	}
1746	2075	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2466,6 +2795,7 @@
2466	2795	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2467	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2468	2797	}
	2798	+
2469	2799	//cJME.count++;
2470	2800	//cJME.count %= 12;
2471	2801	if (gc)
..	..	@@ -2649,6 +2979,7 @@
2649	2979	}
2650	2980	}
2651	2981	}
	2982	+
2652	2983	cFileSystemPane FSPane;
2653	2984
2654	2985	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2702,11 +3033,14 @@
2702	3033	}
2703	3034	}
2704	3035	}
	3036	+
2705	3037	freezematerial = false;
2706	3038	}
2707	3039
2708	3040	void SetMaterial(Object3D object)
2709	3041	{
	3042	+ latestObject = object;
	3043	+
2710	3044	cMaterial mat = object.material;
2711	3045
2712	3046	if (mat == null)
..	..	@@ -2818,12 +3152,17 @@
2818	3152	// }
2819	3153
2820	3154	/**/
2821		- if (deselect)
	3155	+ if (deselect \|\| child == null)
2822	3156	{
2823	3157	//group.deselectAll();
2824	3158	//freeze = true;
2825	3159	GetTree().clearSelection();
2826	3160	//freeze = false;
	3161	+
	3162	+ if (child == null)
	3163	+ {
	3164	+ return;
	3165	+ }
2827	3166	}
2828	3167
2829	3168	//group.addSelectee(child);
..	..	@@ -2892,7 +3231,7 @@
2892	3231	cameraView.ToggleDL();
2893	3232	cameraView.repaint();
2894	3233	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3234	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3235	{
2897	3236	cameraView.ToggleTexture();
2898	3237	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3270,7 @@
2931	3270	frame.validate();
2932	3271
2933	3272	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3273	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3274	{
2936	3275	cameraView.ToggleSwitch();
2937	3276	cameraView.repaint();
..	..	@@ -2962,7 +3301,7 @@
2962	3301	{
2963	3302	copy.live ^= true;
2964	3303	return;
2965		- } else if (event.getSource() == selectCB)
	3304	+ } else if (event.getSource() == selectableCB)
2966	3305	{
2967	3306	copy.dontselect ^= true;
2968	3307	return;
..	..	@@ -3147,9 +3486,9 @@
3147	3486	{
3148	3487	Close();
3149	3488	//return true;
3150		- } else if (source == loadItem)
	3489	+ } else if (source == openItem)
3151	3490	{
3152		- load();
	3491	+ Open();
3153	3492	//return true;
3154	3493	} else if (source == newItem)
3155	3494	{
..	..	@@ -3174,6 +3513,10 @@
3174	3513	{
3175	3514	generatePOV();
3176	3515	//return true;
	3516	+ } else if (event.getSource() == archiveItem)
	3517	+ {
	3518	+ cTools.Archive(frame);
	3519	+ return;
3177	3520	} else if (source == zBufferItem)
3178	3521	{
3179	3522	try
..	..	@@ -3225,8 +3568,8 @@
3225	3568	try
3226	3569	{
3227	3570	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3571	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3572	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3230	3573
3231	3574	Object3D parent = o.parent;
3232	3575	o.parent = null;
..	..	@@ -3237,10 +3580,14 @@
3237	3580
3238	3581	out.flush();
3239	3582
3240		- zstream.close();
	3583	+ baos //zstream
	3584	+ .close();
3241	3585	out.close();
3242	3586
3243		- return baos.toByteArray();
	3587	+ byte[] bytes = baos.toByteArray();
	3588	+
	3589	+ System.out.println("save #bytes = " + bytes.length);
	3590	+ return bytes;
3244	3591	} catch (Exception e)
3245	3592	{
3246	3593	System.err.println(e);
..	..	@@ -3250,13 +3597,16 @@
3250	3597
3251	3598	static public Object Uncompress(byte[] bytes)
3252	3599	{
3253		- System.out.println("#bytes = " + bytes.length);
	3600	+ System.out.println("restore #bytes = " + bytes.length);
3254	3601	try
3255	3602	{
3256	3603	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258		- ObjectInputStream in = new ObjectInputStream(istream);
	3604	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3605	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3259	3606	Object obj = in.readObject();
	3607	+
	3608	+ bais //istream
	3609	+ .close();
3260	3610	in.close();
3261	3611
3262	3612	return obj;
..	..	@@ -3311,37 +3661,77 @@
3311	3661	return null;
3312	3662	}
3313	3663
3314		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315	3664
3316	3665	public void Save()
3317	3666	{
	3667	+ //Save(true);
	3668	+ Replace();
	3669	+ }
	3670	+
	3671	+ private boolean Equal(byte[] compress, byte[] name)
	3672	+ {
	3673	+ if (compress.length != name.length)
	3674	+ {
	3675	+ return false;
	3676	+ }
	3677	+
	3678	+ for (int i=compress.length; --i>=0;)
	3679	+ {
	3680	+ if (compress[i] != name[i])
	3681	+ return false;
	3682	+ }
	3683	+
	3684	+ return true;
	3685	+ }
	3686	+
	3687	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3688	+
	3689	+ public boolean Save(boolean user)
	3690	+ {
	3691	+ System.err.println("Save");
	3692	+
3318	3693	cRadio tab = GetCurrentTab();
3319	3694
3320		- boolean temp = CameraPane.SWITCH;
3321		- CameraPane.SWITCH = false;
	3695	+ byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
3322	3696
3323		- copy.ExtractBigData(hashtable);
	3697	+ boolean thesame = false;
	3698	+
	3699	+ // Quick heuristic using length. Works only when stream is compressed.
	3700	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3701	+ {
	3702	+ thesame = true;
	3703	+ }
3324	3704
3325	3705	//EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
3327		-
3328		- copy.RestoreBigData(hashtable);
3329		-
3330		- CameraPane.SWITCH = temp;
3331		-
3332		- //assert(hashtable.isEmpty());
3333		-
3334		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3706	+ if (!thesame)
3335	3707	{
3336		- tab.graphs[i] = null;
	3708	+ //tab.user[tab.versionindex] = user;
	3709	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3710	+
	3711	+ copy.versions[++copy.versionindex] = compress;
	3712	+
	3713	+ // if (increment)
	3714	+ // tab.versionindex++;
3337	3715	}
3338	3716
	3717	+ //copy.RestoreBigData(versiontable);
	3718	+
	3719	+ //assert(hashtable.isEmpty());
	3720	+
	3721	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3722	+ {
	3723	+ //tab.user[i] = false;
	3724	+ copy.versions[i] = null;
	3725	+ }
	3726	+
	3727	+ SetUndoStates();
	3728	+
3339	3729	// test save
3340	3730	if (false)
3341	3731	{
3342	3732	try
3343	3733	{
3344		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3734	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3345	3735	ObjectOutputStream p = new ObjectOutputStream(ostream);
3346	3736
3347	3737	p.writeObject(copy);
..	..	@@ -3354,23 +3744,30 @@
3354	3744	e.printStackTrace();
3355	3745	}
3356	3746	}
	3747	+
	3748	+ return !thesame;
3357	3749	}
3358	3750
3359	3751	void CopyChanged(Object3D obj)
3360	3752	{
	3753	+ SetUndoStates();
	3754	+
3361	3755	boolean temp = CameraPane.SWITCH;
3362	3756	CameraPane.SWITCH = false;
3363	3757
3364		- copy.ExtractBigData(hashtable);
	3758	+ copy.ExtractBigData(versiontable);
3365	3759
3366	3760	copy.clear();
3367	3761
	3762	+ copy.skyboxname = obj.skyboxname;
	3763	+ copy.skyboxext = obj.skyboxext;
	3764	+
3368	3765	for (int i=0; i<obj.Size(); i++)
3369	3766	{
3370	3767	copy.add(obj.get(i));
3371	3768	}
3372	3769
3373		- copy.RestoreBigData(hashtable);
	3770	+ copy.RestoreBigData(versiontable);
3374	3771
3375	3772	CameraPane.SWITCH = temp;
3376	3773
..	..	@@ -3397,40 +3794,130 @@
3397	3794	refreshContents();
3398	3795	}
3399	3796
3400		- public void Undo()
	3797	+ cButton undoButton;
	3798	+ cButton restoreButton;
	3799	+ cButton replaceButton;
	3800	+ cButton redoButton;
	3801	+
	3802	+ boolean muteSlider;
	3803	+
	3804	+ int VersionCount()
	3805	+ {
	3806	+ int count = 0;
	3807	+
	3808	+ for (int i = copy.versions.length; --i >= 0;)
	3809	+ {
	3810	+ if (copy.versions[i] != null)
	3811	+ count++;
	3812	+ }
	3813	+
	3814	+ return count;
	3815	+ }
	3816	+
	3817	+ void SetUndoStates()
3401	3818	{
3402	3819	cRadio tab = GetCurrentTab();
3403	3820
3404		- if (tab.undoindex == 0)
	3821	+ restoreButton.setEnabled(copy.versionindex != -1);
	3822	+ replaceButton.setEnabled(copy.versionindex != -1);
	3823	+
	3824	+ undoButton.setEnabled(copy.versionindex > 0);
	3825	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3826	+
	3827	+ muteSlider = true;
	3828	+ versionSlider.setMaximum(VersionCount() - 1);
	3829	+ versionSlider.setInteger(copy.versionindex);
	3830	+ muteSlider = false;
	3831	+ }
	3832	+
	3833	+ public boolean Undo()
	3834	+ {
	3835	+ // Option?
	3836	+ Replace();
	3837	+
	3838	+ System.err.println("Undo");
	3839	+
	3840	+ cRadio tab = GetCurrentTab();
	3841	+
	3842	+ if (copy.versionindex == 0)
3405	3843	{
3406	3844	java.awt.Toolkit.getDefaultToolkit().beep();
3407		- return;
	3845	+ return false;
3408	3846	}
3409	3847
3410		- if (tab.graphs[tab.undoindex] == null)
	3848	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3849	+// {
	3850	+// if (Save(false))
	3851	+// tab.versionindex -= 1;
	3852	+// else
	3853	+// {
	3854	+// if (tab.versionindex <= 0)
	3855	+// return false;
	3856	+// else
	3857	+// tab.versionindex -= 1;
	3858	+// }
	3859	+// }
	3860	+
	3861	+ copy.versionindex -= 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ return true;
	3866	+ }
	3867	+
	3868	+ public boolean Restore()
	3869	+ {
	3870	+ System.err.println("Restore");
	3871	+
	3872	+ cRadio tab = GetCurrentTab();
	3873	+
	3874	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3411	3875	{
3412		- Save();
3413		- tab.undoindex -= 1;
	3876	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3877	+ return false;
3414	3878	}
3415	3879
3416		- tab.undoindex -= 1;
	3880	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3881	+
	3882	+ return true;
	3883	+ }
3417	3884
3418		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3885	+ public boolean Replace()
	3886	+ {
	3887	+ System.err.println("Replace");
	3888	+
	3889	+ cRadio tab = GetCurrentTab();
	3890	+
	3891	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3892	+ {
	3893	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3894	+ return false;
	3895	+ }
	3896	+
	3897	+ copy.versions[copy.versionindex] = CompressCopy();
	3898	+
	3899	+ return true;
3419	3900	}
3420	3901
3421	3902	public void Redo()
3422	3903	{
	3904	+ // Option?
	3905	+ Replace();
	3906	+
3423	3907	cRadio tab = GetCurrentTab();
3424	3908
3425		- if (tab.graphs[tab.undoindex + 1] == null)
	3909	+ if (copy.versions[copy.versionindex + 1] == null)
3426	3910	{
3427	3911	java.awt.Toolkit.getDefaultToolkit().beep();
3428	3912	return;
3429	3913	}
3430	3914
3431		- tab.undoindex += 1;
	3915	+ copy.versionindex += 1;
3432	3916
3433		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3917	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3918	+
	3919	+ //if (!tab.user[tab.versionindex])
	3920	+ // tab.graphs[tab.versionindex] = null;
3434	3921	}
3435	3922
3436	3923	void ImportGFD()
..	..	@@ -3582,7 +4069,7 @@
3582	4069	assert false;
3583	4070	}
3584	4071
3585		- void EditSelection()
	4072	+ void EditSelection(boolean newWindow)
3586	4073	{
3587	4074	}
3588	4075
..	..	@@ -3726,9 +4213,25 @@
3726	4213	//copy.Touch();
3727	4214	}
3728	4215
	4216	+ cNumberSlider versionSlider;
	4217	+
3729	4218	public void stateChanged(ChangeEvent e)
3730	4219	{
3731	4220	// assert(false);
	4221	+ if (e.getSource() == versionSlider)
	4222	+ {
	4223	+ if (muteSlider)
	4224	+ return;
	4225	+
	4226	+ int version = versionSlider.getInteger();
	4227	+
	4228	+ if (copy.versions[version] != null)
	4229	+ {
	4230	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4231	+ }
	4232	+
	4233	+ return;
	4234	+ }
3732	4235
3733	4236	if (freezematerial)
3734	4237	{
..	..	@@ -4077,7 +4580,8 @@
4077	4580
4078	4581	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	4582	{
4080		- Save();
	4583	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4584	+ Save();
4081	4585	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	4586	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	4587	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +4668,12 @@
4164	4668	{
4165	4669	ResetModel();
4166	4670	Select(thing.GetTreePath(), true, false); // unselect... false);
	4671	+
	4672	+ if (thing.Size() == 0)
	4673	+ {
	4674	+ //EditSelection(false);
	4675	+ }
	4676	+
4167	4677	refreshContents();
4168	4678	}
4169	4679
..	..	@@ -4312,7 +4822,9 @@
4312	4822	readobj.ResetDisplayList();
4313	4823	} catch (Exception e)
4314	4824	{
4315		- //e.printStackTrace();
	4825	+ if (!e.toString().contains("GZIP"))
	4826	+ e.printStackTrace();
	4827	+
4316	4828	try
4317	4829	{
4318	4830	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4386,11 +4898,14 @@
4386	4898
4387	4899	if (readobj != null)
4388	4900	{
4389		- Save();
	4901	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4902	+ // Save();
4390	4903	try
4391	4904	{
4392	4905	//readobj.deepCopySelf(copy);
4393	4906	copy.clear(); // june 2014
	4907	+ copy.skyboxname = readobj.skyboxname;
	4908	+ copy.skyboxext = readobj.skyboxext;
4394	4909	for (int i = 0; i < readobj.size(); i++)
4395	4910	{
4396	4911	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4431,6 +4946,7 @@
4431	4946	}
4432	4947	} catch (ClassCastException e)
4433	4948	{
	4949	+ e.printStackTrace();
4434	4950	assert (false);
4435	4951	Composite c = (Composite) copy;
4436	4952	c.children.clear();
..	..	@@ -4441,13 +4957,24 @@
4441	4957	c.addChild(csg);
4442	4958	}
4443	4959
	4960	+ copy.versions = readobj.versions;
	4961	+ copy.versionindex = readobj.versionindex;
	4962	+
	4963	+ if (copy.versions == null)
	4964	+ {
	4965	+ copy.versions = new byte[100][];
	4966	+ copy.versionindex = -1;
	4967	+ }
	4968	+
	4969	+ //? SetUndoStates();
	4970	+
4444	4971	ResetModel();
4445	4972	copy.HardTouch(); // recompile?
4446	4973	refreshContents();
4447	4974	}
4448	4975	}
4449	4976
4450		- void load() // throws ClassNotFoundException
	4977	+ void Open() // throws ClassNotFoundException
4451	4978	{
4452	4979	if (Grafreed.standAlone)
4453	4980	{
..	..	@@ -4550,6 +5077,7 @@
4550	5077	//ps.print(buffer.toString());
4551	5078	} catch (IOException e)
4552	5079	{
	5080	+ e.printStackTrace();
4553	5081	}
4554	5082	}
4555	5083
..	..	@@ -4564,6 +5092,8 @@
4564	5092	String filename = browser.getFile();
4565	5093	if (filename != null && filename.length() > 0)
4566	5094	{
	5095	+ if (!filename.endsWith(".gfd"))
	5096	+ filename += ".gfd";
4567	5097	lastname = browser.getDirectory() + filename;
4568	5098	save();
4569	5099	}
..	..	@@ -4730,7 +5260,7 @@
4730	5260	MenuBar menuBar;
4731	5261	Menu fileMenu;
4732	5262	MenuItem newItem;
4733		- MenuItem loadItem;
	5263	+ MenuItem openItem;
4734	5264	MenuItem saveItem;
4735	5265	MenuItem saveAsItem;
4736	5266	MenuItem exportAsItem;
..	..	@@ -4753,22 +5283,36 @@
4753	5283	CheckboxMenuItem toggleSwitchItem;
4754	5284	CheckboxMenuItem toggleRootItem;
4755	5285	CheckboxMenuItem animationItem;
	5286	+ MenuItem archiveItem;
4756	5287	CheckboxMenuItem toggleHandleItem;
4757	5288	CheckboxMenuItem togglePaintItem;
4758	5289	JSplitPane mainPanel;
4759	5290	JScrollPane scrollpane;
	5291	+
4760	5292	JPanel toolbarPanel;
	5293	+
4761	5294	cGridBag treePanel;
	5295	+
4762	5296	JPanel radioPanel;
4763	5297	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5298	+
	5299	+ cGridBag toolboxPanel;
4765	5300	cGridBag materialPanel;
	5301	+ cGridBag ctrlPanel;
	5302	+
4766	5303	JScrollPane infoPanel;
	5304	+
4767	5305	cGridBag optionsPanel;
	5306	+
4768	5307	JTabbedPane objectPanel;
	5308	+ boolean materialFlushed;
	5309	+ Object3D latestObject;
	5310	+
4769	5311	cGridBag XYZPanel;
	5312	+
4770	5313	JSplitPane gridPanel;
4771	5314	JSplitPane bigPanel;
	5315	+
4772	5316	cGridBag bigThree;
4773	5317	cGridBag scenePanel;
4774	5318	cGridBag centralPanel;
..	..	@@ -4883,7 +5427,7 @@
4883	5427	cNumberSlider fogField;
4884	5428	JLabel opacityPowerLabel;
4885	5429	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	5430	+ cTree jTree;
4887	5431	//ObjectUI parent;
4888	5432
4889	5433	cNumberSlider normalpushField;