~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);
..	..	@@ -169,7 +234,7 @@
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171	236	objEditor.ctrlPanel.remove(setupPanel2);
172		- objEditor.ctrlPanel.remove(commandsPanel);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
173	238	objEditor.ctrlPanel.remove(pushPanel);
174	239	//objEditor.ctrlPanel.remove(fillPanel);
175	240
..	..	@@ -244,6 +309,7 @@
244	309	//localCopy.parent = null;
245	310
246	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
247	313	objEditor = this;
248	314	this.callee = callee;
249	315
..	..	@@ -274,12 +340,17 @@
274	340	return frame.action(event, obj);
275	341	}
276	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	+
277	348	void SetupMenu()
278	349	{
279	350	frame.setMenuBar(menuBar = new MenuBar());
280	351	menuBar.add(fileMenu = new Menu("File"));
281	352	fileMenu.add(newItem = new MenuItem("New"));
282		- fileMenu.add(loadItem = new MenuItem("Open..."));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
283	354
284	355	//oe.menuBar.add(menu = new Menu("Include"));
285	356	Menu menu = new Menu("Import");
..	..	@@ -311,7 +382,7 @@
311	382	}
312	383
313	384	newItem.addActionListener(this);
314		- loadItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
315	386	saveItem.addActionListener(this);
316	387	saveAsItem.addActionListener(this);
317	388	exportAsItem.addActionListener(this);
..	..	@@ -320,14 +391,52 @@
320	391	closeItem.addActionListener(this);
321	392
322	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	+
323	420	toolbarPanel = new JPanel();
324	421	toolbarPanel.setName("Toolbar");
325	422	treePanel = new cGridBag();
326	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
327	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328		- 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	+
329	437	materialPanel = new cGridBag().setVertical(true);
330	438	materialPanel.setName("Material");
	439	+
331	440	/JTextPane/
332	441	infoarea = createTextPane();
333	442	doc = infoarea.getStyledDocument();
..	..	@@ -340,7 +449,7 @@
340	449	// TEXTAREA infoarea.setLineWrap(true);
341	450	// TEXTAREA infoarea.setWrapStyleWord(true);
342	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
343		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
344	453	infoPanel.setName("Info");
345	454	//infoPanel.setLayout(new BorderLayout());
346	455	//infoPanel.add(createTextPane());
..	..	@@ -352,7 +461,14 @@
352	461	mainPanel.setDividerSize(9);
353	462	mainPanel.setDividerLocation(0.5); //1.0);
354	463	mainPanel.setResizeWeight(0.5);
355		-
	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	+
356	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357	473	//mainPanel.setLayout(new GridBagLayout());
358	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -583,20 +699,121 @@
583	699	}
584	700	}
585	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	+
586	760	void ToggleFullScreen()
587	761	{
588		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
589	767	{
590		- frame.getContentPane().remove(/"Center",/bigThree);
591		- framePanel.add(bigThree);
592		- 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	+
593	791	} else
594	792	{
595		- frame.getContentPane().remove(/"Center",/framePanel);
596		- framePanel.remove(bigThree);
597		- 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);
598	815	}
599		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
600	817	}
601	818
602	819	private JTextPane createTextPane()
..	..	@@ -737,7 +954,12 @@
737	954	JCheckBox speedupCB;
738	955	JCheckBox rewindCB;
739	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
740	961	JComboBox texresMenu;
	962	+
741	963	JButton resetButton;
742	964	JButton stepButton;
743	965	JButton stepAllButton;
..	..	@@ -746,10 +968,13 @@
746	968	JButton fasterButton;
747	969	JButton remarkButton;
748	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
749	974	cGridBag namePanel;
750	975	cGridBag setupPanel;
751	976	cGridBag setupPanel2;
752		- cGridBag commandsPanel;
	977	+ cGridBag objectCommandsPanel;
753	978	cGridBag pushPanel;
754	979	cGridBag fillPanel;
755	980
..	..	@@ -921,12 +1146,12 @@
921	1146	namePanel = new cGridBag();
922	1147
923	1148	nameField = AddText(namePanel, copy.GetName());
924		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
925	1150	oe.ctrlPanel.add(namePanel);
926	1151
927	1152	oe.ctrlPanel.Return();
928	1153
929		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
930	1155	return;
931	1156
932	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -939,20 +1164,21 @@
939	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940	1165	hideCB.setToolTipText("Hide object");
941	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
943	1168
944	1169	setupPanel2 = new cGridBag().setVertical(false);
945	1170
946	1171	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947	1172	rewindCB.setToolTipText("Rewind animation");
948	1173
949		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950		- randomCB.setToolTipText("Rewind or Go back and forth randomly");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
951	1176
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
952	1180	if (Globals.ADVANCED)
953	1181	{
954		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955		- link2masterCB.setToolTipText("Attach to support");
956	1182	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957	1183	speedupCB.setToolTipText("Option motion capture");
958	1184	}
..	..	@@ -962,23 +1188,23 @@
962	1188	oe.ctrlPanel.add(setupPanel2);
963	1189	oe.ctrlPanel.Return();
964	1190
965		- commandsPanel = new cGridBag().setVertical(false);
	1191	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1192
