~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
..	..	@@ -37,6 +41,65 @@
37	41	JFrame frame;
38	42
39	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	+ }
40	103
41	104	// SCRIPT
42	105
..	..	@@ -147,7 +210,7 @@
147	210
148	211	objEditor.ctrlPanel.remove(namePanel);
149	212
150		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
151	214	return;
152	215
153	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +234,7 @@
171	234
172	235	objEditor.ctrlPanel.remove(setupPanel);
173	236	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	238	objEditor.ctrlPanel.remove(pushPanel);
176	239	//objEditor.ctrlPanel.remove(fillPanel);
177	240
..	..	@@ -277,6 +340,11 @@
277	340	return frame.action(event, obj);
278	341	}
279	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	+
280	348	void SetupMenu()
281	349	{
282	350	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -323,14 +391,52 @@
323	391	closeItem.addActionListener(this);
324	392
325	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	+
326	420	toolbarPanel = new JPanel();
327	421	toolbarPanel.setName("Toolbar");
328	422	treePanel = new cGridBag();
329	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
330	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- 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	+
332	437	materialPanel = new cGridBag().setVertical(true);
333	438	materialPanel.setName("Material");
	439	+
334	440	/JTextPane/
335	441	infoarea = createTextPane();
336	442	doc = infoarea.getStyledDocument();
..	..	@@ -355,7 +461,14 @@
355	461	mainPanel.setDividerSize(9);
356	462	mainPanel.setDividerLocation(0.5); //1.0);
357	463	mainPanel.setResizeWeight(0.5);
358		-
	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	+
359	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	473	//mainPanel.setLayout(new GridBagLayout());
361	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -603,6 +716,8 @@
603	716
604	717	boolean maximized;
605	718
	719	+ cButton fullscreenLayout;
	720	+
606	721	void Minimize()
607	722	{
608	723	frame.setState(Frame.ICONIFIED);
..	..	@@ -628,7 +743,9 @@
628	743
629	744	void ToggleFullScreen()
630	745	{
631		- if (CameraPane.FULLSCREEN)
	746	+ cameraView.ToggleFullScreen();
	747	+
	748	+ if (!CameraPane.FULLSCREEN)
632	749	{
633	750	device.setFullScreenWindow(null);
634	751	//frame.setVisible(false);
..	..	@@ -664,12 +781,10 @@
664	781	// X frame.getContentPane().add(/"Center",/bigThree);
665	782	framePanel.setDividerLocation(0);
666	783
667		- radio.layout = twoButton;
	784	+ radio.layout = fullscreenLayout;
668	785	radio.layout.doClick();
669	786	//frame.setVisible(true);
670	787	}
671		-
672		- cameraView.ToggleFullScreen();
673	788	}
674	789
675	790	private JTextPane createTextPane()
..	..	@@ -810,7 +925,12 @@
810	925	JCheckBox speedupCB;
811	926	JCheckBox rewindCB;
812	927	JCheckBox flipVCB;
	928	+
	929	+ cCheckBox toggleTextureCB;
	930	+ cCheckBox toggleSwitchCB;
	931	+
813	932	JComboBox texresMenu;
	933	+
814	934	JButton resetButton;
815	935	JButton stepButton;
816	936	JButton stepAllButton;
..	..	@@ -819,10 +939,13 @@
819	939	JButton fasterButton;
820	940	JButton remarkButton;
821	941
	942	+ cGridBag editPanel;
	943	+ cGridBag editCommandsPanel;
	944	+
822	945	cGridBag namePanel;
823	946	cGridBag setupPanel;
824	947	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	948	+ cGridBag objectCommandsPanel;
826	949	cGridBag pushPanel;
827	950	cGridBag fillPanel;
828	951
..	..	@@ -999,7 +1122,7 @@
999	1122
1000	1123	oe.ctrlPanel.Return();
1001	1124
1002		- if (!GroupEditor.allparams)
	1125	+ if (!allparams)
1003	1126	return;
1004	1127
1005	1128	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1012,7 +1135,7 @@
1012	1135	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1136	hideCB.setToolTipText("Hide object");
1014	1137	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1138	+ markCB.setToolTipText("As animation target transform");
1016	1139
1017	1140	setupPanel2 = new cGridBag().setVertical(false);
1018	1141
..	..	@@ -1020,7 +1143,7 @@
1020	1143	rewindCB.setToolTipText("Rewind animation");
1021	1144
1022	1145	randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1146	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1147
1025	1148	if (Globals.ADVANCED)
1026	1149	{
..	..	@@ -1035,23 +1158,23 @@
1035	1158	oe.ctrlPanel.add(setupPanel2);
1036	1159	oe.ctrlPanel.Return();
1037	1160
1038		- commandsPanel = new cGridBag().setVertical(false);
	1161	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1162
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1163	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1164	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1165	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1166	stepButton.setToolTipText("Step one frame");
1044	1167	// resetAllButton = AddButton(oe, "Reset All");
1045	1168	// stepAllButton = AddButton(oe, "Step All");
1046	1169	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1170	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1171	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1172	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1173	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1174	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1175	remarkButton.setToolTipText("Set the current transform as the target");
1053	1176
1054		- oe.ctrlPanel.add(commandsPanel);
	1177	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1178	oe.ctrlPanel.Return();
1056	1179
1057	1180	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1340,8 +1463,9 @@
1340	1463	// north.setName("Edit");
1341	1464	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1465	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
	1466	+ objectPanel.add(editPanel);
1344	1467	objectPanel.add(infoPanel);
	1468	+ objectPanel.add(toolboxPanel);
1345	1469
1346	1470	/*
1347	1471	aConstraints.gridx = 0;
..	..	@@ -1350,7 +1474,7 @@
1350	1474	aConstraints.gridy += 1;
1351	1475	aConstraints.gridwidth = 1;
1352	1476	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1477	+ */
1354	1478
1355	1479	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1480	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1367,9 +1491,7 @@
1367	1491	JTabbedPane tabbedPane = new JTabbedPane();
1368	1492	tabbedPane.add(scrollpane);
1369	1493
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1494	+ optionsPanel = new cGridBag().setVertical(false);
1373	1495
1374	1496	optionsPanel.setName("Options");
1375	1497
..	..	@@ -1377,6 +1499,8 @@
1377	1499
1378	1500	tabbedPane.add(optionsPanel);
1379	1501
	1502	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1503	+
1380	1504	scenePanel.add(tabbedPane);
1381	1505
1382	1506	/*
..	..	@@ -1469,6 +1593,8 @@
1469	1593	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1594
1471	1595	frame.setSize(1280, 860);
	1596	+
	1597	+ frame.validate();
1472	1598	frame.setVisible(true);
1473	1599
1474	1600	cameraView.requestFocusInWindow();
..	..	@@ -2788,6 +2914,8 @@
2788	2914
2789	2915	void SetMaterial(Object3D object)
2790	2916	{
	2917	+ latestObject = object;
	2918	+
2791	2919	cMaterial mat = object.material;
2792	2920
2793	2921	if (mat == null)
..	..	@@ -2899,12 +3027,17 @@
2899	3027	// }
2900	3028
2901	3029	/**/
2902		- if (deselect)
	3030	+ if (deselect \|\| child == null)
2903	3031	{
2904	3032	//group.deselectAll();
2905	3033	//freeze = true;
2906	3034	GetTree().clearSelection();
2907	3035	//freeze = false;
	3036	+
	3037	+ if (child == null)
	3038	+ {
	3039	+ return;
	3040	+ }
2908	3041	}
2909	3042
2910	3043	//group.addSelectee(child);
..	..	@@ -2973,7 +3106,7 @@
2973	3106	cameraView.ToggleDL();
2974	3107	cameraView.repaint();
2975	3108	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3109	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3110	{
2978	3111	cameraView.ToggleTexture();
2979	3112	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3145,7 @@
3012	3145	frame.validate();
3013	3146
3014	3147	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3148	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3149	{
3017	3150	cameraView.ToggleSwitch();
3018	3151	cameraView.repaint();
..	..	@@ -3396,6 +3529,8 @@
3396	3529
3397	3530	public void Save()
3398	3531	{
	3532	+ System.err.println("Save");
	3533	+
3399	3534	cRadio tab = GetCurrentTab();
3400	3535
3401	3536	boolean temp = CameraPane.SWITCH;
..	..	@@ -3417,6 +3552,8 @@
3417	3552	tab.graphs[i] = null;
3418	3553	}
3419	3554
	3555	+ SetUndoStates();
	3556	+
3420	3557	// test save
3421	3558	if (false)
3422	3559	{
..	..	@@ -3439,6 +3576,8 @@
3439	3576
3440	3577	void CopyChanged(Object3D obj)
3441	3578	{
	3579	+ SetUndoStates();
	3580	+
3442	3581	boolean temp = CameraPane.SWITCH;
3443	3582	CameraPane.SWITCH = false;
3444	3583
..	..	@@ -3478,8 +3617,21 @@
3478	3617	refreshContents();
3479	3618	}
3480	3619
	3620	+ cButton undoButton;
	3621	+ cButton redoButton;
	3622	+
	3623	+ void SetUndoStates()
	3624	+ {
	3625	+ cRadio tab = GetCurrentTab();
	3626	+
	3627	+ undoButton.setEnabled(tab.undoindex > 0);
	3628	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3629	+ }
	3630	+
3481	3631	public void Undo()
3482	3632	{
	3633	+ System.err.println("Undo");
	3634	+
3483	3635	cRadio tab = GetCurrentTab();
3484	3636
3485	3637	if (tab.undoindex == 0)
..	..	@@ -3663,7 +3815,7 @@
3663	3815	assert false;
3664	3816	}
3665	3817
3666		- void EditSelection()
	3818	+ void EditSelection(boolean newWindow)
3667	3819	{
3668	3820	}
3669	3821
..	..	@@ -4158,7 +4310,8 @@
4158	4310
4159	4311	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	4312	{
4161		- Save();
	4313	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4314	+ Save();
4162	4315	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	4316	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	4317	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +4398,12 @@
4245	4398	{
4246	4399	ResetModel();
4247	4400	Select(thing.GetTreePath(), true, false); // unselect... false);
	4401	+
	4402	+ if (thing.Size() == 0)
	4403	+ {
	4404	+ //EditSelection(false);
	4405	+ }
	4406	+
4248	4407	refreshContents();
4249	4408	}
4250	4409
..	..	@@ -4467,6 +4626,7 @@
4467	4626
4468	4627	if (readobj != null)
4469	4628	{
	4629	+ if (Globals.SAVEONMAKE)
4470	4630	Save();
4471	4631	try
4472	4632	{
..	..	@@ -4645,6 +4805,8 @@
4645	4805	String filename = browser.getFile();
4646	4806	if (filename != null && filename.length() > 0)
4647	4807	{
	4808	+ if (!filename.endsWith(".gfd"))
	4809	+ filename += ".gfd";
4648	4810	lastname = browser.getDirectory() + filename;
4649	4811	save();
4650	4812	}
..	..	@@ -4838,18 +5000,31 @@
4838	5000	CheckboxMenuItem togglePaintItem;
4839	5001	JSplitPane mainPanel;
4840	5002	JScrollPane scrollpane;
	5003	+
4841	5004	JPanel toolbarPanel;
	5005	+
4842	5006	cGridBag treePanel;
	5007	+
4843	5008	JPanel radioPanel;
4844	5009	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5010	+
	5011	+ cGridBag toolboxPanel;
4846	5012	cGridBag materialPanel;
	5013	+ cGridBag ctrlPanel;
	5014	+
4847	5015	JScrollPane infoPanel;
	5016	+
4848	5017	cGridBag optionsPanel;
	5018	+
4849	5019	JTabbedPane objectPanel;
	5020	+ boolean materialFlushed;
	5021	+ Object3D latestObject;
	5022	+
4850	5023	cGridBag XYZPanel;
	5024	+
4851	5025	JSplitPane gridPanel;
4852	5026	JSplitPane bigPanel;
	5027	+
4853	5028	cGridBag bigThree;
4854	5029	cGridBag scenePanel;
4855	5030	cGridBag centralPanel;
..	..	@@ -4964,7 +5139,7 @@
4964	5139	cNumberSlider fogField;
4965	5140	JLabel opacityPowerLabel;
4966	5141	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	5142	+ cTree jTree;
4968	5143	//ObjectUI parent;
4969	5144
4970	5145	cNumberSlider normalpushField;