~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,51 +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);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
53	69	}
54	70
55	71	cCheckBox GetCheckBox(String name, boolean border)
56	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
57	79	try
58	80	{
59		- ImageIcon icon = GetIcon(name);
60		- 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;
61	97	}
62	98	catch (Exception e)
63	99	{
64		- return new cCheckBox(name, border);
	100	+ return null;
65	101	}
66	102	}
67		-
68		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
69	105	{
70		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
71		-
72		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
73	107	{
74		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
75		- Graphics2D g = resized.createGraphics();
76		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
77		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
78		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
79		- g.dispose();
80		-
81		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
82	111	}
83		-
84		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
85		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
86	116	}
87	117
88	118	// SCRIPT
..	..	@@ -194,7 +224,7 @@
194	224
195	225	objEditor.ctrlPanel.remove(namePanel);
196	226
197		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
198	228	return;
199	229
200	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -266,6 +296,12 @@
266	296	client = inClient;
267	297	copy = client;
268	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
269	305	// "this" is not called: SetupUI2(objEditor);
270	306	}
271	307
..	..	@@ -279,6 +315,12 @@
279	315	client = inClient;
280	316	copy = client;
281	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
282	324	SetupUI2(callee.GetEditor());
283	325	}
284	326
..	..	@@ -293,7 +335,7 @@
293	335	//localCopy.parent = null;
294	336
295	337	frame = new JFrame();
296		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
297	339	objEditor = this;
298	340	this.callee = callee;
299	341
..	..	@@ -311,6 +353,12 @@
311	353	copy = localCopy;
312	354	copy.editWindow = this;
313	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
314	362	SetupMenu();
315	363
316	364	//SetupName(objEditor); // new
..	..	@@ -324,12 +372,17 @@
324	372	return frame.action(event, obj);
325	373	}
326	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	+
327	380	void SetupMenu()
328	381	{
329	382	frame.setMenuBar(menuBar = new MenuBar());
330	383	menuBar.add(fileMenu = new Menu("File"));
331	384	fileMenu.add(newItem = new MenuItem("New"));
332		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
333	386
334	387	//oe.menuBar.add(menu = new Menu("Include"));
335	388	Menu menu = new Menu("Import");
..	..	@@ -361,7 +414,7 @@
361	414	}
362	415
363	416	newItem.addActionListener(this);
364		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
365	418	saveItem.addActionListener(this);
366	419	saveAsItem.addActionListener(this);
367	420	exportAsItem.addActionListener(this);
..	..	@@ -370,13 +423,40 @@
370	423	closeItem.addActionListener(this);
371	424
372	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	+
373	452	toolbarPanel = new JPanel();
374	453	toolbarPanel.setName("Toolbar");
	454	+
375	455	treePanel = new cGridBag();
376	456	treePanel.setName("Tree");
377	457
378	458	editPanel = new cGridBag().setVertical(true);
379		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
380	460
381	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382	462
..	..	@@ -384,23 +464,27 @@
384	464	editPanel.add(editCommandsPanel);
385	465	editPanel.add(ctrlPanel);
386	466
387		- materialPanel = new cGridBag().setVertical(true);
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
388	469
389		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
390	473	/JTextPane/
391	474	infoarea = createTextPane();
392	475	doc = infoarea.getStyledDocument();
393	476
394	477	infoarea.setEditable(true);
395	478	SetText();
	479	+
396	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
397	481	// infoarea.setOpaque(false);
398	482	// //infoarea.setForeground(textcolor);
399	483	// TEXTAREA infoarea.setLineWrap(true);
400	484	// TEXTAREA infoarea.setWrapStyleWord(true);
401	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402		- infoPanel.setPreferredSize(new Dimension(50, 200));
403		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
404	488	//infoPanel.setLayout(new BorderLayout());
405	489	//infoPanel.add(createTextPane());
406	490
..	..	@@ -411,7 +495,14 @@
411	495	mainPanel.setDividerSize(9);
412	496	mainPanel.setDividerLocation(0.5); //1.0);
413	497	mainPanel.setResizeWeight(0.5);
414		-
	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	+
415	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416	507	//mainPanel.setLayout(new GridBagLayout());
417	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -642,8 +733,8 @@
642	733	}
643	734	}
644	735
645		-static GraphicsDevice device = GraphicsEnvironment
646		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
647	738
648	739	Rectangle keeprect;
649	740	cRadio radio;
..	..	@@ -659,13 +750,24 @@
659	750
660	751	boolean maximized;
661	752
	753	+ cButton fullscreenLayout;
	754	+
662	755	void Minimize()
663	756	{
664	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
665	759	}
666	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={}
667	764	void Maximize()
668	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
669	771	if (maximized)
670	772	{
671	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -673,20 +775,36 @@
673	775	else
674	776	{
675	777	keeprect = frame.getBounds();
676		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677		- Dimension rect2 = frame.getToolkit().getScreenSize();
678		- 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);
679	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680	783	}
681	784
682	785	maximized ^= true;
	786	+
	787	+ frame.validate();