967		- resetButton = AddButton(commandsPanel, "Reset");
	1193	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1194	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1195	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1196	stepButton.setToolTipText("Step one frame");
971	1197	// resetAllButton = AddButton(oe, "Reset All");
972	1198	// stepAllButton = AddButton(oe, "Step All");
973	1199	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1200	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1201	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1202	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1203	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1204	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1205	remarkButton.setToolTipText("Set the current transform as the target");
980	1206
981		- oe.ctrlPanel.add(commandsPanel);
	1207	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1208	oe.ctrlPanel.Return();
983	1209
984	1210	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1410,11 @@
1184	1410	//worldPanel.setName("World");
1185	1411	centralPanel = new cGridBag();
1186	1412	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1413	+
	1414	+ if (Globals.ADVANCED)
	1415	+ {
	1416	+ timelinePanel = new JPanel(new BorderLayout());
	1417	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189	1418
1190	1419	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1420	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1423,10 @@
1194	1423	// cameraPanel.setDividerSize(9);
1195	1424	cameraPanel.setResizeWeight(1.0);
1196	1425
	1426	+ }
	1427	+
1197	1428	centralPanel.add(cameraView);
	1429	+ centralPanel.setFocusable(true);
1198	1430	//frame.setJMenuBar(timelineMenubar);
1199	1431	//centralPanel.add(timelinePanel);
1200	1432
..	..	@@ -1261,8 +1493,12 @@
1261	1493	// north.setName("Edit");
1262	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1495	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
1265		- objectPanel.add(infoPanel);
	1496	+ objectPanel.add(editPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1266	1502
1267	1503	/*
1268	1504	aConstraints.gridx = 0;
..	..	@@ -1271,7 +1507,7 @@
1271	1507	aConstraints.gridy += 1;
1272	1508	aConstraints.gridwidth = 1;
1273	1509	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1510	+ */
1275	1511
1276	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1288,9 +1524,7 @@
1288	1524	JTabbedPane tabbedPane = new JTabbedPane();
1289	1525	tabbedPane.add(scrollpane);
1290	1526
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1294	1528
1295	1529	optionsPanel.setName("Options");
1296	1530
..	..	@@ -1298,6 +1532,8 @@
1298	1532
1299	1533	tabbedPane.add(optionsPanel);
1300	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1301	1537	scenePanel.add(tabbedPane);
1302	1538
1303	1539	/*
..	..	@@ -1370,9 +1606,9 @@
1370	1606	// aConstraints.gridheight = 1;
1371	1607
1372	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1376	1612	//framePanel.setDividerSize(15);
1377	1613	//framePanel.setResizeWeight(0.15);
1378	1614	framePanel.setName("Frame");
..	..	@@ -1390,9 +1626,14 @@
1390	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1627
1392	1628	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1629	+
	1630	+ cameraView.requestFocusInWindow();
	1631	+
1395	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1396	1637
1397	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1479,24 +1720,6 @@
1479	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	1721	colorSection.add(texture);
1481	1722
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	1723	panel.add(new JSeparator());
1501	1724
1502	1725	panel.add(colorSection);
..	..	@@ -1546,6 +1769,12 @@
1546	1769	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	1771	diffuseSection.add(fakedepth);
	1772	+
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
1549	1778
1550	1779	panel.add(new JSeparator());
1551	1780
..	..	@@ -1597,6 +1826,18 @@
1597	1826	// aConstraints.gridy += 1;
1598	1827	// aConstraints.gridwidth = 1;
1599	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
	1834	+
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
1600	1841
1601	1842	panel.add(new JSeparator());
1602	1843
..	..	@@ -1604,35 +1845,35 @@
1604	1845
1605	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	1847
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1849
1609	1850	cGridBag camera = new cGridBag();
1610	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1614	1855
1615	1856	cGridBag ambient = new cGridBag();
1616	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1620	1861
1621	1862	cGridBag backlit = new cGridBag();
1622	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1626	1867
1627	1868	cGridBag opacity = new cGridBag();
1628	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1632	1873
1633		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1634	1875
1635		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1636	1877
1637	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	1879
..	..	@@ -1739,8 +1980,9 @@
1739	1980	// 3D models
1740	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1741	1982	{
1742		- lastConverter = new com.jmex.model.converters.MaxToJme();
1743		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1744	1986	continue;
1745	1987	}
1746	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2466,6 +2708,7 @@
2466	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2467	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2468	2710	}
	2711	+
2469	2712	//cJME.count++;
2470	2713	//cJME.count %= 12;
2471	2714	if (gc)
..	..	@@ -2649,6 +2892,7 @@
2649	2892	}
2650	2893	}
2651	2894	}
	2895	+
2652	2896	cFileSystemPane FSPane;
2653	2897
2654	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2702,11 +2946,14 @@
2702	2946	}
2703	2947	}
2704	2948	}
	2949	+
2705	2950	freezematerial = false;
2706	2951	}
2707	2952
2708	2953	void SetMaterial(Object3D object)
2709	2954	{
	2955	+ latestObject = object;
	2956	+
2710	2957	cMaterial mat = object.material;
2711	2958
2712	2959	if (mat == null)
..	..	@@ -2818,12 +3065,17 @@
2818	3065	// }
2819	3066
2820	3067	/**/
2821		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2822	3069	{
2823	3070	//group.deselectAll();
2824	3071	//freeze = true;
2825	3072	GetTree().clearSelection();
2826	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2827	3079	}
2828	3080
2829	3081	//group.addSelectee(child);
..	..	@@ -2892,7 +3144,7 @@
2892	3144	cameraView.ToggleDL();
2893	3145	cameraView.repaint();
2894	3146	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3148	{
2897	3149	cameraView.ToggleTexture();
2898	3150	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3183,7 @@
2931	3183	frame.validate();
2932	3184
2933	3185	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3187	{
2936	3188	cameraView.ToggleSwitch();
2937	3189	cameraView.repaint();
..	..	@@ -3147,9 +3399,9 @@
3147	3399	{
3148	3400	Close();
3149	3401	//return true;
3150		- } else if (source == loadItem)
	3402	+ } else if (source == openItem)
3151	3403	{
3152		- load();
	3404	+ Open();
3153	3405	//return true;
3154	3406	} else if (source == newItem)
3155	3407	{
..	..	@@ -3174,6 +3426,10 @@
3174	3426	{
3175	3427	generatePOV();
3176	3428	//return true;
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
3177	3433	} else if (source == zBufferItem)
3178	3434	{
3179	3435	try
..	..	@@ -3225,8 +3481,8 @@
3225	3481	try
3226	3482	{
3227	3483	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3230	3486
3231	3487	Object3D parent = o.parent;
3232	3488	o.parent = null;
..	..	@@ -3237,10 +3493,14 @@
3237	3493
3238	3494	out.flush();
3239	3495
3240		- zstream.close();
	3496	+ baos //zstream
	3497	+ .close();
3241	3498	out.close();
3242	3499
3243		- return baos.toByteArray();
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
3244	3504	} catch (Exception e)
3245	3505	{
3246	3506	System.err.println(e);
..	..	@@ -3250,13 +3510,16 @@
3250	3510
3251	3511	static public Object Uncompress(byte[] bytes)
3252	3512	{
3253		- System.out.println("#bytes = " + bytes.length);
	3513	+ System.out.println("restore #bytes = " + bytes.length);
3254	3514	try
3255	3515	{
3256	3516	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258		- ObjectInputStream in = new ObjectInputStream(istream);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3259	3519	Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
3260	3523	in.close();
3261	3524
3262	3525	return obj;
..	..	@@ -3315,6 +3578,29 @@
3315	3578
3316	3579	public void Save()
3317	3580	{
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
3318	3604	cRadio tab = GetCurrentTab();
3319	3605
3320	3606	boolean temp = CameraPane.SWITCH;
..	..	@@ -3322,20 +3608,42 @@
3322	3608
3323	3609	copy.ExtractBigData(hashtable);
3324	3610
3325		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
3327		-
3328		- copy.RestoreBigData(hashtable);
	3611	+ byte[] compress = Compress(copy);
3329	3612
3330	3613	CameraPane.SWITCH = temp;
3331	3614
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
3332	3637	//assert(hashtable.isEmpty());
3333	3638
3334	3639	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3335	3640	{
3336		- tab.graphs[i] = null;
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
3337	3643	}
3338	3644
	3645	+ SetUndoStates();
	3646	+
3339	3647	// test save
3340	3648	if (false)
3341	3649	{
..	..	@@ -3354,10 +3662,14 @@
3354	3662	e.printStackTrace();
3355	3663	}
3356	3664	}
	3665	+
	3666	+ return !thesame;
3357	3667	}
3358	3668
3359	3669	void CopyChanged(Object3D obj)
3360	3670	{
	3671	+ SetUndoStates();
	3672	+
3361	3673	boolean temp = CameraPane.SWITCH;
3362	3674	CameraPane.SWITCH = false;
3363	3675
..	..	@@ -3397,25 +3709,47 @@
3397	3709	refreshContents();
3398	3710	}
3399	3711
3400		- public void Undo()
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
3401	3716	{
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
3402	3727	cRadio tab = GetCurrentTab();
3403	3728
3404	3729	if (tab.undoindex == 0)
3405	3730	{
3406	3731	java.awt.Toolkit.getDefaultToolkit().beep();
3407		- return;
	3732	+ return false;
3408	3733	}
3409	3734
3410		- if (tab.graphs[tab.undoindex] == null)
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3411	3736	{
3412		- Save();
3413		- tab.undoindex -= 1;
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
3414	3746	}
3415	3747
3416	3748	tab.undoindex -= 1;
3417	3749
3418	3750	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
3419	3753	}
3420	3754
3421	3755	public void Redo()
..	..	@@ -3431,6 +3765,9 @@
3431	3765	tab.undoindex += 1;
3432	3766
3433	3767	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
3434	3771	}
3435	3772
3436	3773	void ImportGFD()
..	..	@@ -3582,7 +3919,7 @@
3582	3919	assert false;
3583	3920	}
3584	3921
3585		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3586	3923	{
3587	3924	}
3588	3925
..	..	@@ -4077,7 +4414,8 @@
4077	4414
4078	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	4416	{
4080		- Save();
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
4081	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +4502,12 @@
4164	4502	{
4165	4503	ResetModel();
4166	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
4167	4511	refreshContents();
4168	4512	}
4169	4513
..	..	@@ -4386,7 +4730,8 @@
4386	4730
4387	4731	if (readobj != null)
4388	4732	{
4389		- Save();
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4390	4735	try
4391	4736	{
4392	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4447,7 +4792,7 @@
4447	4792	}
4448	4793	}
4449	4794
4450		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4451	4796	{
4452	4797	if (Grafreed.standAlone)
4453	4798	{
..	..	@@ -4564,6 +4909,8 @@
4564	4909	String filename = browser.getFile();
4565	4910	if (filename != null && filename.length() > 0)
4566	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4567	4914	lastname = browser.getDirectory() + filename;
4568	4915	save();
4569	4916	}
..	..	@@ -4730,7 +5077,7 @@
4730	5077	MenuBar menuBar;
4731	5078	Menu fileMenu;
4732	5079	MenuItem newItem;
4733		- MenuItem loadItem;
	5080	+ MenuItem openItem;
4734	5081	MenuItem saveItem;
4735	5082	MenuItem saveAsItem;
4736	5083	MenuItem exportAsItem;
..	..	@@ -4753,22 +5100,36 @@
4753	5100	CheckboxMenuItem toggleSwitchItem;
4754	5101	CheckboxMenuItem toggleRootItem;
4755	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4756	5104	CheckboxMenuItem toggleHandleItem;
4757	5105	CheckboxMenuItem togglePaintItem;
4758	5106	JSplitPane mainPanel;
4759	5107	JScrollPane scrollpane;
	5108	+
4760	5109	JPanel toolbarPanel;
	5110	+
4761	5111	cGridBag treePanel;
	5112	+
4762	5113	JPanel radioPanel;
4763	5114	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4765	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4766	5120	JScrollPane infoPanel;
	5121	+
4767	5122	cGridBag optionsPanel;
	5123	+
4768	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4769	5128	cGridBag XYZPanel;
	5129	+
4770	5130	JSplitPane gridPanel;
4771	5131	JSplitPane bigPanel;
	5132	+
4772	5133	cGridBag bigThree;
4773	5134	cGridBag scenePanel;
4774	5135	cGridBag centralPanel;
..	..	@@ -4883,7 +5244,7 @@
4883	5244	cNumberSlider fogField;
4884	5245	JLabel opacityPowerLabel;
4885	5246	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	5247	+ cTree jTree;
4887	5248	//ObjectUI parent;
4888	5249
4889	5250	cNumberSlider normalpushField;