~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(true);
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,111 @@
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	+ }
	749	+
	750	+ maximized ^= true;
	751	+
	752	+ frame.validate();
	753	+ }
	754	+
	755	+ cButton minButton;
	756	+ cButton maxButton;
	757	+ cButton fullButton;
	758	+
585	759	void ToggleFullScreen()
586	760	{
587		- if (CameraPane.FULLSCREEN)
	761	+ cameraView.ToggleFullScreen();
	762	+
	763	+ if (!CameraPane.FULLSCREEN)
588	764	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	765	+ device.setFullScreenWindow(null);
	766	+ frame.validate();
	767	+
	768	+ //frame.setVisible(false);
	769	+// frame.removeNotify();
	770	+// frame.setUndecorated(false);
	771	+// frame.addNotify();
	772	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	773	+
	774	+// X frame.getContentPane().remove(/"Center",/bigThree);
	775	+// X framePanel.add(bigThree);
	776	+// X frame.getContentPane().add(/"Center",/framePanel);
	777	+ framePanel.setDividerLocation(1);
	778	+
	779	+ //frame.setVisible(true);
	780	+ radio.layout = keepButton;
	781	+ //theFrame = null;
	782	+ keepButton = null;
	783	+ radio.layout.doClick();
	784	+
592	785	} else
593	786	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	787	+ keepButton = radio.layout;
	788	+ //keeprect = frame.getBounds();
	789	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	790	+// frame.getToolkit().getScreenSize().height);
	791	+ //frame.setVisible(false);
	792	+ device.setFullScreenWindow(frame);
	793	+ frame.validate();
	794	+// frame.removeNotify();
	795	+// frame.setUndecorated(true);
	796	+// frame.addNotify();
	797	+// X frame.getContentPane().remove(/"Center",/framePanel);
	798	+// X framePanel.remove(bigThree);
	799	+// X frame.getContentPane().add(/"Center",/bigThree);
	800	+ framePanel.setDividerLocation(0);
	801	+
	802	+ radio.layout = fullscreenLayout;
	803	+ radio.layout.doClick();
	804	+ //frame.setVisible(true);
597	805	}
598		- cameraView.ToggleFullScreen();
	806	+ frame.validate();
599	807	}
600	808
601	809	private JTextPane createTextPane()
..	..	@@ -736,7 +944,12 @@
736	944	JCheckBox speedupCB;
737	945	JCheckBox rewindCB;
738	946	JCheckBox flipVCB;
	947	+
	948	+ cCheckBox toggleTextureCB;
	949	+ cCheckBox toggleSwitchCB;
	950	+
739	951	JComboBox texresMenu;
	952	+
740	953	JButton resetButton;
741	954	JButton stepButton;
742	955	JButton stepAllButton;
..	..	@@ -745,9 +958,13 @@
745	958	JButton fasterButton;
746	959	JButton remarkButton;
747	960
	961	+ cGridBag editPanel;
	962	+ cGridBag editCommandsPanel;
	963	+
748	964	cGridBag namePanel;
749	965	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	966	+ cGridBag setupPanel2;
	967	+ cGridBag objectCommandsPanel;
751	968	cGridBag pushPanel;
752	969	cGridBag fillPanel;
753	970
..	..	@@ -919,12 +1136,12 @@
919	1136	namePanel = new cGridBag();
920	1137
921	1138	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1139	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1140	oe.ctrlPanel.add(namePanel);
924	1141
925	1142	oe.ctrlPanel.Return();
926	1143
927		- if (!GroupEditor.allparams)
	1144	+ if (!allparams)
928	1145	return;
929	1146
930	1147	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -937,42 +1154,46 @@
937	1154	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1155	hideCB.setToolTipText("Hide object");
939	1156	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
	1157	+ markCB.setToolTipText("As animation target transform");
941	1158
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1159	+ setupPanel2 = new cGridBag().setVertical(false);
	1160	+
	1161	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1162	rewindCB.setToolTipText("Rewind animation");
944	1163
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1164	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1165	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1166
948	1167	if (Globals.ADVANCED)
949	1168	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1169	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
951	1170	link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1171	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1172	speedupCB.setToolTipText("Option motion capture");
954	1173	}
955	1174
956	1175	oe.ctrlPanel.add(setupPanel);
957	1176	oe.ctrlPanel.Return();
	1177	+ oe.ctrlPanel.add(setupPanel2);
	1178	+ oe.ctrlPanel.Return();
958	1179
959		- commandsPanel = new cGridBag().setVertical(false);
	1180	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1181
961		- resetButton = AddButton(commandsPanel, "Reset");
	1182	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1183	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1184	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1185	stepButton.setToolTipText("Step one frame");
