~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(loadItem = new MenuItem("Open..."));
282	354
283	355	//oe.menuBar.add(menu = new Menu("Include"));
284	356	Menu menu = new Menu("Import");
..	..	@@ -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(50, 200));
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(1);
	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,9 @@
1255	1492	// north.setName("Edit");
1256	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1494	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
	1495	+ objectPanel.add(editPanel);
1259	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1260	1498
1261	1499	/*
1262	1500	aConstraints.gridx = 0;
..	..	@@ -1265,7 +1503,7 @@
1265	1503	aConstraints.gridy += 1;
1266	1504	aConstraints.gridwidth = 1;
1267	1505	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1506	+ */
1269	1507
1270	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,9 +1520,7 @@
1282	1520	JTabbedPane tabbedPane = new JTabbedPane();
1283	1521	tabbedPane.add(scrollpane);
1284	1522
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1288	1524
1289	1525	optionsPanel.setName("Options");
1290	1526
..	..	@@ -1292,6 +1528,8 @@
1292	1528
1293	1529	tabbedPane.add(optionsPanel);
1294	1530
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1532	+
1295	1533	scenePanel.add(tabbedPane);
1296	1534
1297	1535	/*
..	..	@@ -1384,9 +1622,14 @@
1384	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1623
1386	1624	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
1388		-
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1389	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1390	1633
1391	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1473,24 +1716,6 @@
1473	1716	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	1717	colorSection.add(texture);
1475	1718
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	1719	panel.add(new JSeparator());
1495	1720
1496	1721	panel.add(colorSection);
..	..	@@ -1540,6 +1765,12 @@
1540	1765	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541	1766	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1767	diffuseSection.add(fakedepth);
	1768	+
	1769	+ cGridBag shadowbias = new cGridBag();
	1770	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1771	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1772	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1773	+ diffuseSection.add(shadowbias);
1543	1774
1544	1775	panel.add(new JSeparator());
1545	1776
..	..	@@ -1591,6 +1822,18 @@
1591	1822	// aConstraints.gridy += 1;
1592	1823	// aConstraints.gridwidth = 1;
1593	1824
	1825	+ cGridBag anisoU = new cGridBag();
	1826	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1827	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1828	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1829	+ specularSection.add(anisoU);
	1830	+
	1831	+ cGridBag anisoV = new cGridBag();
	1832	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1833	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1834	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1835	+ specularSection.add(anisoV);
	1836	+
1594	1837
1595	1838	panel.add(new JSeparator());
1596	1839
..	..	@@ -1598,35 +1841,35 @@
1598	1841
1599	1842	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1843
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	1845
1603	1846	cGridBag camera = new cGridBag();
1604	1847	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	1848	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	1849	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	1850	+ colorSection.add(camera);
1608	1851
1609	1852	cGridBag ambient = new cGridBag();
1610	1853	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	1854	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1855	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	1856	+ colorSection.add(ambient);
1614	1857
1615	1858	cGridBag backlit = new cGridBag();
1616	1859	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	1860	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1861	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	1862	+ colorSection.add(backlit);
1620	1863
1621	1864	cGridBag opacity = new cGridBag();
1622	1865	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1623	1866	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1867	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1625		- globalSection.add(opacity);
	1868	+ colorSection.add(opacity);
1626	1869
1627		- panel.add(new JSeparator());
	1870	+ //panel.add(new JSeparator());
1628	1871
1629		- panel.add(globalSection);
	1872	+ //panel.add(globalSection);
1630	1873
1631	1874	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	1875
..	..	@@ -1935,6 +2178,7 @@
1935	2178	e2.printStackTrace();
1936	2179	}
1937	2180	}
	2181	+
1938	2182	LoadJMEThread loadThread;
1939	2183
1940	2184	class LoadJMEThread extends Thread
..	..	@@ -1992,6 +2236,7 @@
1992	2236	//LoadFile0(filename, converter);
1993	2237	}
1994	2238	}
	2239	+
1995	2240	LoadOBJThread loadObjThread;
1996	2241
1997	2242	class LoadOBJThread extends Thread
..	..	@@ -2070,19 +2315,19 @@
2070	2315
2071	2316	void LoadObjFile(String fullname)
2072	2317	{
2073		- /*
	2318	+ System.out.println("Loading " + fullname);
	2319	+ /**/
