~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -145,7 +224,7 @@
145	224
146	225	objEditor.ctrlPanel.remove(namePanel);
147	226
148		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
149	228	return;
150	229
151	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -169,7 +248,7 @@
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171	250	objEditor.ctrlPanel.remove(setupPanel2);
172		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
173	252	objEditor.ctrlPanel.remove(pushPanel);
174	253	//objEditor.ctrlPanel.remove(fillPanel);
175	254
..	..	@@ -217,6 +296,12 @@
217	296	client = inClient;
218	297	copy = client;
219	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
220	305	// "this" is not called: SetupUI2(objEditor);
221	306	}
222	307
..	..	@@ -230,6 +315,12 @@
230	315	client = inClient;
231	316	copy = client;
232	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
233	324	SetupUI2(callee.GetEditor());
234	325	}
235	326
..	..	@@ -244,6 +335,7 @@
244	335	//localCopy.parent = null;
245	336
246	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
247	339	objEditor = this;
248	340	this.callee = callee;
249	341
..	..	@@ -261,6 +353,12 @@
261	353	copy = localCopy;
262	354	copy.editWindow = this;
263	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
264	362	SetupMenu();
265	363
266	364	//SetupName(objEditor); // new
..	..	@@ -274,12 +372,17 @@
274	372	return frame.action(event, obj);
275	373	}
276	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
277	380	void SetupMenu()
278	381	{
279	382	frame.setMenuBar(menuBar = new MenuBar());
280	383	menuBar.add(fileMenu = new Menu("File"));
281	384	fileMenu.add(newItem = new MenuItem("New"));
282		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
283	386
284	387	//oe.menuBar.add(menu = new Menu("Include"));
285	388	Menu menu = new Menu("Import");
..	..	@@ -311,7 +414,7 @@
311	414	}
312	415
313	416	newItem.addActionListener(this);
314		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
315	418	saveItem.addActionListener(this);
316	419	saveAsItem.addActionListener(this);
317	420	exportAsItem.addActionListener(this);
..	..	@@ -320,28 +423,68 @@
320	423	closeItem.addActionListener(this);
321	424
322	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
323	452	toolbarPanel = new JPanel();
324	453	toolbarPanel.setName("Toolbar");
	454	+
325	455	treePanel = new cGridBag();
326	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
327	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328		- ctrlPanel.setName("Edit");
329		- materialPanel = new cGridBag().setVertical(true);
330		- materialPanel.setName("Material");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
331	473	/JTextPane/
332	474	infoarea = createTextPane();
333	475	doc = infoarea.getStyledDocument();
334	476
335	477	infoarea.setEditable(true);
336	478	SetText();
	479	+
