~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -44,61 +44,47 @@
44	44
45	45	cButton GetButton(String name, boolean border)
46	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		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
56	49	}
57	50
58	51	cToggleButton GetToggleButton(String name, boolean border)
59	52	{
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		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
69	55	}
70	56
71	57	cCheckBox GetCheckBox(String name, boolean border)
72	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ ImageIcon GetIcon(String name)
	64	+ {
73	65	try
74	66	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	70	+// {
	71	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	72	+// Graphics2D g = resized.createGraphics();
	73	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+// g.dispose();
	77	+//
	78	+// image = resized;
	79	+// }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
77	83	}
78	84	catch (Exception e)
79	85	{
80		- return new cCheckBox(name, border);
	86	+ return null;
81	87	}
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	88	}
103	89
104	90	// SCRIPT
..	..	@@ -282,6 +268,12 @@
282	268	client = inClient;
283	269	copy = client;
284	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
285	277	// "this" is not called: SetupUI2(objEditor);
286	278	}
287	279
..	..	@@ -295,6 +287,12 @@
295	287	client = inClient;
296	288	copy = client;
297	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
298	296	SetupUI2(callee.GetEditor());
299	297	}
300	298
..	..	@@ -309,7 +307,7 @@
309	307	//localCopy.parent = null;
310	308
311	309	frame = new JFrame();
312		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
313	311	objEditor = this;
314	312	this.callee = callee;
315	313
..	..	@@ -327,6 +325,12 @@
327	325	copy = localCopy;
328	326	copy.editWindow = this;
329	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
330	334	SetupMenu();
331	335
332	336	//SetupName(objEditor); // new
..	..	@@ -350,7 +354,7 @@
350	354	frame.setMenuBar(menuBar = new MenuBar());
351	355	menuBar.add(fileMenu = new Menu("File"));
352	356	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	358
355	359	//oe.menuBar.add(menu = new Menu("Include"));
356	360	Menu menu = new Menu("Import");
..	..	@@ -382,7 +386,7 @@
382	386	}
383	387
384	388	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
386	390	saveItem.addActionListener(this);
387	391	saveAsItem.addActionListener(this);
388	392	exportAsItem.addActionListener(this);
..	..	@@ -419,11 +423,12 @@
419	423
420	424	toolbarPanel = new JPanel();
421	425	toolbarPanel.setName("Toolbar");
	426	+
422	427	treePanel = new cGridBag();
423	428	treePanel.setName("Tree");
424	429
425	430	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
427	432
428	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	434
..	..	@@ -431,11 +436,11 @@
431	436	editPanel.add(editCommandsPanel);
432	437	editPanel.add(ctrlPanel);
433	438
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	439	+ toolboxPanel = new cGridBag().setVertical(true);
	440	+ //toolboxPanel.setName("Toolbox");
436	441
437	442	materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
439	444
440	445	/JTextPane/
441	446	infoarea = createTextPane();
..	..	@@ -443,14 +448,15 @@
443	448
444	449	infoarea.setEditable(true);
445	450	SetText();
	451	+