683	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
684	793
685	794	void ToggleFullScreen()
686	795	{
687		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
688	801	{
689	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
690	808	//frame.setVisible(false);
691	809	// frame.removeNotify();
692	810	// frame.setUndecorated(false);
..	..	@@ -696,7 +814,7 @@
696	814	// X frame.getContentPane().remove(/"Center",/bigThree);
697	815	// X framePanel.add(bigThree);
698	816	// X frame.getContentPane().add(/"Center",/framePanel);
699		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
700	818
701	819	//frame.setVisible(true);
702	820	radio.layout = keepButton;
..	..	@@ -711,7 +829,12 @@
711	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712	830	// frame.getToolkit().getScreenSize().height);
713	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
714	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
715	838	// frame.removeNotify();
716	839	// frame.setUndecorated(true);
717	840	// frame.addNotify();
..	..	@@ -720,13 +843,37 @@
720	843	// X frame.getContentPane().add(/"Center",/bigThree);
721	844	framePanel.setDividerLocation(0);
722	845
723		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
724	847	radio.layout.doClick();
725	848	//frame.setVisible(true);
726	849	}
727		-
728		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
729	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
730	877
731	878	private JTextPane createTextPane()
732	879	{
..	..	@@ -849,6 +996,7 @@
849	996	{
850	997	SetupMaterial(materialPanel);
851	998	}
	999	+
852	1000	//SetupName();
853	1001	//SetupViews();
854	1002	}
..	..	@@ -858,7 +1006,7 @@
858	1006	// NumberSlider vDivsField;
859	1007	// JCheckBox endcaps;
860	1008	JCheckBox liveCB;
861		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
862	1010	JCheckBox hideCB;
863	1011	JCheckBox link2masterCB;
864	1012	JCheckBox markCB;
..	..	@@ -866,7 +1014,12 @@
866	1014	JCheckBox speedupCB;
867	1015	JCheckBox rewindCB;
868	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
869	1021	JComboBox texresMenu;
	1022	+
870	1023	JButton resetButton;
871	1024	JButton stepButton;
872	1025	JButton stepAllButton;
..	..	@@ -1053,38 +1206,42 @@
1053	1206	namePanel = new cGridBag();
1054	1207
1055	1208	nameField = AddText(namePanel, copy.GetName());
1056		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1057	1210	oe.ctrlPanel.add(namePanel);
1058	1211
1059	1212	oe.ctrlPanel.Return();
1060	1213
1061		- if (!GroupEditor.allparams)
	1214	+ if (!allparams)
1062	1215	return;
1063	1216
1064	1217	setupPanel = new cGridBag().setVertical(false);
1065	1218
1066	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1067	1220	liveCB.setToolTipText("Animate object");
1068		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1070	1223	// Return();
	1224	+
1071	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1072	1226	hideCB.setToolTipText("Hide object");
1073	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1075	1231
1076	1232	setupPanel2 = new cGridBag().setVertical(false);
1077	1233
1078	1234	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1079	1235	rewindCB.setToolTipText("Rewind animation");
1080	1236
1081		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1238	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1083	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1084	1243	if (Globals.ADVANCED)
1085	1244	{
1086		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087		- link2masterCB.setToolTipText("Attach to support");
1088	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1089	1246	speedupCB.setToolTipText("Option motion capture");
1090	1247	}
..	..	@@ -1358,6 +1515,7 @@
1358	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1359	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1360	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1361	1519
1362	1520	/*
1363	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1395,12 +1553,29 @@
1395	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1396	1554	//tmp.setName("Edit");
1397	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
1398	1559	// JPanel north = new JPanel(new BorderLayout());
1399	1560	// north.setName("Edit");
1400	1561	// north.add(ctrlPanel, BorderLayout.NORTH);
1401	1562	// objectPanel.add(north);
1402	1563	objectPanel.add(editPanel);
1403		- objectPanel.add(infoPanel);
	1564	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1566	+
	1567	+ //if (Globals.ADVANCED)
	1568	+ objectPanel.add(infoPanel);
	1569	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1570	+ objectPanel.setToolTipTextAt(2, "Information");
	1571	+
	1572	+ objectPanel.add(XYZPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1575	+
	1576	+ objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1404	1579
1405	1580	/*
1406	1581	aConstraints.gridx = 0;
..	..	@@ -1409,7 +1584,7 @@
1409	1584	aConstraints.gridy += 1;
1410	1585	aConstraints.gridwidth = 1;
1411	1586	mainPanel.add(objectPanel, aConstraints);
1412		- */
	1587	+ */
1413	1588
1414	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1415	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1421,14 +1596,12 @@
1421	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1422	1597
1423	1598	/JTabbedPane/ scenePanel = new cGridBag();
1424		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1425	1600
1426	1601	JTabbedPane tabbedPane = new JTabbedPane();
1427	1602	tabbedPane.add(scrollpane);
1428	1603
1429		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1430		-
1431		- optionsPanel = new cGridBag().setVertical(true);
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1432	1605
1433	1606	optionsPanel.setName("Options");
1434	1607
..	..	@@ -1436,6 +1609,8 @@
1436	1609
1437	1610	tabbedPane.add(optionsPanel);
1438	1611
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1613	+
1439	1614	scenePanel.add(tabbedPane);
1440	1615
1441	1616	/*
..	..	@@ -1499,7 +1674,7 @@
1499	1674	bigThree = new cGridBag();
1500	1675	bigThree.addComponent(scenePanel);
1501	1676	bigThree.addComponent(centralPanel);
1502		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1503	1678
1504	1679	// // SIDE EFFECT!!!
1505	1680	// aConstraints.gridx = 0;
..	..	@@ -1508,9 +1683,9 @@
1508	1683	// aConstraints.gridheight = 1;
1509	1684
1510	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511		- framePanel.setContinuousLayout(true);
1512		- framePanel.setOneTouchExpandable(true);
1513		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1514	1689	//framePanel.setDividerSize(15);
1515	1690	//framePanel.setResizeWeight(0.15);
1516	1691	framePanel.setName("Frame");
..	..	@@ -1528,16 +1703,18 @@
1528	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1529	1704
1530	1705	frame.setSize(1280, 860);
1531		- frame.setVisible(true);
1532		-
	1706	+
1533	1707	cameraView.requestFocusInWindow();
1534	1708
1535	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1536	1714
1537	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1538	1716	frame.addWindowListener(new WindowAdapter()
1539	1717	{
1540		-
1541	1718	public void windowClosing(WindowEvent e)
1542	1719	{
1543	1720	Close();
..	..	@@ -1560,12 +1737,85 @@
1560	1737	ctrlPanel.removeAll();
1561	1738	}
1562	1739
1563		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1564	1741	{
1565		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1744	+ skin.addMouseListener(new MouseAdapter()
	1745	+ {
	1746	+ public void mouseClicked(MouseEvent e)
	1747	+ {
	1748	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1749	+ cMaterial material = object.material;
	1750	+
	1751	+ // Skin
	1752	+ colorField.setFloat(material.color);
	1753	+ saturationField.setFloat(material.modulation);
	1754	+ subsurfaceField.setFloat(material.subsurface);
	1755	+ selfshadowField.setFloat(material.diffuseness);
	1756	+ diffusenessField.setFloat(material.factor);
	1757	+ shininessField.setFloat(material.shininess);
	1758	+ shadowbiasField.setFloat(material.shadowbias);
	1759	+ diffuseField.setFloat(material.diffuse);
	1760	+ specularField.setFloat(material.specular);
	1761	+
	1762	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1763	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1764	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1765	+
	1766	+ materialtouched = true;
	1767	+ applySelf();
	1768	+ }
	1769	+ });
	1770	+ presetpanel.add(skin);
	1771	+
	1772	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1773	+ rough2.addMouseListener(new MouseAdapter()
	1774	+ {
	1775	+ public void mouseClicked(MouseEvent e)
	1776	+ {
	1777	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1778	+ cMaterial material = object.material;
	1779	+
	1780	+ shininessField.setFloat(material.shininess);
	1781	+ velvetField.setFloat(material.velvet);
	1782	+
	1783	+ materialtouched = true;
	1784	+ applySelf();
	1785	+ }
	1786	+ });
	1787	+ presetpanel.add(rough2);
	1788	+
	1789	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1790	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1791	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1792	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1793	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1794	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1795	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1796	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1797	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1798	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1799	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1800	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1801	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1802	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1803	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1804	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1805	+
	1806	+ cGridBag panel = new cGridBag().setVertical(true);
	1807	+
	1808	+ presetpanel.preferredWidth = 1;
	1809	+
	1810	+ materialpanel.add(panel);
	1811	+ materialpanel.add(presetpanel);
	1812	+
	1813	+ panel.preferredWidth = 8;
	1814	+
	1815	+ /*
1566	1816	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1567	1817	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- */
	1818	+ */
1569	1819
1570	1820	cGridBag editBar = new cGridBag().setVertical(false);
1571	1821
..	..	@@ -1599,45 +1849,50 @@
1599	1849	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1850
1601	1851	cGridBag colorSection = new cGridBag().setVertical(true);
	1852	+
	1853	+ cGridBag huepanel = new cGridBag();
	1854	+ cGridBag huelabel = new cGridBag();
	1855	+ skin = GetLabel("icons/hue.png", false);
	1856	+ skin.fit = true;
	1857	+ huelabel.add(skin);
	1858	+ huelabel.preferredWidth = 20;
	1859	+ huepanel.add(new cGridBag()); // Label
	1860	+ huepanel.add(huelabel); // Field/slider
	1861	+
	1862	+ huepanel.preferredHeight = 7;
	1863	+
	1864	+ colorSection.add(huepanel);
1602	1865
1603	1866	cGridBag color = new cGridBag();
1604		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1605		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1867	+
	1868	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1869	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1871	+
1607	1872	//colorField.preferredWidth = 200;
1608	1873	colorSection.add(color);
1609	1874
1610	1875	cGridBag modulation = new cGridBag();
1611	1876	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1612	1877	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1613		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1614	1879	colorSection.add(modulation);
1615	1880
	1881	+ cGridBag opacity = new cGridBag();
	1882	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1883	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1884	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1885	+ colorSection.add(opacity);
	1886	+
	1887	+ colorSection.add(GetSeparator());
	1888	+
1616	1889	cGridBag texture = new cGridBag();
1617	1890	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1618	1891	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1619	1892	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1620	1893	colorSection.add(texture);
1621	1894
1622		- cGridBag anisoU = new cGridBag();
1623		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626		- colorSection.add(anisoU);
1627		-
1628		- cGridBag anisoV = new cGridBag();
1629		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632		- colorSection.add(anisoV);
1633		-
1634		- cGridBag shadowbias = new cGridBag();
1635		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638		- colorSection.add(shadowbias);
1639		-
1640		- panel.add(new JSeparator());
	1895	+ panel.add(GetSeparator());
1641	1896
1642	1897	panel.add(colorSection);
1643	1898
..	..	@@ -1687,7 +1942,13 @@
1687	1942	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1688	1943	diffuseSection.add(fakedepth);
1689	1944
1690		- panel.add(new JSeparator());
	1945	+ cGridBag shadowbias = new cGridBag();
	1946	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1947	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1948	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1949	+ diffuseSection.add(shadowbias);
	1950	+
	1951	+ panel.add(GetSeparator());
1691	1952
1692	1953	panel.add(diffuseSection);
1693	1954
..	..	@@ -1737,42 +1998,48 @@
1737	1998	// aConstraints.gridy += 1;
1738	1999	// aConstraints.gridwidth = 1;
1739	2000
	2001	+ cGridBag anisoU = new cGridBag();
	2002	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2003	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2004	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2005	+ specularSection.add(anisoU);
1740	2006
1741		- panel.add(new JSeparator());
	2007	+ cGridBag anisoV = new cGridBag();
	2008	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2009	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2010	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2011	+ specularSection.add(anisoV);
	2012	+
	2013	+
	2014	+ panel.add(GetSeparator());
1742	2015
1743	2016	panel.add(specularSection);
1744	2017
1745	2018	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1746	2019
1747		- cGridBag globalSection = new cGridBag().setVertical(true);
	2020	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1748	2021
1749	2022	cGridBag camera = new cGridBag();
1750	2023	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1751	2024	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1752	2025	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753		- globalSection.add(camera);
	2026	+ colorSection.add(camera);
1754	2027
1755	2028	cGridBag ambient = new cGridBag();
1756	2029	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1757	2030	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1758	2031	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759		- globalSection.add(ambient);
	2032	+ colorSection.add(ambient);
1760	2033
1761	2034	cGridBag backlit = new cGridBag();
1762	2035	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1763	2036	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1764	2037	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765		- globalSection.add(backlit);
	2038	+ colorSection.add(backlit);
1766	2039
1767		- cGridBag opacity = new cGridBag();
1768		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1769		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771		- globalSection.add(opacity);
1772		-
1773		- panel.add(new JSeparator());
	2040	+ //panel.add(new JSeparator());
1774	2041
1775		- panel.add(globalSection);
	2042	+ //panel.add(globalSection);
1776	2043
1777	2044	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1778	2045
..	..	@@ -1814,7 +2081,7 @@
1814	2081	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1815	2082	textureSection.add(opacityPower);
1816	2083
1817		- panel.add(new JSeparator());
	2084	+ panel.add(GetSeparator());
1818	2085
1819	2086	panel.add(textureSection);
1820	2087
..	..	@@ -1879,8 +2146,9 @@
1879	2146	// 3D models
1880	2147	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1881	2148	{
1882		- lastConverter = new com.jmex.model.converters.MaxToJme();
1883		- LoadFile(filename, lastConverter);
	2149	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2150	+ //LoadFile(filename, lastConverter);
	2151	+ LoadObjFile(filename); // New 3ds loader
1884	2152	continue;
1885	2153	}
1886	2154	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2606,6 +2874,7 @@
2606	2874	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2607	2875	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2608	2876	}
	2877	+
