~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
..	..	@@ -273,6 +339,11 @@
273	339	{
274	340	return frame.action(event, obj);
275	341	}
	342	+
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
276	347
277	348	void SetupMenu()
278	349	{
..	..	@@ -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(50, 200));
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(1);
	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,15 +1164,15 @@
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
952	1177	if (Globals.ADVANCED)
953	1178	{
..	..	@@ -962,23 +1187,23 @@
962	1187	oe.ctrlPanel.add(setupPanel2);
963	1188	oe.ctrlPanel.Return();
964	1189
965		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1191
967		- resetButton = AddButton(commandsPanel, "Reset");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1193	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1195	stepButton.setToolTipText("Step one frame");
971	1196	// resetAllButton = AddButton(oe, "Reset All");
972	1197	// stepAllButton = AddButton(oe, "Step All");
973	1198	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1200	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1202	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1204	remarkButton.setToolTipText("Set the current transform as the target");
980	1205
981		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1207	oe.ctrlPanel.Return();
983	1208
984	1209	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1409,11 @@
1184	1409	//worldPanel.setName("World");
1185	1410	centralPanel = new cGridBag();
1186	1411	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- 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);
1189	1417
1190	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1422,10 @@
1194	1422	// cameraPanel.setDividerSize(9);
1195	1423	cameraPanel.setResizeWeight(1.0);
1196	1424
	1425	+ }
	1426	+
1197	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1198	1429	//frame.setJMenuBar(timelineMenubar);
1199	1430	//centralPanel.add(timelinePanel);
1200	1431
..	..	@@ -1261,8 +1492,9 @@
1261	1492	// north.setName("Edit");
1262	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1494	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
	1495	+ objectPanel.add(editPanel);
