~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -41,61 +44,47 @@
41	44
42	45	cButton GetButton(String name, boolean border)
43	46	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
53	49	}
54	50
55	51	cToggleButton GetToggleButton(String name, boolean border)
56	52	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
66	55	}
67	56
68	57	cCheckBox GetCheckBox(String name, boolean border)
69	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
70	65	try
71	66	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, 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, 24, 24, 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;
74	83	}
75	84	catch (Exception e)
76	85	{
77		- return new cCheckBox(name, border);
	86	+ return null;
78	87	}
79		- }
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
82		- {
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
86		- {
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
95		- }
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
99	88	}
100	89
101	90	// SCRIPT
..	..	@@ -207,7 +196,7 @@
207	196
208	197	objEditor.ctrlPanel.remove(namePanel);
209	198
210		- if (!GroupEditor.allparams)
	199	+ if (!allparams)
211	200	return;
212	201
213	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +268,12 @@
279	268	client = inClient;
280	269	copy = client;
281	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
282	277	// "this" is not called: SetupUI2(objEditor);
283	278	}
284	279
..	..	@@ -292,6 +287,12 @@
292	287	client = inClient;
293	288	copy = client;
294	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
295	296	SetupUI2(callee.GetEditor());
296	297	}
297	298
..	..	@@ -306,7 +307,7 @@
306	307	//localCopy.parent = null;
307	308
308	309	frame = new JFrame();
309		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
310	311	objEditor = this;
311	312	this.callee = callee;
312	313
..	..	@@ -324,6 +325,12 @@
324	325	copy = localCopy;
325	326	copy.editWindow = this;
326	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
327	334	SetupMenu();
328	335
329	336	//SetupName(objEditor); // new
..	..	@@ -337,12 +344,17 @@
337	344	return frame.action(event, obj);
338	345	}
339	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
340	352	void SetupMenu()
341	353	{
342	354	frame.setMenuBar(menuBar = new MenuBar());
343	355	menuBar.add(fileMenu = new Menu("File"));
344	356	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	358
347	359	//oe.menuBar.add(menu = new Menu("Include"));
348	360	Menu menu = new Menu("Import");
..	..	@@ -374,7 +386,7 @@
374	386	}
375	387
376	388	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
378	390	saveItem.addActionListener(this);
379	391	saveAsItem.addActionListener(this);
380	392	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +395,40 @@
383	395	closeItem.addActionListener(this);
384	396
385	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
386	424	toolbarPanel = new JPanel();
387	425	toolbarPanel.setName("Toolbar");
	426	+
388	427	treePanel = new cGridBag();
389	428	treePanel.setName("Tree");
390	429
391	430	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
393	432
394	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	434
..	..	@@ -398,10 +437,10 @@
398	437	editPanel.add(ctrlPanel);
399	438
400	439	toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	440	+ //toolboxPanel.setName("Toolbox");
402	441
403	442	materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
405	444
406	445	/JTextPane/
407	446	infoarea = createTextPane();
..	..	@@ -409,14 +448,15 @@
409	448
410	449	infoarea.setEditable(true);
411	450	SetText();
	451	+
412	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	453	// infoarea.setOpaque(false);
414	454	// //infoarea.setForeground(textcolor);
415	455	// TEXTAREA infoarea.setLineWrap(true);
416	456	// TEXTAREA infoarea.setWrapStyleWord(true);
417	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
419		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
420	460	//infoPanel.setLayout(new BorderLayout());
421	461	//infoPanel.add(createTextPane());
422	462
..	..	@@ -427,7 +467,14 @@
427	467	mainPanel.setDividerSize(9);
428	468	mainPanel.setDividerLocation(0.5); //1.0);
429	469	mainPanel.setResizeWeight(0.5);
430		-
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	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!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
431	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	479	//mainPanel.setLayout(new GridBagLayout());
433	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +705,8 @@
658	705	}
659	706	}
660	707
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	710
664	711	Rectangle keeprect;
665	712	cRadio radio;
..	..	@@ -680,10 +727,19 @@
680	727	void Minimize()
681	728	{
682	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
683	731	}
684	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={}
685	736	void Maximize()
686	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
687	743	if (maximized)
688	744	{
689	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +747,36 @@
691	747	else
692	748	{
693	749	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- 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);
697	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	755	}
699	756
700	757	maximized ^= true;
	758	+
	759	+ frame.validate();
