~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
..	..	@@ -699,8 +705,8 @@
699	705	}
700	706	}
701	707
702		-static GraphicsDevice device = GraphicsEnvironment
703		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704	710
705	711	Rectangle keeprect;
706	712	cRadio radio;
..	..	@@ -721,10 +727,19 @@
721	727	void Minimize()
722	728	{
723	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
724	731	}
725	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={}
726	736	void Maximize()
727	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
728	743	if (maximized)
729	744	{
730	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -732,22 +747,36 @@
732	747	else
733	748	{
734	749	keeprect = frame.getBounds();
735		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
736		- Dimension rect2 = frame.getToolkit().getScreenSize();
737		- 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);
738	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
739	755	}
740	756
741	757	maximized ^= true;
	758	+
	759	+ frame.validate();
742	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
743	765
744	766	void ToggleFullScreen()
745	767	{
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
746	770	cameraView.ToggleFullScreen();
747	771
748	772	if (!CameraPane.FULLSCREEN)
749	773	{
750	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
751	780	//frame.setVisible(false);
752	781	// frame.removeNotify();
753	782	// frame.setUndecorated(false);
..	..	@@ -757,7 +786,7 @@
757	786	// X frame.getContentPane().remove(/"Center",/bigThree);
758	787	// X framePanel.add(bigThree);
759	788	// X frame.getContentPane().add(/"Center",/framePanel);
760		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
761	790
762	791	//frame.setVisible(true);
763	792	radio.layout = keepButton;
..	..	@@ -772,7 +801,12 @@
772	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773	802	// frame.getToolkit().getScreenSize().height);
774	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
775	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
776	810	// frame.removeNotify();
777	811	// frame.setUndecorated(true);
778	812	// frame.addNotify();
..	..	@@ -785,7 +819,30 @@
785	819	radio.layout.doClick();
786	820	//frame.setVisible(true);
787	821	}
	822	+ frame.validate();
788	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	+ }
789	846
790	847	private JTextPane createTextPane()
791	848	{
..	..	@@ -917,7 +974,7 @@
917	974	// NumberSlider vDivsField;
918	975	// JCheckBox endcaps;
919	976	JCheckBox liveCB;
920		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
921	978	JCheckBox hideCB;
922	979	JCheckBox link2masterCB;
923	980	JCheckBox markCB;
..	..	@@ -1117,7 +1174,7 @@
1117	1174	namePanel = new cGridBag();
1118	1175
1119	1176	nameField = AddText(namePanel, copy.GetName());
1120		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1121	1178	oe.ctrlPanel.add(namePanel);
1122	1179
1123	1180	oe.ctrlPanel.Return();
..	..	@@ -1129,26 +1186,30 @@
1129	1186
1130	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1131	1188	liveCB.setToolTipText("Animate object");
1132		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
1134	1191	// Return();
	1192	+
1135	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1136	1194	hideCB.setToolTipText("Hide object");
1137	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1138	1196	markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1139	1199
1140	1200	setupPanel2 = new cGridBag().setVertical(false);
1141	1201
1142	1202	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1143	1203	rewindCB.setToolTipText("Rewind animation");
1144	1204
1145		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1205	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1146	1206	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1147	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
1148	1211	if (Globals.ADVANCED)
1149	1212	{
1150		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151		- link2masterCB.setToolTipText("Attach to support");
1152	1213	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1153	1214	speedupCB.setToolTipText("Option motion capture");
1154	1215	}
..	..	@@ -1422,6 +1483,7 @@
1422	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1423	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1424	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1425	1487
1426	1488	/*
1427	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1459,13 +1521,23 @@
1459	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1460	1522	//tmp.setName("Edit");
1461	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1462	1525	// JPanel north = new JPanel(new BorderLayout());
1463	1526	// north.setName("Edit");
1464	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1465	1528	// objectPanel.add(north);
1466	1529	objectPanel.add(editPanel);
1467		- 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	+
1468	1539	objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1469	1541
1470	1542	/*
1471	1543	aConstraints.gridx = 0;
..	..	@@ -1486,7 +1558,7 @@
1486	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1487	1559
1488	1560	/JTabbedPane/ scenePanel = new cGridBag();
1489		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1490	1562
1491	1563	JTabbedPane tabbedPane = new JTabbedPane();
1492	1564	tabbedPane.add(scrollpane);
..	..	@@ -1562,9 +1634,9 @@
1562	1634	/**/
1563	1635
1564	1636	bigThree = new cGridBag();
1565		- bigThree.addComponent(scenePanel);
1566	1637	bigThree.addComponent(centralPanel);
1567		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1568	1640
1569	1641	// // SIDE EFFECT!!!
1570	1642	// aConstraints.gridx = 0;
..	..	@@ -1573,9 +1645,9 @@
1573	1645	// aConstraints.gridheight = 1;
1574	1646
1575	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576		- framePanel.setContinuousLayout(true);
1577		- framePanel.setOneTouchExpandable(true);
1578		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1579	1651	//framePanel.setDividerSize(15);
1580	1652	//framePanel.setResizeWeight(0.15);
1581	1653	framePanel.setName("Frame");
..	..	@@ -1594,12 +1666,13 @@
1594	1666
1595	1667	frame.setSize(1280, 860);
1596	1668
1597		- frame.validate();
1598		- frame.setVisible(true);
1599		-
1600	1669	cameraView.requestFocusInWindow();
1601	1670
1602	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1603	1676
1604	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1605	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1686,24 +1759,6 @@
1686	1759	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1687	1760	colorSection.add(texture);
1688	1761
1689		- cGridBag anisoU = new cGridBag();
1690		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1691		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1693		- colorSection.add(anisoU);
1694		-
1695		- cGridBag anisoV = new cGridBag();
1696		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1697		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1699		- colorSection.add(anisoV);
1700		-
1701		- cGridBag shadowbias = new cGridBag();
1702		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1703		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1705		- colorSection.add(shadowbias);
1706		-
1707	1762	panel.add(new JSeparator());
1708	1763
1709	1764	panel.add(colorSection);
..	..	@@ -1753,6 +1808,12 @@
1753	1808	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754	1809	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1755	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);
1756	1817
1757	1818	panel.add(new JSeparator());
1758	1819
..	..	@@ -1804,6 +1865,18 @@
1804	1865	// aConstraints.gridy += 1;
1805	1866	// aConstraints.gridwidth = 1;
1806	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	+
1807	1880
1808	1881	panel.add(new JSeparator());
1809	1882
..	..	@@ -1811,35 +1884,35 @@
1811	1884
1812	1885	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1813	1886
1814		- cGridBag globalSection = new cGridBag().setVertical(true);
	1887	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1815	1888