2074	2320	//lastFilename = fullname;
2075	2321	if(loadObjThread == null)
2076	2322	{
2077		- loadObjThread = new LoadOBJThread();
2078		- loadObjThread.start();
	2323	+ loadObjThread = new LoadOBJThread();
	2324	+ loadObjThread.start();
2079	2325	}
2080	2326
2081	2327	loadObjThread.add(fullname);
2082		- */
	2328	+ /**/
2083	2329
2084		- System.out.println("Loading " + fullname);
2085		- makeSomething(new FileObject(fullname, true), true);
	2330	+ //makeSomething(new FileObject(fullname, true), true);
2086	2331	}
2087	2332
2088	2333	void LoadGFDFile(String fullname)
..	..	@@ -2699,6 +2944,8 @@
2699	2944
2700	2945	void SetMaterial(Object3D object)
2701	2946	{
	2947	+ latestObject = object;
	2948	+
2702	2949	cMaterial mat = object.material;
2703	2950
2704	2951	if (mat == null)
..	..	@@ -2810,12 +3057,17 @@
2810	3057	// }
2811	3058
2812	3059	/**/
2813		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2814	3061	{
2815	3062	//group.deselectAll();
2816	3063	//freeze = true;
2817	3064	GetTree().clearSelection();
2818	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2819	3071	}
2820	3072
2821	3073	//group.addSelectee(child);
..	..	@@ -2884,7 +3136,7 @@
2884	3136	cameraView.ToggleDL();
2885	3137	cameraView.repaint();
2886	3138	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3140	{
2889	3141	cameraView.ToggleTexture();
2890	3142	// june 2013 copy.HardTouch();
..	..	@@ -2923,9 +3175,9 @@
2923	3175	frame.validate();
2924	3176
2925	3177	return;
2926		- } else if (event.getSource() == toggleSwitchItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2927	3179	{
2928		- cameraView.ToggleRandom();
	3180	+ cameraView.ToggleSwitch();
2929	3181	cameraView.repaint();
2930	3182	return;
2931	3183	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3212,23 +3464,45 @@
3212	3464	objEditor.refreshContents();
3213	3465	}
3214	3466
3215		- Object3D graphs[] = new Object3D[10000];
3216		- int undoindex = 0;
3217		-
3218		- static public Object clone(Object o)
	3467	+ static public byte[] Compress(Object3D o)
3219	3468	{
3220	3469	try
3221	3470	{
3222	3471	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3223		- ObjectOutputStream out = new ObjectOutputStream(baos);
	3472	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3473	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3224	3474
	3475	+ Object3D parent = o.parent;
	3476	+ o.parent = null;
	3477	+
3225	3478	out.writeObject(o);
	3479	+
	3480	+ o.parent = parent;
	3481	+
	3482	+ out.flush();
3226	3483
3227		- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
3228		- ObjectInputStream in = new ObjectInputStream(bais);
	3484	+ zstream.close();
	3485	+ out.close();
	3486	+
	3487	+ return baos.toByteArray();
	3488	+ } catch (Exception e)
	3489	+ {
	3490	+ System.err.println(e);
	3491	+ return null;
	3492	+ }
	3493	+ }
	3494	+
	3495	+ static public Object Uncompress(byte[] bytes)
	3496	+ {
	3497	+ System.out.println("#bytes = " + bytes.length);
	3498	+ try
	3499	+ {
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3502	+ ObjectInputStream in = new ObjectInputStream(istream);
3229	3503	Object obj = in.readObject();
3230	3504	in.close();
3231		- out.close();
	3505	+
3232	3506	return obj;
3233	3507	} catch (Exception e)
3234	3508	{
..	..	@@ -3237,24 +3511,87 @@
3237	3511	}
3238	3512	}
3239	3513
	3514	+ static public Object clone(Object o)
	3515	+ {
	3516	+ try
	3517	+ {
	3518	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3519	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3520	+
	3521	+ out.writeObject(o);
	3522	+
	3523	+ out.flush();
	3524	+ out.close();
	3525	+
	3526	+ byte[] bytes = baos.toByteArray();
	3527	+
	3528	+ System.out.println("clone = " + bytes.length);
	3529	+
	3530	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3531	+ ObjectInputStream in = new ObjectInputStream(bais);
	3532	+ Object obj = in.readObject();
	3533	+ in.close();
	3534	+
	3535	+ return obj;
	3536	+ } catch (Exception e)
	3537	+ {
	3538	+ System.err.println(e);
	3539	+ return null;
	3540	+ }
	3541	+ }
	3542	+
	3543	+ cRadio GetCurrentTab()
	3544	+ {
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ if(ab.GetObject() == copy)
	3550	+ {
	3551	+ return ab;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ return null;
	3556	+ }
	3557	+
	3558	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3559	+
3240	3560	public void Save()
3241	3561	{
3242		- if (true) return;
	3562	+ System.err.println("Save");
	3563	+
	3564	+ cRadio tab = GetCurrentTab();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ byte[] compress = Compress(copy);
3243	3572
3244	3573	//EditorFrame.m_MainFrame.requestFocusInWindow();
3245		- graphs[undoindex++] = (Object3D)clone(copy);
	3574	+ tab.graphs[tab.undoindex++] = compress;
3246	3575
3247		- for (int i = undoindex; i < graphs.length; i++)
	3576	+ copy.RestoreBigData(hashtable);
	3577	+
	3578	+ CameraPane.SWITCH = temp;
	3579	+
	3580	+ //assert(hashtable.isEmpty());
	3581	+
	3582	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3248	3583	{
3249		- graphs[i] = null;
	3584	+ tab.graphs[i] = null;
3250	3585	}
3251	3586
	3587	+ SetUndoStates();
	3588	+
3252	3589	// test save
3253	3590	if (false)
3254	3591	{
3255	3592	try
3256	3593	{
3257		- FileOutputStream ostream = new FileOutputStream("save" + undoindex);
	3594	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3258	3595	ObjectOutputStream p = new ObjectOutputStream(ostream);
3259	3596
3260	3597	p.writeObject(copy);
..	..	@@ -3269,48 +3606,96 @@
3269	3606	}
3270	3607	}
3271	3608
	3609	+ void CopyChanged(Object3D obj)
	3610	+ {
	3611	+ SetUndoStates();
	3612	+
	3613	+ boolean temp = CameraPane.SWITCH;
	3614	+ CameraPane.SWITCH = false;
	3615	+
	3616	+ copy.ExtractBigData(hashtable);
	3617	+
	3618	+ copy.clear();
	3619	+
	3620	+ for (int i=0; i<obj.Size(); i++)
	3621	+ {
	3622	+ copy.add(obj.get(i));
	3623	+ }
	3624	+
	3625	+ copy.RestoreBigData(hashtable);
	3626	+
	3627	+ CameraPane.SWITCH = temp;
	3628	+
	3629	+ //assert(hashtable.isEmpty());
	3630	+
	3631	+ copy.Touch();
	3632	+
	3633	+ ResetModel();
	3634	+ copy.HardTouch(); // recompile?
	3635	+
	3636	+ cRadio ab;
	3637	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3638	+ {
	3639	+ ab = (cRadio)e.nextElement();
	3640	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3641	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3642	+ if (test != null)
	3643	+ {
	3644	+ test.editWindow = ab.object.editWindow;
	3645	+ ab.object = test;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ refreshContents();
	3650	+ }
	3651	+
	3652	+ cButton undoButton;
	3653	+ cButton redoButton;
	3654	+
	3655	+ void SetUndoStates()
	3656	+ {
	3657	+ cRadio tab = GetCurrentTab();
	3658	+
	3659	+ undoButton.setEnabled(tab.undoindex > 0);
	3660	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3661	+ }
	3662	+
3272	3663	public void Undo()
3273	3664	{
3274		- if (undoindex == 0)
	3665	+ System.err.println("Undo");
	3666	+
	3667	+ cRadio tab = GetCurrentTab();
	3668	+
	3669	+ if (tab.undoindex == 0)
3275	3670	{
3276	3671	java.awt.Toolkit.getDefaultToolkit().beep();
3277	3672	return;
3278	3673	}
3279	3674
3280		- if (graphs[undoindex] == null)
	3675	+ if (tab.graphs[tab.undoindex] == null)
3281	3676	{
3282	3677	Save();
3283		- undoindex -= 1;
	3678	+ tab.undoindex -= 1;
3284	3679	}
3285	3680
3286		- undoindex -= 1;
	3681	+ tab.undoindex -= 1;
3287	3682
3288		- copy = graphs[undoindex];
3289		-
3290		- cameraView.object = copy;
3291		- copy.Touch();
3292		-
3293		- ResetModel();
3294		- refreshContents();
	3683	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3295	3684	}
3296	3685
3297	3686	public void Redo()
3298	3687	{
3299		- if (graphs[undoindex + 1] == null)
	3688	+ cRadio tab = GetCurrentTab();
	3689	+
	3690	+ if (tab.graphs[tab.undoindex + 1] == null)
3300	3691	{
3301	3692	java.awt.Toolkit.getDefaultToolkit().beep();
3302	3693	return;
3303	3694	}
3304	3695
3305		- undoindex += 1;
	3696	+ tab.undoindex += 1;
3306	3697
3307		- copy = graphs[undoindex];
3308		-
3309		- cameraView.object = copy;
3310		- copy.Touch();
3311		-
3312		- ResetModel();
3313		- refreshContents();
	3698	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3314	3699	}
3315	3700
3316	3701	void ImportGFD()
..	..	@@ -3462,7 +3847,7 @@
3462	3847	assert false;
3463	3848	}
3464	3849
3465		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3466	3851	{
3467	3852	}
3468	3853
..	..	@@ -3957,7 +4342,8 @@
3957	4342
3958	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3959	4344	{
3960		- Save();
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
3961	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
3962	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3963	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -4044,6 +4430,12 @@
4044	4430	{
4045	4431	ResetModel();
4046	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
4047	4439	refreshContents();
4048	4440	}
4049	4441
..	..	@@ -4181,6 +4573,7 @@
4181	4573
4182	4574	try
4183	4575	{
	4576	+ // Try compressed version first.
4184	4577	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4185	4578	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4186	4579	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4250,6 +4643,12 @@
4250	4643
4251	4644	void LoadIt(Object obj)
4252	4645	{
	4646	+ if (obj == null)
	4647	+ {
	4648	+ // Invalid file
	4649	+ return;
	4650	+ }
	4651	+
4253	4652	System.out.println("Loaded " + obj);
4254	4653	//new Exception().printStackTrace();
4255	4654	Object3D readobj = (Object3D) obj;
..	..	@@ -4259,6 +4658,8 @@
4259	4658
4260	4659	if (readobj != null)
4261	4660	{
	4661	+ if (Globals.SAVEONMAKE)
	4662	+ Save();
4262	4663	try
4263	4664	{
4264	4665	//readobj.deepCopySelf(copy);
..	..	@@ -4436,6 +4837,8 @@
4436	4837	String filename = browser.getFile();
4437	4838	if (filename != null && filename.length() > 0)
4438	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4439	4842	lastname = browser.getDirectory() + filename;
4440	4843	save();
4441	4844	}
..	..	@@ -4629,18 +5032,31 @@
4629	5032	CheckboxMenuItem togglePaintItem;
4630	5033	JSplitPane mainPanel;
4631	5034	JScrollPane scrollpane;
	5035	+
4632	5036	JPanel toolbarPanel;
	5037	+
4633	5038	cGridBag treePanel;
	5039	+
4634	5040	JPanel radioPanel;
4635	5041	ButtonGroup buttonGroup;
4636		- cGridBag ctrlPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
4637	5044	cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4638	5047	JScrollPane infoPanel;
	5048	+
4639	5049	cGridBag optionsPanel;
	5050	+
4640	5051	JTabbedPane objectPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
4641	5055	cGridBag XYZPanel;
	5056	+
4642	5057	JSplitPane gridPanel;
4643	5058	JSplitPane bigPanel;
	5059	+
4644	5060	cGridBag bigThree;
4645	5061	cGridBag scenePanel;
4646	5062	cGridBag centralPanel;
..	..	@@ -4755,7 +5171,7 @@
4755	5171	cNumberSlider fogField;
4756	5172	JLabel opacityPowerLabel;
4757	5173	cNumberSlider opacityPowerField;
4758		- JTree jTree;
	5174	+ cTree jTree;
4759	5175	//ObjectUI parent;
4760	5176
4761	5177	cNumberSlider normalpushField;