701	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
702	765
703	766	void ToggleFullScreen()
704	767	{
705		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
706	773	{
707	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
708	780	//frame.setVisible(false);
709	781	// frame.removeNotify();
710	782	// frame.setUndecorated(false);
..	..	@@ -714,7 +786,7 @@
714	786	// X frame.getContentPane().remove(/"Center",/bigThree);
715	787	// X framePanel.add(bigThree);
716	788	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
718	790
719	791	//frame.setVisible(true);
720	792	radio.layout = keepButton;
..	..	@@ -729,7 +801,12 @@
729	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	802	// frame.getToolkit().getScreenSize().height);
731	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
732	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
733	810	// frame.removeNotify();
734	811	// frame.setUndecorated(true);
735	812	// frame.addNotify();
..	..	@@ -742,9 +819,30 @@
742	819	radio.layout.doClick();
743	820	//frame.setVisible(true);
744	821	}
745		-
746		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
747	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	+ }
748	846
749	847	private JTextPane createTextPane()
750	848	{
..	..	@@ -884,7 +982,12 @@
884	982	JCheckBox speedupCB;
885	983	JCheckBox rewindCB;
886	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
887	989	JComboBox texresMenu;
	990	+
888	991	JButton resetButton;
889	992	JButton stepButton;
890	993	JButton stepAllButton;
..	..	@@ -1071,12 +1174,12 @@
1071	1174	namePanel = new cGridBag();
1072	1175
1073	1176	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1178	oe.ctrlPanel.add(namePanel);
1076	1179
1077	1180	oe.ctrlPanel.Return();
1078	1181
1079		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
1080	1183	return;
1081	1184
1082	1185	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1089,20 +1192,21 @@
1089	1192	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1193	hideCB.setToolTipText("Hide object");
1091	1194	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1195	+ markCB.setToolTipText("As animation target transform");
1093	1196
1094	1197	setupPanel2 = new cGridBag().setVertical(false);
1095	1198
1096	1199	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1200	rewindCB.setToolTipText("Rewind animation");
1098	1201
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1203	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1204
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
1102	1208	if (Globals.ADVANCED)
1103	1209	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1210	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1211	speedupCB.setToolTipText("Option motion capture");
1108	1212	}
..	..	@@ -1376,6 +1480,7 @@
1376	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1379	1484
1380	1485	/*
1381	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1412,14 +1517,24 @@
1412	1517
1413	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1519	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1417	1522	// JPanel north = new JPanel(new BorderLayout());
1418	1523	// north.setName("Edit");
1419	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1525	// objectPanel.add(north);
1421	1526	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1527	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1528	+
	1529	+ //if (Globals.ADVANCED)
	1530	+ objectPanel.add(infoPanel);
	1531	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1532	+
	1533	+ objectPanel.add(XYZPanel);
	1534	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1535	+
	1536	+ objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1423	1538
1424	1539	/*
1425	1540	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1543,7 @@
1428	1543	aConstraints.gridy += 1;
1429	1544	aConstraints.gridwidth = 1;
1430	1545	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1546	+ */
1432	1547
1433	1548	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1549	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1440,14 +1555,12 @@
1440	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1441	1556
1442	1557	/JTabbedPane/ scenePanel = new cGridBag();
1443		- scenePanel.preferredWidth = 6;
	1558	+ scenePanel.preferredWidth = 5;
1444	1559
1445	1560	JTabbedPane tabbedPane = new JTabbedPane();
1446	1561	tabbedPane.add(scrollpane);
1447	1562
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1563	+ optionsPanel = new cGridBag().setVertical(false);
1451	1564
1452	1565	optionsPanel.setName("Options");
1453	1566
..	..	@@ -1455,6 +1568,8 @@
1455	1568
1456	1569	tabbedPane.add(optionsPanel);
1457	1570
	1571	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1572	+
