~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,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,12 +340,17 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	frame.setMenuBar(menuBar = new MenuBar());
279	351	menuBar.add(fileMenu = new Menu("File"));
280	352	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
282	354
283	355	//oe.menuBar.add(menu = new Menu("Include"));
284	356	Menu menu = new Menu("Import");
..	..	@@ -310,7 +382,7 @@
310	382	}
311	383
312	384	newItem.addActionListener(this);
313		- loadItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
314	386	saveItem.addActionListener(this);
315	387	saveAsItem.addActionListener(this);
316	388	exportAsItem.addActionListener(this);
..	..	@@ -319,14 +391,52 @@
319	391	closeItem.addActionListener(this);
320	392
321	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
322	420	toolbarPanel = new JPanel();
323	421	toolbarPanel.setName("Toolbar");
324	422	treePanel = new cGridBag();
325	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
326	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
328	437	materialPanel = new cGridBag().setVertical(true);
329	438	materialPanel.setName("Material");
	439	+
330	440	/JTextPane/
331	441	infoarea = createTextPane();
332	442	doc = infoarea.getStyledDocument();
..	..	@@ -339,7 +449,7 @@
339	449	// TEXTAREA infoarea.setLineWrap(true);
340	450	// TEXTAREA infoarea.setWrapStyleWord(true);
341	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
342		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
343	453	infoPanel.setName("Info");
344	454	//infoPanel.setLayout(new BorderLayout());
345	455	//infoPanel.add(createTextPane());
..	..	@@ -351,7 +461,14 @@
351	461	mainPanel.setDividerSize(9);
352	462	mainPanel.setDividerLocation(0.5); //1.0);
353	463	mainPanel.setResizeWeight(0.5);
354		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
355	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	473	//mainPanel.setLayout(new GridBagLayout());
357	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +536,10 @@
419	536	e.printStackTrace();
420	537	}
421	538
422		- String selection = infoarea.getText();
423		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
424		- java.awt.datatransfer.Clipboard clipboard =
425		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	543	//clipboard.setContents(data, data);
427	544	}
428	545
..	..	@@ -582,20 +699,121 @@
582	699	}
583	700	}
584	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
585	760	void ToggleFullScreen()
586	761	{
587		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
588	767	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
592	791	} else
593	792	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
597	815	}
598		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
599	817	}
600	818
601	819	private JTextPane createTextPane()
..	..	@@ -736,7 +954,12 @@
736	954	JCheckBox speedupCB;
737	955	JCheckBox rewindCB;
738	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
739	961	JComboBox texresMenu;
	962	+
740	963	JButton resetButton;
741	964	JButton stepButton;
742	965	JButton stepAllButton;
..	..	@@ -745,9 +968,13 @@
745	968	JButton fasterButton;
746	969	JButton remarkButton;
747	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
748	974	cGridBag namePanel;
749	975	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
751	978	cGridBag pushPanel;
752	979	cGridBag fillPanel;
753	980
..	..	@@ -919,12 +1146,12 @@
919	1146	namePanel = new cGridBag();
920	1147
921	1148	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1150	oe.ctrlPanel.add(namePanel);
924	1151
925	1152	oe.ctrlPanel.Return();
926	1153
927		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
928	1155	return;
929	1156
930	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -937,42 +1164,46 @@
937	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1165	hideCB.setToolTipText("Hide object");
939	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
941	1168
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1172	rewindCB.setToolTipText("Rewind animation");
944	1173
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1176
948	1177	if (Globals.ADVANCED)
949	1178	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
951	1180	link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1182	speedupCB.setToolTipText("Option motion capture");
954	1183	}
955	1184
956	1185	oe.ctrlPanel.add(setupPanel);
957	1186	oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
958	1189
959		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1191
961		- resetButton = AddButton(commandsPanel, "Reset");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1193	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1195	stepButton.setToolTipText("Step one frame");
965	1196	// resetAllButton = AddButton(oe, "Reset All");
966	1197	// stepAllButton = AddButton(oe, "Step All");
967	1198	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1200	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1202	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1204	remarkButton.setToolTipText("Set the current transform as the target");
974	1205
975		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1207	oe.ctrlPanel.Return();
977	1208
978	1209	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1178,8 +1409,11 @@
1178	1409	//worldPanel.setName("World");
1179	1410	centralPanel = new cGridBag();
1180	1411	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1417
1184	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1422,10 @@
1188	1422	// cameraPanel.setDividerSize(9);
1189	1423	cameraPanel.setResizeWeight(1.0);
1190	1424
	1425	+ }
	1426	+
