~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
..	..	@@ -30,11 +34,128 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
36	41	GroupEditor callee;
37	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	102	+ {
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
38	159
39	160	// SCRIPT
40	161
..	..	@@ -145,7 +266,7 @@
145	266
146	267	objEditor.ctrlPanel.remove(namePanel);
147	268
148		- if (!GroupEditor.allparams)
	269	+ if (!allparams)
149	270	return;
150	271
151	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -169,7 +290,7 @@
169	290
170	291	objEditor.ctrlPanel.remove(setupPanel);
171	292	objEditor.ctrlPanel.remove(setupPanel2);
172		- objEditor.ctrlPanel.remove(commandsPanel);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
173	294	objEditor.ctrlPanel.remove(pushPanel);
174	295	//objEditor.ctrlPanel.remove(fillPanel);
175	296
..	..	@@ -217,6 +338,14 @@
217	338	client = inClient;
218	339	copy = client;
219	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
220	349	// "this" is not called: SetupUI2(objEditor);
221	350	}
222	351
..	..	@@ -230,6 +359,14 @@
230	359	client = inClient;
231	360	copy = client;
232	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
233	370	SetupUI2(callee.GetEditor());
234	371	}
235	372
..	..	@@ -244,6 +381,7 @@
244	381	//localCopy.parent = null;
245	382
246	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
247	385	objEditor = this;
248	386	this.callee = callee;
249	387
..	..	@@ -261,6 +399,14 @@
261	399	copy = localCopy;
262	400	copy.editWindow = this;
263	401
	402	+// if (copy.versionlist == null)
	403	+// {
	404	+// copy.versionlist = new Object3D[100];
	405	+// copy.versionindex = -1;
	406	+//
	407	+// Save(true);
	408	+// }
	409	+
264	410	SetupMenu();
265	411
266	412	//SetupName(objEditor); // new
..	..	@@ -274,12 +420,17 @@
274	420	return frame.action(event, obj);
275	421	}
276	422
	423	+ // Cannot work without static
	424	+ static boolean allparams = true;
	425	+
	426	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	427	+
277	428	void SetupMenu()
278	429	{
279	430	frame.setMenuBar(menuBar = new MenuBar());
280	431	menuBar.add(fileMenu = new Menu("File"));
281	432	fileMenu.add(newItem = new MenuItem("New"));
282		- fileMenu.add(loadItem = new MenuItem("Open..."));
	433	+ fileMenu.add(openItem = new MenuItem("Open..."));
283	434
284	435	//oe.menuBar.add(menu = new Menu("Include"));
285	436	Menu menu = new Menu("Import");
..	..	@@ -311,7 +462,7 @@
311	462	}
312	463
313	464	newItem.addActionListener(this);
314		- loadItem.addActionListener(this);
	465	+ openItem.addActionListener(this);
315	466	saveItem.addActionListener(this);
316	467	saveAsItem.addActionListener(this);
317	468	exportAsItem.addActionListener(this);
..	..	@@ -320,28 +471,102 @@
320	471	closeItem.addActionListener(this);
321	472
322	473	objectPanel = new JTabbedPane();
	474	+
	475	+ ChangeListener changeListener = new ChangeListener()
	476	+ {
	477	+ //String name;
	478	+
	479	+ public void stateChanged(ChangeEvent changeEvent)
	480	+ {
	481	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	482	+// {
	483	+// if (latestObject != null)
	484	+// {
	485	+// refreshContents(true);
	486	+// SetMaterial(latestObject);
	487	+// }
	488	+//
	489	+// materialFlushed = true;
	490	+// }
	491	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	492	+// {
	493	+// if (listUI.size() == 0)
	494	+// EditSelection(false);
	495	+// }
	496	+
	497	+// if (objectPanel.getSelectedIndex() == 4)
	498	+// {
	499	+// name = copy.skyboxname;
	500	+//
	501	+// if (name == null)
	502	+// {
	503	+// name = "";
	504	+// }
	505	+//
	506	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	507	+// copy.skyboxext = "jpg";
	508	+// }
	509	+// else
	510	+// {
	511	+// if (name != null)
	512	+// {
	513	+// if (name.equals(""))
	514	+// {
	515	+// copy.skyboxname = null;
	516	+// copy.skyboxext = null;
	517	+// }
	518	+// else
	519	+// {
	520	+// copy.skyboxname = name;
	521	+// }
	522	+// }
	523	+// }
	524	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	525	+
	526	+// refreshContents(false); // To refresh Info tab
	527	+ cameraView.repaint();
	528	+ }
	529	+ };
	530	+ objectPanel.addChangeListener(changeListener);
	531	+
323	532	toolbarPanel = new JPanel();
324	533	toolbarPanel.setName("Toolbar");
	534	+
325	535	treePanel = new cGridBag();
326	536	treePanel.setName("Tree");
	537	+
	538	+ editPanel = new cGridBag().setVertical(true);
	539	+ //editPanel.setName("Edit");
	540	+
327	541	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328		- ctrlPanel.setName("Edit");
329		- materialPanel = new cGridBag().setVertical(true);
330		- materialPanel.setName("Material");
	542	+
	543	+ editCommandsPanel = new cGridBag();
	544	+ editPanel.add(editCommandsPanel);
	545	+ editPanel.add(ctrlPanel);
	546	+
	547	+ toolboxPanel = new cGridBag().setVertical(true);
	548	+ //toolboxPanel.setName("Toolbox");
	549	+
	550	+ skyboxPanel = new cGridBag().setVertical(true);
	551	+
	552	+ materialPanel = new cGridBag().setVertical(false);
	553	+ //materialPanel.setName("Material");
	554	+
331	555	/JTextPane/
332	556	infoarea = createTextPane();
333	557	doc = infoarea.getStyledDocument();
334	558
335	559	infoarea.setEditable(true);
336	560	SetText();
	561	+
337	562	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
338	563	// infoarea.setOpaque(false);
339	564	// //infoarea.setForeground(textcolor);
340	565	// TEXTAREA infoarea.setLineWrap(true);
341	566	// TEXTAREA infoarea.setWrapStyleWord(true);
342	567	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
343		- infoPanel.setPreferredSize(new Dimension(50, 200));
344		- infoPanel.setName("Info");
	568	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	569	+ //infoPanel.setName("Info");
345	570	//infoPanel.setLayout(new BorderLayout());
346	571	//infoPanel.add(createTextPane());
347	572
..	..	@@ -352,7 +577,14 @@
352	577	mainPanel.setDividerSize(9);
353	578	mainPanel.setDividerLocation(0.5); //1.0);
354	579	mainPanel.setResizeWeight(0.5);
355		-
	580	+
	581	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	582	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	583	+ divider.setDividerSize(15);
	584	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	585	+
	586	+ mainPanel.setUI(new BasicSplitPaneUI());
	587	+
356	588	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357	589	//mainPanel.setLayout(new GridBagLayout());
358	590	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -583,21 +815,158 @@
583	815	}
584	816	}
585	817
	818	+//static GraphicsDevice device = GraphicsEnvironment
	819	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	820	+
	821	+ Rectangle keeprect;
	822	+ cRadio radio;
	823	+
	824	+cButton keepButton;
	825	+ cButton twoButton; // Full 3D
	826	+ cButton sixButton;
	827	+ cButton threeButton;
	828	+ cButton sevenButton;
	829	+ cButton fourButton; // full panel
	830	+ cButton oneButton; // full XYZ
	831	+ //cButton currentLayout;
	832	+
	833	+ boolean maximized;
	834	+
	835	+ cButton fullscreenLayout;
	836	+ cButton expandedLayout;
	837	+
	838	+ void Minimize()
	839	+ {
	840	+ frame.setState(Frame.ICONIFIED);
	841	+ frame.validate();
	842	+ }
	843	+
	844	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	845	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	847	+ void Maximize()
	848	+ {
	849	+ if (CameraPane.FULLSCREEN)
	850	+ {
	851	+ ToggleFullScreen();
	852	+ }
	853	+
	854	+ if (maximized)
	855	+ {
	856	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	857	+ }
	858	+ else
	859	+ {
	860	+ keeprect = frame.getBounds();
	861	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	862	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	863	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	864	+// frame.setState(Frame.MAXIMIZED_BOTH);
	865	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	866	+ }
	867	+
	868	+ maximized ^= true;
	869	+
	870	+ frame.validate();
	871	+ }
	872	+
	873	+ cButton minButton;
	874	+ cButton maxButton;
	875	+ cButton fullButton;
	876	+ cButton collapseButton;
	877	+ cButton maximize3DButton;
	878	+