1816	1889	cGridBag camera = new cGridBag();
1817	1890	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1818	1891	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1819	1892	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820		- globalSection.add(camera);
	1893	+ colorSection.add(camera);
1821	1894
1822	1895	cGridBag ambient = new cGridBag();
1823	1896	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1824	1897	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1825	1898	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826		- globalSection.add(ambient);
	1899	+ colorSection.add(ambient);
1827	1900
1828	1901	cGridBag backlit = new cGridBag();
1829	1902	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1830	1903	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831	1904	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832		- globalSection.add(backlit);
	1905	+ colorSection.add(backlit);
1833	1906
1834	1907	cGridBag opacity = new cGridBag();
1835	1908	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1836	1909	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837	1910	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838		- globalSection.add(opacity);
	1911	+ colorSection.add(opacity);
1839	1912
1840		- panel.add(new JSeparator());
	1913	+ //panel.add(new JSeparator());
1841	1914
1842		- panel.add(globalSection);
	1915	+ //panel.add(globalSection);
1843	1916
1844	1917	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1845	1918
..	..	@@ -1946,8 +2019,9 @@
1946	2019	// 3D models
1947	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1948	2021	{
1949		- lastConverter = new com.jmex.model.converters.MaxToJme();
1950		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1951	2025	continue;
1952	2026	}
1953	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2673,6 +2747,7 @@
2673	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2674	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2675	2749	}
	2750	+
2676	2751	//cJME.count++;
2677	2752	//cJME.count %= 12;
2678	2753	if (gc)
..	..	@@ -2856,6 +2931,7 @@
2856	2931	}
2857	2932	}
2858	2933	}
	2934	+
2859	2935	cFileSystemPane FSPane;
2860	2936
2861	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2909,6 +2985,7 @@
2909	2985	}
2910	2986	}
2911	2987	}
	2988	+
2912	2989	freezematerial = false;
2913	2990	}
2914	2991
..	..	@@ -3176,7 +3253,7 @@
3176	3253	{
3177	3254	copy.live ^= true;
3178	3255	return;
3179		- } else if (event.getSource() == selectCB)
	3256	+ } else if (event.getSource() == selectableCB)