337	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
338	481	// infoarea.setOpaque(false);
339	482	// //infoarea.setForeground(textcolor);
340	483	// TEXTAREA infoarea.setLineWrap(true);
341	484	// TEXTAREA infoarea.setWrapStyleWord(true);
342	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
343		- infoPanel.setPreferredSize(new Dimension(50, 200));
344		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
345	488	//infoPanel.setLayout(new BorderLayout());
346	489	//infoPanel.add(createTextPane());
347	490
..	..	@@ -352,7 +495,14 @@
352	495	mainPanel.setDividerSize(9);
353	496	mainPanel.setDividerLocation(0.5); //1.0);
354	497	mainPanel.setResizeWeight(0.5);
355		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
356	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357	507	//mainPanel.setLayout(new GridBagLayout());
358	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -583,21 +733,145 @@
583	733	}
584	734	}
585	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
586	794	void ToggleFullScreen()
587	795	{
588		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
589	801	{
590		- frame.getContentPane().remove(/"Center",/bigThree);
591		- framePanel.add(bigThree);
592		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
593	825	} else
594	826	{
595		- frame.getContentPane().remove(/"Center",/framePanel);
596		- framePanel.remove(bigThree);
597		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
598	849	}
599		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
600	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
601	875
602	876	private JTextPane createTextPane()
603	877	{
..	..	@@ -720,6 +994,7 @@
720	994	{
721	995	SetupMaterial(materialPanel);
722	996	}
	997	+
723	998	//SetupName();
724	999	//SetupViews();
725	1000	}
..	..	@@ -729,7 +1004,7 @@
729	1004	// NumberSlider vDivsField;
730	1005	// JCheckBox endcaps;
731	1006	JCheckBox liveCB;
732		- JCheckBox selectCB;
	1007	+ JCheckBox selectableCB;
733	1008	JCheckBox hideCB;
734	1009	JCheckBox link2masterCB;
735	1010	JCheckBox markCB;
..	..	@@ -737,7 +1012,12 @@
737	1012	JCheckBox speedupCB;
738	1013	JCheckBox rewindCB;
739	1014	JCheckBox flipVCB;
	1015	+
	1016	+ cCheckBox toggleTextureCB;
	1017	+ cCheckBox toggleSwitchCB;
	1018	+
740	1019	JComboBox texresMenu;
	1020	+
741	1021	JButton resetButton;
742	1022	JButton stepButton;
743	1023	JButton stepAllButton;
..	..	@@ -746,10 +1026,13 @@
746	1026	JButton fasterButton;
747	1027	JButton remarkButton;
748	1028
	1029	+ cGridBag editPanel;
	1030	+ cGridBag editCommandsPanel;
	1031	+
749	1032	cGridBag namePanel;
750	1033	cGridBag setupPanel;
751	1034	cGridBag setupPanel2;
752		- cGridBag commandsPanel;
	1035	+ cGridBag objectCommandsPanel;
753	1036	cGridBag pushPanel;
754	1037	cGridBag fillPanel;
755	1038
..	..	@@ -921,38 +1204,42 @@
921	1204	namePanel = new cGridBag();
922	1205
923	1206	nameField = AddText(namePanel, copy.GetName());
924		- namePanel.add(nameField);
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
925	1208	oe.ctrlPanel.add(namePanel);
926	1209
927	1210	oe.ctrlPanel.Return();
928	1211
929		- if (!GroupEditor.allparams)
	1212	+ if (!allparams)
930	1213	return;
931	1214
932	1215	setupPanel = new cGridBag().setVertical(false);
933	1216
934	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
935	1218	liveCB.setToolTipText("Animate object");
936		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937		- selectCB.setToolTipText("Make object selectable");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
938	1221	// Return();
	1222	+
939	1223	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940	1224	hideCB.setToolTipText("Hide object");
941	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942		- markCB.setToolTipText("Set the animation target transform");
	1226	+ markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
943	1229
944	1230	setupPanel2 = new cGridBag().setVertical(false);
945	1231
946	1232	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947	1233	rewindCB.setToolTipText("Rewind animation");
948	1234
949		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950		- randomCB.setToolTipText("Rewind or Go back and forth randomly");
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
951	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
952	1241	if (Globals.ADVANCED)
953	1242	{
954		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955		- link2masterCB.setToolTipText("Attach to support");
956	1243	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957	1244	speedupCB.setToolTipText("Option motion capture");
958	1245	}
..	..	@@ -962,23 +1249,23 @@
962	1249	oe.ctrlPanel.add(setupPanel2);
963	1250	oe.ctrlPanel.Return();
964	1251
965		- commandsPanel = new cGridBag().setVertical(false);
	1252	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1253
967		- resetButton = AddButton(commandsPanel, "Reset");
	1254	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1255	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1256	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1257	stepButton.setToolTipText("Step one frame");
971	1258	// resetAllButton = AddButton(oe, "Reset All");
972	1259	// stepAllButton = AddButton(oe, "Step All");
973	1260	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1261	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1262	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1263	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1264	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1265	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1266	remarkButton.setToolTipText("Set the current transform as the target");
980	1267
981		- oe.ctrlPanel.add(commandsPanel);
	1268	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1269	oe.ctrlPanel.Return();
983	1270
984	1271	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1471,11 @@
1184	1471	//worldPanel.setName("World");
1185	1472	centralPanel = new cGridBag();
1186	1473	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1474	+
	1475	+ if (Globals.ADVANCED)
	1476	+ {
	1477	+ timelinePanel = new JPanel(new BorderLayout());
	1478	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189	1479
1190	1480	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1481	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1484,10 @@
1194	1484	// cameraPanel.setDividerSize(9);
1195	1485	cameraPanel.setResizeWeight(1.0);
1196	1486
	1487	+ }
	1488	+
1197	1489	centralPanel.add(cameraView);
	1490	+ centralPanel.setFocusable(true);
1198	1491	//frame.setJMenuBar(timelineMenubar);
1199	1492	//centralPanel.add(timelinePanel);
1200	1493
..	..	@@ -1220,6 +1513,7 @@
1220	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1221	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1222	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1223	1517
1224	1518	/*
1225	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1257,12 +1551,29 @@
1257	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1258	1552	//tmp.setName("Edit");
1259	1553	objectPanel.add(materialPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1260	1557	// JPanel north = new JPanel(new BorderLayout());
1261	1558	// north.setName("Edit");
1262	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1560	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
1265		- objectPanel.add(infoPanel);
	1561	+ objectPanel.add(editPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1266	1577
1267	1578	/*
1268	1579	aConstraints.gridx = 0;
..	..	@@ -1271,7 +1582,7 @@
1271	1582	aConstraints.gridy += 1;
1272	1583	aConstraints.gridwidth = 1;
1273	1584	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1585	+ */
1275	1586
1276	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1283,14 +1594,12 @@
1283	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1595
1285	1596	/JTabbedPane/ scenePanel = new cGridBag();
1286		- scenePanel.preferredWidth = 6;
	1597	+ scenePanel.preferredWidth = 5;
1287	1598
1288	1599	JTabbedPane tabbedPane = new JTabbedPane();
1289	1600	tabbedPane.add(scrollpane);
1290	1601
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1602	+ optionsPanel = new cGridBag().setVertical(false);
1294	1603
1295	1604	optionsPanel.setName("Options");
1296	1605
..	..	@@ -1298,6 +1607,8 @@
1298	1607
1299	1608	tabbedPane.add(optionsPanel);
1300	1609
	1610	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1611	+
1301	1612	scenePanel.add(tabbedPane);
1302	1613
1303	1614	/*
..	..	@@ -1361,7 +1672,7 @@
1361	1672	bigThree = new cGridBag();
1362	1673	bigThree.addComponent(scenePanel);
1363	1674	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1365	1676
1366	1677	// // SIDE EFFECT!!!
1367	1678	// aConstraints.gridx = 0;
..	..	@@ -1370,9 +1681,9 @@
1370	1681	// aConstraints.gridheight = 1;
1371	1682
1372	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1376	1687	//framePanel.setDividerSize(15);
1377	1688	//framePanel.setResizeWeight(0.15);
1378	1689	framePanel.setName("Frame");
..	..	@@ -1390,14 +1701,18 @@
1390	1701	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1702
1392	1703	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1704	+
	1705	+ cameraView.requestFocusInWindow();
	1706	+
1395	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1396	1712
1397	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1714	frame.addWindowListener(new WindowAdapter()
1399	1715	{
1400		-
1401	1716	public void windowClosing(WindowEvent e)
1402	1717	{
1403	1718	Close();
..	..	@@ -1420,12 +1735,56 @@
1420	1735	ctrlPanel.removeAll();
1421	1736	}
1422	1737
1423		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1424	1739	{
1425		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1426	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1427	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1428		- */
	1787	+ */
1429	1788
1430	1789	cGridBag editBar = new cGridBag().setVertical(false);
1431	1790
..	..	@@ -1459,45 +1818,50 @@
1459	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1460	1819
1461	1820	cGridBag colorSection = new cGridBag().setVertical(true);
	1821	+
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
	1832	+
	1833	+ colorSection.add(huepanel);
1462	1834
1463	1835	cGridBag color = new cGridBag();
1464		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1465		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1840	+
1467	1841	//colorField.preferredWidth = 200;
1468	1842	colorSection.add(color);
1469	1843
1470	1844	cGridBag modulation = new cGridBag();
1471	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1472	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1474	1848	colorSection.add(modulation);
1475	1849
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
	1855	+
	1856	+ colorSection.add(GetSeparator());
	1857	+
1476	1858	cGridBag texture = new cGridBag();
1477	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1478	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	1862	colorSection.add(texture);
1481	1863
1482		- cGridBag anisoU = new cGridBag();
1483		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1484		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoU);
1487		-
1488		- cGridBag anisoV = new cGridBag();
1489		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1490		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492		- colorSection.add(anisoV);
1493		-
1494		- cGridBag shadowbias = new cGridBag();
1495		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1496		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1498		- colorSection.add(shadowbias);
1499		-
1500		- panel.add(new JSeparator());
	1864	+ panel.add(GetSeparator());