586	879	void ToggleFullScreen()
587	880	{
588		- if (CameraPane.FULLSCREEN)
	881	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	882	+
	883	+ cameraView.ToggleFullScreen();
	884	+
	885	+ if (!CameraPane.FULLSCREEN)
589	886	{
590		- frame.getContentPane().remove(/"Center",/bigThree);
591		- framePanel.add(bigThree);
592		- frame.getContentPane().add(/"Center",/framePanel);
	887	+ device.setFullScreenWindow(null);
	888	+ frame.dispose();
	889	+ frame.setUndecorated(false);
	890	+ frame.validate();
	891	+ frame.setVisible(true);
	892	+
	893	+ //frame.setVisible(false);
	894	+// frame.removeNotify();
	895	+// frame.setUndecorated(false);
	896	+// frame.addNotify();
	897	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	898	+
	899	+// X frame.getContentPane().remove(/"Center",/bigThree);
	900	+// X framePanel.add(bigThree);
	901	+// X frame.getContentPane().add(/"Center",/framePanel);
	902	+// framePanel.setDividerLocation(46); // icons are 24x24
	903	+
	904	+ //frame.setVisible(true);
	905	+// radio.layout = keepButton;
	906	+ //theFrame = null;
	907	+ keepButton = null;
	908	+// radio.layout.doClick();
	909	+
593	910	} else
594	911	{
595		- frame.getContentPane().remove(/"Center",/framePanel);
596		- framePanel.remove(bigThree);
597		- frame.getContentPane().add(/"Center",/bigThree);
	912	+ keepButton = radio.layout;
	913	+ //keeprect = frame.getBounds();
	914	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	915	+// frame.getToolkit().getScreenSize().height);
	916	+ //frame.setVisible(false);
	917	+
	918	+ frame.dispose();
	919	+ frame.setUndecorated(true);
	920	+ device.setFullScreenWindow(frame);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+// frame.removeNotify();
	924	+// frame.setUndecorated(true);
	925	+// frame.addNotify();
	926	+// X frame.getContentPane().remove(/"Center",/framePanel);
	927	+// X framePanel.remove(bigThree);
	928	+// X frame.getContentPane().add(/"Center",/bigThree);
	929	+// framePanel.setDividerLocation(0);
	930	+
	931	+// radio.layout = fullscreenLayout;
	932	+// radio.layout.doClick();
	933	+ //frame.setVisible(true);
598	934	}
599		- cameraView.ToggleFullScreen();
	935	+ frame.validate();
	936	+
	937	+ cameraView.requestFocusInWindow();
600	938	}
	939	+
	940	+ void CollapseToolbar()
	941	+ {
	942	+ framePanel.setDividerLocation(0);
	943	+ //frame.validate();
	944	+
	945	+ cameraView.requestFocusInWindow();
	946	+ }
	947	+
	948	+ private Object3D Duplicate(Object3D object)
	949	+ {
	950	+ boolean temp = CameraPane.SWITCH;
	951	+ CameraPane.SWITCH = false;
	952	+
	953	+ object.ExtractBigData(versiontable);
	954	+ // if (copy == client)
	955	+
	956	+ Object3D versions[] = object.versionlist;
	957	+ object.versionlist = null;
	958	+
	959	+ //byte[] compress = Compress(copy);
	960	+ Object3D compress = (Object3D)Grafreed.clone(object);
	961	+
	962	+ object.versionlist = versions;
	963	+
	964	+ object.RestoreBigData(versiontable);
	965	+
	966	+ CameraPane.SWITCH = temp;
	967	+
	968	+ return compress;
	969	+ }
601	970
602	971	private JTextPane createTextPane()
603	972	{
..	..	@@ -720,6 +1089,7 @@
720	1089	{
721	1090	SetupMaterial(materialPanel);
722	1091	}
	1092	+
723	1093	//SetupName();
724	1094	//SetupViews();
725	1095	}
..	..	@@ -729,7 +1099,7 @@
729	1099	// NumberSlider vDivsField;
730	1100	// JCheckBox endcaps;
731	1101	JCheckBox liveCB;
732		- JCheckBox selectCB;
	1102	+ JCheckBox selectableCB;
733	1103	JCheckBox hideCB;
734	1104	JCheckBox link2masterCB;
735	1105	JCheckBox markCB;
..	..	@@ -737,7 +1107,12 @@
737	1107	JCheckBox speedupCB;
738	1108	JCheckBox rewindCB;
739	1109	JCheckBox flipVCB;
	1110	+
	1111	+ cCheckBox toggleTextureCB;
	1112	+ cCheckBox toggleSwitchCB;
	1113	+
740	1114	JComboBox texresMenu;
	1115	+
741	1116	JButton resetButton;
742	1117	JButton stepButton;
743	1118	JButton stepAllButton;
..	..	@@ -746,10 +1121,13 @@
746	1121	JButton fasterButton;
747	1122	JButton remarkButton;
748	1123
	1124	+ cGridBag editPanel;
	1125	+ cGridBag editCommandsPanel;
	1126	+
749	1127	cGridBag namePanel;
750	1128	cGridBag setupPanel;
751	1129	cGridBag setupPanel2;
752		- cGridBag commandsPanel;
	1130	+ cGridBag objectCommandsPanel;
753	1131	cGridBag pushPanel;
754	1132	cGridBag fillPanel;
755	1133
..	..	@@ -920,39 +1298,55 @@
920	1298
921	1299	namePanel = new cGridBag();
922	1300
	1301	+ //if (copy.pinned)
	1302	+ {
	1303	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1304	+ pinButton.setSelected(copy.pinned);
	1305	+ cGridBag t = new cGridBag();
	1306	+ t.preferredWidth = 2;
	1307	+ t.add(pinButton);
	1308	+ namePanel.add(t);
	1309	+
	1310	+ pinButton.addItemListener(this);
	1311	+ }
	1312	+
923	1313	nameField = AddText(namePanel, copy.GetName());
924		- namePanel.add(nameField);
	1314	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
925	1315	oe.ctrlPanel.add(namePanel);
926	1316
927	1317	oe.ctrlPanel.Return();
928	1318
929		- if (!GroupEditor.allparams)
	1319	+ if (!allparams)
930	1320	return;
931	1321
932	1322	setupPanel = new cGridBag().setVertical(false);
933	1323
934	1324	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
935	1325	liveCB.setToolTipText("Animate object");
936		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937		- selectCB.setToolTipText("Make object selectable");
	1326	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1327	+ selectableCB.setToolTipText("Make object selectable");
938	1328	// Return();
	1329	+
939	1330	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940	1331	hideCB.setToolTipText("Hide object");
941	1332	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942		- markCB.setToolTipText("Set the animation target transform");
	1333	+ markCB.setToolTipText("As animation target transform");
	1334	+
	1335	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
943	1336
944	1337	setupPanel2 = new cGridBag().setVertical(false);
945	1338
946	1339	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947	1340	rewindCB.setToolTipText("Rewind animation");
948	1341
949		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950		- randomCB.setToolTipText("Rewind or Go back and forth randomly");
	1342	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1343	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
951	1344
	1345	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1346	+ link2masterCB.setToolTipText("Attach to support");
	1347	+
952	1348	if (Globals.ADVANCED)
953	1349	{
954		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955		- link2masterCB.setToolTipText("Attach to support");
956	1350	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957	1351	speedupCB.setToolTipText("Option motion capture");
958	1352	}
..	..	@@ -962,23 +1356,23 @@
962	1356	oe.ctrlPanel.add(setupPanel2);
963	1357	oe.ctrlPanel.Return();
964	1358
965		- commandsPanel = new cGridBag().setVertical(false);
	1359	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1360
967		- resetButton = AddButton(commandsPanel, "Reset");
	1361	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1362	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1363	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1364	stepButton.setToolTipText("Step one frame");
