~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -37,6 +41,65 @@
37	41	JFrame frame;
38	42
39	43	static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
40	103
41	104	// SCRIPT
42	105
..	..	@@ -147,7 +210,7 @@
147	210
148	211	objEditor.ctrlPanel.remove(namePanel);
149	212
150		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
151	214	return;
152	215
153	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -219,6 +282,12 @@
219	282	client = inClient;
220	283	copy = client;
221	284
	285	+ if (copy.versions == null)
	286	+ {
	287	+ copy.versions = new byte[100][];
	288	+ copy.versionindex = -1;
	289	+ }
	290	+
222	291	// "this" is not called: SetupUI2(objEditor);
223	292	}
224	293
..	..	@@ -232,6 +301,12 @@
232	301	client = inClient;
233	302	copy = client;
234	303
	304	+ if (copy.versions == null)
	305	+ {
	306	+ copy.versions = new byte[100][];
	307	+ copy.versionindex = -1;
	308	+ }
	309	+
235	310	SetupUI2(callee.GetEditor());
236	311	}
237	312
..	..	@@ -246,7 +321,7 @@
246	321	//localCopy.parent = null;
247	322
248	323	frame = new JFrame();
249		- frame.setUndecorated(true);
	324	+ frame.setUndecorated(false);
250	325	objEditor = this;
251	326	this.callee = callee;
252	327
..	..	@@ -264,6 +339,12 @@
264	339	copy = localCopy;
265	340	copy.editWindow = this;
266	341
	342	+ if (copy.versions == null)
	343	+ {
	344	+ copy.versions = new byte[100][];
	345	+ copy.versionindex = -1;
	346	+ }
	347	+
267	348	SetupMenu();
268	349
269	350	//SetupName(objEditor); // new
..	..	@@ -277,12 +358,17 @@
277	358	return frame.action(event, obj);
278	359	}
279	360
	361	+ // Cannot work without static
	362	+ static boolean allparams = true;
	363	+
	364	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	365	+
280	366	void SetupMenu()
281	367	{
282	368	frame.setMenuBar(menuBar = new MenuBar());
283	369	menuBar.add(fileMenu = new Menu("File"));
284	370	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	371	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	372
287	373	//oe.menuBar.add(menu = new Menu("Include"));
288	374	Menu menu = new Menu("Import");
..	..	@@ -314,7 +400,7 @@
314	400	}
315	401
316	402	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	403	+ openItem.addActionListener(this);
318	404	saveItem.addActionListener(this);
319	405	saveAsItem.addActionListener(this);
320	406	exportAsItem.addActionListener(this);
..	..	@@ -323,6 +409,32 @@
323	409	closeItem.addActionListener(this);
324	410
325	411	objectPanel = new JTabbedPane();
	412	+
	413	+ ChangeListener changeListener = new ChangeListener()
	414	+ {
	415	+ public void stateChanged(ChangeEvent changeEvent)
	416	+ {
	417	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	418	+// {
	419	+// if (latestObject != null)
	420	+// {
	421	+// refreshContents(true);
	422	+// SetMaterial(latestObject);
	423	+// }
	424	+//
	425	+// materialFlushed = true;
	426	+// }
	427	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	428	+// {
	429	+// if (listUI.size() == 0)
	430	+// EditSelection(false);
	431	+// }
	432	+
	433	+ refreshContents(false); // To refresh Info tab
	434	+ }
	435	+ };
	436	+ objectPanel.addChangeListener(changeListener);
	437	+
326	438	toolbarPanel = new JPanel();
327	439	toolbarPanel.setName("Toolbar");
328	440	treePanel = new cGridBag();
..	..	@@ -337,9 +449,12 @@
337	449	editPanel.add(editCommandsPanel);
338	450	editPanel.add(ctrlPanel);
339	451
340		- materialPanel = new cGridBag().setVertical(true);
	452	+ toolboxPanel = new cGridBag().setVertical(false);
	453	+ toolboxPanel.setName("Toolbox");
341	454
	455	+ materialPanel = new cGridBag().setVertical(true);
342	456	materialPanel.setName("Material");
	457	+