446	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	453	// infoarea.setOpaque(false);
448	454	// //infoarea.setForeground(textcolor);
449	455	// TEXTAREA infoarea.setLineWrap(true);
450	456	// TEXTAREA infoarea.setWrapStyleWord(true);
451	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452		- infoPanel.setPreferredSize(new Dimension(50, 200));
453		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
454	460	//infoPanel.setLayout(new BorderLayout());
455	461	//infoPanel.add(createTextPane());
456	462
..	..	@@ -463,10 +469,11 @@
463	469	mainPanel.setResizeWeight(0.5);
464	470
465	471	//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466		-// BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467		-// divider.setDividerSize(15);
468		-// divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
469	475
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
470	477
471	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
472	479	//mainPanel.setLayout(new GridBagLayout());
..	..	@@ -698,8 +705,8 @@
698	705	}
699	706	}
700	707
701		-static GraphicsDevice device = GraphicsEnvironment
702		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
703	710
704	711	Rectangle keeprect;
705	712	cRadio radio;
..	..	@@ -720,10 +727,19 @@
720	727	void Minimize()
721	728	{
722	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
723	731	}
724	732
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
725	736	void Maximize()
726	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
727	743	if (maximized)
728	744	{
729	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -731,22 +747,36 @@
731	747	else
732	748	{
733	749	keeprect = frame.getBounds();
734		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735		- Dimension rect2 = frame.getToolkit().getScreenSize();
736		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
737	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
738	755	}
739	756
740	757	maximized ^= true;
	758	+
	759	+ frame.validate();
741	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
742	765
743	766	void ToggleFullScreen()
744	767	{
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
745	770	cameraView.ToggleFullScreen();
746	771
747	772	if (!CameraPane.FULLSCREEN)
748	773	{
749	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
750	780	//frame.setVisible(false);
751	781	// frame.removeNotify();
752	782	// frame.setUndecorated(false);
..	..	@@ -756,7 +786,7 @@
756	786	// X frame.getContentPane().remove(/"Center",/bigThree);
757	787	// X framePanel.add(bigThree);
758	788	// X frame.getContentPane().add(/"Center",/framePanel);
759		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
760	790
761	791	//frame.setVisible(true);
762	792	radio.layout = keepButton;
..	..	@@ -771,7 +801,12 @@
771	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772	802	// frame.getToolkit().getScreenSize().height);
773	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
774	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
775	810	// frame.removeNotify();
776	811	// frame.setUndecorated(true);
777	812	// frame.addNotify();
..	..	@@ -784,7 +819,30 @@
784	819	radio.layout.doClick();
785	820	//frame.setVisible(true);
786	821	}
	822	+ frame.validate();
787	823	}
	824	+
	825	+ private byte[] CompressCopy()
	826	+ {
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
788	846
789	847	private JTextPane createTextPane()
790	848	{
..	..	@@ -916,7 +974,7 @@
916	974	// NumberSlider vDivsField;
917	975	// JCheckBox endcaps;
918	976	JCheckBox liveCB;
919		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
920	978	JCheckBox hideCB;
921	979	JCheckBox link2masterCB;
922	980	JCheckBox markCB;
..	..	@@ -1116,7 +1174,7 @@
1116	1174	namePanel = new cGridBag();
1117	1175
1118	1176	nameField = AddText(namePanel, copy.GetName());
1119		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1120	1178	oe.ctrlPanel.add(namePanel);
1121	1179
1122	1180	oe.ctrlPanel.Return();
..	..	@@ -1128,26 +1186,30 @@
1128	1186
1129	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1130	1188	liveCB.setToolTipText("Animate object");
1131		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1132		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
1133	1191	// Return();
	1192	+
1134	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1135	1194	hideCB.setToolTipText("Hide object");
1136	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1137	1196	markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1138	1199
1139	1200	setupPanel2 = new cGridBag().setVertical(false);
1140	1201
1141	1202	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1142	1203	rewindCB.setToolTipText("Rewind animation");
1143	1204
1144		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1205	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1145	1206	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1146	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
1147	1211	if (Globals.ADVANCED)
1148	1212	{
1149		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1150		- link2masterCB.setToolTipText("Attach to support");
1151	1213	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1152	1214	speedupCB.setToolTipText("Option motion capture");
1153	1215	}
..	..	@@ -1421,6 +1483,7 @@
1421	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1422	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1423	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1424	1487
1425	1488	/*
1426	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1458,13 +1521,23 @@
1458	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1459	1522	//tmp.setName("Edit");
1460	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1461	1525	// JPanel north = new JPanel(new BorderLayout());
1462	1526	// north.setName("Edit");
1463	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1464	1528	// objectPanel.add(north);
1465	1529	objectPanel.add(editPanel);
1466		- objectPanel.add(infoPanel);
	1530	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1531	+
	1532	+ //if (Globals.ADVANCED)
	1533	+ objectPanel.add(infoPanel);
	1534	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1535	+
	1536	+ objectPanel.add(XYZPanel);
	1537	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1538	+
1467	1539	objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1468	1541
1469	1542	/*
1470	1543	aConstraints.gridx = 0;
..	..	@@ -1485,7 +1558,7 @@
1485	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1486	1559
1487	1560	/JTabbedPane/ scenePanel = new cGridBag();
1488		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1489	1562
1490	1563	JTabbedPane tabbedPane = new JTabbedPane();
1491	1564	tabbedPane.add(scrollpane);
..	..	@@ -1561,9 +1634,9 @@
1561	1634	/**/
1562	1635
1563	1636	bigThree = new cGridBag();
1564		- bigThree.addComponent(scenePanel);
1565	1637	bigThree.addComponent(centralPanel);
1566		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1567	1640
1568	1641	// // SIDE EFFECT!!!
1569	1642	// aConstraints.gridx = 0;
..	..	@@ -1572,9 +1645,9 @@
1572	1645	// aConstraints.gridheight = 1;
1573	1646
1574	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1575		- framePanel.setContinuousLayout(true);
1576		- framePanel.setOneTouchExpandable(true);
1577		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1578	1651	//framePanel.setDividerSize(15);
1579	1652	//framePanel.setResizeWeight(0.15);
1580	1653	framePanel.setName("Frame");
..	..	@@ -1593,12 +1666,13 @@
1593	1666
1594	1667	frame.setSize(1280, 860);
1595	1668
1596		- frame.validate();
1597		- frame.setVisible(true);
1598		-
1599	1669	cameraView.requestFocusInWindow();
1600	1670
1601	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1602	1676
1603	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1604	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1685,24 +1759,6 @@
1685	1759	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1686	1760	colorSection.add(texture);
1687	1761
1688		- cGridBag anisoU = new cGridBag();
1689		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692		- colorSection.add(anisoU);
1693		-
1694		- cGridBag anisoV = new cGridBag();
1695		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698		- colorSection.add(anisoV);
1699		-
1700		- cGridBag shadowbias = new cGridBag();
1701		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704		- colorSection.add(shadowbias);
1705		-
1706	1762	panel.add(new JSeparator());
1707	1763
1708	1764	panel.add(colorSection);
..	..	@@ -1752,6 +1808,12 @@
1752	1808	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753	1809	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1754	1810	diffuseSection.add(fakedepth);
	1811	+
	1812	+ cGridBag shadowbias = new cGridBag();
	1813	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1814	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1815	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1816	+ diffuseSection.add(shadowbias);
1755	1817
1756	1818	panel.add(new JSeparator());
1757	1819
..	..	@@ -1803,6 +1865,18 @@
1803	1865	// aConstraints.gridy += 1;
1804	1866	// aConstraints.gridwidth = 1;
1805	1867
	1868	+ cGridBag anisoU = new cGridBag();
	1869	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1870	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1871	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1872	+ specularSection.add(anisoU);
	1873	+
	1874	+ cGridBag anisoV = new cGridBag();
	1875	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1876	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1877	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ specularSection.add(anisoV);
	1879	+
1806	1880
1807	1881	panel.add(new JSeparator());
1808	1882
..	..	@@ -1810,35 +1884,35 @@
1810	1884
1811	1885	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	1886
1813		- cGridBag globalSection = new cGridBag().setVertical(true);
	1887	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1814	1888
1815	1889	cGridBag camera = new cGridBag();
1816	1890	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1817	1891	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1818	1892	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819		- globalSection.add(camera);
	1893	+ colorSection.add(camera);
1820	1894
1821	1895	cGridBag ambient = new cGridBag();
1822	1896	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1823	1897	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1824	1898	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825		- globalSection.add(ambient);
	1899	+ colorSection.add(ambient);
1826	1900
1827	1901	cGridBag backlit = new cGridBag();
1828	1902	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1829	1903	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1830	1904	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831		- globalSection.add(backlit);
	1905	+ colorSection.add(backlit);
1832	1906
1833	1907	cGridBag opacity = new cGridBag();
1834	1908	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1835	1909	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1836	1910	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837		- globalSection.add(opacity);
	1911	+ colorSection.add(opacity);
1838	1912
1839		- panel.add(new JSeparator());
	1913	+ //panel.add(new JSeparator());
1840	1914
1841		- panel.add(globalSection);
	1915	+ //panel.add(globalSection);
1842	1916
1843	1917	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1844	1918
..	..	@@ -1945,8 +2019,9 @@
1945	2019	// 3D models
1946	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1947	2021	{
1948		- lastConverter = new com.jmex.model.converters.MaxToJme();
1949		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1950	2025	continue;
1951	2026	}
1952	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2672,6 +2747,7 @@
2672	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2673	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2674	2749	}
	2750	+
2675	2751	//cJME.count++;
2676	2752	//cJME.count %= 12;
2677	2753	if (gc)
..	..	@@ -2855,6 +2931,7 @@
2855	2931	}
2856	2932	}
2857	2933	}
	2934	+