971	1365	// resetAllButton = AddButton(oe, "Reset All");
972	1366	// stepAllButton = AddButton(oe, "Step All");
973	1367	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1368	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1369	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1370	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1371	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1372	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1373	remarkButton.setToolTipText("Set the current transform as the target");
980	1374
981		- oe.ctrlPanel.add(commandsPanel);
	1375	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1376	oe.ctrlPanel.Return();
983	1377
984	1378	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1578,11 @@
1184	1578	//worldPanel.setName("World");
1185	1579	centralPanel = new cGridBag();
1186	1580	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1581	+
	1582	+ if (Globals.ADVANCED)
	1583	+ {
	1584	+ timelinePanel = new JPanel(new BorderLayout());
	1585	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189	1586
1190	1587	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1588	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1591,10 @@
1194	1591	// cameraPanel.setDividerSize(9);
1195	1592	cameraPanel.setResizeWeight(1.0);
1196	1593
	1594	+ }
	1595	+
1197	1596	centralPanel.add(cameraView);
	1597	+ centralPanel.setFocusable(true);
1198	1598	//frame.setJMenuBar(timelineMenubar);
1199	1599	//centralPanel.add(timelinePanel);
1200	1600
..	..	@@ -1220,6 +1620,7 @@
1220	1620	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1221	1621	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1222	1622	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1623	+ //XYZPanel.setName("XYZ");
1223	1624
1224	1625	/*
1225	1626	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1257,13 +1658,29 @@
1257	1658	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1258	1659	//tmp.setName("Edit");
1259	1660	objectPanel.add(materialPanel);
	1661	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1662	+ objectPanel.setToolTipTextAt(0, "Material");
	1663	+
	1664	+ objectPanel.add(toolboxPanel);
	1665	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1666	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1667	+
	1668	+ objectPanel.add(skyboxPanel);
	1669	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1670	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1671	+
1260	1672	// JPanel north = new JPanel(new BorderLayout());
1261	1673	// north.setName("Edit");
1262	1674	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1675	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
1265		- objectPanel.add(infoPanel);
1266		-
	1676	+ objectPanel.add(editPanel);
	1677	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1678	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1679	+
	1680	+ objectPanel.add(XYZPanel);
	1681	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1682	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1683	+
1267	1684	/*
1268	1685	aConstraints.gridx = 0;
1269	1686	aConstraints.gridwidth = 1;
..	..	@@ -1271,7 +1688,7 @@
1271	1688	aConstraints.gridy += 1;
1272	1689	aConstraints.gridwidth = 1;
1273	1690	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1691	+ */
1275	1692
1276	1693	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1694	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1283,14 +1700,12 @@
1283	1700	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1701
1285	1702	/JTabbedPane/ scenePanel = new cGridBag();
1286		- scenePanel.preferredWidth = 6;
	1703	+ scenePanel.preferredWidth = 5;
1287	1704
1288	1705	JTabbedPane tabbedPane = new JTabbedPane();
1289	1706	tabbedPane.add(scrollpane);
1290	1707
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1708	+ optionsPanel = new cGridBag().setVertical(false);
1294	1709
1295	1710	optionsPanel.setName("Options");
1296	1711
..	..	@@ -1298,8 +1713,15 @@
1298	1713
1299	1714	tabbedPane.add(optionsPanel);
1300	1715
	1716	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1717	+
1301	1718	scenePanel.add(tabbedPane);
1302	1719
	1720	+ //if (Globals.ADVANCED)
	1721	+// tabbedPane.add(infoPanel);
	1722	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1723	+// tabbedPane.setToolTipTextAt(3, "Information");
	1724	+
1303	1725	/*
1304	1726	cTree jTree = new cTree(null);
1305	1727	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1361,7 +1783,7 @@
1361	1783	bigThree = new cGridBag();
1362	1784	bigThree.addComponent(scenePanel);
1363	1785	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1786	+ //bigThree.addComponent(XYZPanel);
1365	1787
1366	1788	// // SIDE EFFECT!!!
1367	1789	// aConstraints.gridx = 0;
..	..	@@ -1370,16 +1792,33 @@
1370	1792	// aConstraints.gridheight = 1;
1371	1793
1372	1794	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1795	+
	1796	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1797	+ new java.beans.PropertyChangeListener()
	1798	+ {
	1799	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1800	+ {
	1801	+ if ((Integer)pce.getOldValue() == 1)
	1802	+ {
	1803	+ if (radio.layout != expandedLayout)
	1804	+ {
	1805	+ radio.layout = expandedLayout;
	1806	+ radio.layout.doClick();
	1807	+ }
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ framePanel.setContinuousLayout(false);
	1813	+ framePanel.setOneTouchExpandable(false);
	1814	+ //.setDividerLocation(0.8);
1376	1815	//framePanel.setDividerSize(15);
1377	1816	//framePanel.setResizeWeight(0.15);
1378	1817	framePanel.setName("Frame");
1379	1818
1380	1819	frame.getContentPane().setLayout(new BorderLayout());
1381	1820	/**/
1382		- JTabbedPane worldPane = new JTabbedPane();
	1821	+ //JTabbedPane worldPane = new JTabbedPane();
1383	1822	//worldPane.add(bigPanel);
1384	1823	//worldPane.add(worldPanel);
1385	1824	/**/
..	..	@@ -1390,14 +1829,18 @@
1390	1829	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1830
1392	1831	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1832	+
	1833	+ cameraView.requestFocusInWindow();
	1834	+
1395	1835	gridPanel.setDividerLocation(1.0);
	1836	+
	1837	+ frame.validate();
	1838	+
	1839	+ frame.setVisible(true);
