~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -38,64 +41,78 @@
38	41	JFrame frame;
39	42
40	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	+ }
41	52
42	53	cButton GetButton(String name, boolean border)
43	54	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	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);
53	63	}
54	64
55	65	cToggleButton GetToggleButton(String name, boolean border)
56	66	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
66	69	}
67	70
68	71	cCheckBox GetCheckBox(String name, boolean border)
69	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
70	79	try
71	80	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	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;
74	97	}
75	98	catch (Exception e)
76	99	{
77		- return new cCheckBox(name, border);
	100	+ return null;
78	101	}
79	102	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
82	105	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
86	107	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
95	111	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
99	116	}
100	117
101	118	// SCRIPT
..	..	@@ -207,7 +224,7 @@
207	224
208	225	objEditor.ctrlPanel.remove(namePanel);
209	226
210		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
211	228	return;
212	229
213	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +296,12 @@
279	296	client = inClient;
280	297	copy = client;
281	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
282	305	// "this" is not called: SetupUI2(objEditor);
283	306	}
284	307
..	..	@@ -292,6 +315,12 @@
292	315	client = inClient;
293	316	copy = client;
294	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
295	324	SetupUI2(callee.GetEditor());
296	325	}
297	326
..	..	@@ -306,7 +335,7 @@
306	335	//localCopy.parent = null;
307	336
308	337	frame = new JFrame();
309		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
310	339	objEditor = this;
311	340	this.callee = callee;
312	341
..	..	@@ -324,6 +353,12 @@
324	353	copy = localCopy;
325	354	copy.editWindow = this;
326	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
327	362	SetupMenu();
328	363
329	364	//SetupName(objEditor); // new
..	..	@@ -337,12 +372,17 @@
337	372	return frame.action(event, obj);
338	373	}
339	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	+
340	380	void SetupMenu()
341	381	{
342	382	frame.setMenuBar(menuBar = new MenuBar());
343	383	menuBar.add(fileMenu = new Menu("File"));
344	384	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	386
347	387	//oe.menuBar.add(menu = new Menu("Include"));
348	388	Menu menu = new Menu("Import");
..	..	@@ -374,7 +414,7 @@
374	414	}
375	415
376	416	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
378	418	saveItem.addActionListener(this);
379	419	saveAsItem.addActionListener(this);
380	420	exportAsItem.addActionListener(this);
..	..	@@ -398,6 +438,11 @@
398	438	//
399	439	// materialFlushed = true;
400	440	// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
401	446
402	447	refreshContents(false); // To refresh Info tab
403	448	}
..	..	@@ -406,11 +451,12 @@
406	451
407	452	toolbarPanel = new JPanel();
408	453	toolbarPanel.setName("Toolbar");
	454	+
409	455	treePanel = new cGridBag();
410	456	treePanel.setName("Tree");
411	457
412	458	editPanel = new cGridBag().setVertical(true);
413		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
414	460
415	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
416	462
..	..	@@ -418,11 +464,11 @@
418	464	editPanel.add(editCommandsPanel);
419	465	editPanel.add(ctrlPanel);
420	466
421		- toolboxPanel = new cGridBag().setVertical(false);
422		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
423	469
424		- materialPanel = new cGridBag().setVertical(true);
425		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
426	472
427	473	/JTextPane/
428	474	infoarea = createTextPane();
..	..	@@ -430,14 +476,15 @@
430	476
431	477	infoarea.setEditable(true);
432	478	SetText();
	479	+
433	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
434	481	// infoarea.setOpaque(false);
435	482	// //infoarea.setForeground(textcolor);
436	483	// TEXTAREA infoarea.setLineWrap(true);
437	484	// TEXTAREA infoarea.setWrapStyleWord(true);
438	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
439		- infoPanel.setPreferredSize(new Dimension(50, 200));
440		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
441	488	//infoPanel.setLayout(new BorderLayout());
442	489	//infoPanel.add(createTextPane());
443	490
..	..	@@ -448,7 +495,14 @@
448	495	mainPanel.setDividerSize(9);
449	496	mainPanel.setDividerLocation(0.5); //1.0);
450	497	mainPanel.setResizeWeight(0.5);
451		-
	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	+