1501	1865
1502	1866	panel.add(colorSection);
1503	1867
..	..	@@ -1547,7 +1911,13 @@
1547	1911	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	1912	diffuseSection.add(fakedepth);
1549	1913
1550		- panel.add(new JSeparator());
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
	1919	+
	1920	+ panel.add(GetSeparator());
1551	1921
1552	1922	panel.add(diffuseSection);
1553	1923
..	..	@@ -1597,42 +1967,48 @@
1597	1967	// aConstraints.gridy += 1;
1598	1968	// aConstraints.gridwidth = 1;
1599	1969
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1600	1975
1601		- panel.add(new JSeparator());
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
	1981	+
	1982	+
	1983	+ panel.add(GetSeparator());
1602	1984
1603	1985	panel.add(specularSection);
1604	1986
1605	1987	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	1988
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1990
1609	1991	cGridBag camera = new cGridBag();
1610	1992	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1993	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1994	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1995	+ colorSection.add(camera);
1614	1996
1615	1997	cGridBag ambient = new cGridBag();
1616	1998	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1999	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2000	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	2001	+ colorSection.add(ambient);
1620	2002
1621	2003	cGridBag backlit = new cGridBag();
1622	2004	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	2007	+ colorSection.add(backlit);
1626	2008
1627		- cGridBag opacity = new cGridBag();
1628		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
1632		-
1633		- panel.add(new JSeparator());
	2009	+ //panel.add(new JSeparator());