1396	1840
1397	1841	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1842	frame.addWindowListener(new WindowAdapter()
1399	1843	{
1400		-
1401	1844	public void windowClosing(WindowEvent e)
1402	1845	{
1403	1846	Close();
..	..	@@ -1420,12 +1863,418 @@
1420	1863	ctrlPanel.removeAll();
1421	1864	}
1422	1865
1423		- void SetupMaterial(cGridBag panel)
	1866	+ void SetupMaterial(cGridBag materialpanel)
1424	1867	{
1425		- /*
	1868	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1869	+
	1870	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1871	+ skin.setToolTipText("Skin");
	1872	+ skin.addMouseListener(new MouseAdapter()
	1873	+ {
	1874	+ public void mouseClicked(MouseEvent e)
	1875	+ {
	1876	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1877	+ cMaterial material = object.material;
	1878	+
	1879	+ // Skin
	1880	+ colorField.setFloat(material.color);
	1881	+ saturationField.setFloat(material.modulation);
	1882	+ subsurfaceField.setFloat(material.subsurface);
	1883	+ selfshadowField.setFloat(material.diffuseness);
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ shininessField.setFloat(material.shininess);
	1886	+ shadowbiasField.setFloat(material.shadowbias);
	1887	+ diffuseField.setFloat(material.diffuse);
	1888	+ specularField.setFloat(material.specular);
	1889	+
	1890	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1891	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1892	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1893	+
	1894	+ materialtouched = true;
	1895	+ applySelf();
	1896	+ }
	1897	+ });
	1898	+ presetpanel.add(skin);
	1899	+
	1900	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1901	+ lambert.setToolTipText("Diffuse");
	1902	+ lambert.addMouseListener(new MouseAdapter()
	1903	+ {
	1904	+ public void mouseClicked(MouseEvent e)
	1905	+ {
	1906	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1907	+ cMaterial material = object.material;
	1908	+
	1909	+ diffusenessField.setFloat(material.factor);
	1910	+ selfshadowField.setFloat(material.diffuseness);
	1911	+
	1912	+ materialtouched = true;
	1913	+ applySelf();
	1914	+ }
	1915	+ });
	1916	+ presetpanel.add(lambert);
	1917	+
	1918	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1919	+ diffuse2.setToolTipText("Diffuse2");
	1920	+ diffuse2.addMouseListener(new MouseAdapter()
	1921	+ {
	1922	+ public void mouseClicked(MouseEvent e)
	1923	+ {
	1924	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1925	+ cMaterial material = object.material;
	1926	+
	1927	+ diffusenessField.setFloat(material.factor);
	1928	+ selfshadowField.setFloat(material.diffuseness);
	1929	+
	1930	+ materialtouched = true;
	1931	+ applySelf();
	1932	+ }
	1933	+ });
	1934	+ presetpanel.add(diffuse2);
	1935	+
	1936	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1937	+ diffusemoon.setToolTipText("Moon");
	1938	+ diffusemoon.addMouseListener(new MouseAdapter()
	1939	+ {
	1940	+ public void mouseClicked(MouseEvent e)
	1941	+ {
	1942	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1943	+ cMaterial material = object.material;
	1944	+
	1945	+ diffusenessField.setFloat(material.factor);
	1946	+ selfshadowField.setFloat(material.diffuseness);
	1947	+
	1948	+ materialtouched = true;
	1949	+ applySelf();
	1950	+ }
	1951	+ });
	1952	+ presetpanel.add(diffusemoon);
	1953	+
	1954	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1955	+ diffusemoon2.setToolTipText("Moon2");
	1956	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1957	+ {
	1958	+ public void mouseClicked(MouseEvent e)
	1959	+ {
	1960	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1961	+ cMaterial material = object.material;
	1962	+
	1963	+ diffusenessField.setFloat(material.factor);
	1964	+ selfshadowField.setFloat(material.diffuseness);
	1965	+
	1966	+ materialtouched = true;
	1967	+ applySelf();
	1968	+ }
	1969	+ });
	1970	+ presetpanel.add(diffusemoon2);
	1971	+
	1972	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1973	+ diffusemoon3.setToolTipText("Moon3");
	1974	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1975	+ {
	1976	+ public void mouseClicked(MouseEvent e)
	1977	+ {
	1978	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1979	+ cMaterial material = object.material;
	1980	+
	1981	+ diffusenessField.setFloat(material.factor);
	1982	+ selfshadowField.setFloat(material.diffuseness);
	1983	+
	1984	+ materialtouched = true;
	1985	+ applySelf();
	1986	+ }
	1987	+ });
	1988	+ presetpanel.add(diffusemoon3);
	1989	+
	1990	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1991	+ diffusesheen.setToolTipText("Sheen");
	1992	+ diffusesheen.addMouseListener(new MouseAdapter()
	1993	+ {
	1994	+ public void mouseClicked(MouseEvent e)
	1995	+ {
	1996	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1997	+ cMaterial material = object.material;
	1998	+
	1999	+ sheenField.setFloat(material.sheen);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(diffusesheen);
	2006	+
	2007	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2008	+ rough.setToolTipText("Rough metal");
	2009	+ rough.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ shininessField.setFloat(material.shininess);
	2017	+ velvetField.setFloat(material.velvet);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(rough);
	2024	+
	2025	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2026	+ rough2.setToolTipText("Medium metal");
	2027	+ rough2.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ shininessField.setFloat(material.shininess);
	2035	+ lightareaField.setFloat(material.lightarea);
	2036	+
	2037	+ materialtouched = true;
	2038	+ applySelf();
	2039	+ }
	2040	+ });
	2041	+ presetpanel.add(rough2);
	2042	+
	2043	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2044	+ shini0.setToolTipText("Shiny");
	2045	+ shini0.addMouseListener(new MouseAdapter()
	2046	+ {
	2047	+ public void mouseClicked(MouseEvent e)
	2048	+ {
	2049	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2050	+ cMaterial material = object.material;
	2051	+
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ lightareaField.setFloat(material.lightarea);
	2054	+
	2055	+ materialtouched = true;
	2056	+ applySelf();
	2057	+ }
	2058	+ });
	2059	+ presetpanel.add(shini0);
	2060	+
	2061	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2062	+ shini1.setToolTipText("Shiny2");
	2063	+ shini1.addMouseListener(new MouseAdapter()
	2064	+ {
	2065	+ public void mouseClicked(MouseEvent e)
	2066	+ {
	2067	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2068	+ cMaterial material = object.material;
	2069	+
	2070	+ shininessField.setFloat(material.shininess);
	2071	+ lightareaField.setFloat(material.lightarea);
	2072	+
	2073	+ materialtouched = true;
	2074	+ applySelf();
	2075	+ }
	2076	+ });
	2077	+ presetpanel.add(shini1);
	2078	+
	2079	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2080	+ shini2.setToolTipText("Shiny3");
	2081	+ shini2.addMouseListener(new MouseAdapter()
	2082	+ {
	2083	+ public void mouseClicked(MouseEvent e)
	2084	+ {
	2085	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2086	+ cMaterial material = object.material;
	2087	+
	2088	+ shininessField.setFloat(material.shininess);
	2089	+ lightareaField.setFloat(material.lightarea);
	2090	+
	2091	+ materialtouched = true;
	2092	+ applySelf();
	2093	+ }
	2094	+ });
	2095	+ presetpanel.add(shini2);
	2096	+
	2097	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2098	+ aniso.setToolTipText("AnisoU");
	2099	+ aniso.addMouseListener(new MouseAdapter()
	2100	+ {
	2101	+ public void mouseClicked(MouseEvent e)
	2102	+ {
	2103	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2104	+ cMaterial material = object.material;
	2105	+
	2106	+ anisoField.setFloat(material.aniso);
	2107	+ anisoVField.setFloat(material.anisoV);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(aniso);
	2114	+
	2115	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2116	+ aniso2.setToolTipText("AnisoV");
	2117	+ aniso2.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ anisoField.setFloat(material.aniso);
	2125	+ anisoVField.setFloat(material.anisoV);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(aniso2);
	2132	+
	2133	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2134	+ aniso3.setToolTipText("AnisoUV");
	2135	+ aniso3.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ anisoField.setFloat(material.aniso);
	2143	+ anisoVField.setFloat(material.anisoV);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(aniso3);
	2150	+
	2151	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2152	+ velvet0.setToolTipText("Velvet");
	2153	+ velvet0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ diffusenessField.setFloat(material.factor);
	2161	+ selfshadowField.setFloat(material.diffuseness);
	2162	+ sheenField.setFloat(material.sheen);
	2163	+ shininessField.setFloat(material.shininess);
	2164	+ velvetField.setFloat(material.velvet);
	2165	+ shiftField.setFloat(material.shift);
	2166	+
	2167	+ materialtouched = true;
	2168	+ applySelf();
	2169	+ }
	2170	+ });
	2171	+ presetpanel.add(velvet0);
	2172	+
	2173	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2174	+ bump0.setToolTipText("Bump texture");
	2175	+ bump0.addMouseListener(new MouseAdapter()
	2176	+ {
	2177	+ public void mouseClicked(MouseEvent e)
	2178	+ {
	2179	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2180	+ cMaterial material = object.material;
	2181	+
	2182	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2183	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2184	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(bump0);
	2191	+
	2192	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2193	+ borderShader.setToolTipText("Border fade");
	2194	+ borderShader.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ borderfadeField.setFloat(0.5);
	2199	+ opacityField.setFloat(0.6);
	2200	+
	2201	+ materialtouched = true;
	2202	+ applySelf();
	2203	+ }
	2204	+ });
	2205	+ presetpanel.add(borderShader);
	2206	+
	2207	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2208	+ halo.setToolTipText("Halo");
	2209	+ halo.addMouseListener(new MouseAdapter()
	2210	+ {
	2211	+ public void mouseClicked(MouseEvent e)
	2212	+ {
	2213	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2214	+ cMaterial material = object.material;
	2215	+
	2216	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(halo);
	2223	+
	2224	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2225	+ candle.setToolTipText("Candle");
	2226	+ candle.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ subsurfaceField.setFloat(material.subsurface);
	2234	+ shadowbiasField.setFloat(material.shadowbias);
	2235	+ ambientField.setFloat(material.ambient);
	2236	+ specularField.setFloat(material.specular);
	2237	+ lightareaField.setFloat(material.lightarea);
	2238	+ shininessField.setFloat(material.shininess);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(candle);
	2245	+
	2246	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2247	+ shadowShader.setToolTipText("Shadow");
	2248	+ shadowShader.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ diffuseField.setFloat(0.001);
	2253	+ ambientField.setFloat(0.001);
	2254	+ cameraField.setFloat(0.001);
	2255	+ specularField.setFloat(0.001);
	2256	+ fakedepthField.setFloat(0.001);
	2257	+ opacityField.setFloat(0.6);
	2258	+
	2259	+ materialtouched = true;
	2260	+ applySelf();
	2261	+ }
	2262	+ });
	2263	+ presetpanel.add(shadowShader);
	2264	+
	2265	+ cGridBag panel = new cGridBag().setVertical(true);
	2266	+
	2267	+ presetpanel.preferredWidth = 1;
	2268	+
	2269	+ materialpanel.add(presetpanel);
	2270	+ materialpanel.add(panel);
	2271	+
	2272	+ panel.preferredWidth = 8;
	2273	+
	2274	+ /*
1426	2275	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1427	2276	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1428		- */
	2277	+ */
1429	2278
1430	2279	cGridBag editBar = new cGridBag().setVertical(false);
1431	2280
..	..	@@ -1459,45 +2308,50 @@
1459	2308	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1460	2309
1461	2310	cGridBag colorSection = new cGridBag().setVertical(true);
	2311	+
	2312	+ cGridBag huepanel = new cGridBag();
	2313	+ cGridBag huelabel = new cGridBag();
	2314	+ skin = GetLabel("icons/hue.png", false);
	2315	+ skin.fit = true;
	2316	+ huelabel.add(skin);
	2317	+ huelabel.preferredWidth = 20;
	2318	+ huepanel.add(new cGridBag()); // Label
	2319	+ huepanel.add(huelabel); // Field/slider
	2320	+
	2321	+ huepanel.preferredHeight = 7;
	2322	+
	2323	+ colorSection.add(huepanel);
1462	2324
1463	2325	cGridBag color = new cGridBag();
1464		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1465		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2326	+
	2327	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2328	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2329	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2330	+
1467	2331	//colorField.preferredWidth = 200;
1468	2332	colorSection.add(color);
1469	2333
1470	2334	cGridBag modulation = new cGridBag();
1471	2335	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1472	2336	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2337	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1474	2338	colorSection.add(modulation);
1475	2339
	2340	+ cGridBag opacity = new cGridBag();
	2341	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2342	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2343	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2344	+ colorSection.add(opacity);
	2345	+
	2346	+ colorSection.add(GetSeparator());
	2347	+
1476	2348	cGridBag texture = new cGridBag();
1477	2349	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1478	2350	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479	2351	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	2352	colorSection.add(texture);
1481	2353
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		- panel.add(new JSeparator());
	2354	+ panel.add(GetSeparator());
1501	2355
1502	2356	panel.add(colorSection);
1503	2357
..	..	@@ -1547,7 +2401,13 @@
1547	2401	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	2402	diffuseSection.add(fakedepth);
1549	2403
1550		- panel.add(new JSeparator());
	2404	+ cGridBag shadowbias = new cGridBag();
	2405	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2406	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2407	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2408	+ diffuseSection.add(shadowbias);
	2409	+
	2410	+ panel.add(GetSeparator());
1551	2411
1552	2412	panel.add(diffuseSection);
1553	2413
..	..	@@ -1597,42 +2457,48 @@
1597	2457	// aConstraints.gridy += 1;
1598	2458	// aConstraints.gridwidth = 1;
1599	2459
	2460	+ cGridBag anisoU = new cGridBag();
	2461	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2462	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2463	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2464	+ specularSection.add(anisoU);
1600	2465
1601		- panel.add(new JSeparator());
	2466	+ cGridBag anisoV = new cGridBag();
	2467	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2468	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2469	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2470	+ specularSection.add(anisoV);
	2471	+
	2472	+
	2473	+ panel.add(GetSeparator());
1602	2474
1603	2475	panel.add(specularSection);
1604	2476
1605	2477	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	2478
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	2479	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	2480
1609	2481	cGridBag camera = new cGridBag();
1610	2482	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	2483	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2484	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	2485	+ colorSection.add(camera);
1614	2486
1615	2487	cGridBag ambient = new cGridBag();
1616	2488	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	2489	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2490	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	2491	+ colorSection.add(ambient);
1620	2492
1621	2493	cGridBag backlit = new cGridBag();
1622	2494	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	2495	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	2496	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	2497	+ colorSection.add(backlit);
1626	2498
1627		- cGridBag opacity = new cGridBag();
1628		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
1632		-
1633		- panel.add(new JSeparator());
	2499	+ //panel.add(new JSeparator());
1634	2500
1635		- panel.add(globalSection);
	2501	+ //panel.add(globalSection);
1636	2502
1637	2503	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	2504
..	..	@@ -1674,7 +2540,7 @@
1674	2540	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1675	2541	textureSection.add(opacityPower);
1676	2542
1677		- panel.add(new JSeparator());
	2543	+ panel.add(GetSeparator());
1678	2544
1679	2545	panel.add(textureSection);
1680	2546
..	..	@@ -1739,8 +2605,9 @@
1739	2605	// 3D models
1740	2606	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1741	2607	{
1742		- lastConverter = new com.jmex.model.converters.MaxToJme();
1743		- LoadFile(filename, lastConverter);
	2608	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2609	+ //LoadFile(filename, lastConverter);
	2610	+ LoadObjFile(filename); // New 3ds loader
1744	2611	continue;
1745	2612	}
1746	2613	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2466,6 +3333,7 @@
2466	3333	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2467	3334	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2468	3335	}
	3336	+
2469	3337	//cJME.count++;
2470	3338	//cJME.count %= 12;
2471	3339	if (gc)
..	..	@@ -2649,6 +3517,7 @@
2649	3517	}
2650	3518	}
2651	3519	}
	3520	+