3180	3257	{
3181	3258	copy.dontselect ^= true;
3182	3259	return;
..	..	@@ -3361,9 +3438,9 @@
3361	3438	{
3362	3439	Close();
3363	3440	//return true;
3364		- } else if (source == loadItem)
	3441	+ } else if (source == openItem)
3365	3442	{
3366		- load();
	3443	+ Open();
3367	3444	//return true;
3368	3445	} else if (source == newItem)
3369	3446	{
..	..	@@ -3388,6 +3465,10 @@
3388	3465	{
3389	3466	generatePOV();
3390	3467	//return true;
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
3391	3472	} else if (source == zBufferItem)
3392	3473	{
3393	3474	try
..	..	@@ -3439,8 +3520,8 @@
3439	3520	try
3440	3521	{
3441	3522	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3444	3525
3445	3526	Object3D parent = o.parent;
3446	3527	o.parent = null;
..	..	@@ -3451,10 +3532,14 @@
3451	3532
3452	3533	out.flush();
3453	3534
3454		- zstream.close();
	3535	+ baos //zstream
	3536	+ .close();
3455	3537	out.close();
3456	3538
3457		- return baos.toByteArray();
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
3458	3543	} catch (Exception e)
3459	3544	{
3460	3545	System.err.println(e);
..	..	@@ -3464,13 +3549,16 @@
3464	3549
3465	3550	static public Object Uncompress(byte[] bytes)
3466	3551	{
3467		- System.out.println("#bytes = " + bytes.length);
	3552	+ System.out.println("restore #bytes = " + bytes.length);
3468	3553	try
3469	3554	{
3470	3555	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472		- ObjectInputStream in = new ObjectInputStream(istream);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3473	3558	Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
3474	3562	in.close();
3475	3563
3476	3564	return obj;
..	..	@@ -3525,31 +3613,67 @@
3525	3613	return null;
3526	3614	}
3527	3615
3528		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529	3616
3530	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)
3531	3642	{
3532	3643	System.err.println("Save");
3533	3644
3534	3645	cRadio tab = GetCurrentTab();
3535	3646
3536		- boolean temp = CameraPane.SWITCH;
3537		- CameraPane.SWITCH = false;
	3647	+ byte[] compress = CompressCopy();
3538	3648
3539		- 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	+ }
3540	3656
3541	3657	//EditorFrame.m_MainFrame.requestFocusInWindow();
3542		- 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	+ }
3543	3668
3544		- copy.RestoreBigData(hashtable);
	3669	+ //copy.RestoreBigData(versiontable);
3545	3670
3546		- CameraPane.SWITCH = temp;
3547		-
3548	3671	//assert(hashtable.isEmpty());
3549	3672
3550		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3551	3674	{
3552		- tab.graphs[i] = null;
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
3553	3677	}
3554	3678
3555	3679	SetUndoStates();
..	..	@@ -3559,7 +3683,7 @@
3559	3683	{
3560	3684	try
3561	3685	{
3562		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3563	3687	ObjectOutputStream p = new ObjectOutputStream(ostream);
3564	3688
3565	3689	p.writeObject(copy);
..	..	@@ -3572,6 +3696,8 @@
3572	3696	e.printStackTrace();
3573	3697	}
3574	3698	}
	3699	+
	3700	+ return !thesame;
3575	3701	}
3576	3702
3577	3703	void CopyChanged(Object3D obj)
..	..	@@ -3581,7 +3707,7 @@
3581	3707	boolean temp = CameraPane.SWITCH;
3582	3708	CameraPane.SWITCH = false;
3583	3709
3584		- copy.ExtractBigData(hashtable);
	3710	+ copy.ExtractBigData(versiontable);
3585	3711
3586	3712	copy.clear();
3587	3713
..	..	@@ -3590,7 +3716,7 @@
3590	3716	copy.add(obj.get(i));
3591	3717	}
3592	3718
3593		- copy.RestoreBigData(hashtable);
	3719	+ copy.RestoreBigData(versiontable);
3594	3720
3595	3721	CameraPane.SWITCH = temp;
3596	3722
..	..	@@ -3618,52 +3744,129 @@
3618	3744	}
3619	3745
3620	3746	cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
3621	3749	cButton redoButton;
3622	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	+
3623	3766	void SetUndoStates()
3624	3767	{
3625	3768	cRadio tab = GetCurrentTab();
3626	3769
3627		- undoButton.setEnabled(tab.undoindex > 0);
3628		- 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;
3629	3780	}
3630	3781
3631		- public void Undo()
	3782	+ public boolean Undo()