343	458	/JTextPane/
344	459	infoarea = createTextPane();
345	460	doc = infoarea.getStyledDocument();
..	..	@@ -352,7 +467,7 @@
352	467	// TEXTAREA infoarea.setLineWrap(true);
353	468	// TEXTAREA infoarea.setWrapStyleWord(true);
354	469	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
355		- infoPanel.setPreferredSize(new Dimension(50, 200));
	470	+ infoPanel.setPreferredSize(new Dimension(1, 1));
356	471	infoPanel.setName("Info");
357	472	//infoPanel.setLayout(new BorderLayout());
358	473	//infoPanel.add(createTextPane());
..	..	@@ -364,7 +479,14 @@
364	479	mainPanel.setDividerSize(9);
365	480	mainPanel.setDividerLocation(0.5); //1.0);
366	481	mainPanel.setResizeWeight(0.5);
367		-
	482	+
	483	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	484	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	485	+ divider.setDividerSize(15);
	486	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	487	+
	488	+ mainPanel.setUI(new BasicSplitPaneUI());
	489	+
368	490	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369	491	//mainPanel.setLayout(new GridBagLayout());
370	492	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -595,8 +717,8 @@
595	717	}
596	718	}
597	719
598		-static GraphicsDevice device = GraphicsEnvironment
599		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	720	+//static GraphicsDevice device = GraphicsEnvironment
	721	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
600	722
601	723	Rectangle keeprect;
602	724	cRadio radio;
..	..	@@ -612,13 +734,24 @@
612	734
613	735	boolean maximized;
614	736
	737	+ cButton fullscreenLayout;
	738	+
615	739	void Minimize()
616	740	{
617	741	frame.setState(Frame.ICONIFIED);
	742	+ frame.validate();
618	743	}
619	744
	745	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	746	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	747	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