2609	2878	//cJME.count++;
2610	2879	//cJME.count %= 12;
2611	2880	if (gc)
..	..	@@ -2789,6 +3058,7 @@
2789	3058	}
2790	3059	}
2791	3060	}
	3061	+
2792	3062	cFileSystemPane FSPane;
2793	3063
2794	3064	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2798,7 +3068,7 @@
2798	3068
2799	3069	freezematerial = true;
2800	3070	colorField.setFloat(mat.color);
2801		- modulationField.setFloat(mat.modulation);
	3071	+ saturationField.setFloat(mat.modulation);
2802	3072	metalnessField.setFloat(mat.metalness);
2803	3073	diffuseField.setFloat(mat.diffuse);
2804	3074	specularField.setFloat(mat.specular);
..	..	@@ -2842,11 +3112,14 @@
2842	3112	}
2843	3113	}
2844	3114	}
	3115	+
2845	3116	freezematerial = false;
2846	3117	}
2847	3118
2848	3119	void SetMaterial(Object3D object)
2849	3120	{
	3121	+ latestObject = object;
	3122	+
2850	3123	cMaterial mat = object.material;
2851	3124
2852	3125	if (mat == null)
..	..	@@ -2958,12 +3231,17 @@
2958	3231	// }
2959	3232
2960	3233	/**/
2961		- if (deselect)
	3234	+ if (deselect \|\| child == null)
2962	3235	{
2963	3236	//group.deselectAll();
2964	3237	//freeze = true;
2965	3238	GetTree().clearSelection();
2966	3239	//freeze = false;
	3240	+
	3241	+ if (child == null)
	3242	+ {
	3243	+ return;
	3244	+ }
2967	3245	}
2968	3246
2969	3247	//group.addSelectee(child);
..	..	@@ -3032,7 +3310,7 @@
3032	3310	cameraView.ToggleDL();
3033	3311	cameraView.repaint();
3034	3312	return;
3035		- } else if (event.getSource() == toggleTextureItem)
	3313	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3036	3314	{
3037	3315	cameraView.ToggleTexture();
3038	3316	// june 2013 copy.HardTouch();
..	..	@@ -3071,7 +3349,7 @@
3071	3349	frame.validate();
3072	3350
3073	3351	return;
3074		- } else if (event.getSource() == toggleSwitchItem)
	3352	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3075	3353	{
3076	3354	cameraView.ToggleSwitch();
3077	3355	cameraView.repaint();
..	..	@@ -3101,8 +3379,9 @@
3101	3379	} else if (event.getSource() == liveCB)
3102	3380	{
3103	3381	copy.live ^= true;
	3382	+ objEditor.refreshContents(true); // To show item colors
3104	3383	return;
3105		- } else if (event.getSource() == selectCB)
	3384	+ } else if (event.getSource() == selectableCB)