1458	1573	scenePanel.add(tabbedPane);
1459	1574
1460	1575	/*
..	..	@@ -1518,7 +1633,7 @@
1518	1633	bigThree = new cGridBag();
1519	1634	bigThree.addComponent(scenePanel);
1520	1635	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1522	1637
1523	1638	// // SIDE EFFECT!!!
1524	1639	// aConstraints.gridx = 0;
..	..	@@ -1527,9 +1642,9 @@
1527	1642	// aConstraints.gridheight = 1;
1528	1643
1529	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1533	1648	//framePanel.setDividerSize(15);
1534	1649	//framePanel.setResizeWeight(0.15);
1535	1650	framePanel.setName("Frame");
..	..	@@ -1547,11 +1662,14 @@
1547	1662	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1663
1549	1664	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1665	+
1552	1666	cameraView.requestFocusInWindow();
1553	1667
1554	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1555	1673
1556	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1638,24 +1756,6 @@
1638	1756	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	1757	colorSection.add(texture);
1640	1758
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659	1759	panel.add(new JSeparator());
1660	1760
1661	1761	panel.add(colorSection);
..	..	@@ -1705,6 +1805,12 @@
1705	1805	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706	1806	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	1807	diffuseSection.add(fakedepth);
	1808	+
	1809	+ cGridBag shadowbias = new cGridBag();
	1810	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1811	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ diffuseSection.add(shadowbias);
1708	1814
1709	1815	panel.add(new JSeparator());
1710	1816
..	..	@@ -1756,6 +1862,18 @@
1756	1862	// aConstraints.gridy += 1;
1757	1863	// aConstraints.gridwidth = 1;
1758	1864
	1865	+ cGridBag anisoU = new cGridBag();
	1866	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1867	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1869	+ specularSection.add(anisoU);
	1870	+
	1871	+ cGridBag anisoV = new cGridBag();
	1872	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1873	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1875	+ specularSection.add(anisoV);
	1876	+
1759	1877
1760	1878	panel.add(new JSeparator());
1761	1879
..	..	@@ -1763,35 +1881,35 @@
1763	1881
1764	1882	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	1883
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	1885
1768	1886	cGridBag camera = new cGridBag();
1769	1887	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	1888	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	1889	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	1890	+ colorSection.add(camera);
1773	1891
1774	1892	cGridBag ambient = new cGridBag();
1775	1893	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	1894	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	1895	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	1896	+ colorSection.add(ambient);
1779	1897
1780	1898	cGridBag backlit = new cGridBag();
1781	1899	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	1900	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	1901	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	1902	+ colorSection.add(backlit);
1785	1903
1786	1904	cGridBag opacity = new cGridBag();
1787	1905	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788	1906	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789	1907	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
	1908	+ colorSection.add(opacity);
1791	1909
1792		- panel.add(new JSeparator());
	1910	+ //panel.add(new JSeparator());
1793	1911
1794		- panel.add(globalSection);
	1912	+ //panel.add(globalSection);
1795	1913
1796	1914	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1915
..	..	@@ -1898,8 +2016,9 @@
1898	2016	// 3D models
1899	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2018	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1903	2022	continue;
1904	2023	}
1905	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +2744,7 @@
2625	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	2746	}
	2747	+
2628	2748	//cJME.count++;
2629	2749	//cJME.count %= 12;
2630	2750	if (gc)
..	..	@@ -2808,6 +2928,7 @@
2808	2928	}
2809	2929	}
2810	2930	}
	2931	+
2811	2932	cFileSystemPane FSPane;
2812	2933
2813	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2861,11 +2982,14 @@
2861	2982	}
2862	2983	}
2863	2984	}
	2985	+
2864	2986	freezematerial = false;
2865	2987	}
2866	2988
2867	2989	void SetMaterial(Object3D object)
2868	2990	{
	2991	+ latestObject = object;
	2992	+
2869	2993	cMaterial mat = object.material;
2870	2994
2871	2995	if (mat == null)
..	..	@@ -2977,12 +3101,17 @@
2977	3101	// }
2978	3102
2979	3103	/**/
2980		- if (deselect)
	3104	+ if (deselect \|\| child == null)