620	748	void Maximize()
621	749	{
	750	+ if (CameraPane.FULLSCREEN)
	751	+ {
	752	+ ToggleFullScreen();
	753	+ }
	754	+
622	755	if (maximized)
623	756	{
624	757	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -626,20 +759,36 @@
626	759	else
627	760	{
628	761	keeprect = frame.getBounds();
629		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630		- Dimension rect2 = frame.getToolkit().getScreenSize();
631		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	762	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	763	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	764	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
632	765	// frame.setState(Frame.MAXIMIZED_BOTH);
	766	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
633	767	}
634	768
635	769	maximized ^= true;
	770	+
	771	+ frame.validate();
636	772	}
	773	+
	774	+ cButton minButton;
	775	+ cButton maxButton;
	776	+ cButton fullButton;
637	777
638	778	void ToggleFullScreen()
639	779	{
640		- if (CameraPane.FULLSCREEN)
	780	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	781	+
	782	+ cameraView.ToggleFullScreen();
	783	+
	784	+ if (!CameraPane.FULLSCREEN)
641	785	{
642	786	device.setFullScreenWindow(null);
	787	+ frame.dispose();
	788	+ frame.setUndecorated(false);
	789	+ frame.validate();
	790	+ frame.setVisible(true);
	791	+
643	792	//frame.setVisible(false);
644	793	// frame.removeNotify();
645	794	// frame.setUndecorated(false);
..	..	@@ -649,7 +798,7 @@
649	798	// X frame.getContentPane().remove(/"Center",/bigThree);
650	799	// X framePanel.add(bigThree);
651	800	// X frame.getContentPane().add(/"Center",/framePanel);
652		- framePanel.setDividerLocation(1);
	801	+ framePanel.setDividerLocation(46);
653	802
654	803	//frame.setVisible(true);
655	804	radio.layout = keepButton;
..	..	@@ -664,7 +813,12 @@
664	813	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665	814	// frame.getToolkit().getScreenSize().height);
666	815	//frame.setVisible(false);
	816	+
	817	+ frame.dispose();
	818	+ frame.setUndecorated(true);
667	819	device.setFullScreenWindow(frame);
	820	+ frame.validate();
	821	+ frame.setVisible(true);
668	822	// frame.removeNotify();
669	823	// frame.setUndecorated(true);
670	824	// frame.addNotify();
..	..	@@ -673,13 +827,34 @@
673	827	// X frame.getContentPane().add(/"Center",/bigThree);
674	828	framePanel.setDividerLocation(0);
675	829
676		- radio.layout = twoButton;
	830	+ radio.layout = fullscreenLayout;
677	831	radio.layout.doClick();
678	832	//frame.setVisible(true);
679	833	}
680		-
681		- cameraView.ToggleFullScreen();
	834	+ frame.validate();
682	835	}
	836	+
	837	+ private byte[] CompressCopy()
	838	+ {
	839	+ boolean temp = CameraPane.SWITCH;
	840	+ CameraPane.SWITCH = false;
	841	+
	842	+ copy.ExtractBigData(versiontable);
	843	+ // if (copy == client)
	844	+
	845	+ byte[] versions[] = copy.versions;
	846	+ copy.versions = null;
	847	+
	848	+ byte[] compress = Compress(copy);
	849	+
	850	+ copy.versions = versions;
	851	+
	852	+ copy.RestoreBigData(versiontable);
	853	+
	854	+ CameraPane.SWITCH = temp;
	855	+
	856	+ return compress;
	857	+ }
683	858
684	859	private JTextPane createTextPane()
685	860	{
..	..	@@ -819,7 +994,12 @@
819	994	JCheckBox speedupCB;
820	995	JCheckBox rewindCB;
821	996	JCheckBox flipVCB;
	997	+
	998	+ cCheckBox toggleTextureCB;
	999	+ cCheckBox toggleSwitchCB;
	1000	+
822	1001	JComboBox texresMenu;
	1002	+
823	1003	JButton resetButton;
824	1004	JButton stepButton;
825	1005	JButton stepAllButton;
..	..	@@ -1006,12 +1186,12 @@
1006	1186	namePanel = new cGridBag();
1007	1187
1008	1188	nameField = AddText(namePanel, copy.GetName());
1009		- namePanel.add(nameField);
	1189	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1010	1190	oe.ctrlPanel.add(namePanel);
1011	1191
1012	1192	oe.ctrlPanel.Return();
1013	1193
1014		- if (!GroupEditor.allparams)
	1194	+ if (!allparams)
1015	1195	return;
1016	1196
1017	1197	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1024,20 +1204,21 @@
1024	1204	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1025	1205	hideCB.setToolTipText("Hide object");
1026	1206	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027		- markCB.setToolTipText("Set the animation target transform");
	1207	+ markCB.setToolTipText("As animation target transform");
1028	1208
1029	1209	setupPanel2 = new cGridBag().setVertical(false);
1030	1210
1031	1211	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1032	1212	rewindCB.setToolTipText("Rewind animation");
1033	1213
1034		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1214	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1215	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1036	1216
	1217	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1218	+ link2masterCB.setToolTipText("Attach to support");
	1219	+
1037	1220	if (Globals.ADVANCED)
1038	1221	{
1039		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1040		- link2masterCB.setToolTipText("Attach to support");
1041	1222	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1042	1223	speedupCB.setToolTipText("Option motion capture");
1043	1224	}
..	..	@@ -1353,7 +1534,11 @@
1353	1534	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1535	// objectPanel.add(north);
1355	1536	objectPanel.add(editPanel);
1356		- objectPanel.add(infoPanel);
	1537	+
	1538	+ //if (Globals.ADVANCED)
	1539	+ objectPanel.add(infoPanel);
	1540	+
	1541	+ objectPanel.add(toolboxPanel);
1357	1542
1358	1543	/*
1359	1544	aConstraints.gridx = 0;
..	..	@@ -1362,7 +1547,7 @@
1362	1547	aConstraints.gridy += 1;
1363	1548	aConstraints.gridwidth = 1;
1364	1549	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1550	+ */
1366	1551
1367	1552	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1553	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1379,9 +1564,7 @@
1379	1564	JTabbedPane tabbedPane = new JTabbedPane();
1380	1565	tabbedPane.add(scrollpane);
1381	1566
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1567	+ optionsPanel = new cGridBag().setVertical(false);
1385	1568
1386	1569	optionsPanel.setName("Options");
1387	1570
..	..	@@ -1389,6 +1572,8 @@
1389	1572
1390	1573	tabbedPane.add(optionsPanel);
1391	1574
	1575	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1576	+
1392	1577	scenePanel.add(tabbedPane);
1393	1578
1394	1579	/*
..	..	@@ -1461,9 +1646,9 @@
1461	1646	// aConstraints.gridheight = 1;
1462	1647
1463	1648	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1649	+ framePanel.setContinuousLayout(false);
	1650	+ framePanel.setOneTouchExpandable(false);
	1651	+ //.setDividerLocation(0.8);
1467	1652	//framePanel.setDividerSize(15);
1468	1653	//framePanel.setResizeWeight(0.15);
1469	1654	framePanel.setName("Frame");
..	..	@@ -1481,11 +1666,14 @@
1481	1666	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1667
1483	1668	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1669	+
1486	1670	cameraView.requestFocusInWindow();
1487	1671
1488	1672	gridPanel.setDividerLocation(1.0);
	1673	+
	1674	+ frame.validate();
	1675	+
	1676	+ frame.setVisible(true);
1489	1677
1490	1678	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	1679	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1572,24 +1760,6 @@
1572	1760	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	1761	colorSection.add(texture);
1574	1762
1575		- cGridBag anisoU = new cGridBag();
1576		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1577		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579		- colorSection.add(anisoU);
1580		-
1581		- cGridBag anisoV = new cGridBag();
1582		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1583		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1585		- colorSection.add(anisoV);
1586		-
1587		- cGridBag shadowbias = new cGridBag();
1588		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1589		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1591		- colorSection.add(shadowbias);
1592		-
1593	1763	panel.add(new JSeparator());
1594	1764
1595	1765	panel.add(colorSection);
..	..	@@ -1639,6 +1809,12 @@
1639	1809	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1640	1810	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	1811	diffuseSection.add(fakedepth);
	1812	+
	1813	+ cGridBag shadowbias = new cGridBag();
	1814	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1815	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1816	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1817	+ diffuseSection.add(shadowbias);
1642	1818
1643	1819	panel.add(new JSeparator());
1644	1820
..	..	@@ -1690,6 +1866,18 @@
1690	1866	// aConstraints.gridy += 1;
1691	1867	// aConstraints.gridwidth = 1;
1692	1868
	1869	+ cGridBag anisoU = new cGridBag();
	1870	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1871	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1872	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1873	+ specularSection.add(anisoU);
	1874	+
	1875	+ cGridBag anisoV = new cGridBag();
	1876	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1877	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1878	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1879	+ specularSection.add(anisoV);
	1880	+
1693	1881
1694	1882	panel.add(new JSeparator());
1695	1883
..	..	@@ -1697,35 +1885,35 @@
1697	1885
1698	1886	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	1887
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	1888	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	1889
1702	1890	cGridBag camera = new cGridBag();
1703	1891	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	1892	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1893	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	1894	+ colorSection.add(camera);
1707	1895
1708	1896	cGridBag ambient = new cGridBag();
1709	1897	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	1898	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1899	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	1900	+ colorSection.add(ambient);
1713	1901
1714	1902	cGridBag backlit = new cGridBag();
1715	1903	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	1904	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	1905	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	1906	+ colorSection.add(backlit);
1719	1907
1720	1908	cGridBag opacity = new cGridBag();
1721	1909	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722	1910	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723	1911	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
	1912	+ colorSection.add(opacity);
1725	1913
1726		- panel.add(new JSeparator());
	1914	+ //panel.add(new JSeparator());
1727	1915
1728		- panel.add(globalSection);
	1916	+ //panel.add(globalSection);
1729	1917
1730	1918	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	1919
..	..	@@ -1832,8 +2020,9 @@
1832	2020	// 3D models
1833	2021	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	2022	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	2023	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2024	+ //LoadFile(filename, lastConverter);
	2025	+ LoadObjFile(filename); // New 3ds loader
1837	2026	continue;
1838	2027	}
1839	2028	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +2748,7 @@
2559	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2749	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2750	}
	2751	+
2562	2752	//cJME.count++;
2563	2753	//cJME.count %= 12;
2564	2754	if (gc)
..	..	@@ -2742,6 +2932,7 @@
2742	2932	}
2743	2933	}
2744	2934	}
	2935	+
2745	2936	cFileSystemPane FSPane;
2746	2937
2747	2938	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2795,11 +2986,14 @@
2795	2986	}
2796	2987	}
2797	2988	}
	2989	+
2798	2990	freezematerial = false;
2799	2991	}
2800	2992
2801	2993	void SetMaterial(Object3D object)
2802	2994	{
	2995	+ latestObject = object;
	2996	+
2803	2997	cMaterial mat = object.material;
2804	2998
2805	2999	if (mat == null)
..	..	@@ -2911,12 +3105,17 @@
2911	3105	// }
2912	3106
2913	3107	/**/
2914		- if (deselect)
	3108	+ if (deselect \|\| child == null)
2915	3109	{
2916	3110	//group.deselectAll();
2917	3111	//freeze = true;
2918	3112	GetTree().clearSelection();
2919	3113	//freeze = false;
	3114	+
	3115	+ if (child == null)
	3116	+ {
	3117	+ return;
	3118	+ }
2920	3119	}
2921	3120
2922	3121	//group.addSelectee(child);
..	..	@@ -2985,7 +3184,7 @@
2985	3184	cameraView.ToggleDL();
2986	3185	cameraView.repaint();
2987	3186	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3187	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3188	{
2990	3189	cameraView.ToggleTexture();
2991	3190	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3223,7 @@
3024	3223	frame.validate();
3025	3224
3026	3225	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3226	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3227	{
3029	3228	cameraView.ToggleSwitch();
3030	3229	cameraView.repaint();
..	..	@@ -3240,9 +3439,9 @@
3240	3439	{
3241	3440	Close();
3242	3441	//return true;
3243		- } else if (source == loadItem)
	3442	+ } else if (source == openItem)
3244	3443	{
3245		- load();
	3444	+ Open();
3246	3445	//return true;
3247	3446	} else if (source == newItem)
3248	3447	{
..	..	@@ -3267,6 +3466,10 @@
3267	3466	{
3268	3467	generatePOV();
3269	3468	//return true;
	3469	+ } else if (event.getSource() == archiveItem)
	3470	+ {
	3471	+ cTools.Archive(frame);
	3472	+ return;
3270	3473	} else if (source == zBufferItem)
3271	3474	{
3272	3475	try
..	..	@@ -3318,8 +3521,8 @@
3318	3521	try
3319	3522	{
3320	3523	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3524	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3525	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3323	3526
3324	3527	Object3D parent = o.parent;
3325	3528	o.parent = null;
..	..	@@ -3330,10 +3533,14 @@
3330	3533
3331	3534	out.flush();
3332	3535
3333		- zstream.close();
	3536	+ baos //zstream
	3537	+ .close();
3334	3538	out.close();
3335	3539
3336		- return baos.toByteArray();
	3540	+ byte[] bytes = baos.toByteArray();
	3541	+
	3542	+ System.out.println("save #bytes = " + bytes.length);
	3543	+ return bytes;
3337	3544	} catch (Exception e)
3338	3545	{
3339	3546	System.err.println(e);
..	..	@@ -3343,13 +3550,16 @@
3343	3550
3344	3551	static public Object Uncompress(byte[] bytes)
3345	3552	{
3346		- System.out.println("#bytes = " + bytes.length);
	3553	+ System.out.println("restore #bytes = " + bytes.length);
3347	3554	try
3348	3555	{
3349	3556	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351		- ObjectInputStream in = new ObjectInputStream(istream);
	3557	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3558	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3352	3559	Object obj = in.readObject();
	3560	+
	3561	+ bais //istream
	3562	+ .close();
3353	3563	in.close();
3354	3564
3355	3565	return obj;
..	..	@@ -3404,37 +3614,77 @@
3404	3614	return null;
3405	3615	}
3406	3616
3407		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408	3617
3409	3618	public void Save()
3410	3619	{
	3620	+ //Save(true);
	3621	+ Replace();
	3622	+ }
	3623	+
	3624	+ private boolean Equal(byte[] compress, byte[] name)
	3625	+ {
	3626	+ if (compress.length != name.length)
	3627	+ {
	3628	+ return false;
	3629	+ }
	3630	+
	3631	+ for (int i=compress.length; --i>=0;)
	3632	+ {
	3633	+ if (compress[i] != name[i])
	3634	+ return false;
	3635	+ }
	3636	+
	3637	+ return true;
	3638	+ }
	3639	+
	3640	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3641	+
	3642	+ public boolean Save(boolean user)
	3643	+ {
	3644	+ System.err.println("Save");
	3645	+
3411	3646	cRadio tab = GetCurrentTab();
3412	3647
3413		- boolean temp = CameraPane.SWITCH;
3414		- CameraPane.SWITCH = false;
	3648	+ byte[] compress = CompressCopy();
3415	3649
3416		- copy.ExtractBigData(hashtable);
	3650	+ boolean thesame = false;
	3651	+
	3652	+ // Quick heuristic using length. Works only when stream is compressed.
	3653	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3654	+ {
	3655	+ thesame = true;
	3656	+ }
3417	3657
3418	3658	//EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
3422		-
3423		- CameraPane.SWITCH = temp;
3424		-
3425		- //assert(hashtable.isEmpty());
3426		-
3427		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3659	+ if (!thesame)
3428	3660	{
3429		- tab.graphs[i] = null;
	3661	+ //tab.user[tab.versionindex] = user;
	3662	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3663	+
	3664	+ copy.versions[++copy.versionindex] = compress;
	3665	+
	3666	+ // if (increment)
	3667	+ // tab.versionindex++;
3430	3668	}
3431	3669
	3670	+ //copy.RestoreBigData(versiontable);
	3671	+
	3672	+ //assert(hashtable.isEmpty());
	3673	+
	3674	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3675	+ {
	3676	+ //tab.user[i] = false;
	3677	+ copy.versions[i] = null;
	3678	+ }
	3679	+
	3680	+ SetUndoStates();
	3681	+
3432	3682	// test save
3433	3683	if (false)
3434	3684	{
3435	3685	try
3436	3686	{
3437		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3687	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3438	3688	ObjectOutputStream p = new ObjectOutputStream(ostream);
3439	3689
3440	3690	p.writeObject(copy);
..	..	@@ -3447,14 +3697,18 @@
3447	3697	e.printStackTrace();
3448	3698	}
3449	3699	}
	3700	+
	3701	+ return !thesame;
3450	3702	}
3451	3703
3452	3704	void CopyChanged(Object3D obj)
3453	3705	{
	3706	+ SetUndoStates();
	3707	+
3454	3708	boolean temp = CameraPane.SWITCH;
3455	3709	CameraPane.SWITCH = false;
3456	3710
3457		- copy.ExtractBigData(hashtable);
	3711	+ copy.ExtractBigData(versiontable);
3458	3712
3459	3713	copy.clear();
3460	3714
..	..	@@ -3463,7 +3717,7 @@
3463	3717	copy.add(obj.get(i));
3464	3718	}
3465	3719
3466		- copy.RestoreBigData(hashtable);
	3720	+ copy.RestoreBigData(versiontable);
3467	3721
3468	3722	CameraPane.SWITCH = temp;
3469	3723
..	..	@@ -3490,40 +3744,130 @@
3490	3744	refreshContents();
3491	3745	}
3492	3746
3493		- public void Undo()
	3747	+ cButton undoButton;
	3748	+ cButton restoreButton;
	3749	+ cButton replaceButton;
	3750	+ cButton redoButton;
	3751	+
	3752	+ boolean muteSlider;
	3753	+
	3754	+ int VersionCount()
	3755	+ {
	3756	+ int count = 0;
	3757	+
	3758	+ for (int i = copy.versions.length; --i >= 0;)
	3759	+ {
	3760	+ if (copy.versions[i] != null)
	3761	+ count++;
	3762	+ }
	3763	+
	3764	+ return count;
	3765	+ }
	3766	+
	3767	+ void SetUndoStates()
3494	3768	{
3495	3769	cRadio tab = GetCurrentTab();
3496	3770
3497		- if (tab.undoindex == 0)
	3771	+ restoreButton.setEnabled(copy.versionindex != -1);
	3772	+ replaceButton.setEnabled(copy.versionindex != -1);
	3773	+
	3774	+ undoButton.setEnabled(copy.versionindex > 0);
	3775	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3776	+
	3777	+ muteSlider = true;
	3778	+ versionSlider.setMaximum(VersionCount() - 1);
	3779	+ versionSlider.setInteger(copy.versionindex);
	3780	+ muteSlider = false;
	3781	+ }
	3782	+
	3783	+ public boolean Undo()
	3784	+ {
	3785	+ // Option?
	3786	+ Replace();
	3787	+
	3788	+ System.err.println("Undo");
	3789	+
	3790	+ cRadio tab = GetCurrentTab();
	3791	+
	3792	+ if (copy.versionindex == 0)
3498	3793	{
3499	3794	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	3795	+ return false;
3501	3796	}
3502	3797
3503		- if (tab.graphs[tab.undoindex] == null)
	3798	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3799	+// {
	3800	+// if (Save(false))
	3801	+// tab.versionindex -= 1;
	3802	+// else
	3803	+// {
	3804	+// if (tab.versionindex <= 0)
	3805	+// return false;
	3806	+// else
	3807	+// tab.versionindex -= 1;
	3808	+// }
	3809	+// }
	3810	+
	3811	+ copy.versionindex -= 1;
	3812	+
	3813	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3814	+
	3815	+ return true;
	3816	+ }
	3817	+
	3818	+ public boolean Restore()
	3819	+ {
	3820	+ System.err.println("Restore");
	3821	+
	3822	+ cRadio tab = GetCurrentTab();
	3823	+
	3824	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3504	3825	{
3505		- Save();
3506		- tab.undoindex -= 1;
	3826	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3827	+ return false;
3507	3828	}
3508	3829
3509		- tab.undoindex -= 1;
	3830	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3831	+
	3832	+ return true;
	3833	+ }
3510	3834
3511		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3835	+ public boolean Replace()
	3836	+ {
	3837	+ System.err.println("Replace");
	3838	+
	3839	+ cRadio tab = GetCurrentTab();
	3840	+
	3841	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3842	+ {
	3843	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3844	+ return false;
	3845	+ }
	3846	+
	3847	+ copy.versions[copy.versionindex] = CompressCopy();
	3848	+
	3849	+ return true;
3512	3850	}
3513	3851
3514	3852	public void Redo()
3515	3853	{
	3854	+ // Option?
	3855	+ Replace();
	3856	+
3516	3857	cRadio tab = GetCurrentTab();
3517	3858
3518		- if (tab.graphs[tab.undoindex + 1] == null)
	3859	+ if (copy.versions[copy.versionindex + 1] == null)
3519	3860	{
3520	3861	java.awt.Toolkit.getDefaultToolkit().beep();
3521	3862	return;
3522	3863	}
3523	3864
3524		- tab.undoindex += 1;
	3865	+ copy.versionindex += 1;
3525	3866
3526		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3867	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3868	+
	3869	+ //if (!tab.user[tab.versionindex])
	3870	+ // tab.graphs[tab.versionindex] = null;
3527	3871	}
3528	3872
3529	3873	void ImportGFD()
..	..	@@ -3675,7 +4019,7 @@
3675	4019	assert false;
3676	4020	}
3677	4021
3678		- void EditSelection()
	4022	+ void EditSelection(boolean newWindow)
3679	4023	{
3680	4024	}
3681	4025
..	..	@@ -3819,9 +4163,25 @@
3819	4163	//copy.Touch();
3820	4164	}
3821	4165
	4166	+ cNumberSlider versionSlider;
	4167	+
3822	4168	public void stateChanged(ChangeEvent e)
3823	4169	{
3824	4170	// assert(false);
	4171	+ if (e.getSource() == versionSlider)
	4172	+ {
	4173	+ if (muteSlider)
	4174	+ return;
	4175	+
	4176	+ int version = versionSlider.getInteger();
	4177	+
	4178	+ if (copy.versions[version] != null)
	4179	+ {
	4180	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4181	+ }
	4182	+
	4183	+ return;
	4184	+ }
3825	4185
3826	4186	if (freezematerial)
3827	4187	{
..	..	@@ -4170,7 +4530,8 @@
4170	4530
4171	4531	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	4532	{
4173		- Save();
	4533	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4534	+ Save();
4174	4535	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	4536	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	4537	// if (thing instanceof GenericJointDemo)
..	..	@@ -4257,6 +4618,12 @@
4257	4618	{
4258	4619	ResetModel();
4259	4620	Select(thing.GetTreePath(), true, false); // unselect... false);
	4621	+
	4622	+ if (thing.Size() == 0)
	4623	+ {
	4624	+ //EditSelection(false);
	4625	+ }
	4626	+
4260	4627	refreshContents();
4261	4628	}
4262	4629
..	..	@@ -4479,7 +4846,8 @@
4479	4846
4480	4847	if (readobj != null)
4481	4848	{
4482		- Save();
	4849	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4850	+ // Save();
4483	4851	try
4484	4852	{
4485	4853	//readobj.deepCopySelf(copy);
..	..	@@ -4534,13 +4902,24 @@
4534	4902	c.addChild(csg);
4535	4903	}
4536	4904
	4905	+ copy.versions = readobj.versions;
	4906	+ copy.versionindex = readobj.versionindex;
	4907	+
	4908	+ if (copy.versions == null)
	4909	+ {
	4910	+ copy.versions = new byte[100][];
	4911	+ copy.versionindex = -1;
	4912	+ }
	4913	+
	4914	+ //? SetUndoStates();
	4915	+
4537	4916	ResetModel();
4538	4917	copy.HardTouch(); // recompile?
4539	4918	refreshContents();
4540	4919	}
4541	4920	}
4542	4921
4543		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4544	4923	{
4545	4924	if (Grafreed.standAlone)
4546	4925	{
..	..	@@ -4657,6 +5036,8 @@
4657	5036	String filename = browser.getFile();
4658	5037	if (filename != null && filename.length() > 0)
4659	5038	{
	5039	+ if (!filename.endsWith(".gfd"))
	5040	+ filename += ".gfd";
4660	5041	lastname = browser.getDirectory() + filename;
4661	5042	save();
4662	5043	}
..	..	@@ -4823,7 +5204,7 @@
4823	5204	MenuBar menuBar;
4824	5205	Menu fileMenu;
4825	5206	MenuItem newItem;
4826		- MenuItem loadItem;
	5207	+ MenuItem openItem;
4827	5208	MenuItem saveItem;
4828	5209	MenuItem saveAsItem;
4829	5210	MenuItem exportAsItem;
..	..	@@ -4846,22 +5227,36 @@
4846	5227	CheckboxMenuItem toggleSwitchItem;
4847	5228	CheckboxMenuItem toggleRootItem;
4848	5229	CheckboxMenuItem animationItem;
	5230	+ MenuItem archiveItem;
4849	5231	CheckboxMenuItem toggleHandleItem;
4850	5232	CheckboxMenuItem togglePaintItem;
4851	5233	JSplitPane mainPanel;
4852	5234	JScrollPane scrollpane;
	5235	+
4853	5236	JPanel toolbarPanel;
	5237	+
4854	5238	cGridBag treePanel;
	5239	+
4855	5240	JPanel radioPanel;
4856	5241	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	5242	+
	5243	+ cGridBag toolboxPanel;
4858	5244	cGridBag materialPanel;
	5245	+ cGridBag ctrlPanel;
	5246	+
4859	5247	JScrollPane infoPanel;
	5248	+
4860	5249	cGridBag optionsPanel;
	5250	+
4861	5251	JTabbedPane objectPanel;
	5252	+ boolean materialFlushed;
	5253	+ Object3D latestObject;
	5254	+
4862	5255	cGridBag XYZPanel;
	5256	+
4863	5257	JSplitPane gridPanel;
4864	5258	JSplitPane bigPanel;
	5259	+
4865	5260	cGridBag bigThree;
4866	5261	cGridBag scenePanel;
4867	5262	cGridBag centralPanel;
..	..	@@ -4976,7 +5371,7 @@
4976	5371	cNumberSlider fogField;
4977	5372	JLabel opacityPowerLabel;
4978	5373	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	5374	+ cTree jTree;
4980	5375	//ObjectUI parent;
4981	5376
4982	5377	cNumberSlider normalpushField;