1634	2010
1635		- panel.add(globalSection);
	2011	+ //panel.add(globalSection);
1636	2012
1637	2013	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	2014
..	..	@@ -1674,7 +2050,7 @@
1674	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1675	2051	textureSection.add(opacityPower);
1676	2052
1677		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1678	2054
1679	2055	panel.add(textureSection);
1680	2056
..	..	@@ -1739,8 +2115,9 @@
1739	2115	// 3D models
1740	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1741	2117	{
1742		- lastConverter = new com.jmex.model.converters.MaxToJme();
1743		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1744	2121	continue;
1745	2122	}
1746	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2466,6 +2843,7 @@
2466	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2467	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2468	2845	}
	2846	+
2469	2847	//cJME.count++;
2470	2848	//cJME.count %= 12;
2471	2849	if (gc)
..	..	@@ -2649,6 +3027,7 @@
2649	3027	}
2650	3028	}
2651	3029	}
	3030	+
2652	3031	cFileSystemPane FSPane;
2653	3032
2654	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2658,7 +3037,7 @@
2658	3037
2659	3038	freezematerial = true;
2660	3039	colorField.setFloat(mat.color);
2661		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2662	3041	metalnessField.setFloat(mat.metalness);
2663	3042	diffuseField.setFloat(mat.diffuse);
2664	3043	specularField.setFloat(mat.specular);
..	..	@@ -2702,11 +3081,14 @@
2702	3081	}
2703	3082	}
2704	3083	}
	3084	+