452	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
453	507	//mainPanel.setLayout(new GridBagLayout());
454	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -679,8 +733,8 @@
679	733	}
680	734	}
681	735
682		-static GraphicsDevice device = GraphicsEnvironment
683		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
684	738
685	739	Rectangle keeprect;
686	740	cRadio radio;
..	..	@@ -701,10 +755,19 @@
701	755	void Minimize()
702	756	{
703	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
704	759	}
705	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={}
706	764	void Maximize()
707	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
708	771	if (maximized)
709	772	{
710	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -712,20 +775,36 @@
712	775	else
713	776	{
714	777	keeprect = frame.getBounds();
715		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716		- Dimension rect2 = frame.getToolkit().getScreenSize();
717		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
719	783	}
720	784
721	785	maximized ^= true;
	786	+
	787	+ frame.validate();
722	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
723	793
724	794	void ToggleFullScreen()
725	795	{
726		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
727	801	{
728	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
729	808	//frame.setVisible(false);
730	809	// frame.removeNotify();
731	810	// frame.setUndecorated(false);
..	..	@@ -735,7 +814,7 @@
735	814	// X frame.getContentPane().remove(/"Center",/bigThree);
736	815	// X framePanel.add(bigThree);
737	816	// X frame.getContentPane().add(/"Center",/framePanel);
738		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
739	818
740	819	//frame.setVisible(true);
741	820	radio.layout = keepButton;
..	..	@@ -750,7 +829,12 @@
750	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
751	830	// frame.getToolkit().getScreenSize().height);
752	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
753	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
754	838	// frame.removeNotify();
755	839	// frame.setUndecorated(true);
756	840	// frame.addNotify();
..	..	@@ -763,9 +847,31 @@
763	847	radio.layout.doClick();
764	848	//frame.setVisible(true);
765	849	}
766		-
767		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
768	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
769	875
770	876	private JTextPane createTextPane()
771	877	{
..	..	@@ -888,6 +994,7 @@
888	994	{
889	995	SetupMaterial(materialPanel);
890	996	}
	997	+
891	998	//SetupName();
892	999	//SetupViews();
893	1000	}
..	..	@@ -897,7 +1004,7 @@
897	1004	// NumberSlider vDivsField;
898	1005	// JCheckBox endcaps;
899	1006	JCheckBox liveCB;
900		- JCheckBox selectCB;
	1007	+ JCheckBox selectableCB;
901	1008	JCheckBox hideCB;
902	1009	JCheckBox link2masterCB;
903	1010	JCheckBox markCB;
..	..	@@ -1097,38 +1204,42 @@
1097	1204	namePanel = new cGridBag();
1098	1205
1099	1206	nameField = AddText(namePanel, copy.GetName());
1100		- namePanel.add(nameField);
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1101	1208	oe.ctrlPanel.add(namePanel);
1102	1209
1103	1210	oe.ctrlPanel.Return();
1104	1211
1105		- if (!GroupEditor.allparams)
	1212	+ if (!allparams)
1106	1213	return;
1107	1214
1108	1215	setupPanel = new cGridBag().setVertical(false);
1109	1216
1110	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1111	1218	liveCB.setToolTipText("Animate object");
1112		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1113		- selectCB.setToolTipText("Make object selectable");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
1114	1221	// Return();
	1222	+
1115	1223	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1116	1224	hideCB.setToolTipText("Hide object");
1117	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118		- markCB.setToolTipText("Set the animation target transform");
	1226	+ markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1119	1229
1120	1230	setupPanel2 = new cGridBag().setVertical(false);
1121	1231
1122	1232	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1123	1233	rewindCB.setToolTipText("Rewind animation");
1124	1234
1125		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1127	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
1128	1241	if (Globals.ADVANCED)
1129	1242	{
1130		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1131		- link2masterCB.setToolTipText("Attach to support");
1132	1243	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1133	1244	speedupCB.setToolTipText("Option motion capture");
1134	1245	}
..	..	@@ -1402,6 +1513,7 @@
1402	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1403	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1404	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1405	1517
1406	1518	/*
1407	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1439,13 +1551,29 @@
1439	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1440	1552	//tmp.setName("Edit");
1441	1553	objectPanel.add(materialPanel);
1442		- objectPanel.add(toolboxPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1443	1557	// JPanel north = new JPanel(new BorderLayout());
1444	1558	// north.setName("Edit");
1445	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1446	1560	// objectPanel.add(north);
1447	1561	objectPanel.add(editPanel);
1448		- objectPanel.add(infoPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1449	1577
1450	1578	/*
1451	1579	aConstraints.gridx = 0;
..	..	@@ -1454,7 +1582,7 @@
1454	1582	aConstraints.gridy += 1;
1455	1583	aConstraints.gridwidth = 1;
1456	1584	mainPanel.add(objectPanel, aConstraints);
1457		- */
	1585	+ */
1458	1586
1459	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1460	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1466,7 +1594,7 @@
1466	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1467	1595
1468	1596	/JTabbedPane/ scenePanel = new cGridBag();
1469		- scenePanel.preferredWidth = 6;
	1597	+ scenePanel.preferredWidth = 5;
1470	1598
1471	1599	JTabbedPane tabbedPane = new JTabbedPane();
1472	1600	tabbedPane.add(scrollpane);
..	..	@@ -1544,7 +1672,7 @@
1544	1672	bigThree = new cGridBag();
1545	1673	bigThree.addComponent(scenePanel);
1546	1674	bigThree.addComponent(centralPanel);
1547		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1548	1676
1549	1677	// // SIDE EFFECT!!!
1550	1678	// aConstraints.gridx = 0;
..	..	@@ -1553,9 +1681,9 @@
1553	1681	// aConstraints.gridheight = 1;
1554	1682
1555	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1556		- framePanel.setContinuousLayout(true);
1557		- framePanel.setOneTouchExpandable(true);
1558		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1559	1687	//framePanel.setDividerSize(15);
1560	1688	//framePanel.setResizeWeight(0.15);
1561	1689	framePanel.setName("Frame");
..	..	@@ -1574,17 +1702,17 @@
1574	1702
1575	1703	frame.setSize(1280, 860);
1576	1704
1577		- frame.validate();
1578		- frame.setVisible(true);
1579		-
1580	1705	cameraView.requestFocusInWindow();
1581	1706
1582	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1583	1712
1584	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1585	1714	frame.addWindowListener(new WindowAdapter()
1586	1715	{
1587		-
1588	1716	public void windowClosing(WindowEvent e)
1589	1717	{
1590	1718	Close();
..	..	@@ -1607,12 +1735,56 @@
1607	1735	ctrlPanel.removeAll();
1608	1736	}
1609	1737
1610		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1611	1739	{
1612		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1613	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1614	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1615		- */
	1787	+ */
1616	1788
1617	1789	cGridBag editBar = new cGridBag().setVertical(false);
1618	1790
..	..	@@ -1646,45 +1818,50 @@
1646	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1647	1819
1648	1820	cGridBag colorSection = new cGridBag().setVertical(true);
	1821	+
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
	1832	+
	1833	+ colorSection.add(huepanel);
1649	1834
1650	1835	cGridBag color = new cGridBag();
1651		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1652		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1840	+
1654	1841	//colorField.preferredWidth = 200;
1655	1842	colorSection.add(color);
1656	1843
1657	1844	cGridBag modulation = new cGridBag();
1658	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1659	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1661	1848	colorSection.add(modulation);
1662	1849
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
	1855	+
	1856	+ colorSection.add(GetSeparator());
	1857	+
1663	1858	cGridBag texture = new cGridBag();
1664	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1665	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1666	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1667	1862	colorSection.add(texture);
1668	1863
1669		- cGridBag anisoU = new cGridBag();
1670		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1671		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1673		- colorSection.add(anisoU);
1674		-
1675		- cGridBag anisoV = new cGridBag();
1676		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1677		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1678		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1679		- colorSection.add(anisoV);
1680		-
1681		- cGridBag shadowbias = new cGridBag();
1682		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1683		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1684		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1685		- colorSection.add(shadowbias);
1686		-
1687		- panel.add(new JSeparator());
	1864	+ panel.add(GetSeparator());
1688	1865
1689	1866	panel.add(colorSection);
1690	1867
..	..	@@ -1734,7 +1911,13 @@
1734	1911	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1735	1912	diffuseSection.add(fakedepth);
1736	1913
1737		- panel.add(new JSeparator());
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
	1919	+
	1920	+ panel.add(GetSeparator());
1738	1921
1739	1922	panel.add(diffuseSection);
1740	1923
..	..	@@ -1784,42 +1967,48 @@
1784	1967	// aConstraints.gridy += 1;
1785	1968	// aConstraints.gridwidth = 1;
1786	1969
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1787	1975
1788		- panel.add(new JSeparator());
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
	1981	+
	1982	+
	1983	+ panel.add(GetSeparator());
1789	1984
1790	1985	panel.add(specularSection);
1791	1986
1792	1987	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1793	1988
1794		- cGridBag globalSection = new cGridBag().setVertical(true);
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1795	1990
1796	1991	cGridBag camera = new cGridBag();
1797	1992	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1798	1993	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799	1994	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800		- globalSection.add(camera);
	1995	+ colorSection.add(camera);
1801	1996
1802	1997	cGridBag ambient = new cGridBag();
1803	1998	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1804	1999	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805	2000	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1806		- globalSection.add(ambient);
	2001	+ colorSection.add(ambient);
1807	2002
1808	2003	cGridBag backlit = new cGridBag();
1809	2004	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1810	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1811	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1812		- globalSection.add(backlit);
	2007	+ colorSection.add(backlit);
1813	2008
1814		- cGridBag opacity = new cGridBag();
1815		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1816		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818		- globalSection.add(opacity);
1819		-
1820		- panel.add(new JSeparator());
	2009	+ //panel.add(new JSeparator());
1821	2010
1822		- panel.add(globalSection);
	2011	+ //panel.add(globalSection);
1823	2012
1824	2013	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1825	2014
..	..	@@ -1861,7 +2050,7 @@
1861	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1862	2051	textureSection.add(opacityPower);
1863	2052
1864		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1865	2054
1866	2055	panel.add(textureSection);
1867	2056
..	..	@@ -1926,8 +2115,9 @@
1926	2115	// 3D models
1927	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1928	2117	{
1929		- lastConverter = new com.jmex.model.converters.MaxToJme();
1930		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1931	2121	continue;
1932	2122	}
1933	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2653,6 +2843,7 @@
2653	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2654	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2655	2845	}
	2846	+
2656	2847	//cJME.count++;
2657	2848	//cJME.count %= 12;
2658	2849	if (gc)
..	..	@@ -2836,6 +3027,7 @@
2836	3027	}
2837	3028	}
2838	3029	}
	3030	+
2839	3031	cFileSystemPane FSPane;
2840	3032
2841	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2845,7 +3037,7 @@
2845	3037
2846	3038	freezematerial = true;
2847	3039	colorField.setFloat(mat.color);
2848		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2849	3041	metalnessField.setFloat(mat.metalness);
2850	3042	diffuseField.setFloat(mat.diffuse);
2851	3043	specularField.setFloat(mat.specular);
..	..	@@ -2889,6 +3081,7 @@
2889	3081	}
2890	3082	}
2891	3083	}
	3084	+