1265	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1266	1498
1267	1499	/*
1268	1500	aConstraints.gridx = 0;
..	..	@@ -1271,7 +1503,7 @@
1271	1503	aConstraints.gridy += 1;
1272	1504	aConstraints.gridwidth = 1;
1273	1505	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1506	+ */
1275	1507
1276	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1288,9 +1520,7 @@
1288	1520	JTabbedPane tabbedPane = new JTabbedPane();
1289	1521	tabbedPane.add(scrollpane);
1290	1522
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1294	1524
1295	1525	optionsPanel.setName("Options");
1296	1526
..	..	@@ -1298,6 +1528,8 @@
1298	1528
1299	1529	tabbedPane.add(optionsPanel);
1300	1530
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1532	+
1301	1533	scenePanel.add(tabbedPane);
1302	1534
1303	1535	/*
..	..	@@ -1390,9 +1622,14 @@
1390	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1623
1392	1624	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1395	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1396	1633
1397	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1479,24 +1716,6 @@
1479	1716	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	1717	colorSection.add(texture);
1481	1718
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	1719	panel.add(new JSeparator());
1501	1720
1502	1721	panel.add(colorSection);
..	..	@@ -1546,6 +1765,12 @@
1546	1765	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547	1766	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	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);
1549	1774
1550	1775	panel.add(new JSeparator());
1551	1776
..	..	@@ -1597,6 +1822,18 @@
1597	1822	// aConstraints.gridy += 1;
1598	1823	// aConstraints.gridwidth = 1;
1599	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	+
1600	1837
1601	1838	panel.add(new JSeparator());
1602	1839
..	..	@@ -1604,35 +1841,35 @@
1604	1841
1605	1842	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	1843
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1845
1609	1846	cGridBag camera = new cGridBag();
1610	1847	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1848	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1849	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1850	+ colorSection.add(camera);
1614	1851
1615	1852	cGridBag ambient = new cGridBag();
1616	1853	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1854	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1855	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1856	+ colorSection.add(ambient);
1620	1857
1621	1858	cGridBag backlit = new cGridBag();
1622	1859	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1860	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1861	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1862	+ colorSection.add(backlit);
1626	1863
1627	1864	cGridBag opacity = new cGridBag();
1628	1865	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629	1866	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1867	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
	1868	+ colorSection.add(opacity);
1632	1869
1633		- panel.add(new JSeparator());
	1870	+ //panel.add(new JSeparator());
1634	1871
1635		- panel.add(globalSection);
	1872	+ //panel.add(globalSection);
1636	1873
1637	1874	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	1875
..	..	@@ -2707,6 +2944,8 @@
2707	2944
2708	2945	void SetMaterial(Object3D object)
2709	2946	{
	2947	+ latestObject = object;
	2948	+
2710	2949	cMaterial mat = object.material;
2711	2950
2712	2951	if (mat == null)
..	..	@@ -2818,12 +3057,17 @@
2818	3057	// }
2819	3058
2820	3059	/**/
2821		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2822	3061	{
2823	3062	//group.deselectAll();
2824	3063	//freeze = true;
2825	3064	GetTree().clearSelection();
2826	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2827	3071	}
2828	3072
2829	3073	//group.addSelectee(child);
..	..	@@ -2892,7 +3136,7 @@
2892	3136	cameraView.ToggleDL();
2893	3137	cameraView.repaint();
2894	3138	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3140	{
2897	3141	cameraView.ToggleTexture();
2898	3142	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3175,7 @@
2931	3175	frame.validate();
2932	3176
2933	3177	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3179	{
2936	3180	cameraView.ToggleSwitch();
2937	3181	cameraView.repaint();
..	..	@@ -3315,6 +3559,8 @@
3315	3559
3316	3560	public void Save()
3317	3561	{
	3562	+ System.err.println("Save");
	3563	+
3318	3564	cRadio tab = GetCurrentTab();
3319	3565
3320	3566	boolean temp = CameraPane.SWITCH;
..	..	@@ -3322,8 +3568,10 @@
3322	3568
3323	3569	copy.ExtractBigData(hashtable);
3324	3570
	3571	+ byte[] compress = Compress(copy);
	3572	+
3325	3573	//EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
	3574	+ tab.graphs[tab.undoindex++] = compress;
3327	3575
3328	3576	copy.RestoreBigData(hashtable);
3329	3577
..	..	@@ -3336,6 +3584,8 @@
3336	3584	tab.graphs[i] = null;
3337	3585	}
3338	3586
	3587	+ SetUndoStates();
	3588	+
3339	3589	// test save
3340	3590	if (false)
3341	3591	{
..	..	@@ -3358,6 +3608,8 @@
3358	3608
3359	3609	void CopyChanged(Object3D obj)
3360	3610	{
	3611	+ SetUndoStates();
	3612	+
3361	3613	boolean temp = CameraPane.SWITCH;
3362	3614	CameraPane.SWITCH = false;
3363	3615
..	..	@@ -3397,8 +3649,21 @@
3397	3649	refreshContents();
3398	3650	}
3399	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	+
3400	3663	public void Undo()
3401	3664	{
	3665	+ System.err.println("Undo");
	3666	+
3402	3667	cRadio tab = GetCurrentTab();
3403	3668
3404	3669	if (tab.undoindex == 0)
..	..	@@ -3582,7 +3847,7 @@
3582	3847	assert false;
3583	3848	}
3584	3849
3585		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3586	3851	{
3587	3852	}
3588	3853
..	..	@@ -4077,7 +4342,8 @@
4077	4342
4078	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	4344	{
4080		- Save();
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
4081	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +4430,12 @@
4164	4430	{
4165	4431	ResetModel();
4166	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
4167	4439	refreshContents();
4168	4440	}
4169	4441
..	..	@@ -4386,6 +4658,7 @@
4386	4658
4387	4659	if (readobj != null)
4388	4660	{
	4661	+ if (Globals.SAVEONMAKE)
4389	4662	Save();
4390	4663	try
4391	4664	{
..	..	@@ -4564,6 +4837,8 @@
4564	4837	String filename = browser.getFile();
4565	4838	if (filename != null && filename.length() > 0)
4566	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4567	4842	lastname = browser.getDirectory() + filename;
4568	4843	save();
4569	4844	}
..	..	@@ -4757,18 +5032,31 @@
4757	5032	CheckboxMenuItem togglePaintItem;
4758	5033	JSplitPane mainPanel;
4759	5034	JScrollPane scrollpane;
	5035	+
4760	5036	JPanel toolbarPanel;
	5037	+
4761	5038	cGridBag treePanel;
	5039	+
4762	5040	JPanel radioPanel;
4763	5041	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
4765	5044	cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4766	5047	JScrollPane infoPanel;
	5048	+
4767	5049	cGridBag optionsPanel;
	5050	+
4768	5051	JTabbedPane objectPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
4769	5055	cGridBag XYZPanel;
	5056	+
4770	5057	JSplitPane gridPanel;
4771	5058	JSplitPane bigPanel;
	5059	+
4772	5060	cGridBag bigThree;
4773	5061	cGridBag scenePanel;
4774	5062	cGridBag centralPanel;
..	..	@@ -4883,7 +5171,7 @@
4883	5171	cNumberSlider fogField;
4884	5172	JLabel opacityPowerLabel;
4885	5173	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	5174	+ cTree jTree;
4887	5175	//ObjectUI parent;
4888	5176
4889	5177	cNumberSlider normalpushField;