965	1186	// resetAllButton = AddButton(oe, "Reset All");
966	1187	// stepAllButton = AddButton(oe, "Step All");
967	1188	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1189	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1190	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1191	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1192	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1193	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1194	remarkButton.setToolTipText("Set the current transform as the target");
974	1195
975		- oe.ctrlPanel.add(commandsPanel);
	1196	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1197	oe.ctrlPanel.Return();
977	1198
978	1199	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1178,8 +1399,11 @@
1178	1399	//worldPanel.setName("World");
1179	1400	centralPanel = new cGridBag();
1180	1401	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1402	+
	1403	+ if (Globals.ADVANCED)
	1404	+ {
	1405	+ timelinePanel = new JPanel(new BorderLayout());
	1406	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1407
1184	1408	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1409	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1412,10 @@
1188	1412	// cameraPanel.setDividerSize(9);
1189	1413	cameraPanel.setResizeWeight(1.0);
1190	1414
	1415	+ }
	1416	+
1191	1417	centralPanel.add(cameraView);
	1418	+ centralPanel.setFocusable(true);
1192	1419	//frame.setJMenuBar(timelineMenubar);
1193	1420	//centralPanel.add(timelinePanel);
1194	1421
..	..	@@ -1255,8 +1482,9 @@
1255	1482	// north.setName("Edit");
1256	1483	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1484	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
	1485	+ objectPanel.add(editPanel);
1259	1486	objectPanel.add(infoPanel);
	1487	+ objectPanel.add(toolboxPanel);
1260	1488
1261	1489	/*
1262	1490	aConstraints.gridx = 0;
..	..	@@ -1265,7 +1493,7 @@
1265	1493	aConstraints.gridy += 1;
1266	1494	aConstraints.gridwidth = 1;
1267	1495	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1496	+ */
1269	1497
1270	1498	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1499	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,9 +1510,7 @@
1282	1510	JTabbedPane tabbedPane = new JTabbedPane();
1283	1511	tabbedPane.add(scrollpane);
1284	1512
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1513	+ optionsPanel = new cGridBag().setVertical(false);
1288	1514
1289	1515	optionsPanel.setName("Options");
1290	1516
..	..	@@ -1292,6 +1518,8 @@
1292	1518
1293	1519	tabbedPane.add(optionsPanel);
1294	1520
	1521	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1522	+
1295	1523	scenePanel.add(tabbedPane);
1296	1524
1297	1525	/*
..	..	@@ -1384,8 +1612,12 @@
1384	1612	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1613
1386	1614	frame.setSize(1280, 860);
	1615	+
	1616	+ frame.validate();
1387	1617	frame.setVisible(true);
1388	1618
	1619	+ cameraView.requestFocusInWindow();
	1620	+
1389	1621	gridPanel.setDividerLocation(1.0);
1390	1622
1391	1623	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1473,24 +1705,6 @@
1473	1705	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	1706	colorSection.add(texture);
1475	1707
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	1708	panel.add(new JSeparator());
1495	1709
1496	1710	panel.add(colorSection);
..	..	@@ -1540,6 +1754,12 @@
1540	1754	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541	1755	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1756	diffuseSection.add(fakedepth);
	1757	+
	1758	+ cGridBag shadowbias = new cGridBag();
	1759	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1760	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1762	+ diffuseSection.add(shadowbias);
1543	1763
1544	1764	panel.add(new JSeparator());
1545	1765
..	..	@@ -1591,6 +1811,18 @@
1591	1811	// aConstraints.gridy += 1;
1592	1812	// aConstraints.gridwidth = 1;
1593	1813
	1814	+ cGridBag anisoU = new cGridBag();
	1815	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1816	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ specularSection.add(anisoU);
	1819	+
	1820	+ cGridBag anisoV = new cGridBag();
	1821	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1822	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1823	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1824	+ specularSection.add(anisoV);
	1825	+
1594	1826
1595	1827	panel.add(new JSeparator());
1596	1828
..	..	@@ -1598,35 +1830,35 @@
1598	1830
1599	1831	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1832
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	1833	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	1834
1603	1835	cGridBag camera = new cGridBag();
1604	1836	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	1837	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	1838	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	1839	+ colorSection.add(camera);
1608	1840
1609	1841	cGridBag ambient = new cGridBag();
1610	1842	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	1843	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1844	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	1845	+ colorSection.add(ambient);
1614	1846
1615	1847	cGridBag backlit = new cGridBag();
1616	1848	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	1849	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1850	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	1851	+ colorSection.add(backlit);
1620	1852
1621	1853	cGridBag opacity = new cGridBag();
1622	1854	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1623	1855	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1856	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1625		- globalSection.add(opacity);
	1857	+ colorSection.add(opacity);
1626	1858
1627		- panel.add(new JSeparator());
	1859	+ //panel.add(new JSeparator());
1628	1860
1629		- panel.add(globalSection);
	1861	+ //panel.add(globalSection);
1630	1862
1631	1863	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	1864
..	..	@@ -2072,19 +2304,19 @@
2072	2304
2073	2305	void LoadObjFile(String fullname)
2074	2306	{
2075		- /*
	2307	+ System.out.println("Loading " + fullname);
	2308	+ /**/