2892	3085	freezematerial = false;
2893	3086	}
2894	3087
..	..	@@ -3007,12 +3200,17 @@
3007	3200	// }
3008	3201
3009	3202	/**/
3010		- if (deselect)
	3203	+ if (deselect \|\| child == null)
3011	3204	{
3012	3205	//group.deselectAll();
3013	3206	//freeze = true;
3014	3207	GetTree().clearSelection();
3015	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
3016	3214	}
3017	3215
3018	3216	//group.addSelectee(child);
..	..	@@ -3150,8 +3348,9 @@
3150	3348	} else if (event.getSource() == liveCB)
3151	3349	{
3152	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
3153	3352	return;
3154		- } else if (event.getSource() == selectCB)
	3353	+ } else if (event.getSource() == selectableCB)
3155	3354	{
3156	3355	copy.dontselect ^= true;
3157	3356	return;
..	..	@@ -3159,7 +3358,7 @@
3159	3358	{
3160	3359	copy.hide ^= true;
3161	3360	copy.Touch(); // display list issue
3162		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3163	3362	return;
3164	3363	} else if (event.getSource() == link2masterCB)
3165	3364	{
..	..	@@ -3336,9 +3535,9 @@
3336	3535	{
3337	3536	Close();
3338	3537	//return true;
3339		- } else if (source == loadItem)
	3538	+ } else if (source == openItem)
3340	3539	{
3341		- load();
	3540	+ Open();
3342	3541	//return true;
3343	3542	} else if (source == newItem)
3344	3543	{
..	..	@@ -3363,6 +3562,10 @@
3363	3562	{
3364	3563	generatePOV();
3365	3564	//return true;
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
3366	3569	} else if (source == zBufferItem)
3367	3570	{
3368	3571	try
..	..	@@ -3411,11 +3614,12 @@
3411	3614
3412	3615	static public byte[] Compress(Object3D o)
3413	3616	{
	3617	+ // Slower to actually compress.
3414	3618	try
3415	3619	{
3416	3620	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3417		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3418		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3419	3623
3420	3624	Object3D parent = o.parent;
3421	3625	o.parent = null;
..	..	@@ -3426,10 +3630,14 @@
3426	3630
3427	3631	out.flush();
3428	3632
3429		- zstream.close();
	3633	+ baos //zstream
	3634	+ .close();
3430	3635	out.close();
3431	3636
3432		- return baos.toByteArray();
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
3433	3641	} catch (Exception e)
3434	3642	{
3435	3643	System.err.println(e);
..	..	@@ -3439,13 +3647,16 @@
3439	3647
3440	3648	static public Object Uncompress(byte[] bytes)
3441	3649	{
3442		- System.out.println("#bytes = " + bytes.length);
	3650	+ System.out.println("restore #bytes = " + bytes.length);
3443	3651	try
3444	3652	{
3445	3653	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3446		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3447		- ObjectInputStream in = new ObjectInputStream(istream);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3448	3656	Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
3449	3660	in.close();
3450	3661
3451	3662	return obj;
..	..	@@ -3500,39 +3711,78 @@
3500	3711	return null;
3501	3712	}
3502	3713
3503		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3504	3714
3505	3715	public void Save()
3506	3716	{
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
3507	3742	System.err.println("Save");
	3743	+ Replace();
3508	3744
3509	3745	cRadio tab = GetCurrentTab();
3510	3746
3511		- boolean temp = CameraPane.SWITCH;
3512		- CameraPane.SWITCH = false;
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3513	3748
3514		- copy.ExtractBigData(hashtable);
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
3515	3755
3516	3756	//EditorFrame.m_MainFrame.requestFocusInWindow();
3517		- tab.graphs[tab.undoindex++] = Compress(copy);
3518		-
3519		- copy.RestoreBigData(hashtable);
3520		-
3521		- CameraPane.SWITCH = temp;
3522		-
3523		- //assert(hashtable.isEmpty());
3524		-
3525		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3757	+ if (!thesame)
3526	3758	{
3527		- tab.graphs[i] = null;
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
3528	3766	}
3529	3767
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
3530	3780	// test save
3531	3781	if (false)
3532	3782	{
3533	3783	try
3534	3784	{
3535		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3536	3786	ObjectOutputStream p = new ObjectOutputStream(ostream);
3537	3787
3538	3788	p.writeObject(copy);
..	..	@@ -3545,26 +3795,66 @@
3545	3795	e.printStackTrace();
3546	3796	}
3547	3797	}
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
3548	3832	}
3549	3833
3550	3834	void CopyChanged(Object3D obj)
3551	3835	{
	3836	+ SetUndoStates();
	3837	+
3552	3838	boolean temp = CameraPane.SWITCH;
3553	3839	CameraPane.SWITCH = false;
3554	3840
3555		- copy.ExtractBigData(hashtable);
	3841	+ copy.ExtractBigData(versiontable);
3556	3842
3557	3843	copy.clear();
3558	3844
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
3559	3848	for (int i=0; i<obj.Size(); i++)
3560	3849	{
3561	3850	copy.add(obj.get(i));
3562	3851	}
3563	3852
3564		- copy.RestoreBigData(hashtable);
	3853	+ copy.RestoreBigData(versiontable);
3565	3854
3566	3855	CameraPane.SWITCH = temp;
3567	3856
	3857	+ RefreshSelection();
3568	3858	//assert(hashtable.isEmpty());
3569	3859
3570	3860	copy.Touch();
..	..	@@ -3588,42 +3878,131 @@
3588	3878	refreshContents();
3589	3879	}
3590	3880
3591		- public void Undo()
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
3592	3889	{
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
	3902	+ {
	3903	+ cRadio tab = GetCurrentTab();
	3904	+
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
3593	3922	System.err.println("Undo");
3594	3923
3595	3924	cRadio tab = GetCurrentTab();
3596	3925
3597		- if (tab.undoindex == 0)
	3926	+ if (copy.versionindex == 0)
3598	3927	{
3599	3928	java.awt.Toolkit.getDefaultToolkit().beep();
3600		- return;
	3929	+ return false;
3601	3930	}
3602	3931
3603		- if (tab.graphs[tab.undoindex] == null)
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3604	3959	{
3605		- Save();
3606		- tab.undoindex -= 1;
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
3607	3962	}
3608	3963
3609		- tab.undoindex -= 1;
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
3610	3969
3611		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
3612	3985	}
3613	3986
3614	3987	public void Redo()
3615	3988	{
	3989	+ // Option?
	3990	+ Replace();
	3991	+
3616	3992	cRadio tab = GetCurrentTab();
3617	3993
3618		- if (tab.graphs[tab.undoindex + 1] == null)
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
3619	3995	{
3620	3996	java.awt.Toolkit.getDefaultToolkit().beep();
3621	3997	return;
3622	3998	}
3623	3999
3624		- tab.undoindex += 1;
	4000	+ copy.versionindex += 1;
3625	4001
3626		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
3627	4006	}
3628	4007
3629	4008	void ImportGFD()
..	..	@@ -3834,7 +4213,7 @@
3834	4213	//copy.material = new cMaterial(copy.GetMaterial());
3835	4214
3836	4215	current.color = (float) colorField.getFloat();
3837		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3838	4217	current.metalness = (float) metalnessField.getFloat();
3839	4218	current.diffuse = (float) diffuseField.getFloat();
3840	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3867,7 +4246,7 @@
3867	4246	cMaterial mat = copy.material;
3868	4247
3869	4248	colorField.SetToolTipValue((mat.color));
3870		- modulationField.SetToolTipValue((mat.modulation));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
3871	4250	metalnessField.SetToolTipValue((mat.metalness));
3872	4251	diffuseField.SetToolTipValue((mat.diffuse));
3873	4252	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3919,9 +4298,25 @@
3919	4298	//copy.Touch();
3920	4299	}
3921	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3922	4303	public void stateChanged(ChangeEvent e)
3923	4304	{
3924	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3925	4320
3926	4321	if (freezematerial)
3927	4322	{
..	..	@@ -3957,6 +4352,12 @@
3957	4352	{
3958	4353	//System.out.println("stateChanged = " + this);
3959	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3960	4361	applySelf();
3961	4362	//System.out.println("this = " + this);
3962	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -4256,6 +4657,7 @@
4256	4657	{
4257	4658	if (GetTree() != null)
4258	4659	{
	4660	+ GetTree().revalidate();
4259	4661	GetTree().repaint();
4260	4662	}
4261	4663
..	..	@@ -4270,7 +4672,7 @@
4270	4672
4271	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4272	4674	{
4273		- if (Globals.SAVEONMAKE) // && resetmodel)
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4274	4676	Save();
4275	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
4276	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4512,7 +4914,9 @@
4512	4914	readobj.ResetDisplayList();
4513	4915	} catch (Exception e)
4514	4916	{
4515		- //e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
4516	4920	try
4517	4921	{
4518	4922	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4586,12 +4990,14 @@
4586	4990
4587	4991	if (readobj != null)
4588	4992	{
4589		- if (Globals.SAVEONMAKE)
4590		- Save();
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4591	4995	try
4592	4996	{
4593	4997	//readobj.deepCopySelf(copy);
4594	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4595	5001	for (int i = 0; i < readobj.size(); i++)
4596	5002	{
4597	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4632,6 +5038,7 @@
4632	5038	}
4633	5039	} catch (ClassCastException e)
4634	5040	{
	5041	+ e.printStackTrace();
4635	5042	assert (false);
4636	5043	Composite c = (Composite) copy;
4637	5044	c.children.clear();
..	..	@@ -4642,13 +5049,24 @@
4642	5049	c.addChild(csg);
4643	5050	}
4644	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4645	5063	ResetModel();
4646	5064	copy.HardTouch(); // recompile?
4647	5065	refreshContents();
4648	5066	}
4649	5067	}
4650	5068
4651		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4652	5070	{
4653	5071	if (Grafreed.standAlone)
4654	5072	{
..	..	@@ -4751,6 +5169,7 @@
4751	5169	//ps.print(buffer.toString());
4752	5170	} catch (IOException e)
4753	5171	{
	5172	+ e.printStackTrace();
4754	5173	}
4755	5174	}
4756	5175
..	..	@@ -4765,6 +5184,8 @@
4765	5184	String filename = browser.getFile();
4766	5185	if (filename != null && filename.length() > 0)
4767	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4768	5189	lastname = browser.getDirectory() + filename;
4769	5190	save();
4770	5191	}
..	..	@@ -4931,7 +5352,7 @@
4931	5352	MenuBar menuBar;
4932	5353	Menu fileMenu;
4933	5354	MenuItem newItem;
4934		- MenuItem loadItem;
	5355	+ MenuItem openItem;
4935	5356	MenuItem saveItem;
4936	5357	MenuItem saveAsItem;
4937	5358	MenuItem exportAsItem;
..	..	@@ -4954,6 +5375,7 @@
4954	5375	CheckboxMenuItem toggleSwitchItem;
4955	5376	CheckboxMenuItem toggleRootItem;
4956	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4957	5379	CheckboxMenuItem toggleHandleItem;
4958	5380	CheckboxMenuItem togglePaintItem;
4959	5381	JSplitPane mainPanel;
..	..	@@ -5040,7 +5462,7 @@
5040	5462	JLabel colorLabel;
5041	5463	cNumberSlider colorField;
5042	5464	JLabel modulationLabel;
5043		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
5044	5466	JLabel metalnessLabel;
5045	5467	cNumberSlider metalnessField;
5046	5468	JLabel diffuseLabel;