2652	3521	cFileSystemPane FSPane;
2653	3522
2654	3523	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2658,7 +3527,7 @@
2658	3527
2659	3528	freezematerial = true;
2660	3529	colorField.setFloat(mat.color);
2661		- modulationField.setFloat(mat.modulation);
	3530	+ saturationField.setFloat(mat.modulation);
2662	3531	metalnessField.setFloat(mat.metalness);
2663	3532	diffuseField.setFloat(mat.diffuse);
2664	3533	specularField.setFloat(mat.specular);
..	..	@@ -2702,11 +3571,14 @@
2702	3571	}
2703	3572	}
2704	3573	}
	3574	+
2705	3575	freezematerial = false;
2706	3576	}
2707	3577
2708	3578	void SetMaterial(Object3D object)
2709	3579	{
	3580	+ latestObject = object;
	3581	+
2710	3582	cMaterial mat = object.material;
2711	3583
2712	3584	if (mat == null)
..	..	@@ -2717,32 +3589,8 @@
2717	3589
2718	3590	if (multiplyToggle != null)
2719	3591	multiplyToggle.setSelected(mat.multiply);
2720		-
2721		- assert (object.projectedVertices != null);
2722		-
2723		- if (object.projectedVertices.length <= 2)
2724		- {
2725		- // Side effect...
2726		- Object3D.cVector2[] keep = object.projectedVertices;
2727		- object.projectedVertices = new Object3D.cVector2[3];
2728		- for (int i = 0; i < 3; i++)
2729		- {
2730		- if (i < keep.length)
2731		- {
2732		- object.projectedVertices[i] = keep[i];
2733		- } else
2734		- {
2735		- object.projectedVertices[i] = new Object3D.cVector2();
2736		- }
2737		- /*
2738		- if(keep.length == 0)
2739		- object.projectedVertices[0] = new Object3D.cVector2();
2740		- else
2741		- object.projectedVertices[0] = keep[0];
2742		- object.projectedVertices[1] = new Object3D.cVector2();
2743		- */
2744		- }
2745		- }
	3592	+
	3593	+ AllocProjectedVertices(object);
2746	3594
2747	3595	SetMaterial(mat, object.projectedVertices);
2748	3596	}
..	..	@@ -2818,12 +3666,17 @@
2818	3666	// }
2819	3667
2820	3668	/**/
2821		- if (deselect)
	3669	+ if (deselect \|\| child == null)