3632	3783	{
	3784	+ // Option?
	3785	+ Replace();
	3786	+
3633	3787	System.err.println("Undo");
3634	3788
3635	3789	cRadio tab = GetCurrentTab();
3636	3790
3637		- if (tab.undoindex == 0)
	3791	+ if (copy.versionindex == 0)
3638	3792	{
3639	3793	java.awt.Toolkit.getDefaultToolkit().beep();
3640		- return;
	3794	+ return false;
3641	3795	}
3642	3796
3643		- 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)
3644	3824	{
3645		- Save();
3646		- tab.undoindex -= 1;
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
3647	3827	}
3648	3828
3649		- tab.undoindex -= 1;
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
3650	3833
3651		- 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;
3652	3849	}
3653	3850
3654	3851	public void Redo()
3655	3852	{
	3853	+ // Option?
	3854	+ Replace();
	3855	+
3656	3856	cRadio tab = GetCurrentTab();
3657	3857
3658		- if (tab.graphs[tab.undoindex + 1] == null)
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
3659	3859	{
3660	3860	java.awt.Toolkit.getDefaultToolkit().beep();
3661	3861	return;
3662	3862	}
3663	3863
3664		- tab.undoindex += 1;
	3864	+ copy.versionindex += 1;
3665	3865
3666		- 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;
3667	3870	}
3668	3871
3669	3872	void ImportGFD()
..	..	@@ -3959,9 +4162,25 @@
3959	4162	//copy.Touch();
3960	4163	}
3961	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3962	4167	public void stateChanged(ChangeEvent e)
3963	4168	{
3964	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	+ }
3965	4184
3966	4185	if (freezematerial)
3967	4186	{
..	..	@@ -4310,7 +4529,7 @@
4310	4529
4311	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4312	4531	{
4313		- if (Globals.SAVEONMAKE) // && resetmodel)
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4314	4533	Save();
4315	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
4316	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4552,7 +4771,9 @@
4552	4771	readobj.ResetDisplayList();
4553	4772	} catch (Exception e)
4554	4773	{
4555		- //e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
4556	4777	try
4557	4778	{
4558	4779	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4626,12 +4847,14 @@
4626	4847
4627	4848	if (readobj != null)
4628	4849	{
4629		- if (Globals.SAVEONMAKE)
4630		- Save();
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4631	4852	try
4632	4853	{
4633	4854	//readobj.deepCopySelf(copy);
4634	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4635	4858	for (int i = 0; i < readobj.size(); i++)
4636	4859	{
4637	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4672,6 +4895,7 @@
4672	4895	}
4673	4896	} catch (ClassCastException e)
4674	4897	{
	4898	+ e.printStackTrace();
4675	4899	assert (false);
4676	4900	Composite c = (Composite) copy;
4677	4901	c.children.clear();
..	..	@@ -4682,13 +4906,24 @@
4682	4906	c.addChild(csg);
4683	4907	}
4684	4908
	4909	+ copy.versions = readobj.versions;
	4910	+ copy.versionindex = readobj.versionindex;
	4911	+
	4912	+ if (copy.versions == null)
	4913	+ {
	4914	+ copy.versions = new byte[100][];
	4915	+ copy.versionindex = -1;
	4916	+ }
	4917	+
	4918	+ //? SetUndoStates();
	4919	+
4685	4920	ResetModel();
4686	4921	copy.HardTouch(); // recompile?
4687	4922	refreshContents();
4688	4923	}
4689	4924	}
4690	4925
4691		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4692	4927	{
4693	4928	if (Grafreed.standAlone)
4694	4929	{
..	..	@@ -4791,6 +5026,7 @@
4791	5026	//ps.print(buffer.toString());
4792	5027	} catch (IOException e)
4793	5028	{
	5029	+ e.printStackTrace();
4794	5030	}
4795	5031	}
4796	5032
..	..	@@ -4973,7 +5209,7 @@
4973	5209	MenuBar menuBar;
4974	5210	Menu fileMenu;
4975	5211	MenuItem newItem;
4976		- MenuItem loadItem;
	5212	+ MenuItem openItem;
4977	5213	MenuItem saveItem;
4978	5214	MenuItem saveAsItem;
4979	5215	MenuItem exportAsItem;
..	..	@@ -4996,6 +5232,7 @@
4996	5232	CheckboxMenuItem toggleSwitchItem;
4997	5233	CheckboxMenuItem toggleRootItem;
4998	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
4999	5236	CheckboxMenuItem toggleHandleItem;
5000	5237	CheckboxMenuItem togglePaintItem;
5001	5238	JSplitPane mainPanel;