2705	3085	freezematerial = false;
2706	3086	}
2707	3087
2708	3088	void SetMaterial(Object3D object)
2709	3089	{
	3090	+ latestObject = object;
	3091	+
2710	3092	cMaterial mat = object.material;
2711	3093
2712	3094	if (mat == null)
..	..	@@ -2818,12 +3200,17 @@
2818	3200	// }
2819	3201
2820	3202	/**/
2821		- if (deselect)
	3203	+ if (deselect \|\| child == null)
2822	3204	{
2823	3205	//group.deselectAll();
2824	3206	//freeze = true;
2825	3207	GetTree().clearSelection();
2826	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
2827	3214	}
2828	3215
2829	3216	//group.addSelectee(child);
..	..	@@ -2892,7 +3279,7 @@
2892	3279	cameraView.ToggleDL();
2893	3280	cameraView.repaint();
2894	3281	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3282	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3283	{
2897	3284	cameraView.ToggleTexture();
2898	3285	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3318,7 @@
2931	3318	frame.validate();
2932	3319
2933	3320	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3321	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3322	{
2936	3323	cameraView.ToggleSwitch();
2937	3324	cameraView.repaint();
..	..	@@ -2961,8 +3348,9 @@
2961	3348	} else if (event.getSource() == liveCB)
2962	3349	{
2963	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
2964	3352	return;
2965		- } else if (event.getSource() == selectCB)
	3353	+ } else if (event.getSource() == selectableCB)
2966	3354	{
2967	3355	copy.dontselect ^= true;
2968	3356	return;
..	..	@@ -2970,7 +3358,7 @@
2970	3358	{
2971	3359	copy.hide ^= true;
2972	3360	copy.Touch(); // display list issue
2973		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
2974	3362	return;
2975	3363	} else if (event.getSource() == link2masterCB)
2976	3364	{
..	..	@@ -3147,9 +3535,9 @@
3147	3535	{
3148	3536	Close();
3149	3537	//return true;
3150		- } else if (source == loadItem)
	3538	+ } else if (source == openItem)
3151	3539	{
3152		- load();
	3540	+ Open();
3153	3541	//return true;
3154	3542	} else if (source == newItem)
3155	3543	{
..	..	@@ -3174,6 +3562,10 @@
3174	3562	{
3175	3563	generatePOV();
3176	3564	//return true;
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
3177	3569	} else if (source == zBufferItem)
3178	3570	{
3179	3571	try
..	..	@@ -3222,11 +3614,12 @@
3222	3614
3223	3615	static public byte[] Compress(Object3D o)
3224	3616	{
	3617	+ // Slower to actually compress.
3225	3618	try
3226	3619	{
3227	3620	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3230	3623
3231	3624	Object3D parent = o.parent;
3232	3625	o.parent = null;
..	..	@@ -3237,10 +3630,14 @@
3237	3630
3238	3631	out.flush();
3239	3632
3240		- zstream.close();
	3633	+ baos //zstream
	3634	+ .close();
3241	3635	out.close();
3242	3636
3243		- return baos.toByteArray();
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
3244	3641	} catch (Exception e)
3245	3642	{
3246	3643	System.err.println(e);
..	..	@@ -3250,13 +3647,16 @@
3250	3647
3251	3648	static public Object Uncompress(byte[] bytes)
3252	3649	{
3253		- System.out.println("#bytes = " + bytes.length);
	3650	+ System.out.println("restore #bytes = " + bytes.length);
3254	3651	try
3255	3652	{
3256	3653	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258		- ObjectInputStream in = new ObjectInputStream(istream);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3259	3656	Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
3260	3660	in.close();
3261	3661
3262	3662	return obj;
..	..	@@ -3311,37 +3711,78 @@
3311	3711	return null;
3312	3712	}
3313	3713
3314		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315	3714
3316	3715	public void Save()
3317	3716	{
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
	3742	+ System.err.println("Save");
	3743	+ Replace();
	3744	+
3318	3745	cRadio tab = GetCurrentTab();
3319	3746
3320		- boolean temp = CameraPane.SWITCH;
3321		- CameraPane.SWITCH = false;
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3322	3748
3323		- copy.ExtractBigData(hashtable);
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
3324	3755
3325	3756	//EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
3327		-
3328		- copy.RestoreBigData(hashtable);
3329		-
3330		- CameraPane.SWITCH = temp;
3331		-
3332		- //assert(hashtable.isEmpty());
3333		-
3334		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3757	+ if (!thesame)
3335	3758	{
3336		- tab.graphs[i] = null;
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
3337	3766	}
3338	3767
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
3339	3780	// test save
3340	3781	if (false)
3341	3782	{
3342	3783	try
3343	3784	{
3344		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3345	3786	ObjectOutputStream p = new ObjectOutputStream(ostream);
3346	3787
3347	3788	p.writeObject(copy);
..	..	@@ -3354,26 +3795,66 @@
3354	3795	e.printStackTrace();
3355	3796	}
3356	3797	}
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
3357	3832	}
3358	3833
3359	3834	void CopyChanged(Object3D obj)
3360	3835	{
	3836	+ SetUndoStates();
	3837	+
3361	3838	boolean temp = CameraPane.SWITCH;
3362	3839	CameraPane.SWITCH = false;
3363	3840
3364		- copy.ExtractBigData(hashtable);
	3841	+ copy.ExtractBigData(versiontable);
3365	3842
3366	3843	copy.clear();
3367	3844
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
3368	3848	for (int i=0; i<obj.Size(); i++)
3369	3849	{
3370	3850	copy.add(obj.get(i));
3371	3851	}
3372	3852
3373		- copy.RestoreBigData(hashtable);
	3853	+ copy.RestoreBigData(versiontable);
3374	3854
3375	3855	CameraPane.SWITCH = temp;
3376	3856
	3857	+ RefreshSelection();
3377	3858	//assert(hashtable.isEmpty());
3378	3859
3379	3860	copy.Touch();
..	..	@@ -3397,40 +3878,131 @@
3397	3878	refreshContents();
3398	3879	}
3399	3880
3400		- public void Undo()
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
	3889	+ {
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
3401	3902	{
3402	3903	cRadio tab = GetCurrentTab();
3403	3904
3404		- if (tab.undoindex == 0)
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
	3922	+ System.err.println("Undo");
	3923	+
	3924	+ cRadio tab = GetCurrentTab();
	3925	+
	3926	+ if (copy.versionindex == 0)
3405	3927	{
3406	3928	java.awt.Toolkit.getDefaultToolkit().beep();
3407		- return;
	3929	+ return false;
3408	3930	}
3409	3931
3410		- if (tab.graphs[tab.undoindex] == null)
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3411	3959	{
3412		- Save();
3413		- tab.undoindex -= 1;
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
3414	3962	}
3415	3963
3416		- tab.undoindex -= 1;
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
3417	3969
3418		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
3419	3985	}
3420	3986
3421	3987	public void Redo()
3422	3988	{
	3989	+ // Option?
	3990	+ Replace();
	3991	+
3423	3992	cRadio tab = GetCurrentTab();
3424	3993
3425		- if (tab.graphs[tab.undoindex + 1] == null)
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
3426	3995	{
3427	3996	java.awt.Toolkit.getDefaultToolkit().beep();
3428	3997	return;
3429	3998	}
3430	3999
3431		- tab.undoindex += 1;
	4000	+ copy.versionindex += 1;
3432	4001
3433		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
3434	4006	}
3435	4007
3436	4008	void ImportGFD()
..	..	@@ -3582,7 +4154,7 @@
3582	4154	assert false;
3583	4155	}
3584	4156
3585		- void EditSelection()
	4157	+ void EditSelection(boolean newWindow)
3586	4158	{
3587	4159	}
3588	4160
..	..	@@ -3641,7 +4213,7 @@
3641	4213	//copy.material = new cMaterial(copy.GetMaterial());
3642	4214
3643	4215	current.color = (float) colorField.getFloat();
3644		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3645	4217	current.metalness = (float) metalnessField.getFloat();
3646	4218	current.diffuse = (float) diffuseField.getFloat();
3647	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3674,7 +4246,7 @@
3674	4246	cMaterial mat = copy.material;
3675	4247
3676	4248	colorField.SetToolTipValue((mat.color));
3677		- modulationField.SetToolTipValue((mat.modulation));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
3678	4250	metalnessField.SetToolTipValue((mat.metalness));
3679	4251	diffuseField.SetToolTipValue((mat.diffuse));
3680	4252	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3726,9 +4298,25 @@
3726	4298	//copy.Touch();
3727	4299	}
3728	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3729	4303	public void stateChanged(ChangeEvent e)
3730	4304	{
3731	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3732	4320
3733	4321	if (freezematerial)
3734	4322	{
..	..	@@ -3764,6 +4352,12 @@
3764	4352	{
3765	4353	//System.out.println("stateChanged = " + this);
3766	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3767	4361	applySelf();
3768	4362	//System.out.println("this = " + this);
3769	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -4063,6 +4657,7 @@
4063	4657	{
4064	4658	if (GetTree() != null)
4065	4659	{
	4660	+ GetTree().revalidate();
4066	4661	GetTree().repaint();
4067	4662	}
4068	4663
..	..	@@ -4077,7 +4672,8 @@
4077	4672
4078	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	4674	{
4080		- Save();
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4676	+ Save();
4081	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	4679	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +4760,12 @@
4164	4760	{
4165	4761	ResetModel();
4166	4762	Select(thing.GetTreePath(), true, false); // unselect... false);
	4763	+
	4764	+ if (thing.Size() == 0)
	4765	+ {
	4766	+ //EditSelection(false);
	4767	+ }
	4768	+
4167	4769	refreshContents();
4168	4770	}
4169	4771
..	..	@@ -4312,7 +4914,9 @@
4312	4914	readobj.ResetDisplayList();
4313	4915	} catch (Exception e)
4314	4916	{
4315		- //e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
4316	4920	try
4317	4921	{
4318	4922	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4386,11 +4990,14 @@
4386	4990
4387	4991	if (readobj != null)
4388	4992	{
4389		- Save();
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4390	4995	try
4391	4996	{
4392	4997	//readobj.deepCopySelf(copy);
4393	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4394	5001	for (int i = 0; i < readobj.size(); i++)
4395	5002	{
4396	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4431,6 +5038,7 @@
4431	5038	}
4432	5039	} catch (ClassCastException e)
4433	5040	{
	5041	+ e.printStackTrace();
4434	5042	assert (false);
4435	5043	Composite c = (Composite) copy;
4436	5044	c.children.clear();
..	..	@@ -4441,13 +5049,24 @@
4441	5049	c.addChild(csg);
4442	5050	}
4443	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4444	5063	ResetModel();
4445	5064	copy.HardTouch(); // recompile?
4446	5065	refreshContents();
4447	5066	}
4448	5067	}
4449	5068
4450		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4451	5070	{
4452	5071	if (Grafreed.standAlone)
4453	5072	{
..	..	@@ -4550,6 +5169,7 @@
4550	5169	//ps.print(buffer.toString());
4551	5170	} catch (IOException e)
4552	5171	{
	5172	+ e.printStackTrace();
4553	5173	}
4554	5174	}
4555	5175
..	..	@@ -4564,6 +5184,8 @@
4564	5184	String filename = browser.getFile();
4565	5185	if (filename != null && filename.length() > 0)
4566	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4567	5189	lastname = browser.getDirectory() + filename;
4568	5190	save();
4569	5191	}
..	..	@@ -4730,7 +5352,7 @@
4730	5352	MenuBar menuBar;
4731	5353	Menu fileMenu;
4732	5354	MenuItem newItem;
4733		- MenuItem loadItem;
	5355	+ MenuItem openItem;
4734	5356	MenuItem saveItem;
4735	5357	MenuItem saveAsItem;
4736	5358	MenuItem exportAsItem;
..	..	@@ -4753,22 +5375,36 @@
4753	5375	CheckboxMenuItem toggleSwitchItem;
4754	5376	CheckboxMenuItem toggleRootItem;
4755	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4756	5379	CheckboxMenuItem toggleHandleItem;
4757	5380	CheckboxMenuItem togglePaintItem;
4758	5381	JSplitPane mainPanel;
4759	5382	JScrollPane scrollpane;
	5383	+
4760	5384	JPanel toolbarPanel;
	5385	+
4761	5386	cGridBag treePanel;
	5387	+
4762	5388	JPanel radioPanel;
4763	5389	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5390	+
	5391	+ cGridBag toolboxPanel;
4765	5392	cGridBag materialPanel;
	5393	+ cGridBag ctrlPanel;
	5394	+
4766	5395	JScrollPane infoPanel;
	5396	+
4767	5397	cGridBag optionsPanel;
	5398	+
4768	5399	JTabbedPane objectPanel;
	5400	+ boolean materialFlushed;
	5401	+ Object3D latestObject;
	5402	+
4769	5403	cGridBag XYZPanel;
	5404	+
4770	5405	JSplitPane gridPanel;
4771	5406	JSplitPane bigPanel;
	5407	+
4772	5408	cGridBag bigThree;
4773	5409	cGridBag scenePanel;
4774	5410	cGridBag centralPanel;
..	..	@@ -4826,7 +5462,7 @@
4826	5462	JLabel colorLabel;
4827	5463	cNumberSlider colorField;
4828	5464	JLabel modulationLabel;
4829		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
4830	5466	JLabel metalnessLabel;
4831	5467	cNumberSlider metalnessField;
4832	5468	JLabel diffuseLabel;
..	..	@@ -4883,7 +5519,7 @@
4883	5519	cNumberSlider fogField;
4884	5520	JLabel opacityPowerLabel;
4885	5521	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	5522	+ cTree jTree;
4887	5523	//ObjectUI parent;
4888	5524
4889	5525	cNumberSlider normalpushField;