2822	3670	{
2823	3671	//group.deselectAll();
2824	3672	//freeze = true;
2825	3673	GetTree().clearSelection();
2826	3674	//freeze = false;
	3675	+
	3676	+ if (child == null)
	3677	+ {
	3678	+ return;
	3679	+ }
2827	3680	}
2828	3681
2829	3682	//group.addSelectee(child);
..	..	@@ -2857,6 +3710,17 @@
2857	3710	public void itemStateChanged(ItemEvent event)
2858	3711	{
2859	3712	// System.out.println("Propagate = " + propagate);
	3713	+ if (event.getSource() == pinButton)
	3714	+ {
	3715	+ copy.pinned ^= true;
	3716	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3717	+ {
	3718	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3719	+ copy.CloseUI();
	3720	+ //copy.editWindow.refreshContents();
	3721	+ }
	3722	+ }
	3723	+ else
2860	3724	if (event.getSource() == propagateToggle)
2861	3725	{
2862	3726	propagate ^= true;
..	..	@@ -2892,7 +3756,7 @@
2892	3756	cameraView.ToggleDL();
2893	3757	cameraView.repaint();
2894	3758	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3759	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3760	{
2897	3761	cameraView.ToggleTexture();
2898	3762	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3795,7 @@
2931	3795	frame.validate();
2932	3796
2933	3797	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3798	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3799	{
2936	3800	cameraView.ToggleSwitch();
2937	3801	cameraView.repaint();
..	..	@@ -2961,8 +3825,9 @@
2961	3825	} else if (event.getSource() == liveCB)
2962	3826	{
2963	3827	copy.live ^= true;
	3828	+ objEditor.refreshContents(true); // To show item colors
2964	3829	return;
2965		- } else if (event.getSource() == selectCB)
	3830	+ } else if (event.getSource() == selectableCB)
2966	3831	{
2967	3832	copy.dontselect ^= true;
2968	3833	return;
..	..	@@ -2970,7 +3835,7 @@
2970	3835	{
2971	3836	copy.hide ^= true;
2972	3837	copy.Touch(); // display list issue
2973		- objEditor.refreshContents();
	3838	+ objEditor.refreshContents(true); // To show item colors
2974	3839	return;
2975	3840	} else if (event.getSource() == link2masterCB)
2976	3841	{
..	..	@@ -3147,9 +4012,9 @@
3147	4012	{
3148	4013	Close();
3149	4014	//return true;
3150		- } else if (source == loadItem)
	4015	+ } else if (source == openItem)
3151	4016	{
3152		- load();
	4017	+ Open();
3153	4018	//return true;
3154	4019	} else if (source == newItem)
3155	4020	{
..	..	@@ -3174,6 +4039,10 @@
3174	4039	{
3175	4040	generatePOV();
3176	4041	//return true;
	4042	+ } else if (event.getSource() == archiveItem)
	4043	+ {
	4044	+ cTools.Archive(frame);
	4045	+ return;
3177	4046	} else if (source == zBufferItem)
3178	4047	{
3179	4048	try
..	..	@@ -3222,11 +4091,12 @@
3222	4091
3223	4092	static public byte[] Compress(Object3D o)
3224	4093	{
	4094	+ // Slower to actually compress.
3225	4095	try
3226	4096	{
3227	4097	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4098	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4099	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3230	4100
3231	4101	Object3D parent = o.parent;
3232	4102	o.parent = null;
..	..	@@ -3237,10 +4107,14 @@
3237	4107
3238	4108	out.flush();
3239	4109
3240		- zstream.close();
	4110	+ baos //zstream
	4111	+ .close();
3241	4112	out.close();
3242	4113
3243		- return baos.toByteArray();
	4114	+ byte[] bytes = baos.toByteArray();
	4115	+
	4116	+ System.out.println("save #bytes = " + bytes.length);
	4117	+ return bytes;
3244	4118	} catch (Exception e)
3245	4119	{
3246	4120	System.err.println(e);
..	..	@@ -3250,13 +4124,16 @@
3250	4124
3251	4125	static public Object Uncompress(byte[] bytes)
3252	4126	{
3253		- System.out.println("#bytes = " + bytes.length);
	4127	+ System.out.println("restore #bytes = " + bytes.length);
3254	4128	try
3255	4129	{
3256	4130	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258		- ObjectInputStream in = new ObjectInputStream(istream);
	4131	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4132	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3259	4133	Object obj = in.readObject();
	4134	+
	4135	+ bais //istream
	4136	+ .close();
3260	4137	in.close();
3261	4138
3262	4139	return obj;
..	..	@@ -3311,37 +4188,95 @@
3311	4188	return null;
3312	4189	}
3313	4190
3314		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315	4191
3316	4192	public void Save()
3317	4193	{
3318		- cRadio tab = GetCurrentTab();
	4194	+ //Save(true);
	4195	+ Replace();
	4196	+ SetVersionStates();
	4197	+ }
	4198	+
	4199	+ private boolean Equal(byte[] compress, byte[] name)
	4200	+ {
	4201	+ if (compress.length != name.length)
	4202	+ {
	4203	+ return false;
	4204	+ }
3319	4205
3320		- boolean temp = CameraPane.SWITCH;
3321		- CameraPane.SWITCH = false;
	4206	+ for (int i=compress.length; --i>=0;)
	4207	+ {
	4208	+ if (compress[i] != name[i])
	4209	+ return false;
	4210	+ }
3322	4211
3323		- copy.ExtractBigData(hashtable);
	4212	+ return true;
	4213	+ }
	4214	+
	4215	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4216	+
	4217	+ void DeleteVersion()
	4218	+ {
	4219	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4220	+ {
	4221	+ copy.versionlist[i] = copy.versionlist[i+1];
	4222	+ }
	4223	+
	4224	+ CopyChanged();
	4225	+
	4226	+ SetVersionStates();
	4227	+ }
	4228	+
	4229	+ public boolean Save(boolean user)
	4230	+ {
	4231	+ System.err.println("Save");
	4232	+ Replace();
	4233	+
	4234	+ //cRadio tab = GetCurrentTab();
	4235	+
	4236	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4237	+
	4238	+ boolean thesame = false;
	4239	+
	4240	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4241	+// {
	4242	+// thesame = true;
	4243	+// }
3324	4244
3325	4245	//EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
3327		-
3328		- copy.RestoreBigData(hashtable);
3329		-
3330		- CameraPane.SWITCH = temp;
3331		-
3332		- //assert(hashtable.isEmpty());
3333		-
3334		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4246	+ if (!thesame)
3335	4247	{
3336		- tab.graphs[i] = null;
	4248	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4249	+ {
	4250	+ copy.versionlist[i] = copy.versionlist[i-1];
	4251	+ }
	4252	+
	4253	+ //tab.user[tab.versionindex] = user;
	4254	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4255	+
	4256	+ copy.versionlist[++copy.versionindex] = compress;
	4257	+
	4258	+ // if (increment)
	4259	+ // tab.versionindex++;
3337	4260	}
3338	4261
	4262	+ //copy.RestoreBigData(versiontable);
	4263	+
	4264	+ //assert(hashtable.isEmpty());
	4265	+
	4266	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4267	+// {
	4268	+// //tab.user[i] = false;
	4269	+// copy.versionlist[i] = null;
	4270	+// }
	4271	+
	4272	+ SetVersionStates();
	4273	+
3339	4274	// test save
3340	4275	if (false)
3341	4276	{
3342	4277	try
3343	4278	{
3344		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4279	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3345	4280	ObjectOutputStream p = new ObjectOutputStream(ostream);
3346	4281
3347	4282	p.writeObject(copy);
..	..	@@ -3354,26 +4289,68 @@
3354	4289	e.printStackTrace();
3355	4290	}
3356	4291	}
	4292	+
	4293	+ return !thesame;
	4294	+ }
	4295	+
	4296	+ boolean flashIt = true;
	4297	+
	4298	+ void RefreshSelection()
	4299	+ {
	4300	+ Object3D selection = new Object3D();
	4301	+
	4302	+ for (int i = 0; i < copy.selection.size(); i++)
	4303	+ {
	4304	+ Object3D elem = copy.selection.elementAt(i);
	4305	+
	4306	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4307	+
	4308	+ if (obj == null)
	4309	+ {
	4310	+ copy.selection.remove(i--);
	4311	+ }
	4312	+ else
	4313	+ {
	4314	+ selection.add(obj);
	4315	+ copy.selection.setElementAt(obj, i);
	4316	+ }
	4317	+ }
	4318	+
	4319	+ flashIt = false;
	4320	+ GetTree().clearSelection();
	4321	+ for (int i = 0; i < selection.size(); i++)
	4322	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4323	+ flashIt = true;
	4324	+
	4325	+ //refreshContents(false);
3357	4326	}
3358	4327
3359		- void CopyChanged(Object3D obj)
	4328	+ void CopyChanged()
3360	4329	{
	4330	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4331	+
	4332	+ SetVersionStates();
	4333	+
3361	4334	boolean temp = CameraPane.SWITCH;
3362	4335	CameraPane.SWITCH = false;
3363	4336
3364		- copy.ExtractBigData(hashtable);
	4337	+ copy.ExtractBigData(versiontable);
3365	4338
3366	4339	copy.clear();
3367	4340
	4341	+ copy.skyboxname = obj.skyboxname;
	4342	+ copy.skyboxext = obj.skyboxext;
	4343	+
3368	4344	for (int i=0; i<obj.Size(); i++)
3369	4345	{
3370	4346	copy.add(obj.get(i));
3371	4347	}
3372	4348
3373		- copy.RestoreBigData(hashtable);
	4349	+ copy.RestoreBigData(versiontable);
3374	4350
3375	4351	CameraPane.SWITCH = temp;
3376	4352
	4353	+ RefreshSelection();
3377	4354	//assert(hashtable.isEmpty());
3378	4355
3379	4356	copy.Touch();
..	..	@@ -3394,43 +4371,144 @@
3394	4371	}
3395	4372	}
3396	4373
3397		- refreshContents();
	4374	+ refreshContents(true);
3398	4375	}
3399	4376
3400		- public void Undo()
3401		- {
3402		- cRadio tab = GetCurrentTab();
	4377	+ cButton previousVersionButton;
	4378	+ cButton restoreButton;
	4379	+ cButton replaceButton;
	4380	+ cButton nextVersionButton;
	4381	+ cButton saveVersionButton;
	4382	+ cButton deleteVersionButton;
3403	4383
3404		- if (tab.undoindex == 0)
	4384	+ boolean muteSlider;
	4385	+
	4386	+ int VersionCount()
	4387	+ {
	4388	+ int count = 0;
	4389	+
	4390	+ for (int i = copy.versionlist.length; --i >= 0;)
	4391	+ {
	4392	+ if (copy.versionlist[i] != null)
	4393	+ count++;
	4394	+ }
	4395	+
	4396	+ return count;
	4397	+ }
	4398	+
	4399	+ void SetVersionStates()
	4400	+ {
	4401	+ //if (true)
	4402	+ // return;
	4403	+
	4404	+ //cRadio tab = GetCurrentTab();
	4405	+
	4406	+ restoreButton.setEnabled(copy.versionindex != -1);
	4407	+ replaceButton.setEnabled(copy.versionindex != -1);
	4408	+
	4409	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4410	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4411	+
	4412	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4413	+ copy.versionlist[copy.versionindex + 1] != null);
	4414	+
	4415	+ muteSlider = true;
	4416	+ versionSlider.setMinimum(0);
	4417	+ versionSlider.setMaximum(VersionCount() - 1);
	4418	+ versionSlider.setInteger(copy.versionindex);
	4419	+ versionSlider.setEnabled(copy.versionindex != -1);
	4420	+ muteSlider = false;
	4421	+ }
	4422	+
	4423	+ public boolean PreviousVersion()
	4424	+ {
	4425	+ // Option?
	4426	+ Replace();
	4427	+
	4428	+ System.err.println("Undo");
	4429	+
	4430	+ //cRadio tab = GetCurrentTab();
	4431	+
	4432	+ if (copy.versionindex == 0)
3405	4433	{
3406	4434	java.awt.Toolkit.getDefaultToolkit().beep();
3407		- return;
	4435	+ return false;
3408	4436	}
3409	4437
3410		- if (tab.graphs[tab.undoindex] == null)
3411		- {
3412		- Save();
3413		- tab.undoindex -= 1;
3414		- }
	4438	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4439	+// {
	4440	+// if (Save(false))
	4441	+// tab.versionindex -= 1;
	4442	+// else
	4443	+// {
	4444	+// if (tab.versionindex <= 0)
	4445	+// return false;
	4446	+// else
	4447	+// tab.versionindex -= 1;
	4448	+// }
	4449	+// }
3415	4450
3416		- tab.undoindex -= 1;
	4451	+ copy.versionindex -= 1;
3417	4452
3418		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4453	+ CopyChanged();
	4454	+
	4455	+ return true;
3419	4456	}
3420	4457
3421		- public void Redo()
	4458	+ public boolean Restore()
3422	4459	{
3423		- cRadio tab = GetCurrentTab();
	4460	+ System.err.println("Restore");
3424	4461
3425		- if (tab.graphs[tab.undoindex + 1] == null)
	4462	+ //cRadio tab = GetCurrentTab();
	4463	+
	4464	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4465	+ {
	4466	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4467	+ return false;
	4468	+ }
	4469	+
	4470	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4471	+ CopyChanged();
	4472	+
	4473	+ return true;
	4474	+ }
	4475	+
	4476	+ public boolean Replace()
	4477	+ {
	4478	+ System.err.println("Replace");
	4479	+
	4480	+ //cRadio tab = GetCurrentTab();
	4481	+
	4482	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4483	+ {
	4484	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4485	+ return false;
	4486	+ }
	4487	+
	4488	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4489	+
	4490	+ return true;
	4491	+ }
	4492	+
	4493	+ public void NextVersion()
	4494	+ {
	4495	+ // Option?
	4496	+ Replace();
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionlist[copy.versionindex + 1] == null)
3426	4501	{
3427	4502	java.awt.Toolkit.getDefaultToolkit().beep();
3428	4503	return;
3429	4504	}
3430	4505
3431		- tab.undoindex += 1;
	4506	+ copy.versionindex += 1;
3432	4507
3433		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4508	+ CopyChanged();
	4509	+
	4510	+ //if (!tab.user[tab.versionindex])
	4511	+ // tab.graphs[tab.versionindex] = null;
3434	4512	}
3435	4513
3436	4514	void ImportGFD()
..	..	@@ -3582,7 +4660,7 @@
3582	4660	assert false;
3583	4661	}
3584	4662
3585		- void EditSelection()
	4663	+ void EditSelection(boolean newWindow)
3586	4664	{
3587	4665	}
3588	4666
..	..	@@ -3641,7 +4719,7 @@
3641	4719	//copy.material = new cMaterial(copy.GetMaterial());
3642	4720
3643	4721	current.color = (float) colorField.getFloat();
3644		- current.modulation = (float) modulationField.getFloat();
	4722	+ current.modulation = (float) saturationField.getFloat();
3645	4723	current.metalness = (float) metalnessField.getFloat();
3646	4724	current.diffuse = (float) diffuseField.getFloat();
3647	4725	current.specular = (float) specularField.getFloat();
..	..	@@ -3674,7 +4752,7 @@
3674	4752	cMaterial mat = copy.material;
3675	4753
3676	4754	colorField.SetToolTipValue((mat.color));
3677		- modulationField.SetToolTipValue((mat.modulation));
	4755	+ saturationField.SetToolTipValue((mat.modulation));
3678	4756	metalnessField.SetToolTipValue((mat.metalness));
3679	4757	diffuseField.SetToolTipValue((mat.diffuse));
3680	4758	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3726,9 +4804,28 @@
3726	4804	//copy.Touch();
3727	4805	}
3728	4806
	4807	+ cNumberSlider versionSlider;
	4808	+
3729	4809	public void stateChanged(ChangeEvent e)
3730	4810	{
3731	4811	// assert(false);
	4812	+ if (e.getSource() == versionSlider)
	4813	+ {
	4814	+ if (muteSlider)
	4815	+ return;
	4816	+
	4817	+ Replace();
	4818	+
	4819	+ int version = versionSlider.getInteger();
	4820	+
	4821	+ if (version != -1 && copy.versionlist[version] != null)
	4822	+ {
	4823	+ copy.versionindex = version;
	4824	+ CopyChanged();
	4825	+ }
	4826	+
	4827	+ return;
	4828	+ }
3732	4829
3733	4830	if (freezematerial)
3734	4831	{
..	..	@@ -3764,6 +4861,12 @@
3764	4861	{
3765	4862	//System.out.println("stateChanged = " + this);
3766	4863	materialtouched = true;
	4864	+
	4865	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4866	+ {
	4867	+ saturationField.setFloat(1);
	4868	+ }
	4869	+
3767	4870	applySelf();
3768	4871	//System.out.println("this = " + this);
3769	4872	//System.out.println("PARENT = " + parent);
..	..	@@ -4063,6 +5166,7 @@
4063	5166	{
4064	5167	if (GetTree() != null)
4065	5168	{
	5169	+ GetTree().revalidate();
4066	5170	GetTree().repaint();
4067	5171	}
4068	5172
..	..	@@ -4071,13 +5175,17 @@
4071	5175	ctrlPanel.validate(); // ? new
4072	5176	ctrlPanel.repaint();
4073	5177	}
	5178	+
	5179	+ if (previousVersionButton != null && copy.versionlist != null)
	5180	+ SetVersionStates();
4074	5181	}
4075	5182
4076	5183	static TweenManager tweenManager = new TweenManager();
4077	5184
4078	5185	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	5186	{
4080		- Save();
	5187	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5188	+ Save();
4081	5189	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	5190	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	5191	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +5272,12 @@
4164	5272	{
4165	5273	ResetModel();
4166	5274	Select(thing.GetTreePath(), true, false); // unselect... false);
	5275	+
	5276	+ if (thing.Size() == 0)
	5277	+ {
	5278	+ //EditSelection(false);
	5279	+ }
	5280	+
4167	5281	refreshContents();
4168	5282	}
4169	5283
..	..	@@ -4312,7 +5426,9 @@
4312	5426	readobj.ResetDisplayList();
4313	5427	} catch (Exception e)
4314	5428	{
4315		- //e.printStackTrace();
	5429	+ if (!e.toString().contains("GZIP"))
	5430	+ e.printStackTrace();
	5431	+
4316	5432	try
4317	5433	{
4318	5434	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4386,11 +5502,14 @@
4386	5502
4387	5503	if (readobj != null)
4388	5504	{
4389		- Save();
	5505	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5506	+ // Save();
4390	5507	try
4391	5508	{
4392	5509	//readobj.deepCopySelf(copy);
4393	5510	copy.clear(); // june 2014
	5511	+ copy.skyboxname = readobj.skyboxname;
	5512	+ copy.skyboxext = readobj.skyboxext;
4394	5513	for (int i = 0; i < readobj.size(); i++)
4395	5514	{
4396	5515	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4431,6 +5550,7 @@
4431	5550	}
4432	5551	} catch (ClassCastException e)
4433	5552	{
	5553	+ e.printStackTrace();
4434	5554	assert (false);
4435	5555	Composite c = (Composite) copy;
4436	5556	c.children.clear();
..	..	@@ -4441,17 +5561,31 @@
4441	5561	c.addChild(csg);
4442	5562	}
4443	5563
	5564	+ copy.versionlist = readobj.versionlist;
	5565	+ copy.versionindex = readobj.versionindex;
	5566	+
	5567	+ if (copy.versionlist == null)
	5568	+ {
	5569	+ // Backward compatibility
	5570	+ copy.versionlist = new Object3D[100];
	5571	+ copy.versionindex = -1;
	5572	+
	5573	+ //Save(true);
	5574	+ }
	5575	+
	5576	+ //? SetUndoStates();
	5577	+
4444	5578	ResetModel();
4445	5579	copy.HardTouch(); // recompile?
4446	5580	refreshContents();
4447	5581	}
4448	5582	}
4449	5583
4450		- void load() // throws ClassNotFoundException
	5584	+ void Open() // throws ClassNotFoundException
4451	5585	{
4452	5586	if (Grafreed.standAlone)
4453	5587	{
4454		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5588	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4455	5589	browser.show();
4456	5590	String filename = browser.getFile();
4457	5591	if (filename != null && filename.length() > 0)
..	..	@@ -4528,6 +5662,8 @@
4528	5662
4529	5663	void save()
4530	5664	{
	5665	+ Replace();
	5666	+
4531	5667	if (lastname == null)
4532	5668	{
4533	5669	return;
..	..	@@ -4550,6 +5686,7 @@
4550	5686	//ps.print(buffer.toString());
4551	5687	} catch (IOException e)
4552	5688	{
	5689	+ e.printStackTrace();
4553	5690	}
4554	5691	}
4555	5692
..	..	@@ -4564,6 +5701,8 @@
4564	5701	String filename = browser.getFile();
4565	5702	if (filename != null && filename.length() > 0)
4566	5703	{
	5704	+ if (!filename.endsWith(".gfd"))
	5705	+ filename += ".gfd";
4567	5706	lastname = browser.getDirectory() + filename;
4568	5707	save();
4569	5708	}
..	..	@@ -4730,7 +5869,7 @@
4730	5869	MenuBar menuBar;
4731	5870	Menu fileMenu;
4732	5871	MenuItem newItem;
4733		- MenuItem loadItem;
	5872	+ MenuItem openItem;
4734	5873	MenuItem saveItem;
4735	5874	MenuItem saveAsItem;
4736	5875	MenuItem exportAsItem;
..	..	@@ -4753,22 +5892,37 @@
4753	5892	CheckboxMenuItem toggleSwitchItem;
4754	5893	CheckboxMenuItem toggleRootItem;
4755	5894	CheckboxMenuItem animationItem;
	5895	+ MenuItem archiveItem;
4756	5896	CheckboxMenuItem toggleHandleItem;
4757	5897	CheckboxMenuItem togglePaintItem;
4758	5898	JSplitPane mainPanel;
4759	5899	JScrollPane scrollpane;
	5900	+
4760	5901	JPanel toolbarPanel;
	5902	+
4761	5903	cGridBag treePanel;
	5904	+
4762	5905	JPanel radioPanel;
4763	5906	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5907	+
	5908	+ cGridBag toolboxPanel;
	5909	+ cGridBag skyboxPanel;
4765	5910	cGridBag materialPanel;
	5911	+ cGridBag ctrlPanel;
	5912	+
4766	5913	JScrollPane infoPanel;
	5914	+
4767	5915	cGridBag optionsPanel;
	5916	+
4768	5917	JTabbedPane objectPanel;
	5918	+ boolean materialFlushed;
	5919	+ Object3D latestObject;
	5920	+
4769	5921	cGridBag XYZPanel;
	5922	+
4770	5923	JSplitPane gridPanel;
4771	5924	JSplitPane bigPanel;
	5925	+
4772	5926	cGridBag bigThree;
4773	5927	cGridBag scenePanel;
4774	5928	cGridBag centralPanel;
..	..	@@ -4826,7 +5980,7 @@
4826	5980	JLabel colorLabel;
4827	5981	cNumberSlider colorField;
4828	5982	JLabel modulationLabel;
4829		- cNumberSlider modulationField;
	5983	+ cNumberSlider saturationField;
4830	5984	JLabel metalnessLabel;
4831	5985	cNumberSlider metalnessField;
4832	5986	JLabel diffuseLabel;
..	..	@@ -4857,6 +6011,7 @@
4857	6011	cNumberSlider anisoField;
4858	6012	JLabel anisoVLabel;
4859	6013	cNumberSlider anisoVField;
	6014	+
4860	6015	JLabel cameraLabel;
4861	6016	cNumberSlider cameraField;
4862	6017	JLabel selfshadowLabel;
..	..	@@ -4871,6 +6026,7 @@
4871	6026	cNumberSlider fakedepthField;
4872	6027	JLabel shadowbiasLabel;
4873	6028	cNumberSlider shadowbiasField;
	6029	+
4874	6030	JLabel bumpLabel;
4875	6031	cNumberSlider bumpField;
4876	6032	JLabel noiseLabel;
..	..	@@ -4883,7 +6039,7 @@
4883	6039	cNumberSlider fogField;
4884	6040	JLabel opacityPowerLabel;
4885	6041	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	6042	+ cTree jTree;
4887	6043	//ObjectUI parent;
4888	6044
4889	6045	cNumberSlider normalpushField;