1191	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1192	1429	//frame.setJMenuBar(timelineMenubar);
1193	1430	//centralPanel.add(timelinePanel);
1194	1431
..	..	@@ -1255,8 +1492,12 @@
1255	1492	// north.setName("Edit");
1256	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1494	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
1259		- objectPanel.add(infoPanel);
	1495	+ objectPanel.add(editPanel);
	1496	+
	1497	+ //if (Globals.ADVANCED)
	1498	+ objectPanel.add(infoPanel);
	1499	+
	1500	+ objectPanel.add(toolboxPanel);
1260	1501
1261	1502	/*
1262	1503	aConstraints.gridx = 0;
..	..	@@ -1265,7 +1506,7 @@
1265	1506	aConstraints.gridy += 1;
1266	1507	aConstraints.gridwidth = 1;
1267	1508	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1509	+ */
1269	1510
1270	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,9 +1523,7 @@
1282	1523	JTabbedPane tabbedPane = new JTabbedPane();
1283	1524	tabbedPane.add(scrollpane);
1284	1525
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1288	1527
1289	1528	optionsPanel.setName("Options");
1290	1529
..	..	@@ -1292,6 +1531,8 @@
1292	1531
1293	1532	tabbedPane.add(optionsPanel);
1294	1533
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1535	+
1295	1536	scenePanel.add(tabbedPane);
1296	1537
1297	1538	/*
..	..	@@ -1364,9 +1605,9 @@
1364	1605	// aConstraints.gridheight = 1;
1365	1606
1366	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1367		- framePanel.setContinuousLayout(true);
1368		- framePanel.setOneTouchExpandable(true);
1369		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1370	1611	//framePanel.setDividerSize(15);
1371	1612	//framePanel.setResizeWeight(0.15);
1372	1613	framePanel.setName("Frame");
..	..	@@ -1384,9 +1625,14 @@
1384	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1626
1386	1627	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
1388		-
	1628	+
	1629	+ cameraView.requestFocusInWindow();
	1630	+
1389	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1390	1636
1391	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1473,24 +1719,6 @@
1473	1719	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	1720	colorSection.add(texture);
1475	1721
1476		- cGridBag anisoU = new cGridBag();
1477		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1478		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480		- colorSection.add(anisoU);
1481		-
1482		- cGridBag anisoV = new cGridBag();
1483		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1484		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoV);
1487		-
1488		- cGridBag shadowbias = new cGridBag();
1489		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1490		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1492		- colorSection.add(shadowbias);
1493		-
1494	1722	panel.add(new JSeparator());
1495	1723
1496	1724	panel.add(colorSection);
..	..	@@ -1540,6 +1768,12 @@
1540	1768	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541	1769	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1770	diffuseSection.add(fakedepth);
	1771	+
	1772	+ cGridBag shadowbias = new cGridBag();
	1773	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1774	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ diffuseSection.add(shadowbias);
1543	1777
1544	1778	panel.add(new JSeparator());
1545	1779
..	..	@@ -1591,6 +1825,18 @@
1591	1825	// aConstraints.gridy += 1;
1592	1826	// aConstraints.gridwidth = 1;
1593	1827
	1828	+ cGridBag anisoU = new cGridBag();
	1829	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1830	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1832	+ specularSection.add(anisoU);
	1833	+
	1834	+ cGridBag anisoV = new cGridBag();
	1835	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1836	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ specularSection.add(anisoV);
	1839	+
1594	1840
1595	1841	panel.add(new JSeparator());
1596	1842
..	..	@@ -1598,35 +1844,35 @@
1598	1844
1599	1845	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1846
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	1847	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	1848
1603	1849	cGridBag camera = new cGridBag();
1604	1850	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	1851	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	1852	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	1853	+ colorSection.add(camera);
1608	1854
1609	1855	cGridBag ambient = new cGridBag();
1610	1856	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	1857	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1858	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	1859	+ colorSection.add(ambient);
1614	1860
1615	1861	cGridBag backlit = new cGridBag();
1616	1862	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	1863	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1864	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	1865	+ colorSection.add(backlit);
1620	1866
1621	1867	cGridBag opacity = new cGridBag();
1622	1868	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1623	1869	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1870	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1625		- globalSection.add(opacity);
	1871	+ colorSection.add(opacity);
1626	1872
1627		- panel.add(new JSeparator());
	1873	+ //panel.add(new JSeparator());
1628	1874
1629		- panel.add(globalSection);
	1875	+ //panel.add(globalSection);
1630	1876
1631	1877	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	1878
..	..	@@ -1733,8 +1979,9 @@
1733	1979	// 3D models
1734	1980	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1735	1981	{
1736		- lastConverter = new com.jmex.model.converters.MaxToJme();
1737		- LoadFile(filename, lastConverter);
	1982	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1983	+ //LoadFile(filename, lastConverter);
	1984	+ LoadObjFile(filename); // New 3ds loader
1738	1985	continue;
1739	1986	}
1740	1987	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2072,19 +2319,19 @@
2072	2319
2073	2320	void LoadObjFile(String fullname)
2074	2321	{
2075		- /*
	2322	+ System.out.println("Loading " + fullname);
	2323	+ /**/