2981	3105	{
2982	3106	//group.deselectAll();
2983	3107	//freeze = true;
2984	3108	GetTree().clearSelection();
2985	3109	//freeze = false;
	3110	+
	3111	+ if (child == null)
	3112	+ {
	3113	+ return;
	3114	+ }
2986	3115	}
2987	3116
2988	3117	//group.addSelectee(child);
..	..	@@ -3051,7 +3180,7 @@
3051	3180	cameraView.ToggleDL();
3052	3181	cameraView.repaint();
3053	3182	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3183	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3184	{
3056	3185	cameraView.ToggleTexture();
3057	3186	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3219,7 @@
3090	3219	frame.validate();
3091	3220
3092	3221	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3222	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3223	{
3095	3224	cameraView.ToggleSwitch();
3096	3225	cameraView.repaint();
..	..	@@ -3306,9 +3435,9 @@
3306	3435	{
3307	3436	Close();
3308	3437	//return true;
3309		- } else if (source == loadItem)
	3438	+ } else if (source == openItem)
3310	3439	{
3311		- load();
	3440	+ Open();
3312	3441	//return true;
3313	3442	} else if (source == newItem)
3314	3443	{
..	..	@@ -3333,6 +3462,10 @@
3333	3462	{
3334	3463	generatePOV();
3335	3464	//return true;
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
3336	3469	} else if (source == zBufferItem)
3337	3470	{
3338	3471	try
..	..	@@ -3384,8 +3517,8 @@
3384	3517	try
3385	3518	{
3386	3519	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3522
3390	3523	Object3D parent = o.parent;
3391	3524	o.parent = null;
..	..	@@ -3396,10 +3529,14 @@
3396	3529
3397	3530	out.flush();
3398	3531
3399		- zstream.close();
	3532	+ baos //zstream
	3533	+ .close();
3400	3534	out.close();
3401	3535
3402		- return baos.toByteArray();
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
3403	3540	} catch (Exception e)
3404	3541	{
3405	3542	System.err.println(e);
..	..	@@ -3409,13 +3546,16 @@
3409	3546
3410	3547	static public Object Uncompress(byte[] bytes)
3411	3548	{
3412		- System.out.println("#bytes = " + bytes.length);
	3549	+ System.out.println("restore #bytes = " + bytes.length);
3413	3550	try
3414	3551	{
3415	3552	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3555	Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
3419	3559	in.close();
3420	3560
3421	3561	return obj;
..	..	@@ -3470,39 +3610,77 @@
3470	3610	return null;
3471	3611	}
3472	3612
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	3613
3475	3614	public void Save()
	3615	+ {
	3616	+ //Save(true);
	3617	+ Replace();
	3618	+ }
	3619	+
	3620	+ private boolean Equal(byte[] compress, byte[] name)
	3621	+ {
	3622	+ if (compress.length != name.length)
	3623	+ {
	3624	+ return false;
	3625	+ }
	3626	+
	3627	+ for (int i=compress.length; --i>=0;)
	3628	+ {
	3629	+ if (compress[i] != name[i])
	3630	+ return false;
	3631	+ }
	3632	+
	3633	+ return true;
	3634	+ }
	3635	+
	3636	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3637	+
	3638	+ public boolean Save(boolean user)
3476	3639	{
3477	3640	System.err.println("Save");
3478	3641
3479	3642	cRadio tab = GetCurrentTab();
3480	3643
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	3644	+ byte[] compress = CompressCopy();
3483	3645
3484		- copy.ExtractBigData(hashtable);
	3646	+ boolean thesame = false;
	3647	+
	3648	+ // Quick heuristic using length. Works only when stream is compressed.
	3649	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3650	+ {
	3651	+ thesame = true;
	3652	+ }
3485	3653
3486	3654	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3655	+ if (!thesame)
3496	3656	{
3497		- tab.graphs[i] = null;
	3657	+ //tab.user[tab.versionindex] = user;
	3658	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3659	+
	3660	+ copy.versions[++copy.versionindex] = compress;
	3661	+
	3662	+ // if (increment)
	3663	+ // tab.versionindex++;
3498	3664	}
3499	3665
	3666	+ //copy.RestoreBigData(versiontable);
	3667	+
	3668	+ //assert(hashtable.isEmpty());
	3669	+
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3671	+ {
	3672	+ //tab.user[i] = false;
	3673	+ copy.versions[i] = null;
	3674	+ }
	3675	+
	3676	+ SetUndoStates();
	3677	+
3500	3678	// test save
3501	3679	if (false)
3502	3680	{
3503	3681	try
3504	3682	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	3684	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	3685
3508	3686	p.writeObject(copy);
..	..	@@ -3515,14 +3693,18 @@
3515	3693	e.printStackTrace();
3516	3694	}
3517	3695	}
	3696	+
	3697	+ return !thesame;
3518	3698	}
3519	3699
3520	3700	void CopyChanged(Object3D obj)
3521	3701	{
	3702	+ SetUndoStates();
	3703	+
3522	3704	boolean temp = CameraPane.SWITCH;
3523	3705	CameraPane.SWITCH = false;
3524	3706
3525		- copy.ExtractBigData(hashtable);
	3707	+ copy.ExtractBigData(versiontable);
3526	3708
3527	3709	copy.clear();
3528	3710
..	..	@@ -3531,7 +3713,7 @@
3531	3713	copy.add(obj.get(i));
3532	3714	}
3533	3715
3534		- copy.RestoreBigData(hashtable);
	3716	+ copy.RestoreBigData(versiontable);
3535	3717
3536	3718	CameraPane.SWITCH = temp;
3537	3719
..	..	@@ -3558,42 +3740,130 @@
3558	3740	refreshContents();
3559	3741	}
3560	3742
3561		- public void Undo()
	3743	+ cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
	3746	+ cButton redoButton;
	3747	+
	3748	+ boolean muteSlider;
	3749	+
	3750	+ int VersionCount()
3562	3751	{
	3752	+ int count = 0;
	3753	+
	3754	+ for (int i = copy.versions.length; --i >= 0;)
	3755	+ {
	3756	+ if (copy.versions[i] != null)
	3757	+ count++;
	3758	+ }
	3759	+
	3760	+ return count;
	3761	+ }
	3762	+
	3763	+ void SetUndoStates()
	3764	+ {
	3765	+ cRadio tab = GetCurrentTab();
	3766	+
	3767	+ restoreButton.setEnabled(copy.versionindex != -1);
	3768	+ replaceButton.setEnabled(copy.versionindex != -1);
	3769	+
	3770	+ undoButton.setEnabled(copy.versionindex > 0);
	3771	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3772	+
	3773	+ muteSlider = true;
	3774	+ versionSlider.setMaximum(VersionCount() - 1);
	3775	+ versionSlider.setInteger(copy.versionindex);
	3776	+ muteSlider = false;
	3777	+ }
	3778	+
	3779	+ public boolean Undo()
	3780	+ {
	3781	+ // Option?
	3782	+ Replace();
	3783	+
3563	3784	System.err.println("Undo");
3564	3785
3565	3786	cRadio tab = GetCurrentTab();
3566	3787
3567		- if (tab.undoindex == 0)
	3788	+ if (copy.versionindex == 0)
3568	3789	{
3569	3790	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	3791	+ return false;
3571	3792	}
3572	3793
3573		- if (tab.graphs[tab.undoindex] == null)
	3794	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3795	+// {
	3796	+// if (Save(false))
	3797	+// tab.versionindex -= 1;
	3798	+// else
	3799	+// {
	3800	+// if (tab.versionindex <= 0)
	3801	+// return false;
	3802	+// else
	3803	+// tab.versionindex -= 1;
	3804	+// }
	3805	+// }
	3806	+
	3807	+ copy.versionindex -= 1;
	3808	+
	3809	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3810	+
	3811	+ return true;
	3812	+ }
	3813	+
	3814	+ public boolean Restore()
	3815	+ {
	3816	+ System.err.println("Restore");
	3817	+
	3818	+ cRadio tab = GetCurrentTab();
	3819	+
	3820	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3574	3821	{
3575		- Save();
3576		- tab.undoindex -= 1;
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
3577	3824	}
3578	3825
3579		- tab.undoindex -= 1;
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
3580	3830
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3831	+ public boolean Replace()
	3832	+ {
	3833	+ System.err.println("Replace");
	3834	+
	3835	+ cRadio tab = GetCurrentTab();
	3836	+
	3837	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3838	+ {
	3839	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3840	+ return false;
	3841	+ }
	3842	+
	3843	+ copy.versions[copy.versionindex] = CompressCopy();
	3844	+
	3845	+ return true;
3582	3846	}
3583	3847
3584	3848	public void Redo()
3585	3849	{
	3850	+ // Option?
	3851	+ Replace();
	3852	+
3586	3853	cRadio tab = GetCurrentTab();
3587	3854
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
3589	3856	{
3590	3857	java.awt.Toolkit.getDefaultToolkit().beep();
3591	3858	return;
3592	3859	}
3593	3860
3594		- tab.undoindex += 1;
	3861	+ copy.versionindex += 1;
3595	3862
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
3597	3867	}
3598	3868
3599	3869	void ImportGFD()
..	..	@@ -3889,9 +4159,25 @@
3889	4159	//copy.Touch();
3890	4160	}
3891	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3892	4164	public void stateChanged(ChangeEvent e)
3893	4165	{
3894	4166	// assert(false);
	4167	+ if (e.getSource() == versionSlider)
	4168	+ {
	4169	+ if (muteSlider)
	4170	+ return;
	4171	+
	4172	+ int version = versionSlider.getInteger();
	4173	+
	4174	+ if (copy.versions[version] != null)
	4175	+ {
	4176	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4177	+ }
	4178	+
	4179	+ return;
	4180	+ }
3895	4181
3896	4182	if (freezematerial)
3897	4183	{
..	..	@@ -4240,7 +4526,7 @@
4240	4526
4241	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	4528	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	4530	Save();
4245	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4556,8 +4842,8 @@
4556	4842
4557	4843	if (readobj != null)
4558	4844	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4561	4847	try
4562	4848	{
4563	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4612,13 +4898,24 @@
4612	4898	c.addChild(csg);
4613	4899	}
4614	4900
	4901	+ copy.versions = readobj.versions;
	4902	+ copy.versionindex = readobj.versionindex;
	4903	+
	4904	+ if (copy.versions == null)
	4905	+ {
	4906	+ copy.versions = new byte[100][];
	4907	+ copy.versionindex = -1;
	4908	+ }
	4909	+
	4910	+ //? SetUndoStates();
	4911	+
4615	4912	ResetModel();
4616	4913	copy.HardTouch(); // recompile?
4617	4914	refreshContents();
4618	4915	}
4619	4916	}
4620	4917
4621		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4622	4919	{
4623	4920	if (Grafreed.standAlone)
4624	4921	{
..	..	@@ -4735,6 +5032,8 @@
4735	5032	String filename = browser.getFile();
4736	5033	if (filename != null && filename.length() > 0)
4737	5034	{
	5035	+ if (!filename.endsWith(".gfd"))
	5036	+ filename += ".gfd";
4738	5037	lastname = browser.getDirectory() + filename;
4739	5038	save();
4740	5039	}
..	..	@@ -4901,7 +5200,7 @@
4901	5200	MenuBar menuBar;
4902	5201	Menu fileMenu;
4903	5202	MenuItem newItem;
4904		- MenuItem loadItem;
	5203	+ MenuItem openItem;
4905	5204	MenuItem saveItem;
4906	5205	MenuItem saveAsItem;
4907	5206	MenuItem exportAsItem;
..	..	@@ -4924,6 +5223,7 @@
4924	5223	CheckboxMenuItem toggleSwitchItem;
4925	5224	CheckboxMenuItem toggleRootItem;
4926	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4927	5227	CheckboxMenuItem toggleHandleItem;
4928	5228	CheckboxMenuItem togglePaintItem;
4929	5229	JSplitPane mainPanel;
..	..	@@ -4945,6 +5245,8 @@
4945	5245	cGridBag optionsPanel;
4946	5246
4947	5247	JTabbedPane objectPanel;
	5248	+ boolean materialFlushed;
	5249	+ Object3D latestObject;
4948	5250
4949	5251	cGridBag XYZPanel;
4950	5252