2858	2935	cFileSystemPane FSPane;
2859	2936
2860	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2908,6 +2985,7 @@
2908	2985	}
2909	2986	}
2910	2987	}
	2988	+
2911	2989	freezematerial = false;
2912	2990	}
2913	2991
..	..	@@ -3175,7 +3253,7 @@
3175	3253	{
3176	3254	copy.live ^= true;
3177	3255	return;
3178		- } else if (event.getSource() == selectCB)
	3256	+ } else if (event.getSource() == selectableCB)
3179	3257	{
3180	3258	copy.dontselect ^= true;
3181	3259	return;
..	..	@@ -3360,9 +3438,9 @@
3360	3438	{
3361	3439	Close();
3362	3440	//return true;
3363		- } else if (source == loadItem)
	3441	+ } else if (source == openItem)
3364	3442	{
3365		- load();
	3443	+ Open();
3366	3444	//return true;
3367	3445	} else if (source == newItem)
3368	3446	{
..	..	@@ -3387,6 +3465,10 @@
3387	3465	{
3388	3466	generatePOV();
3389	3467	//return true;
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
3390	3472	} else if (source == zBufferItem)
3391	3473	{
3392	3474	try
..	..	@@ -3438,8 +3520,8 @@
3438	3520	try
3439	3521	{
3440	3522	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3441		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3442		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3443	3525
3444	3526	Object3D parent = o.parent;
3445	3527	o.parent = null;
..	..	@@ -3450,10 +3532,14 @@
3450	3532
3451	3533	out.flush();
3452	3534
3453		- zstream.close();
	3535	+ baos //zstream
	3536	+ .close();
3454	3537	out.close();
3455	3538
3456		- return baos.toByteArray();
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
3457	3543	} catch (Exception e)
3458	3544	{
3459	3545	System.err.println(e);
..	..	@@ -3463,13 +3549,16 @@
3463	3549
3464	3550	static public Object Uncompress(byte[] bytes)
3465	3551	{
3466		- System.out.println("#bytes = " + bytes.length);
	3552	+ System.out.println("restore #bytes = " + bytes.length);
3467	3553	try
3468	3554	{
3469	3555	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3470		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3471		- ObjectInputStream in = new ObjectInputStream(istream);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3472	3558	Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
3473	3562	in.close();
3474	3563
3475	3564	return obj;
..	..	@@ -3524,31 +3613,67 @@
3524	3613	return null;
3525	3614	}
3526	3615
3527		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3528	3616
3529	3617	public void Save()
	3618	+ {
	3619	+ //Save(true);
	3620	+ Replace();
	3621	+ }
	3622	+
	3623	+ private boolean Equal(byte[] compress, byte[] name)
	3624	+ {
	3625	+ if (compress.length != name.length)
	3626	+ {
	3627	+ return false;
	3628	+ }
	3629	+
	3630	+ for (int i=compress.length; --i>=0;)
	3631	+ {
	3632	+ if (compress[i] != name[i])
	3633	+ return false;
	3634	+ }
	3635	+
	3636	+ return true;
	3637	+ }
	3638	+
	3639	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3640	+
	3641	+ public boolean Save(boolean user)
3530	3642	{
3531	3643	System.err.println("Save");
3532	3644
3533	3645	cRadio tab = GetCurrentTab();
3534	3646
3535		- boolean temp = CameraPane.SWITCH;
3536		- CameraPane.SWITCH = false;
	3647	+ byte[] compress = CompressCopy();
3537	3648
3538		- copy.ExtractBigData(hashtable);
	3649	+ boolean thesame = false;
	3650	+
	3651	+ // Quick heuristic using length. Works only when stream is compressed.
	3652	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3653	+ {
	3654	+ thesame = true;
	3655	+ }
3539	3656
3540	3657	//EditorFrame.m_MainFrame.requestFocusInWindow();
3541		- tab.graphs[tab.undoindex++] = Compress(copy);
	3658	+ if (!thesame)
	3659	+ {
	3660	+ //tab.user[tab.versionindex] = user;
	3661	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3662	+
	3663	+ copy.versions[++copy.versionindex] = compress;
	3664	+
	3665	+ // if (increment)
	3666	+ // tab.versionindex++;
	3667	+ }
3542	3668
3543		- copy.RestoreBigData(hashtable);
	3669	+ //copy.RestoreBigData(versiontable);
3544	3670
3545		- CameraPane.SWITCH = temp;
3546		-
3547	3671	//assert(hashtable.isEmpty());
3548	3672
3549		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3550	3674	{
3551		- tab.graphs[i] = null;
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
3552	3677	}
3553	3678
3554	3679	SetUndoStates();
..	..	@@ -3558,7 +3683,7 @@
3558	3683	{
3559	3684	try
3560	3685	{
3561		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3562	3687	ObjectOutputStream p = new ObjectOutputStream(ostream);
3563	3688
3564	3689	p.writeObject(copy);
..	..	@@ -3571,6 +3696,8 @@
3571	3696	e.printStackTrace();
3572	3697	}
3573	3698	}
	3699	+
	3700	+ return !thesame;
3574	3701	}
3575	3702
3576	3703	void CopyChanged(Object3D obj)
..	..	@@ -3580,7 +3707,7 @@
3580	3707	boolean temp = CameraPane.SWITCH;
3581	3708	CameraPane.SWITCH = false;
3582	3709
3583		- copy.ExtractBigData(hashtable);
	3710	+ copy.ExtractBigData(versiontable);
3584	3711
3585	3712	copy.clear();
3586	3713
..	..	@@ -3589,7 +3716,7 @@
3589	3716	copy.add(obj.get(i));
3590	3717	}
3591	3718
3592		- copy.RestoreBigData(hashtable);
	3719	+ copy.RestoreBigData(versiontable);
3593	3720
3594	3721	CameraPane.SWITCH = temp;
3595	3722
..	..	@@ -3617,52 +3744,129 @@
3617	3744	}
3618	3745
3619	3746	cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
3620	3749	cButton redoButton;
3621	3750
	3751	+ boolean muteSlider;
	3752	+
	3753	+ int VersionCount()
	3754	+ {
	3755	+ int count = 0;
	3756	+
	3757	+ for (int i = copy.versions.length; --i >= 0;)
	3758	+ {
	3759	+ if (copy.versions[i] != null)
	3760	+ count++;
	3761	+ }
	3762	+
	3763	+ return count;
	3764	+ }
	3765	+
3622	3766	void SetUndoStates()
3623	3767	{
3624	3768	cRadio tab = GetCurrentTab();
3625	3769
3626		- undoButton.setEnabled(tab.undoindex > 0);
3627		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3770	+ restoreButton.setEnabled(copy.versionindex != -1);
	3771	+ replaceButton.setEnabled(copy.versionindex != -1);
	3772	+
	3773	+ undoButton.setEnabled(copy.versionindex > 0);
	3774	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3775	+
	3776	+ muteSlider = true;
	3777	+ versionSlider.setMaximum(VersionCount() - 1);
	3778	+ versionSlider.setInteger(copy.versionindex);
	3779	+ muteSlider = false;
3628	3780	}
3629	3781
3630		- public void Undo()
	3782	+ public boolean Undo()
3631	3783	{
	3784	+ // Option?
	3785	+ Replace();
	3786	+
3632	3787	System.err.println("Undo");
3633	3788
3634	3789	cRadio tab = GetCurrentTab();
3635	3790
3636		- if (tab.undoindex == 0)
	3791	+ if (copy.versionindex == 0)
3637	3792	{
3638	3793	java.awt.Toolkit.getDefaultToolkit().beep();
3639		- return;
	3794	+ return false;
3640	3795	}
3641	3796
3642		- if (tab.graphs[tab.undoindex] == null)
	3797	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3798	+// {
	3799	+// if (Save(false))
	3800	+// tab.versionindex -= 1;
	3801	+// else
	3802	+// {
	3803	+// if (tab.versionindex <= 0)
	3804	+// return false;
	3805	+// else
	3806	+// tab.versionindex -= 1;
	3807	+// }
	3808	+// }
	3809	+
	3810	+ copy.versionindex -= 1;
	3811	+
	3812	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3813	+
	3814	+ return true;
	3815	+ }
	3816	+
	3817	+ public boolean Restore()
	3818	+ {
	3819	+ System.err.println("Restore");
	3820	+
	3821	+ cRadio tab = GetCurrentTab();
	3822	+
	3823	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3643	3824	{
3644		- Save();
3645		- tab.undoindex -= 1;
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
3646	3827	}
3647	3828
3648		- tab.undoindex -= 1;
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
3649	3833
3650		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3834	+ public boolean Replace()
	3835	+ {
	3836	+ System.err.println("Replace");
	3837	+
	3838	+ cRadio tab = GetCurrentTab();
	3839	+
	3840	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3841	+ {
	3842	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3843	+ return false;
	3844	+ }
	3845	+
	3846	+ copy.versions[copy.versionindex] = CompressCopy();
	3847	+
	3848	+ return true;
3651	3849	}
3652	3850
3653	3851	public void Redo()
3654	3852	{
	3853	+ // Option?
	3854	+ Replace();
	3855	+
3655	3856	cRadio tab = GetCurrentTab();
3656	3857
3657		- if (tab.graphs[tab.undoindex + 1] == null)
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
3658	3859	{
3659	3860	java.awt.Toolkit.getDefaultToolkit().beep();
3660	3861	return;
3661	3862	}
3662	3863
3663		- tab.undoindex += 1;
	3864	+ copy.versionindex += 1;
3664	3865
3665		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3866	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3867	+
	3868	+ //if (!tab.user[tab.versionindex])
	3869	+ // tab.graphs[tab.versionindex] = null;
3666	3870	}
3667	3871
3668	3872	void ImportGFD()
..	..	@@ -3958,9 +4162,25 @@
3958	4162	//copy.Touch();
3959	4163	}
3960	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3961	4167	public void stateChanged(ChangeEvent e)
3962	4168	{
3963	4169	// assert(false);
	4170	+ if (e.getSource() == versionSlider)
	4171	+ {
	4172	+ if (muteSlider)
	4173	+ return;
	4174	+
	4175	+ int version = versionSlider.getInteger();
	4176	+
	4177	+ if (copy.versions[version] != null)
	4178	+ {
	4179	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4180	+ }
	4181	+
	4182	+ return;
	4183	+ }
3964	4184
3965	4185	if (freezematerial)
3966	4186	{
..	..	@@ -4309,7 +4529,7 @@
4309	4529
4310	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4311	4531	{
4312		- if (Globals.SAVEONMAKE) // && resetmodel)
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4313	4533	Save();
4314	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
4315	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4551,7 +4771,9 @@
4551	4771	readobj.ResetDisplayList();
4552	4772	} catch (Exception e)
4553	4773	{
4554		- //e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
4555	4777	try
4556	4778	{
4557	4779	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4625,8 +4847,8 @@
4625	4847
4626	4848	if (readobj != null)
4627	4849	{
4628		- if (Globals.SAVEONMAKE)
4629		- Save();
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4630	4852	try
4631	4853	{
4632	4854	//readobj.deepCopySelf(copy);
..	..	@@ -4671,6 +4893,7 @@
4671	4893	}
4672	4894	} catch (ClassCastException e)
4673	4895	{
	4896	+ e.printStackTrace();
4674	4897	assert (false);
4675	4898	Composite c = (Composite) copy;
4676	4899	c.children.clear();
..	..	@@ -4681,13 +4904,24 @@
4681	4904	c.addChild(csg);
4682	4905	}
4683	4906
	4907	+ copy.versions = readobj.versions;
	4908	+ copy.versionindex = readobj.versionindex;
	4909	+
	4910	+ if (copy.versions == null)
	4911	+ {
	4912	+ copy.versions = new byte[100][];
	4913	+ copy.versionindex = -1;
	4914	+ }
	4915	+
	4916	+ //? SetUndoStates();
	4917	+
4684	4918	ResetModel();
4685	4919	copy.HardTouch(); // recompile?
4686	4920	refreshContents();
4687	4921	}
4688	4922	}
4689	4923
4690		- void load() // throws ClassNotFoundException
	4924	+ void Open() // throws ClassNotFoundException
4691	4925	{
4692	4926	if (Grafreed.standAlone)
4693	4927	{
..	..	@@ -4790,6 +5024,7 @@
4790	5024	//ps.print(buffer.toString());
4791	5025	} catch (IOException e)
4792	5026	{
	5027	+ e.printStackTrace();
4793	5028	}
4794	5029	}
4795	5030
..	..	@@ -4972,7 +5207,7 @@
4972	5207	MenuBar menuBar;
4973	5208	Menu fileMenu;
4974	5209	MenuItem newItem;
4975		- MenuItem loadItem;
	5210	+ MenuItem openItem;
4976	5211	MenuItem saveItem;
4977	5212	MenuItem saveAsItem;
4978	5213	MenuItem exportAsItem;
..	..	@@ -4995,6 +5230,7 @@
4995	5230	CheckboxMenuItem toggleSwitchItem;
4996	5231	CheckboxMenuItem toggleRootItem;
4997	5232	CheckboxMenuItem animationItem;
	5233	+ MenuItem archiveItem;
4998	5234	CheckboxMenuItem toggleHandleItem;
4999	5235	CheckboxMenuItem togglePaintItem;
5000	5236	JSplitPane mainPanel;