2076	2324	//lastFilename = fullname;
2077	2325	if(loadObjThread == null)
2078	2326	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2327	+ loadObjThread = new LoadOBJThread();
	2328	+ loadObjThread.start();
2081	2329	}
2082	2330
2083	2331	loadObjThread.add(fullname);
2084		- */
	2332	+ /**/
2085	2333
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2334	+ //makeSomething(new FileObject(fullname, true), true);
2088	2335	}
2089	2336
2090	2337	void LoadGFDFile(String fullname)
..	..	@@ -2460,6 +2707,7 @@
2460	2707	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	2709	}
	2710	+
2463	2711	//cJME.count++;
2464	2712	//cJME.count %= 12;
2465	2713	if (gc)
..	..	@@ -2643,6 +2891,7 @@
2643	2891	}
2644	2892	}
2645	2893	}
	2894	+
2646	2895	cFileSystemPane FSPane;
2647	2896
2648	2897	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2696,11 +2945,14 @@
2696	2945	}
2697	2946	}
2698	2947	}
	2948	+
2699	2949	freezematerial = false;
2700	2950	}
2701	2951
2702	2952	void SetMaterial(Object3D object)
2703	2953	{
	2954	+ latestObject = object;
	2955	+
2704	2956	cMaterial mat = object.material;
2705	2957
2706	2958	if (mat == null)
..	..	@@ -2812,12 +3064,17 @@
2812	3064	// }
2813	3065
2814	3066	/**/
2815		- if (deselect)
	3067	+ if (deselect \|\| child == null)
2816	3068	{
2817	3069	//group.deselectAll();
2818	3070	//freeze = true;
2819	3071	GetTree().clearSelection();
2820	3072	//freeze = false;
	3073	+
	3074	+ if (child == null)
	3075	+ {
	3076	+ return;
	3077	+ }
2821	3078	}
2822	3079
2823	3080	//group.addSelectee(child);
..	..	@@ -2886,7 +3143,7 @@
2886	3143	cameraView.ToggleDL();
2887	3144	cameraView.repaint();
2888	3145	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3146	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3147	{
2891	3148	cameraView.ToggleTexture();
2892	3149	// june 2013 copy.HardTouch();
..	..	@@ -2925,7 +3182,7 @@
2925	3182	frame.validate();
2926	3183
2927	3184	return;
2928		- } else if (event.getSource() == toggleSwitchItem)
	3185	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3186	{
2930	3187	cameraView.ToggleSwitch();
2931	3188	cameraView.repaint();
..	..	@@ -3141,9 +3398,9 @@
3141	3398	{
3142	3399	Close();
3143	3400	//return true;
3144		- } else if (source == loadItem)
	3401	+ } else if (source == openItem)
3145	3402	{
3146		- load();
	3403	+ Open();
3147	3404	//return true;
3148	3405	} else if (source == newItem)
3149	3406	{
..	..	@@ -3168,6 +3425,10 @@
3168	3425	{
3169	3426	generatePOV();
3170	3427	//return true;
	3428	+ } else if (event.getSource() == archiveItem)
	3429	+ {
	3430	+ cTools.Archive(frame);
	3431	+ return;
3171	3432	} else if (source == zBufferItem)
3172	3433	{
3173	3434	try
..	..	@@ -3214,7 +3475,7 @@
3214	3475	objEditor.refreshContents();
3215	3476	}
3216	3477
3217		- static public byte[] Compress(Object o)
	3478	+ static public byte[] Compress(Object3D o)
3218	3479	{
3219	3480	try
3220	3481	{
..	..	@@ -3222,8 +3483,13 @@
3222	3483	java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3223	3484	ObjectOutputStream out = new ObjectOutputStream(zstream);
3224	3485
	3486	+ Object3D parent = o.parent;
	3487	+ o.parent = null;
	3488	+
3225	3489	out.writeObject(o);
3226	3490
	3491	+ o.parent = parent;
	3492	+
3227	3493	out.flush();
3228	3494
3229	3495	zstream.close();
..	..	@@ -3304,6 +3570,30 @@
3304	3570
3305	3571	public void Save()
3306	3572	{
	3573	+ // Default reduces the probability of heuristics errors.
	3574	+ Save(true);
	3575	+ }
	3576	+
	3577	+ private boolean Equal(byte[] compress, byte[] name)
	3578	+ {
	3579	+ if (compress.length != name.length)
	3580	+ {
	3581	+ return false;
	3582	+ }
	3583	+
	3584	+ for (int i=compress.length; --i>=0;)
	3585	+ {
	3586	+ if (compress[i] != name[i])
	3587	+ return false;
	3588	+ }
	3589	+
	3590	+ return true;
	3591	+ }
	3592	+
	3593	+ public boolean Save(boolean user)
	3594	+ {
	3595	+ System.err.println("Save");
	3596	+
3307	3597	cRadio tab = GetCurrentTab();
3308	3598
3309	3599	boolean temp = CameraPane.SWITCH;
..	..	@@ -3311,20 +3601,37 @@
3311	3601
3312	3602	copy.ExtractBigData(hashtable);
3313	3603
3314		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3315		- tab.graphs[tab.undoindex++] = Compress(copy);
3316		-
3317		- copy.RestoreBigData(hashtable);
	3604	+ byte[] compress = Compress(copy);
3318	3605
3319	3606	CameraPane.SWITCH = temp;
3320	3607
	3608	+ boolean thesame = false;
	3609	+
	3610	+ // Quick heuristic using length. Works only when stream is compressed.
	3611	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3612	+ {
	3613	+ thesame = true;
	3614	+ }
	3615	+
	3616	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3617	+ if (!thesame)
	3618	+ {
	3619	+ tab.user[tab.undoindex] = user;
	3620	+ tab.graphs[tab.undoindex++] = compress;
	3621	+ }
	3622	+
	3623	+ copy.RestoreBigData(hashtable);
	3624	+
3321	3625	//assert(hashtable.isEmpty());
3322	3626
3323	3627	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3324	3628	{
	3629	+ tab.user[i] = false;
3325	3630	tab.graphs[i] = null;
3326	3631	}
3327	3632
	3633	+ SetUndoStates();
	3634	+
3328	3635	// test save
3329	3636	if (false)
3330	3637	{
..	..	@@ -3343,10 +3650,14 @@
3343	3650	e.printStackTrace();
3344	3651	}
3345	3652	}
	3653	+
	3654	+ return !thesame;
3346	3655	}
3347	3656
3348	3657	void CopyChanged(Object3D obj)
3349	3658	{
	3659	+ SetUndoStates();
	3660	+
3350	3661	boolean temp = CameraPane.SWITCH;
3351	3662	CameraPane.SWITCH = false;
3352	3663
..	..	@@ -3386,25 +3697,47 @@
3386	3697	refreshContents();
3387	3698	}
3388	3699
3389		- public void Undo()
	3700	+ cButton undoButton;
	3701	+ cButton redoButton;
	3702	+
	3703	+ void SetUndoStates()
3390	3704	{
	3705	+ cRadio tab = GetCurrentTab();
	3706	+
	3707	+ undoButton.setEnabled(tab.undoindex > 0);
	3708	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3709	+ }
	3710	+
	3711	+ public boolean Undo()
	3712	+ {
	3713	+ System.err.println("Undo");
	3714	+
3391	3715	cRadio tab = GetCurrentTab();
3392	3716
3393	3717	if (tab.undoindex == 0)
3394	3718	{
3395	3719	java.awt.Toolkit.getDefaultToolkit().beep();
3396		- return;
	3720	+ return false;
3397	3721	}
3398	3722
3399		- if (tab.graphs[tab.undoindex] == null)
	3723	+ if (tab.graphs[tab.undoindex] == null \|\| !tab.user[tab.undoindex])
3400	3724	{
3401		- Save();
3402		- tab.undoindex -= 1;
	3725	+ if (Save(false))
	3726	+ tab.undoindex -= 1;
	3727	+ else
	3728	+ {
	3729	+ if (tab.undoindex <= 0)
	3730	+ return false;
	3731	+ else
	3732	+ tab.undoindex -= 1;
	3733	+ }
3403	3734	}
3404	3735
3405	3736	tab.undoindex -= 1;
3406	3737
3407	3738	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3739	+
	3740	+ return true;
3408	3741	}
3409	3742
3410	3743	public void Redo()
..	..	@@ -3420,6 +3753,9 @@
3420	3753	tab.undoindex += 1;
3421	3754
3422	3755	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3756	+
	3757	+ if (!tab.user[tab.undoindex])
	3758	+ tab.graphs[tab.undoindex] = null;
3423	3759	}
3424	3760
3425	3761	void ImportGFD()
..	..	@@ -3571,7 +3907,7 @@
3571	3907	assert false;
3572	3908	}
3573	3909
3574		- void EditSelection()
	3910	+ void EditSelection(boolean newWindow)
3575	3911	{
3576	3912	}
3577	3913
..	..	@@ -4066,7 +4402,8 @@
4066	4402
4067	4403	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4068	4404	{
4069		- Save();
	4405	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4406	+ Save();
4070	4407	//Tween.set(thing, 0).target(1).start(tweenManager);
4071	4408	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4072	4409	// if (thing instanceof GenericJointDemo)
..	..	@@ -4153,6 +4490,12 @@
4153	4490	{
4154	4491	ResetModel();
4155	4492	Select(thing.GetTreePath(), true, false); // unselect... false);
	4493	+
	4494	+ if (thing.Size() == 0)
	4495	+ {
	4496	+ //EditSelection(false);
	4497	+ }
	4498	+
4156	4499	refreshContents();
4157	4500	}
4158	4501
..	..	@@ -4290,6 +4633,7 @@
4290	4633
4291	4634	try
4292	4635	{
	4636	+ // Try compressed version first.
4293	4637	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4294	4638	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4295	4639	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4359,6 +4703,12 @@
4359	4703
4360	4704	void LoadIt(Object obj)
4361	4705	{
	4706	+ if (obj == null)
	4707	+ {
	4708	+ // Invalid file
	4709	+ return;
	4710	+ }
	4711	+
4362	4712	System.out.println("Loaded " + obj);
4363	4713	//new Exception().printStackTrace();
4364	4714	Object3D readobj = (Object3D) obj;
..	..	@@ -4368,6 +4718,7 @@
4368	4718
4369	4719	if (readobj != null)
4370	4720	{
	4721	+ if (Globals.SAVEONMAKE)
4371	4722	Save();
4372	4723	try
4373	4724	{
..	..	@@ -4429,7 +4780,7 @@
4429	4780	}
4430	4781	}
4431	4782
4432		- void load() // throws ClassNotFoundException
	4783	+ void Open() // throws ClassNotFoundException
4433	4784	{
4434	4785	if (Grafreed.standAlone)
4435	4786	{
..	..	@@ -4546,6 +4897,8 @@
4546	4897	String filename = browser.getFile();
4547	4898	if (filename != null && filename.length() > 0)
4548	4899	{
	4900	+ if (!filename.endsWith(".gfd"))
	4901	+ filename += ".gfd";
4549	4902	lastname = browser.getDirectory() + filename;
4550	4903	save();
4551	4904	}
..	..	@@ -4712,7 +5065,7 @@
4712	5065	MenuBar menuBar;
4713	5066	Menu fileMenu;
4714	5067	MenuItem newItem;
4715		- MenuItem loadItem;
	5068	+ MenuItem openItem;
4716	5069	MenuItem saveItem;
4717	5070	MenuItem saveAsItem;
4718	5071	MenuItem exportAsItem;
..	..	@@ -4735,22 +5088,36 @@
4735	5088	CheckboxMenuItem toggleSwitchItem;
4736	5089	CheckboxMenuItem toggleRootItem;
4737	5090	CheckboxMenuItem animationItem;
	5091	+ MenuItem archiveItem;
4738	5092	CheckboxMenuItem toggleHandleItem;
4739	5093	CheckboxMenuItem togglePaintItem;
4740	5094	JSplitPane mainPanel;
4741	5095	JScrollPane scrollpane;
	5096	+
4742	5097	JPanel toolbarPanel;
	5098	+
4743	5099	cGridBag treePanel;
	5100	+
4744	5101	JPanel radioPanel;
4745	5102	ButtonGroup buttonGroup;
4746		- cGridBag ctrlPanel;
	5103	+
	5104	+ cGridBag toolboxPanel;
4747	5105	cGridBag materialPanel;
	5106	+ cGridBag ctrlPanel;
	5107	+
4748	5108	JScrollPane infoPanel;
	5109	+
4749	5110	cGridBag optionsPanel;
	5111	+
4750	5112	JTabbedPane objectPanel;
	5113	+ boolean materialFlushed;
	5114	+ Object3D latestObject;
	5115	+
4751	5116	cGridBag XYZPanel;
	5117	+
4752	5118	JSplitPane gridPanel;
4753	5119	JSplitPane bigPanel;
	5120	+
4754	5121	cGridBag bigThree;
4755	5122	cGridBag scenePanel;
4756	5123	cGridBag centralPanel;
..	..	@@ -4865,7 +5232,7 @@
4865	5232	cNumberSlider fogField;
4866	5233	JLabel opacityPowerLabel;
4867	5234	cNumberSlider opacityPowerField;
4868		- JTree jTree;
	5235	+ cTree jTree;
4869	5236	//ObjectUI parent;
4870	5237
4871	5238	cNumberSlider normalpushField;