3106	3385	{
3107	3386	copy.dontselect ^= true;
3108	3387	return;
..	..	@@ -3110,7 +3389,7 @@
3110	3389	{
3111	3390	copy.hide ^= true;
3112	3391	copy.Touch(); // display list issue
3113		- objEditor.refreshContents();
	3392	+ objEditor.refreshContents(true); // To show item colors
3114	3393	return;
3115	3394	} else if (event.getSource() == link2masterCB)
3116	3395	{
..	..	@@ -3287,9 +3566,9 @@
3287	3566	{
3288	3567	Close();
3289	3568	//return true;
3290		- } else if (source == loadItem)
	3569	+ } else if (source == openItem)
3291	3570	{
3292		- load();
	3571	+ Open();
3293	3572	//return true;
3294	3573	} else if (source == newItem)
3295	3574	{
..	..	@@ -3314,6 +3593,10 @@
3314	3593	{
3315	3594	generatePOV();
3316	3595	//return true;
	3596	+ } else if (event.getSource() == archiveItem)
	3597	+ {
	3598	+ cTools.Archive(frame);
	3599	+ return;
3317	3600	} else if (source == zBufferItem)
3318	3601	{
3319	3602	try
..	..	@@ -3362,11 +3645,12 @@
3362	3645
3363	3646	static public byte[] Compress(Object3D o)
3364	3647	{
	3648	+ // Slower to actually compress.
3365	3649	try
3366	3650	{
3367	3651	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3652	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3653	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3370	3654
3371	3655	Object3D parent = o.parent;
3372	3656	o.parent = null;
..	..	@@ -3377,10 +3661,14 @@
3377	3661
3378	3662	out.flush();
3379	3663
3380		- zstream.close();
	3664	+ baos //zstream
	3665	+ .close();
3381	3666	out.close();
3382	3667
3383		- return baos.toByteArray();
	3668	+ byte[] bytes = baos.toByteArray();
	3669	+
	3670	+ System.out.println("save #bytes = " + bytes.length);
	3671	+ return bytes;
3384	3672	} catch (Exception e)
3385	3673	{
3386	3674	System.err.println(e);
..	..	@@ -3390,13 +3678,16 @@
3390	3678
3391	3679	static public Object Uncompress(byte[] bytes)
3392	3680	{
3393		- System.out.println("#bytes = " + bytes.length);
	3681	+ System.out.println("restore #bytes = " + bytes.length);
3394	3682	try
3395	3683	{
3396	3684	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398		- ObjectInputStream in = new ObjectInputStream(istream);
	3685	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3686	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3399	3687	Object obj = in.readObject();
	3688	+
	3689	+ bais //istream
	3690	+ .close();
3400	3691	in.close();
3401	3692
3402	3693	return obj;
..	..	@@ -3451,39 +3742,95 @@
3451	3742	return null;
3452	3743	}
3453	3744
3454		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3455	3745
3456	3746	public void Save()
3457	3747	{
	3748	+ //Save(true);
	3749	+ Replace();
	3750	+ SetUndoStates();
	3751	+ }
	3752	+
	3753	+ private boolean Equal(byte[] compress, byte[] name)
	3754	+ {
	3755	+ if (compress.length != name.length)
	3756	+ {
	3757	+ return false;
	3758	+ }
	3759	+
	3760	+ for (int i=compress.length; --i>=0;)
	3761	+ {
	3762	+ if (compress[i] != name[i])
	3763	+ return false;
	3764	+ }
	3765	+
	3766	+ return true;
	3767	+ }
	3768	+
	3769	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3770	+
	3771	+ void DeleteVersion()
	3772	+ {
	3773	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	3774	+ {
	3775	+ copy.versionlist[i] = copy.versionlist[i+1];
	3776	+ }
	3777	+
	3778	+ CopyChanged();
	3779	+
	3780	+ SetUndoStates();
	3781	+ }
	3782	+
	3783	+ public boolean Save(boolean user)
	3784	+ {
3458	3785	System.err.println("Save");
	3786	+ //Replace();
3459	3787
3460	3788	cRadio tab = GetCurrentTab();
3461	3789
3462		- boolean temp = CameraPane.SWITCH;
3463		- CameraPane.SWITCH = false;
	3790	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3464	3791
3465		- copy.ExtractBigData(hashtable);
	3792	+ boolean thesame = false;
	3793	+
	3794	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3795	+// {
	3796	+// thesame = true;
	3797	+// }
3466	3798
3467	3799	//EditorFrame.m_MainFrame.requestFocusInWindow();
3468		- tab.graphs[tab.undoindex++] = Compress(copy);
3469		-
3470		- copy.RestoreBigData(hashtable);
3471		-
3472		- CameraPane.SWITCH = temp;
3473		-
3474		- //assert(hashtable.isEmpty());
3475		-
3476		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3800	+ if (!thesame)
3477	3801	{
3478		- tab.graphs[i] = null;
	3802	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	3803	+ {
	3804	+ copy.versionlist[i] = copy.versionlist[i-1];
	3805	+ }
	3806	+
	3807	+ //tab.user[tab.versionindex] = user;
	3808	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3809	+
	3810	+ copy.versionlist[++copy.versionindex] = compress;
	3811	+
	3812	+ // if (increment)
	3813	+ // tab.versionindex++;
3479	3814	}
3480	3815
	3816	+ //copy.RestoreBigData(versiontable);
	3817	+
	3818	+ //assert(hashtable.isEmpty());
	3819	+
	3820	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3821	+// {
	3822	+// //tab.user[i] = false;
	3823	+// copy.versionlist[i] = null;
	3824	+// }
	3825	+
	3826	+ SetUndoStates();
	3827	+
3481	3828	// test save
3482	3829	if (false)
3483	3830	{
3484	3831	try
3485	3832	{
3486		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3833	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3487	3834	ObjectOutputStream p = new ObjectOutputStream(ostream);
3488	3835
3489	3836	p.writeObject(copy);
..	..	@@ -3496,26 +3843,68 @@
3496	3843	e.printStackTrace();
3497	3844	}
3498	3845	}
	3846	+
	3847	+ return !thesame;
	3848	+ }
	3849	+
	3850	+ boolean flashIt = true;
	3851	+
	3852	+ void RefreshSelection()
	3853	+ {
	3854	+ Object3D selection = new Object3D();
	3855	+
	3856	+ for (int i = 0; i < copy.selection.size(); i++)
	3857	+ {
	3858	+ Object3D elem = copy.selection.elementAt(i);
	3859	+
	3860	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3861	+
	3862	+ if (obj == null)
	3863	+ {
	3864	+ copy.selection.remove(i--);
	3865	+ }
	3866	+ else
	3867	+ {
	3868	+ selection.add(obj);
	3869	+ copy.selection.setElementAt(obj, i);
	3870	+ }
	3871	+ }
	3872	+
	3873	+ flashIt = false;
	3874	+ GetTree().clearSelection();
	3875	+ for (int i = 0; i < selection.size(); i++)
	3876	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3877	+ flashIt = true;
	3878	+
	3879	+ //refreshContents(false);
3499	3880	}
3500	3881
3501		- void CopyChanged(Object3D obj)
	3882	+ void CopyChanged()
3502	3883	{
	3884	+ Object3D obj = copy.versionlist[copy.versionindex];
	3885	+
	3886	+ SetUndoStates();
	3887	+
3503	3888	boolean temp = CameraPane.SWITCH;
3504	3889	CameraPane.SWITCH = false;
3505	3890
3506		- copy.ExtractBigData(hashtable);
	3891	+ copy.ExtractBigData(versiontable);
3507	3892
3508	3893	copy.clear();
3509	3894
	3895	+ copy.skyboxname = obj.skyboxname;
	3896	+ copy.skyboxext = obj.skyboxext;
	3897	+
3510	3898	for (int i=0; i<obj.Size(); i++)
3511	3899	{
3512	3900	copy.add(obj.get(i));
3513	3901	}
3514	3902
3515		- copy.RestoreBigData(hashtable);
	3903	+ copy.RestoreBigData(versiontable);
3516	3904
3517	3905	CameraPane.SWITCH = temp;
3518	3906
	3907	+ RefreshSelection();
3519	3908	//assert(hashtable.isEmpty());
3520	3909
3521	3910	copy.Touch();
..	..	@@ -3536,45 +3925,139 @@
3536	3925	}
3537	3926	}
3538	3927
3539		- refreshContents();
	3928	+ refreshContents(true);
3540	3929	}
3541	3930
3542		- public void Undo()
	3931	+ cButton previousVersionButton;
	3932	+ cButton restoreButton;
	3933	+ cButton replaceButton;
	3934	+ cButton nextVersionButton;
	3935	+ cButton saveVersionButton;
	3936	+ cButton deleteVersionButton;
	3937	+
	3938	+ boolean muteSlider;
	3939	+
	3940	+ int VersionCount()
3543	3941	{
	3942	+ int count = 0;
	3943	+
	3944	+ for (int i = copy.versionlist.length; --i >= 0;)
	3945	+ {
	3946	+ if (copy.versionlist[i] != null)
	3947	+ count++;
	3948	+ }
	3949	+
	3950	+ return count;
	3951	+ }
	3952	+
	3953	+ void SetUndoStates()
	3954	+ {
	3955	+ cRadio tab = GetCurrentTab();
	3956	+
	3957	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	3958	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	3959	+
	3960	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	3961	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3962	+
	3963	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	3964	+ copy.versionlist[copy.versionindex + 1] != null);
	3965	+
	3966	+ muteSlider = true;
	3967	+ versionSlider.setMaximum(VersionCount() - 1);
	3968	+ versionSlider.setInteger(copy.versionindex);
	3969	+ muteSlider = false;
	3970	+ }
	3971	+
	3972	+ public boolean PreviousVersion()
	3973	+ {
	3974	+ // Option?
	3975	+ Replace();
	3976	+
3544	3977	System.err.println("Undo");
3545	3978
3546	3979	cRadio tab = GetCurrentTab();
3547	3980
3548		- if (tab.undoindex == 0)
	3981	+ if (copy.versionindex == 0)
3549	3982	{
3550	3983	java.awt.Toolkit.getDefaultToolkit().beep();
3551		- return;
	3984	+ return false;
3552	3985	}
3553	3986
3554		- if (tab.graphs[tab.undoindex] == null)
3555		- {
3556		- Save();
3557		- tab.undoindex -= 1;
3558		- }
	3987	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3988	+// {
	3989	+// if (Save(false))
	3990	+// tab.versionindex -= 1;
	3991	+// else
	3992	+// {
	3993	+// if (tab.versionindex <= 0)
	3994	+// return false;
	3995	+// else
	3996	+// tab.versionindex -= 1;
	3997	+// }
	3998	+// }
3559	3999
3560		- tab.undoindex -= 1;
	4000	+ copy.versionindex -= 1;
3561	4001
3562		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged();
	4003	+
	4004	+ return true;
3563	4005	}
3564	4006
3565		- public void Redo()
	4007	+ public boolean Restore()
3566	4008	{
	4009	+ System.err.println("Restore");
	4010	+
3567	4011	cRadio tab = GetCurrentTab();
3568	4012
3569		- if (tab.graphs[tab.undoindex + 1] == null)
	4013	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4014	+ {
	4015	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4016	+ return false;
	4017	+ }
	4018	+
	4019	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4020	+ CopyChanged();
	4021	+
	4022	+ return true;
	4023	+ }
	4024	+
	4025	+ public boolean Replace()
	4026	+ {
	4027	+ System.err.println("Replace");
	4028	+
	4029	+ cRadio tab = GetCurrentTab();
	4030	+
	4031	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4032	+ {
	4033	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4034	+ return false;
	4035	+ }
	4036	+
	4037	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4038	+
	4039	+ return true;
	4040	+ }
	4041	+
	4042	+ public void NextVersion()
	4043	+ {
	4044	+ // Option?
	4045	+ Replace();
	4046	+
	4047	+ cRadio tab = GetCurrentTab();
	4048	+
	4049	+ if (copy.versionlist[copy.versionindex + 1] == null)
3570	4050	{
3571	4051	java.awt.Toolkit.getDefaultToolkit().beep();
3572	4052	return;
3573	4053	}
3574	4054
3575		- tab.undoindex += 1;
	4055	+ copy.versionindex += 1;
3576	4056
3577		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4057	+ CopyChanged();
	4058	+
	4059	+ //if (!tab.user[tab.versionindex])
	4060	+ // tab.graphs[tab.versionindex] = null;
3578	4061	}
3579	4062
3580	4063	void ImportGFD()
..	..	@@ -3726,7 +4209,7 @@
3726	4209	assert false;
3727	4210	}
3728	4211
3729		- void EditSelection()
	4212	+ void EditSelection(boolean newWindow)
3730	4213	{
3731	4214	}
3732	4215
..	..	@@ -3785,7 +4268,7 @@
3785	4268	//copy.material = new cMaterial(copy.GetMaterial());
3786	4269
3787	4270	current.color = (float) colorField.getFloat();
3788		- current.modulation = (float) modulationField.getFloat();
	4271	+ current.modulation = (float) saturationField.getFloat();
3789	4272	current.metalness = (float) metalnessField.getFloat();
3790	4273	current.diffuse = (float) diffuseField.getFloat();
3791	4274	current.specular = (float) specularField.getFloat();
..	..	@@ -3818,7 +4301,7 @@
3818	4301	cMaterial mat = copy.material;
3819	4302
3820	4303	colorField.SetToolTipValue((mat.color));
3821		- modulationField.SetToolTipValue((mat.modulation));
	4304	+ saturationField.SetToolTipValue((mat.modulation));
3822	4305	metalnessField.SetToolTipValue((mat.metalness));
3823	4306	diffuseField.SetToolTipValue((mat.diffuse));
3824	4307	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3870,9 +4353,26 @@
3870	4353	//copy.Touch();
3871	4354	}
3872	4355
	4356	+ cNumberSlider versionSlider;
	4357	+
3873	4358	public void stateChanged(ChangeEvent e)
3874	4359	{
3875	4360	// assert(false);
	4361	+ if (e.getSource() == versionSlider)
	4362	+ {
	4363	+ if (muteSlider)
	4364	+ return;
	4365	+
	4366	+ int version = versionSlider.getInteger();
	4367	+
	4368	+ if (copy.versionlist[version] != null)
	4369	+ {
	4370	+ copy.versionindex = version;
	4371	+ CopyChanged();
	4372	+ }
	4373	+
	4374	+ return;
	4375	+ }
3876	4376
3877	4377	if (freezematerial)
3878	4378	{
..	..	@@ -3908,6 +4408,12 @@
3908	4408	{
3909	4409	//System.out.println("stateChanged = " + this);
3910	4410	materialtouched = true;
	4411	+
	4412	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4413	+ {
	4414	+ saturationField.setFloat(1);
	4415	+ }
	4416	+
3911	4417	applySelf();
3912	4418	//System.out.println("this = " + this);
3913	4419	//System.out.println("PARENT = " + parent);
..	..	@@ -4207,6 +4713,7 @@
4207	4713	{
4208	4714	if (GetTree() != null)
4209	4715	{
	4716	+ GetTree().revalidate();
4210	4717	GetTree().repaint();
4211	4718	}
4212	4719
..	..	@@ -4215,13 +4722,16 @@
4215	4722	ctrlPanel.validate(); // ? new
4216	4723	ctrlPanel.repaint();
4217	4724	}
	4725	+
	4726	+ if (previousVersionButton != null && copy.versionlist != null)
	4727	+ SetUndoStates();
4218	4728	}
4219	4729
4220	4730	static TweenManager tweenManager = new TweenManager();
4221	4731
4222	4732	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223	4733	{
4224		- if (Globals.SAVEONMAKE)
	4734	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4225	4735	Save();
4226	4736	//Tween.set(thing, 0).target(1).start(tweenManager);
4227	4737	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4309,6 +4819,12 @@
4309	4819	{
4310	4820	ResetModel();
4311	4821	Select(thing.GetTreePath(), true, false); // unselect... false);
	4822	+
	4823	+ if (thing.Size() == 0)
	4824	+ {
	4825	+ //EditSelection(false);
	4826	+ }
	4827	+
4312	4828	refreshContents();
4313	4829	}
4314	4830
..	..	@@ -4457,7 +4973,9 @@
4457	4973	readobj.ResetDisplayList();
4458	4974	} catch (Exception e)
4459	4975	{
4460		- //e.printStackTrace();
	4976	+ if (!e.toString().contains("GZIP"))
	4977	+ e.printStackTrace();
	4978	+
4461	4979	try
4462	4980	{
4463	4981	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4531,12 +5049,14 @@
4531	5049
4532	5050	if (readobj != null)
4533	5051	{
4534		- if (Globals.SAVEONMAKE)
4535		- Save();
	5052	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5053	+ // Save();
4536	5054	try
4537	5055	{
4538	5056	//readobj.deepCopySelf(copy);
4539	5057	copy.clear(); // june 2014
	5058	+ copy.skyboxname = readobj.skyboxname;
	5059	+ copy.skyboxext = readobj.skyboxext;
4540	5060	for (int i = 0; i < readobj.size(); i++)
4541	5061	{
4542	5062	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4577,6 +5097,7 @@
4577	5097	}
4578	5098	} catch (ClassCastException e)
4579	5099	{
	5100	+ e.printStackTrace();
4580	5101	assert (false);
4581	5102	Composite c = (Composite) copy;
4582	5103	c.children.clear();
..	..	@@ -4587,17 +5108,28 @@
4587	5108	c.addChild(csg);
4588	5109	}
4589	5110
	5111	+ copy.versionlist = readobj.versionlist;
	5112	+ copy.versionindex = readobj.versionindex;
	5113	+
	5114	+ if (copy.versionlist == null)
	5115	+ {
	5116	+ copy.versionlist = new Object3D[100];
	5117	+ copy.versionindex = -1;
	5118	+ }
	5119	+
	5120	+ //? SetUndoStates();
	5121	+
4590	5122	ResetModel();
4591	5123	copy.HardTouch(); // recompile?
4592	5124	refreshContents();
4593	5125	}
4594	5126	}
4595	5127
4596		- void load() // throws ClassNotFoundException
	5128	+ void Open() // throws ClassNotFoundException
4597	5129	{
4598	5130	if (Grafreed.standAlone)
4599	5131	{
4600		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5132	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4601	5133	browser.show();
4602	5134	String filename = browser.getFile();
4603	5135	if (filename != null && filename.length() > 0)
..	..	@@ -4696,6 +5228,7 @@
4696	5228	//ps.print(buffer.toString());
4697	5229	} catch (IOException e)
4698	5230	{
	5231	+ e.printStackTrace();
4699	5232	}
4700	5233	}
4701	5234
..	..	@@ -4710,6 +5243,8 @@
4710	5243	String filename = browser.getFile();
4711	5244	if (filename != null && filename.length() > 0)
4712	5245	{
	5246	+ if (!filename.endsWith(".gfd"))
	5247	+ filename += ".gfd";
4713	5248	lastname = browser.getDirectory() + filename;
4714	5249	save();
4715	5250	}
..	..	@@ -4876,7 +5411,7 @@
4876	5411	MenuBar menuBar;
4877	5412	Menu fileMenu;
4878	5413	MenuItem newItem;
4879		- MenuItem loadItem;
	5414	+ MenuItem openItem;
4880	5415	MenuItem saveItem;
4881	5416	MenuItem saveAsItem;
4882	5417	MenuItem exportAsItem;
..	..	@@ -4899,22 +5434,36 @@
4899	5434	CheckboxMenuItem toggleSwitchItem;
4900	5435	CheckboxMenuItem toggleRootItem;
4901	5436	CheckboxMenuItem animationItem;
	5437	+ MenuItem archiveItem;
4902	5438	CheckboxMenuItem toggleHandleItem;
4903	5439	CheckboxMenuItem togglePaintItem;
4904	5440	JSplitPane mainPanel;
4905	5441	JScrollPane scrollpane;
	5442	+
4906	5443	JPanel toolbarPanel;
	5444	+
4907	5445	cGridBag treePanel;
	5446	+
4908	5447	JPanel radioPanel;
4909	5448	ButtonGroup buttonGroup;
4910		- cGridBag ctrlPanel;
	5449	+
	5450	+ cGridBag toolboxPanel;
4911	5451	cGridBag materialPanel;
	5452	+ cGridBag ctrlPanel;
	5453	+
4912	5454	JScrollPane infoPanel;
	5455	+
4913	5456	cGridBag optionsPanel;
	5457	+
4914	5458	JTabbedPane objectPanel;
	5459	+ boolean materialFlushed;
	5460	+ Object3D latestObject;
	5461	+
4915	5462	cGridBag XYZPanel;
	5463	+
4916	5464	JSplitPane gridPanel;
4917	5465	JSplitPane bigPanel;
	5466	+
4918	5467	cGridBag bigThree;
4919	5468	cGridBag scenePanel;
4920	5469	cGridBag centralPanel;
..	..	@@ -4972,7 +5521,7 @@
4972	5521	JLabel colorLabel;
4973	5522	cNumberSlider colorField;
4974	5523	JLabel modulationLabel;
4975		- cNumberSlider modulationField;
	5524	+ cNumberSlider saturationField;
4976	5525	JLabel metalnessLabel;
4977	5526	cNumberSlider metalnessField;
4978	5527	JLabel diffuseLabel;
..	..	@@ -5029,7 +5578,7 @@
5029	5578	cNumberSlider fogField;
5030	5579	JLabel opacityPowerLabel;
5031	5580	cNumberSlider opacityPowerField;
5032		- JTree jTree;
	5581	+ cTree jTree;
5033	5582	//ObjectUI parent;
5034	5583
5035	5584	cNumberSlider normalpushField;