2076	2309	//lastFilename = fullname;
2077	2310	if(loadObjThread == null)
2078	2311	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2312	+ loadObjThread = new LoadOBJThread();
	2313	+ loadObjThread.start();
2081	2314	}
2082	2315
2083	2316	loadObjThread.add(fullname);
2084		- */
	2317	+ /**/
2085	2318
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2319	+ //makeSomething(new FileObject(fullname, true), true);
2088	2320	}
2089	2321
2090	2322	void LoadGFDFile(String fullname)
..	..	@@ -2701,6 +2933,8 @@
2701	2933
2702	2934	void SetMaterial(Object3D object)
2703	2935	{
	2936	+ latestObject = object;
	2937	+
2704	2938	cMaterial mat = object.material;
2705	2939
2706	2940	if (mat == null)
..	..	@@ -2812,12 +3046,17 @@
2812	3046	// }
2813	3047
2814	3048	/**/
2815		- if (deselect)
	3049	+ if (deselect \|\| child == null)
2816	3050	{
2817	3051	//group.deselectAll();
2818	3052	//freeze = true;
2819	3053	GetTree().clearSelection();
2820	3054	//freeze = false;
	3055	+
	3056	+ if (child == null)
	3057	+ {
	3058	+ return;
	3059	+ }
2821	3060	}
2822	3061
2823	3062	//group.addSelectee(child);
..	..	@@ -2886,7 +3125,7 @@
2886	3125	cameraView.ToggleDL();
2887	3126	cameraView.repaint();
2888	3127	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3128	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3129	{
2891	3130	cameraView.ToggleTexture();
2892	3131	// june 2013 copy.HardTouch();
..	..	@@ -2925,7 +3164,7 @@
2925	3164	frame.validate();
2926	3165
2927	3166	return;
2928		- } else if (event.getSource() == toggleSwitchItem)
	3167	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3168	{
2930	3169	cameraView.ToggleSwitch();
2931	3170	cameraView.repaint();
..	..	@@ -3214,7 +3453,7 @@
3214	3453	objEditor.refreshContents();
3215	3454	}
3216	3455
3217		- static public byte[] Compress(Object o)
	3456	+ static public byte[] Compress(Object3D o)
3218	3457	{
3219	3458	try
3220	3459	{
..	..	@@ -3222,8 +3461,13 @@
3222	3461	java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3223	3462	ObjectOutputStream out = new ObjectOutputStream(zstream);
3224	3463
	3464	+ Object3D parent = o.parent;
	3465	+ o.parent = null;
	3466	+
3225	3467	out.writeObject(o);
3226	3468
	3469	+ o.parent = parent;
	3470	+
3227	3471	out.flush();
3228	3472
3229	3473	zstream.close();
..	..	@@ -3304,6 +3548,8 @@
3304	3548
3305	3549	public void Save()
3306	3550	{
	3551	+ System.err.println("Save");
	3552	+
3307	3553	cRadio tab = GetCurrentTab();
3308	3554
3309	3555	boolean temp = CameraPane.SWITCH;
..	..	@@ -3311,8 +3557,10 @@
3311	3557
3312	3558	copy.ExtractBigData(hashtable);
3313	3559
	3560	+ byte[] compress = Compress(copy);
	3561	+
3314	3562	//EditorFrame.m_MainFrame.requestFocusInWindow();
3315		- tab.graphs[tab.undoindex++] = Compress(copy);
	3563	+ tab.graphs[tab.undoindex++] = compress;
3316	3564
3317	3565	copy.RestoreBigData(hashtable);
3318	3566
..	..	@@ -3325,6 +3573,8 @@
3325	3573	tab.graphs[i] = null;
3326	3574	}
3327	3575
	3576	+ SetUndoStates();
	3577	+
3328	3578	// test save
3329	3579	if (false)
3330	3580	{
..	..	@@ -3347,6 +3597,8 @@
3347	3597
3348	3598	void CopyChanged(Object3D obj)
3349	3599	{
	3600	+ SetUndoStates();
	3601	+
3350	3602	boolean temp = CameraPane.SWITCH;
3351	3603	CameraPane.SWITCH = false;
3352	3604
..	..	@@ -3386,8 +3638,21 @@
3386	3638	refreshContents();
3387	3639	}
3388	3640
	3641	+ cButton undoButton;
	3642	+ cButton redoButton;
	3643	+
	3644	+ void SetUndoStates()
	3645	+ {
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ undoButton.setEnabled(tab.undoindex > 0);
	3649	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3650	+ }
	3651	+
3389	3652	public void Undo()
3390	3653	{
	3654	+ System.err.println("Undo");
	3655	+
3391	3656	cRadio tab = GetCurrentTab();
3392	3657
3393	3658	if (tab.undoindex == 0)
..	..	@@ -3571,7 +3836,7 @@
3571	3836	assert false;
3572	3837	}
3573	3838
3574		- void EditSelection()
	3839	+ void EditSelection(boolean newWindow)
3575	3840	{
3576	3841	}
3577	3842
..	..	@@ -4066,7 +4331,8 @@
4066	4331
4067	4332	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4068	4333	{
4069		- Save();
	4334	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4335	+ Save();
4070	4336	//Tween.set(thing, 0).target(1).start(tweenManager);
4071	4337	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4072	4338	// if (thing instanceof GenericJointDemo)
..	..	@@ -4153,6 +4419,12 @@
4153	4419	{
4154	4420	ResetModel();
4155	4421	Select(thing.GetTreePath(), true, false); // unselect... false);
	4422	+
	4423	+ if (thing.Size() == 0)
	4424	+ {
	4425	+ //EditSelection(false);
	4426	+ }
	4427	+
4156	4428	refreshContents();
4157	4429	}
4158	4430
..	..	@@ -4290,6 +4562,7 @@
4290	4562
4291	4563	try
4292	4564	{
	4565	+ // Try compressed version first.
4293	4566	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4294	4567	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4295	4568	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4359,6 +4632,12 @@
4359	4632
4360	4633	void LoadIt(Object obj)
4361	4634	{
	4635	+ if (obj == null)
	4636	+ {
	4637	+ // Invalid file
	4638	+ return;
	4639	+ }
	4640	+
4362	4641	System.out.println("Loaded " + obj);
4363	4642	//new Exception().printStackTrace();
4364	4643	Object3D readobj = (Object3D) obj;
..	..	@@ -4368,6 +4647,7 @@
4368	4647
4369	4648	if (readobj != null)
4370	4649	{
	4650	+ if (Globals.SAVEONMAKE)
4371	4651	Save();
4372	4652	try
4373	4653	{
..	..	@@ -4546,6 +4826,8 @@
4546	4826	String filename = browser.getFile();
4547	4827	if (filename != null && filename.length() > 0)
4548	4828	{
	4829	+ if (!filename.endsWith(".gfd"))
	4830	+ filename += ".gfd";
4549	4831	lastname = browser.getDirectory() + filename;
4550	4832	save();
4551	4833	}
..	..	@@ -4739,18 +5021,31 @@
4739	5021	CheckboxMenuItem togglePaintItem;
4740	5022	JSplitPane mainPanel;
4741	5023	JScrollPane scrollpane;
	5024	+
4742	5025	JPanel toolbarPanel;
	5026	+
4743	5027	cGridBag treePanel;
	5028	+
4744	5029	JPanel radioPanel;
4745	5030	ButtonGroup buttonGroup;
4746		- cGridBag ctrlPanel;
	5031	+
	5032	+ cGridBag toolboxPanel;
4747	5033	cGridBag materialPanel;
	5034	+ cGridBag ctrlPanel;
	5035	+
4748	5036	JScrollPane infoPanel;
	5037	+
4749	5038	cGridBag optionsPanel;
	5039	+
4750	5040	JTabbedPane objectPanel;
	5041	+ boolean materialFlushed;
	5042	+ Object3D latestObject;
	5043	+
4751	5044	cGridBag XYZPanel;
	5045	+
4752	5046	JSplitPane gridPanel;
4753	5047	JSplitPane bigPanel;
	5048	+
4754	5049	cGridBag bigThree;
4755	5050	cGridBag scenePanel;
4756	5051	cGridBag centralPanel;
..	..	@@ -4865,7 +5160,7 @@
4865	5160	cNumberSlider fogField;
4866	5161	JLabel opacityPowerLabel;
4867	5162	cNumberSlider opacityPowerField;
4868		- JTree jTree;
	5163	+ cTree jTree;
4869	5164	//ObjectUI parent;
4870	5165
4871	5166	cNumberSlider normalpushField;