~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,87 @@
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 cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
38	118
39	119	// SCRIPT
40	120
..	..	@@ -138,34 +218,42 @@
138	218	public void closeUI()
139	219	{
140	220	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	221	+// System.out.println("this = " + this);
	222	+// System.out.println("objEditor = " + objEditor);
143	223	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	224	+// objEditor.ctrlPanel.remove(nameField);
145	225
146		- if (!GroupEditor.allparams)
	226	+ objEditor.ctrlPanel.remove(namePanel);
	227	+
	228	+ if (!allparams)
147	229	return;
148	230
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	231	+// objEditor.ctrlPanel.remove(liveCB);
	232	+// objEditor.ctrlPanel.remove(hideCB);
	233	+// objEditor.ctrlPanel.remove(markCB);
	234	+//
	235	+// objEditor.ctrlPanel.remove(randomCB);
	236	+// objEditor.ctrlPanel.remove(speedupCB);
	237	+// objEditor.ctrlPanel.remove(rewindCB);
	238	+//
	239	+// objEditor.ctrlPanel.remove(resetButton);
	240	+// objEditor.ctrlPanel.remove(stepButton);
	241	+//// objEditor.ctrlPanel.remove(stepAllButton);
	242	+//// objEditor.ctrlPanel.remove(resetAllButton);
	243	+// objEditor.ctrlPanel.remove(link2masterCB);
	244	+// //objEditor.ctrlPanel.remove(flipVCB);
	245	+// //objEditor.ctrlPanel.remove(texresMenu);
	246	+// objEditor.ctrlPanel.remove(slowerButton);
	247	+// objEditor.ctrlPanel.remove(fasterButton);
	248	+// objEditor.ctrlPanel.remove(remarkButton);
167	249
168		- Remove(normalpushField);
	250	+ objEditor.ctrlPanel.remove(setupPanel);
	251	+ objEditor.ctrlPanel.remove(setupPanel2);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	253	+ objEditor.ctrlPanel.remove(pushPanel);
	254	+ //objEditor.ctrlPanel.remove(fillPanel);
	255	+
	256	+ //Remove(normalpushField);
169	257	}
170	258
171	259	public ObjEditor GetEditor()
..	..	@@ -209,6 +297,12 @@
209	297	client = inClient;
210	298	copy = client;
211	299
	300	+ if (copy.versionlist == null)
	301	+ {
	302	+ copy.versionlist = new Object3D[100];
	303	+ copy.versionindex = -1;
	304	+ }
	305	+
212	306	// "this" is not called: SetupUI2(objEditor);
213	307	}
214	308
..	..	@@ -222,6 +316,12 @@
222	316	client = inClient;
223	317	copy = client;
224	318
	319	+ if (copy.versionlist == null)
	320	+ {
	321	+ copy.versionlist = new Object3D[100];
	322	+ copy.versionindex = -1;
	323	+ }
	324	+
225	325	SetupUI2(callee.GetEditor());
226	326	}
227	327
..	..	@@ -236,6 +336,7 @@
236	336	//localCopy.parent = null;
237	337
238	338	frame = new JFrame();
	339	+ frame.setUndecorated(false);
239	340	objEditor = this;
240	341	this.callee = callee;
241	342
..	..	@@ -253,6 +354,12 @@
253	354	copy = localCopy;
254	355	copy.editWindow = this;
255	356
	357	+ if (copy.versionlist == null)
	358	+ {
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
	361	+ }
	362	+
256	363	SetupMenu();
257	364
258	365	//SetupName(objEditor); // new
..	..	@@ -266,28 +373,49 @@
266	373	return frame.action(event, obj);
267	374	}
268	375
	376	+ // Cannot work without static
	377	+ static boolean allparams = true;
	378	+
	379	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	380	+
269	381	void SetupMenu()
270	382	{
271	383	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	384	+ menuBar.add(fileMenu = new Menu("File"));
	385	+ fileMenu.add(newItem = new MenuItem("New"));
	386	+ fileMenu.add(openItem = new MenuItem("Open..."));
	387	+
	388	+ //oe.menuBar.add(menu = new Menu("Include"));
	389	+ Menu menu = new Menu("Import");
	390	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	391	+ importOBJItem.addActionListener(this);
	392	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	393	+ import3DSItem.addActionListener(this);
	394	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	395	+ importVRMLX3DItem.addActionListener(this);
	396	+ menu.add("-");
	397	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	398	+ importGFDItem.addActionListener(this);
	399	+ fileMenu.add(menu);
	400	+ fileMenu.add("-");
	401	+
	402	+ fileMenu.add(saveItem = new MenuItem("Save"));
	403	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	404	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	405	+ fileMenu.add("-");
	406	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	407	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	408	+ fileMenu.add("-");
282	409	if (client.parent != null)
283	410	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	411	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	412	} else
286	413	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	414	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	415	}
289	416
290		- loadItem.addActionListener(this);
	417	+ newItem.addActionListener(this);
	418	+ openItem.addActionListener(this);
291	419	saveItem.addActionListener(this);
292	420	saveAsItem.addActionListener(this);
293	421	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +423,71 @@
295	423	//povItem.addActionListener(this);
296	424	closeItem.addActionListener(this);
297	425
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	426	objectPanel = new JTabbedPane();
	427	+
	428	+ ChangeListener changeListener = new ChangeListener()
	429	+ {
	430	+ public void stateChanged(ChangeEvent changeEvent)
	431	+ {
	432	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	433	+// {
	434	+// if (latestObject != null)
	435	+// {
	436	+// refreshContents(true);
	437	+// SetMaterial(latestObject);
	438	+// }
	439	+//
	440	+// materialFlushed = true;
	441	+// }
	442	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	443	+// {
	444	+// if (listUI.size() == 0)
	445	+// EditSelection(false);
	446	+// }
	447	+
	448	+ refreshContents(false); // To refresh Info tab
	449	+ }
	450	+ };
	451	+ objectPanel.addChangeListener(changeListener);
	452	+
354	453	toolbarPanel = new JPanel();
355	454	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	455	+
	456	+ treePanel = new cGridBag();
357	457	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
361		- materialPanel.setName("Material");
	458	+
	459	+ editPanel = new cGridBag().setVertical(true);
	460	+ //editPanel.setName("Edit");
	461	+
	462	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	463	+
	464	+ editCommandsPanel = new cGridBag();
	465	+ editPanel.add(editCommandsPanel);
	466	+ editPanel.add(ctrlPanel);
	467	+
	468	+ toolboxPanel = new cGridBag().setVertical(true);
	469	+ //toolboxPanel.setName("Toolbox");
	470	+
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
	474	+ //materialPanel.setName("Material");
	475	+
362	476	/JTextPane/
363	477	infoarea = createTextPane();
	478	+ doc = infoarea.getStyledDocument();
	479	+
364	480	infoarea.setEditable(true);
365	481	SetText();
	482	+
366	483	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	484	// infoarea.setOpaque(false);
368	485	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	486	+// TEXTAREA infoarea.setLineWrap(true);
	487	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	488	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
373		- infoPanel.setName("Info");
	489	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	490	+ //infoPanel.setName("Info");
374	491	//infoPanel.setLayout(new BorderLayout());
375	492	//infoPanel.add(createTextPane());
376	493
..	..	@@ -378,16 +495,23 @@
378	495	mainPanel.setName("Main");
379	496	mainPanel.setContinuousLayout(true);
380	497	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	498	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	499	+ mainPanel.setDividerLocation(0.5); //1.0);
	500	+ mainPanel.setResizeWeight(0.5);
	501	+
	502	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	503	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	504	+ divider.setDividerSize(15);
	505	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	506	+
	507	+ mainPanel.setUI(new BasicSplitPaneUI());
	508	+
385	509	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	510	//mainPanel.setLayout(new GridBagLayout());
387	511	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	512	+// treePanel.setLayout(new GridBagLayout());
	513	+ //ctrlPanel.setLayout(new GridBagLayout());
	514	+ //materialPanel.setLayout(new GridBagLayout());
391	515
392	516	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	517	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +550,7 @@
426	550	static String newline = "\n";
427	551	protected static final String buttonString = "JButton";
428	552	StyledDocument doc;
429		- JTextArea infoarea;
	553	+ JTextPane infoarea;
430	554
431	555	void ClearInfo()
432	556	{
..	..	@@ -449,10 +573,10 @@
449	573	e.printStackTrace();
450	574	}
451	575
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	576	+// String selection = infoarea.getText();
	577	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	578	+// java.awt.datatransfer.Clipboard clipboard =
	579	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	580	//clipboard.setContents(data, data);
457	581	}
458	582
..	..	@@ -475,13 +599,13 @@
475	599	//SendInfo("Name:", "bold");
476	600	if (sel.GetTextures() != null \|\| debug)
477	601	{
478		- si.SendInfo(sel.toString(), "bold");
	602	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	603	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	604	if (sel.Size() > 0)
481	605	{
482	606	si.SendInfo("#children = " + sel.Size(), "regular");
483	607	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	608	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	609	if (debug)
486	610	{
487	611	try
..	..	@@ -493,7 +617,10 @@
493	617	}
494	618
495	619	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	620	+ {
	621	+ si.SendInfo(" BBox min: " + minima, "regular");
	622	+ si.SendInfo(" BBox max: " + maxima, "regular");
	623	+ }
497	624
498	625	if (sel.bRep != null)
499	626	{
..	..	@@ -520,7 +647,7 @@
520	647	}
521	648	if (sel.support != null)
522	649	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	650	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	651	}
525	652	if (sel.scriptnode != null)
526	653	{
..	..	@@ -591,6 +718,9 @@
591	718	{
592	719	CameraPane.pointflow = (PointFlow) sel;
593	720	}
	721	+
	722	+ si.SendInfo("_____________________", "regular");
	723	+ si.SendInfo("", "regular");
594	724	}
595	725	}
596	726
..	..	@@ -606,68 +736,194 @@
606	736	}
607	737	}
608	738
	739	+//static GraphicsDevice device = GraphicsEnvironment
	740	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	741	+
	742	+ Rectangle keeprect;
	743	+ cRadio radio;
	744	+
	745	+cButton keepButton;
	746	+ cButton twoButton; // Full 3D
	747	+ cButton sixButton;
	748	+ cButton threeButton;
	749	+ cButton sevenButton;
	750	+ cButton fourButton; // full panel
	751	+ cButton oneButton; // full XYZ
	752	+ //cButton currentLayout;
	753	+
	754	+ boolean maximized;
	755	+
	756	+ cButton fullscreenLayout;
	757	+
	758	+ void Minimize()
	759	+ {
	760	+ frame.setState(Frame.ICONIFIED);
	761	+ frame.validate();
	762	+ }
	763	+
	764	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	765	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	766	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	767	+ void Maximize()
	768	+ {
	769	+ if (CameraPane.FULLSCREEN)
	770	+ {
	771	+ ToggleFullScreen();
	772	+ }
	773	+
	774	+ if (maximized)
	775	+ {
	776	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	777	+ }
	778	+ else
	779	+ {
	780	+ keeprect = frame.getBounds();
	781	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	782	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	783	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	784	+// frame.setState(Frame.MAXIMIZED_BOTH);
	785	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	786	+ }
	787	+
	788	+ maximized ^= true;
	789	+
	790	+ frame.validate();
	791	+ }
	792	+
	793	+ cButton minButton;
	794	+ cButton maxButton;
	795	+ cButton fullButton;
	796	+
609	797	void ToggleFullScreen()
610	798	{
611		- if (CameraPane.FULLSCREEN)
	799	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	800	+
	801	+ cameraView.ToggleFullScreen();
	802	+
	803	+ if (!CameraPane.FULLSCREEN)
612	804	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	805	+ device.setFullScreenWindow(null);
	806	+ frame.dispose();
	807	+ frame.setUndecorated(false);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
	810	+
	811	+ //frame.setVisible(false);
	812	+// frame.removeNotify();
	813	+// frame.setUndecorated(false);
	814	+// frame.addNotify();
	815	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	816	+
	817	+// X frame.getContentPane().remove(/"Center",/bigThree);
	818	+// X framePanel.add(bigThree);
	819	+// X frame.getContentPane().add(/"Center",/framePanel);
	820	+ framePanel.setDividerLocation(46);
	821	+
	822	+ //frame.setVisible(true);
	823	+ radio.layout = keepButton;
	824	+ //theFrame = null;
	825	+ keepButton = null;
	826	+ radio.layout.doClick();
	827	+
616	828	} else
617	829	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	830	+ keepButton = radio.layout;
	831	+ //keeprect = frame.getBounds();
	832	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	833	+// frame.getToolkit().getScreenSize().height);
	834	+ //frame.setVisible(false);
	835	+
	836	+ frame.dispose();
	837	+ frame.setUndecorated(true);
	838	+ device.setFullScreenWindow(frame);
	839	+ frame.validate();
	840	+ frame.setVisible(true);
	841	+// frame.removeNotify();
	842	+// frame.setUndecorated(true);
	843	+// frame.addNotify();
	844	+// X frame.getContentPane().remove(/"Center",/framePanel);
	845	+// X framePanel.remove(bigThree);
	846	+// X frame.getContentPane().add(/"Center",/bigThree);
	847	+ framePanel.setDividerLocation(0);
	848	+
	849	+ radio.layout = fullscreenLayout;
	850	+ radio.layout.doClick();
	851	+ //frame.setVisible(true);
621	852	}
622		- cameraView.ToggleFullScreen();
	853	+ frame.validate();
	854	+
	855	+ cameraView.requestFocusInWindow();
623	856	}
624	857
625		- private JTextArea createTextPane()
	858	+ private Object3D CompressCopy()
626	859	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	860	+ boolean temp = CameraPane.SWITCH;
	861	+ CameraPane.SWITCH = false;
	862	+
	863	+ copy.ExtractBigData(versiontable);
	864	+ // if (copy == client)
	865	+
	866	+ Object3D versions[] = copy.versionlist;
	867	+ copy.versionlist = null;
	868	+
	869	+ //byte[] compress = Compress(copy);
	870	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	871	+
	872	+ copy.versionlist = versions;
	873	+
	874	+ copy.RestoreBigData(versiontable);
	875	+
	876	+ CameraPane.SWITCH = temp;
	877	+
	878	+ return compress;
	879	+ }
642	880
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	881	+ private JTextPane createTextPane()
	882	+ {
	883	+// TEXTAREA String[] initString =
	884	+// {
	885	+// "This is an editable JTextPane, ", //regular
	886	+// "another ", //italic
	887	+// "styled ", //bold
	888	+// "text ", //small
	889	+// "component, ", //large
	890	+// "which supports embedded components..." + newline,//regular
	891	+// " " + newline, //button
	892	+// "...and embedded icons..." + newline, //regular
	893	+// " ", //icon
	894	+// newline + "JTextPane is a subclass of JEditorPane that "
	895	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	896	+// + "cover methods for interacting with those objects."
	897	+// };
	898	+//
	899	+// String[] initStyles =
	900	+// {
	901	+// "regular", "italic", "bold", "small", "large",
	902	+// "regular", "button", "regular", "icon",
	903	+// "regular"
	904	+// };
	905	+//
	906	+// JTextPane textPane = new JTextPane();
	907	+// textPane.setEditable(true);
	908	+// /StyledDocument/ doc = textPane.getStyledDocument();
	909	+// addStylesToDocument(doc);
	910	+//
	911	+// try
	912	+// {
	913	+// for (int j = 0; j < 2; j++)
	914	+// {
	915	+// for (int i = 0; i < initString.length; i++)
	916	+// {
	917	+// doc.insertString(doc.getLength(), initString[i],
	918	+// doc.getStyle(initStyles[i]));
	919	+// }
	920	+// }
	921	+// } catch (BadLocationException ble)
	922	+// {
	923	+// System.err.println("Couldn't insert initial text into text pane.");
	924	+// }
649	925
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	926	+ return new JTextPane(); // textPane;
671	927	}
672	928
673	929	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +976,7 @@
720	976	protected static ImageIcon createImageIcon(String path,
721	977	String description)
722	978	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	979	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	980	if (imgURL != null)
725	981	{
726	982	return new ImageIcon(imgURL, description);
..	..	@@ -743,6 +999,7 @@
743	999	{
744	1000	SetupMaterial(materialPanel);
745	1001	}
	1002	+
746	1003	//SetupName();
747	1004	//SetupViews();
748	1005	}
..	..	@@ -752,6 +1009,7 @@
752	1009	// NumberSlider vDivsField;
753	1010	// JCheckBox endcaps;
754	1011	JCheckBox liveCB;
	1012	+ JCheckBox selectableCB;
755	1013	JCheckBox hideCB;
756	1014	JCheckBox link2masterCB;
757	1015	JCheckBox markCB;
..	..	@@ -759,7 +1017,12 @@
759	1017	JCheckBox speedupCB;
760	1018	JCheckBox rewindCB;
761	1019	JCheckBox flipVCB;
	1020	+
	1021	+ cCheckBox toggleTextureCB;
	1022	+ cCheckBox toggleSwitchCB;
	1023	+
762	1024	JComboBox texresMenu;
	1025	+
763	1026	JButton resetButton;
764	1027	JButton stepButton;
765	1028	JButton stepAllButton;
..	..	@@ -767,115 +1030,87 @@
767	1030	JButton slowerButton;
768	1031	JButton fasterButton;
769	1032	JButton remarkButton;
	1033	+
	1034	+ cGridBag editPanel;
	1035	+ cGridBag editCommandsPanel;
	1036	+
	1037	+ cGridBag namePanel;
	1038	+ cGridBag setupPanel;
	1039	+ cGridBag setupPanel2;
	1040	+ cGridBag objectCommandsPanel;
	1041	+ cGridBag pushPanel;
	1042	+ cGridBag fillPanel;
770	1043
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1044	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1045	{
773	1046	JCheckBox cb;
774	1047
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1048	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1049	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1050
785	1051	return cb;
786	1052	}
787	1053
788		- cButton AddButton(ObjEditor oe, String label)
	1054	+ cButton AddButton(cGridBag panel, String label)
789	1055	{
790	1056	cButton cb;
791	1057
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1058	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1059	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1060
802	1061	return cb;
803	1062	}
804	1063
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1064	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1065	{
807	1066	JComboBox combo;
808	1067
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	1068	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1069	combo.addActionListener(this);
813	1070
814	1071	return combo;
815	1072	}
816	1073
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1074	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1075	{
819		- NumberSlider combo;
	1076	+ cGridBag control = new cGridBag();
	1077	+
	1078	+ cNumberSlider combo;
820	1079
821	1080	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1081	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1082	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1083	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1084	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1085	+
	1086	+ panel.add(control);
	1087	+
	1088	+ return control;
841	1089	}
842	1090
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1091	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	1092	{
845		- NumberSlider combo;
	1093	+ cGridBag control = new cGridBag();
	1094	+
	1095	+ cNumberSlider combo;
846	1096
847	1097	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1098	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	1099	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1100	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1101	combo.setInteger(current);
861	1102
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1103	+ panel.add(control);
	1104	+
	1105	+ return control;
867	1106	}
868	1107
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1108	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1109	{
871	1110	JTextArea text;
872	1111
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1112	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1113	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1114
880	1115	return text;
881	1116	}
..	..	@@ -905,9 +1140,16 @@
905	1140	objEditor.ctrlPanel.remove(j);
906	1141	}
907	1142
	1143	+ void Remove(cNumberSlider j)
	1144	+ {
	1145	+ j.removeChangeListener(this);
	1146	+ //objEditor.ctrlPanel.remove(j.label);
	1147	+ objEditor.ctrlPanel.remove(j);
	1148	+ }
	1149	+
908	1150	/*
909	1151	*/
910		- void Return() // ObjEditor oe)
	1152	+ void Return0() // ObjEditor oe)
911	1153	{
912	1154	aConstraints.gridy += 1;
913	1155	aConstraints.gridx = 0;
..	..	@@ -962,37 +1204,92 @@
962	1204
963	1205	void SetupUI2(ObjEditor oe)
964	1206	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1207	+ //SetupName(oe);
970	1208
971		- if (!GroupEditor.allparams)
	1209	+ namePanel = new cGridBag();
	1210	+
	1211	+ //if (copy.pinned)
	1212	+ {
	1213	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1214	+ pinButton.setSelected(copy.pinned);
	1215	+ cGridBag t = new cGridBag();
	1216	+ t.preferredWidth = 2;
	1217	+ t.add(pinButton);
	1218	+ namePanel.add(t);
	1219	+
	1220	+ pinButton.addItemListener(this);
	1221	+ }
	1222	+
	1223	+ nameField = AddText(namePanel, copy.GetName());
	1224	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1225	+ oe.ctrlPanel.add(namePanel);
	1226	+
	1227	+ oe.ctrlPanel.Return();
	1228	+
	1229	+ if (!allparams)
972	1230	return;
973	1231
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1232	+ setupPanel = new cGridBag().setVertical(false);
	1233	+
	1234	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1235	+ liveCB.setToolTipText("Animate object");
	1236	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1237	+ selectableCB.setToolTipText("Make object selectable");
977	1238	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- stepButton = AddButton(oe, "Step");
	1239	+
	1240	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1241	+ hideCB.setToolTipText("Hide object");
	1242	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1243	+ markCB.setToolTipText("As animation target transform");
	1244	+
	1245	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1246	+
	1247	+ setupPanel2 = new cGridBag().setVertical(false);
	1248	+
	1249	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1250	+ rewindCB.setToolTipText("Rewind animation");
	1251	+
	1252	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1253	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1254	+
	1255	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1256	+ link2masterCB.setToolTipText("Attach to support");
	1257	+
	1258	+ if (Globals.ADVANCED)
	1259	+ {
	1260	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1261	+ speedupCB.setToolTipText("Option motion capture");
	1262	+ }
	1263	+
	1264	+ oe.ctrlPanel.add(setupPanel);
	1265	+ oe.ctrlPanel.Return();
	1266	+ oe.ctrlPanel.add(setupPanel2);
	1267	+ oe.ctrlPanel.Return();
	1268	+
	1269	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1270	+
	1271	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1272	+ resetButton.setToolTipText("Jump to frame zero");
	1273	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1274	+ stepButton.setToolTipText("Step one frame");
984	1275	// resetAllButton = AddButton(oe, "Reset All");
985	1276	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1277	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1278	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1279	+ slowerButton.setToolTipText("Decrease animation speed");
	1280	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1281	+ fasterButton.setToolTipText("Increase animation speed");
	1282	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1283	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1284
992		- Return();
	1285	+ oe.ctrlPanel.add(objectCommandsPanel);
	1286	+ oe.ctrlPanel.Return();
993	1287
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1288	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1289	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1290	+ //Return();
	1291	+
	1292	+ oe.ctrlPanel.Return();
996	1293
997	1294	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1295	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1384,7 @@
1087	1384	oe.aConstraints.gridwidth = 1;
1088	1385	/**/
1089	1386	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1387	+ oe.ctrlPanel.Return();
1091	1388
1092	1389	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1390	//textureButton.setEnabled(false);
..	..	@@ -1191,8 +1488,11 @@
1191	1488	//worldPanel.setName("World");
1192	1489	centralPanel = new cGridBag();
1193	1490	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1491	+
	1492	+ if (Globals.ADVANCED)
	1493	+ {
	1494	+ timelinePanel = new JPanel(new BorderLayout());
	1495	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1496
1197	1497	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1498	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1501,10 @@
1201	1501	// cameraPanel.setDividerSize(9);
1202	1502	cameraPanel.setResizeWeight(1.0);
1203	1503
	1504	+ }
	1505	+
1204	1506	centralPanel.add(cameraView);
	1507	+ centralPanel.setFocusable(true);
1205	1508	//frame.setJMenuBar(timelineMenubar);
1206	1509	//centralPanel.add(timelinePanel);
1207	1510
..	..	@@ -1227,6 +1530,7 @@
1227	1530	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1531	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1532	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1533	+ //XYZPanel.setName("XYZ");
1230	1534
1231	1535	/*
1232	1536	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,12 +1568,29 @@
1264	1568	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1569	//tmp.setName("Edit");
1266	1570	objectPanel.add(materialPanel);
1267		- JPanel north = new JPanel(new BorderLayout());
1268		- north.setName("Edit");
1269		- north.add(ctrlPanel, BorderLayout.NORTH);
1270		- objectPanel.add(north);
1271		- objectPanel.add(infoPanel);
	1571	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1572	+ objectPanel.setToolTipTextAt(0, "Material");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1272	1577
	1578	+ objectPanel.add(skyboxPanel);
	1579	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1580	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1581	+
	1582	+// JPanel north = new JPanel(new BorderLayout());
	1583	+// north.setName("Edit");
	1584	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1585	+// objectPanel.add(north);
	1586	+ objectPanel.add(editPanel);
	1587	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1588	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1589	+
	1590	+ objectPanel.add(XYZPanel);
	1591	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1592	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1593	+
1273	1594	/*
1274	1595	aConstraints.gridx = 0;
1275	1596	aConstraints.gridwidth = 1;
..	..	@@ -1277,7 +1598,7 @@
1277	1598	aConstraints.gridy += 1;
1278	1599	aConstraints.gridwidth = 1;
1279	1600	mainPanel.add(objectPanel, aConstraints);
1280		- */
	1601	+ */
1281	1602
1282	1603	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1283	1604	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1289,23 +1610,28 @@
1289	1610	scrollpane.addMouseWheelListener(this); // Default not fast enough
1290	1611
1291	1612	/JTabbedPane/ scenePanel = new cGridBag();
1292		- scenePanel.preferredWidth = 7;
	1613	+ scenePanel.preferredWidth = 5;
1293	1614
1294	1615	JTabbedPane tabbedPane = new JTabbedPane();
1295	1616	tabbedPane.add(scrollpane);
1296	1617
1297		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1298		-
1299		- optionsPanel = new JPanel(new GridBagLayout());
	1618	+ optionsPanel = new cGridBag().setVertical(false);
1300	1619
1301	1620	optionsPanel.setName("Options");
1302	1621
1303		- AddOptions(optionsPanel, aConstraints);
	1622	+ AddOptions(optionsPanel); //, aConstraints);
1304	1623
1305	1624	tabbedPane.add(optionsPanel);
1306	1625
	1626	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1627	+
1307	1628	scenePanel.add(tabbedPane);
1308	1629
	1630	+ //if (Globals.ADVANCED)
	1631	+ tabbedPane.add(infoPanel);
	1632	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1633	+ tabbedPane.setToolTipTextAt(3, "Information");
	1634	+
1309	1635	/*
1310	1636	cTree jTree = new cTree(null);
1311	1637	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1367,7 +1693,7 @@
1367	1693	bigThree = new cGridBag();
1368	1694	bigThree.addComponent(scenePanel);
1369	1695	bigThree.addComponent(centralPanel);
1370		- bigThree.addComponent(XYZPanel);
	1696	+ //bigThree.addComponent(XYZPanel);
1371	1697
1372	1698	// // SIDE EFFECT!!!
1373	1699	// aConstraints.gridx = 0;
..	..	@@ -1376,9 +1702,9 @@
1376	1702	// aConstraints.gridheight = 1;
1377	1703
1378	1704	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1379		- framePanel.setContinuousLayout(true);
1380		- framePanel.setOneTouchExpandable(true);
1381		- framePanel.setDividerLocation(0.8);
	1705	+ framePanel.setContinuousLayout(false);
	1706	+ framePanel.setOneTouchExpandable(false);
	1707	+ //.setDividerLocation(0.8);
1382	1708	//framePanel.setDividerSize(15);
1383	1709	//framePanel.setResizeWeight(0.15);
1384	1710	framePanel.setName("Frame");
..	..	@@ -1395,15 +1721,19 @@
1395	1721
1396	1722	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1397	1723
1398		- frame.setSize(1024, 768);
1399		- frame.show();
1400		-
	1724	+ frame.setSize(1280, 860);
	1725	+
	1726	+ cameraView.requestFocusInWindow();
	1727	+
1401	1728	gridPanel.setDividerLocation(1.0);
	1729	+
	1730	+ frame.validate();
	1731	+
	1732	+ frame.setVisible(true);
1402	1733
1403	1734	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1404	1735	frame.addWindowListener(new WindowAdapter()
1405	1736	{
1406		-
1407	1737	public void windowClosing(WindowEvent e)
1408	1738	{
1409	1739	Close();
..	..	@@ -1411,7 +1741,7 @@
1411	1741	});
1412	1742	}
1413	1743
1414		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1744	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1415	1745	{
1416	1746	}
1417	1747
..	..	@@ -1426,260 +1756,556 @@
1426	1756	ctrlPanel.removeAll();
1427	1757	}
1428	1758
1429		- void SetupMaterial(JPanel ctrlPanel)
	1759	+ void SetupMaterial(cGridBag materialpanel)
1430	1760	{
1431		- aConstraints.weighty = 0;
1432		- //aConstraints.weightx = 1;
1433		- /*
	1761	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1762	+
	1763	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1764	+ skin.setToolTipText("Skin");
	1765	+ skin.addMouseListener(new MouseAdapter()
	1766	+ {
	1767	+ public void mouseClicked(MouseEvent e)
	1768	+ {
	1769	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1770	+ cMaterial material = object.material;
	1771	+
	1772	+ // Skin
	1773	+ colorField.setFloat(material.color);
	1774	+ saturationField.setFloat(material.modulation);
	1775	+ subsurfaceField.setFloat(material.subsurface);
	1776	+ selfshadowField.setFloat(material.diffuseness);
	1777	+ diffusenessField.setFloat(material.factor);
	1778	+ shininessField.setFloat(material.shininess);
	1779	+ shadowbiasField.setFloat(material.shadowbias);
	1780	+ diffuseField.setFloat(material.diffuse);
	1781	+ specularField.setFloat(material.specular);
	1782	+
	1783	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1784	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1785	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1786	+
	1787	+ materialtouched = true;
	1788	+ applySelf();
	1789	+ }
	1790	+ });
	1791	+ presetpanel.add(skin);
	1792	+
	1793	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1794	+ lambert.setToolTipText("Diffuse");
	1795	+ lambert.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1800	+ cMaterial material = object.material;
	1801	+
	1802	+ diffusenessField.setFloat(material.factor);
	1803	+ selfshadowField.setFloat(material.diffuseness);
	1804	+
	1805	+ materialtouched = true;
	1806	+ applySelf();
	1807	+ }
	1808	+ });
	1809	+ presetpanel.add(lambert);
	1810	+
	1811	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1812	+ diffuse2.setToolTipText("Diffuse2");
	1813	+ diffuse2.addMouseListener(new MouseAdapter()
	1814	+ {
	1815	+ public void mouseClicked(MouseEvent e)
	1816	+ {
	1817	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1818	+ cMaterial material = object.material;
	1819	+
	1820	+ diffusenessField.setFloat(material.factor);
	1821	+ selfshadowField.setFloat(material.diffuseness);
	1822	+
	1823	+ materialtouched = true;
	1824	+ applySelf();
	1825	+ }
	1826	+ });
	1827	+ presetpanel.add(diffuse2);
	1828	+
	1829	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1830	+ diffusemoon.setToolTipText("Moon");
	1831	+ diffusemoon.addMouseListener(new MouseAdapter()
	1832	+ {
	1833	+ public void mouseClicked(MouseEvent e)
	1834	+ {
	1835	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1836	+ cMaterial material = object.material;
	1837	+
	1838	+ diffusenessField.setFloat(material.factor);
	1839	+ selfshadowField.setFloat(material.diffuseness);
	1840	+
	1841	+ materialtouched = true;
	1842	+ applySelf();
	1843	+ }
	1844	+ });
	1845	+ presetpanel.add(diffusemoon);
	1846	+
	1847	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1848	+ diffusemoon2.setToolTipText("Moon2");
	1849	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1850	+ {
	1851	+ public void mouseClicked(MouseEvent e)
	1852	+ {
	1853	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1854	+ cMaterial material = object.material;
	1855	+
	1856	+ diffusenessField.setFloat(material.factor);
	1857	+ selfshadowField.setFloat(material.diffuseness);
	1858	+
	1859	+ materialtouched = true;
	1860	+ applySelf();
	1861	+ }
	1862	+ });
	1863	+ presetpanel.add(diffusemoon2);
	1864	+
	1865	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1866	+ diffusemoon3.setToolTipText("Moon3");
	1867	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1868	+ {
	1869	+ public void mouseClicked(MouseEvent e)
	1870	+ {
	1871	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1872	+ cMaterial material = object.material;
	1873	+
	1874	+ diffusenessField.setFloat(material.factor);
	1875	+ selfshadowField.setFloat(material.diffuseness);
	1876	+
	1877	+ materialtouched = true;
	1878	+ applySelf();
	1879	+ }
	1880	+ });
	1881	+ presetpanel.add(diffusemoon3);
	1882	+
	1883	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1884	+ diffusesheen.setToolTipText("Sheen");
	1885	+ diffusesheen.addMouseListener(new MouseAdapter()
	1886	+ {
	1887	+ public void mouseClicked(MouseEvent e)
	1888	+ {
	1889	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1890	+ cMaterial material = object.material;
	1891	+
	1892	+ sheenField.setFloat(material.sheen);
	1893	+
	1894	+ materialtouched = true;
	1895	+ applySelf();
	1896	+ }
	1897	+ });
	1898	+ presetpanel.add(diffusesheen);
	1899	+
	1900	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1901	+ rough.setToolTipText("Rough metal");
	1902	+ rough.addMouseListener(new MouseAdapter()
	1903	+ {
	1904	+ public void mouseClicked(MouseEvent e)
	1905	+ {
	1906	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1907	+ cMaterial material = object.material;
	1908	+
	1909	+ shininessField.setFloat(material.shininess);
	1910	+ velvetField.setFloat(material.velvet);
	1911	+
	1912	+ materialtouched = true;
	1913	+ applySelf();
	1914	+ }
	1915	+ });
	1916	+ presetpanel.add(rough);
	1917	+
	1918	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1919	+ rough2.setToolTipText("Medium metal");
	1920	+ rough2.addMouseListener(new MouseAdapter()
	1921	+ {
	1922	+ public void mouseClicked(MouseEvent e)
	1923	+ {
	1924	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1925	+ cMaterial material = object.material;
	1926	+
	1927	+ shininessField.setFloat(material.shininess);
	1928	+ lightareaField.setFloat(material.lightarea);
	1929	+
	1930	+ materialtouched = true;
	1931	+ applySelf();
	1932	+ }
	1933	+ });
	1934	+ presetpanel.add(rough2);
	1935	+
	1936	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1937	+ shini0.setToolTipText("Shiny");
	1938	+ shini0.addMouseListener(new MouseAdapter()
	1939	+ {
	1940	+ public void mouseClicked(MouseEvent e)
	1941	+ {
	1942	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1943	+ cMaterial material = object.material;
	1944	+
	1945	+ shininessField.setFloat(material.shininess);
	1946	+ lightareaField.setFloat(material.lightarea);
	1947	+
	1948	+ materialtouched = true;
	1949	+ applySelf();
	1950	+ }
	1951	+ });
	1952	+ presetpanel.add(shini0);
	1953	+
	1954	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1955	+ shini1.setToolTipText("Shiny2");
	1956	+ shini1.addMouseListener(new MouseAdapter()
	1957	+ {
	1958	+ public void mouseClicked(MouseEvent e)
	1959	+ {
	1960	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1961	+ cMaterial material = object.material;
	1962	+
	1963	+ shininessField.setFloat(material.shininess);
	1964	+ lightareaField.setFloat(material.lightarea);
	1965	+
	1966	+ materialtouched = true;
	1967	+ applySelf();
	1968	+ }
	1969	+ });
	1970	+ presetpanel.add(shini1);
	1971	+
	1972	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1973	+ shini2.setToolTipText("Shiny3");
	1974	+ shini2.addMouseListener(new MouseAdapter()
	1975	+ {
	1976	+ public void mouseClicked(MouseEvent e)
	1977	+ {
	1978	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1979	+ cMaterial material = object.material;
	1980	+
	1981	+ shininessField.setFloat(material.shininess);
	1982	+ lightareaField.setFloat(material.lightarea);
	1983	+
	1984	+ materialtouched = true;
	1985	+ applySelf();
	1986	+ }
	1987	+ });
	1988	+ presetpanel.add(shini2);
	1989	+
	1990	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1991	+ aniso.setToolTipText("AnisoU");
	1992	+ aniso.addMouseListener(new MouseAdapter()
	1993	+ {
	1994	+ public void mouseClicked(MouseEvent e)
	1995	+ {
	1996	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1997	+ cMaterial material = object.material;
	1998	+
	1999	+ anisoField.setFloat(material.aniso);
	2000	+ anisoVField.setFloat(material.anisoV);
	2001	+
	2002	+ materialtouched = true;
	2003	+ applySelf();
	2004	+ }
	2005	+ });
	2006	+ presetpanel.add(aniso);
	2007	+
	2008	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2009	+ aniso2.setToolTipText("AnisoV");
	2010	+ aniso2.addMouseListener(new MouseAdapter()
	2011	+ {
	2012	+ public void mouseClicked(MouseEvent e)
	2013	+ {
	2014	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2015	+ cMaterial material = object.material;
	2016	+
	2017	+ anisoField.setFloat(material.aniso);
	2018	+ anisoVField.setFloat(material.anisoV);
	2019	+
	2020	+ materialtouched = true;
	2021	+ applySelf();
	2022	+ }
	2023	+ });
	2024	+ presetpanel.add(aniso2);
	2025	+
	2026	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2027	+ aniso3.setToolTipText("AnisoUV");
	2028	+ aniso3.addMouseListener(new MouseAdapter()
	2029	+ {
	2030	+ public void mouseClicked(MouseEvent e)
	2031	+ {
	2032	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2033	+ cMaterial material = object.material;
	2034	+
	2035	+ anisoField.setFloat(material.aniso);
	2036	+ anisoVField.setFloat(material.anisoV);
	2037	+
	2038	+ materialtouched = true;
	2039	+ applySelf();
	2040	+ }
	2041	+ });
	2042	+ presetpanel.add(aniso3);
	2043	+
	2044	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2045	+ velvet0.setToolTipText("Velvet");
	2046	+ velvet0.addMouseListener(new MouseAdapter()
	2047	+ {
	2048	+ public void mouseClicked(MouseEvent e)
	2049	+ {
	2050	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2051	+ cMaterial material = object.material;
	2052	+
	2053	+ diffusenessField.setFloat(material.factor);
	2054	+ selfshadowField.setFloat(material.diffuseness);
	2055	+ sheenField.setFloat(material.sheen);
	2056	+ shininessField.setFloat(material.shininess);
	2057	+ velvetField.setFloat(material.velvet);
	2058	+ shiftField.setFloat(material.shift);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(velvet0);
	2065	+
	2066	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2067	+ bump0.setToolTipText("Bump texture");
	2068	+ bump0.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2076	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2077	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2078	+
	2079	+ materialtouched = true;
	2080	+ applySelf();
	2081	+ }
	2082	+ });
	2083	+ presetpanel.add(bump0);
	2084	+
	2085	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2086	+ halo.setToolTipText("Halo");
	2087	+ halo.addMouseListener(new MouseAdapter()
	2088	+ {
	2089	+ public void mouseClicked(MouseEvent e)
	2090	+ {
	2091	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2092	+ cMaterial material = object.material;
	2093	+
	2094	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2095	+
	2096	+ materialtouched = true;
	2097	+ applySelf();
	2098	+ }
	2099	+ });
	2100	+ presetpanel.add(halo);
	2101	+
	2102	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2103	+ candle.setToolTipText("Candle");
	2104	+ candle.addMouseListener(new MouseAdapter()
	2105	+ {
	2106	+ public void mouseClicked(MouseEvent e)
	2107	+ {
	2108	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2109	+ cMaterial material = object.material;
	2110	+
	2111	+ subsurfaceField.setFloat(material.subsurface);
	2112	+ shadowbiasField.setFloat(material.shadowbias);
	2113	+ ambientField.setFloat(material.ambient);
	2114	+ specularField.setFloat(material.specular);
	2115	+ lightareaField.setFloat(material.lightarea);
	2116	+ shininessField.setFloat(material.shininess);
	2117	+
	2118	+ materialtouched = true;
	2119	+ applySelf();
	2120	+ }
	2121	+ });
	2122	+ presetpanel.add(candle);
	2123	+
	2124	+ cGridBag panel = new cGridBag().setVertical(true);
	2125	+
	2126	+ presetpanel.preferredWidth = 1;
	2127	+
	2128	+ materialpanel.add(presetpanel);
	2129	+ materialpanel.add(panel);
	2130	+
	2131	+ panel.preferredWidth = 8;
	2132	+
	2133	+ /*
1434	2134	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1435	2135	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437		- aConstraints.gridx += 1;
1438		- */
	2136	+ */
1439	2137
1440		- aConstraints.gridwidth = 1;
1441		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	2138	+ cGridBag editBar = new cGridBag().setVertical(false);
	2139	+
	2140	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2141	+ createMaterialButton.setToolTipText("Create material");
1445	2142
1446	2143	/*
1447	2144	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448		- aConstraints.gridx += 1;
1449		- aConstraints.weighty = 0;
1450		- aConstraints.gridwidth = 1;
1451	2145	*/
1452	2146
1453		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454		- aConstraints.gridx += 1;
	2147	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2148	+ clearMaterialButton.setToolTipText("Clear material");
	2149	+
	2150	+ if (Globals.ADVANCED)
	2151	+ {
	2152	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2153	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2154	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2155	+ }
1455	2156
1456		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1457		-
1458		- aConstraints.gridx += 1;
1459		-
1460		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1461		-
1462		- aConstraints.gridx += 1;
1463		-
1464		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1465		-
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.weighty = 0;
1469		- aConstraints.gridwidth = 1;
	2157	+ editBar.preferredHeight = 15;
	2158	+
	2159	+ panel.add(editBar);
	2160	+
1470	2161	/**/
1471	2162	//aConstraints.weighty = 0;
1472	2163	////aConstraints.weightx = 1;
1473	2164	//aConstraints.weighty = 1;
1474	2165	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1475	2166	//aConstraints.gridx += 1;
1476		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1477		- aConstraints.weighty = 0;
1478		- aConstraints.gridx = 0;
1479		- aConstraints.gridy += 1;
1480		- aConstraints.gridwidth = 1;
	2167	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1481	2168
1482		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1483		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1485		- aConstraints.gridx += 1;
1486		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1487		- //aConstraints.weightx = 0;
1488		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1489		- aConstraints.gridx = 0;
1490		- aConstraints.gridy += 1;
1491		- aConstraints.gridwidth = 1;
	2169	+ cGridBag colorSection = new cGridBag().setVertical(true);
1492	2170
1493		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1494		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1495		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1496		- aConstraints.gridx += 1;
1497		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1498		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1499		- aConstraints.gridx = 0;
1500		- aConstraints.gridy += 1;
1501		- aConstraints.gridwidth = 1;
	2171	+ cGridBag huepanel = new cGridBag();
	2172	+ cGridBag huelabel = new cGridBag();
	2173	+ skin = GetLabel("icons/hue.png", false);
	2174	+ skin.fit = true;
	2175	+ huelabel.add(skin);
	2176	+ huelabel.preferredWidth = 20;
	2177	+ huepanel.add(new cGridBag()); // Label
	2178	+ huepanel.add(huelabel); // Field/slider
	2179	+
	2180	+ huepanel.preferredHeight = 7;
1502	2181
1503		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1504		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1506		- aConstraints.gridx += 1;
1507		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1508		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	2182	+ colorSection.add(huepanel);
	2183	+
	2184	+ cGridBag color = new cGridBag();
	2185	+
	2186	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2187	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2188	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1512	2189
1513		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1514		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	2190	+ //colorField.preferredWidth = 200;
	2191	+ colorSection.add(color);
1522	2192
1523		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1524		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	2193	+ cGridBag modulation = new cGridBag();
	2194	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2195	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2196	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2197	+ colorSection.add(modulation);
1532	2198
1533		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1534		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	2199	+ cGridBag opacity = new cGridBag();
	2200	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2201	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2202	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2203	+ colorSection.add(opacity);
1542	2204
1543		- //aConstraints.weighty = 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1545		- //aConstraints.gridx += 1;
1546		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1547		- aConstraints.weighty = 0;
1548		- aConstraints.gridx = 0;
1549		- aConstraints.gridy += 1;
1550		- aConstraints.gridwidth = 1;
	2205	+ colorSection.add(GetSeparator());
	2206	+
	2207	+ cGridBag texture = new cGridBag();
	2208	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2209	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2210	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2211	+ colorSection.add(texture);
1551	2212
1552		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1553		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1555		- aConstraints.gridx += 1;
1556		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1557		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1558		- aConstraints.gridx = 0;
1559		- aConstraints.gridy += 1;
1560		- aConstraints.gridwidth = 1;
	2213	+ panel.add(GetSeparator());
	2214	+
	2215	+ panel.add(colorSection);
	2216	+
	2217	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2218	+
	2219	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2220	+
	2221	+ cGridBag diffuse = new cGridBag();
	2222	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2223	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2224	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2225	+ diffuseSection.add(diffuse);
1561	2226
1562		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1563		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1565		- aConstraints.gridx += 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1567		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1568		- aConstraints.gridx = 0;
1569		- aConstraints.gridy += 1;
1570		- aConstraints.gridwidth = 1;
	2227	+ cGridBag diffuseness = new cGridBag();
	2228	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2229	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2230	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2231	+ diffuseSection.add(diffuseness);
1571	2232
1572		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1573		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1575		- aConstraints.gridx += 1;
1576		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1577		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1578		- aConstraints.gridx = 0;
1579		- aConstraints.gridy += 1;
1580		- aConstraints.gridwidth = 1;
	2233	+ cGridBag selfshadow = new cGridBag();
	2234	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2235	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2236	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2237	+ diffuseSection.add(selfshadow);
1581	2238
1582		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1583		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1585		- aConstraints.gridx += 1;
1586		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1587		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	2239	+ cGridBag sheen = new cGridBag();
	2240	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2241	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2242	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2243	+ diffuseSection.add(sheen);
1591	2244
1592		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1593		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	2245	+ cGridBag subsurface = new cGridBag();
	2246	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2247	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2248	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2249	+ diffuseSection.add(subsurface);
1601	2250
1602		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1603		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	2251	+ cGridBag shadow = new cGridBag();
	2252	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2253	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2254	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2255	+ diffuseSection.add(shadow);
1611	2256
1612		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1613		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	2257	+ cGridBag fakedepth = new cGridBag();
	2258	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2259	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2260	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2261	+ diffuseSection.add(fakedepth);
1621	2262
1622		- //aConstraints.weighty = 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1624		- //aConstraints.gridx += 1;
1625		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1626		- aConstraints.weighty = 0;
1627		- aConstraints.gridx = 0;
1628		- aConstraints.gridy += 1;
1629		- aConstraints.gridwidth = 1;
	2263	+ cGridBag shadowbias = new cGridBag();
	2264	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2265	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2266	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2267	+ diffuseSection.add(shadowbias);
1630	2268
1631		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1632		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1633		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1634		- aConstraints.gridx += 1;
1635		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1636		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1637		- aConstraints.gridx = 0;
1638		- aConstraints.gridy += 1;
1639		- aConstraints.gridwidth = 1;
	2269	+ panel.add(GetSeparator());
	2270	+
	2271	+ panel.add(diffuseSection);
	2272	+
	2273	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2274	+
	2275	+ cGridBag specularSection = new cGridBag().setVertical(true);
1640	2276
1641		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1642		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1644		- aConstraints.gridx += 1;
1645		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1646		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1647		- aConstraints.gridx = 0;
1648		- aConstraints.gridy += 1;
1649		- aConstraints.gridwidth = 1;
	2277	+ cGridBag specular = new cGridBag();
	2278	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2279	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2280	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2281	+ specularSection.add(specular);
1650	2282
1651		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1652		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1654		- aConstraints.gridx += 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1656		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1657		- aConstraints.gridx = 0;
1658		- aConstraints.gridy += 1;
1659		- aConstraints.gridwidth = 1;
	2283	+ cGridBag lightarea = new cGridBag();
	2284	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2285	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2286	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2287	+ specularSection.add(lightarea);
1660	2288
1661		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1662		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1664		- aConstraints.gridx += 1;
1665		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1666		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1667		- aConstraints.gridx = 0;
1668		- aConstraints.gridy += 1;
1669		- aConstraints.gridwidth = 1;
	2289	+ cGridBag shininess = new cGridBag();
	2290	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2291	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2292	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2293	+ specularSection.add(shininess);
1670	2294
1671		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1672		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1674		- aConstraints.gridx += 1;
1675		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1676		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1677		- aConstraints.gridx = 0;
1678		- aConstraints.gridy += 1;
1679		- aConstraints.gridwidth = 1;
	2295	+ cGridBag metalness = new cGridBag();
	2296	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2297	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2298	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2299	+ specularSection.add(metalness);
1680	2300
1681		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1682		- Return();
	2301	+ cGridBag velvet = new cGridBag();
	2302	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2303	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2304	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2305	+ specularSection.add(velvet);
	2306	+
	2307	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2308	+ //Return();
1683	2309	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1684	2310	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	2311	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1690,130 +2316,99 @@
1690	2316	// aConstraints.gridy += 1;
1691	2317	// aConstraints.gridwidth = 1;
1692	2318
1693		- //aConstraints.weighty = 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1695		- //aConstraints.gridx += 1;
1696		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1697		- aConstraints.weighty = 0;
1698		- aConstraints.gridx = 0;
1699		- aConstraints.gridy += 1;
1700		- aConstraints.gridwidth = 1;
	2319	+ cGridBag anisoU = new cGridBag();
	2320	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2321	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2322	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2323	+ specularSection.add(anisoU);
1701	2324
1702		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1703		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1705		- aConstraints.gridx += 1;
1706		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1707		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1708		- aConstraints.gridx = 0;
1709		- aConstraints.gridy += 1;
1710		- aConstraints.gridwidth = 1;
	2325	+ cGridBag anisoV = new cGridBag();
	2326	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2327	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2328	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2329	+ specularSection.add(anisoV);
1711	2330
1712		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1713		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1715		- aConstraints.gridx += 1;
1716		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1717		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1718		- aConstraints.gridx = 0;
1719		- aConstraints.gridy += 1;
1720		- aConstraints.gridwidth = 1;
1721	2331
1722		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1723		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1724		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1725		- aConstraints.gridx += 1;
1726		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1727		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1728		- aConstraints.gridx = 0;
1729		- aConstraints.gridy += 1;
1730		- aConstraints.gridwidth = 1;
	2332	+ panel.add(GetSeparator());
	2333	+
	2334	+ panel.add(specularSection);
	2335	+
	2336	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2337	+
	2338	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1731	2339
1732		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1733		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1735		- aConstraints.gridx += 1;
1736		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1737		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1738		- aConstraints.gridx = 0;
1739		- aConstraints.gridy += 1;
1740		- aConstraints.gridwidth = 1;
1741		- aConstraints.weighty = 0;
	2340	+ cGridBag camera = new cGridBag();
	2341	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2342	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2343	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2344	+ colorSection.add(camera);
1742	2345
1743		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1744		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1745		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1746		- aConstraints.gridx += 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1748		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1749		- aConstraints.gridx = 0;
1750		- aConstraints.gridy += 1;
1751		- aConstraints.gridwidth = 1;
	2346	+ cGridBag ambient = new cGridBag();
	2347	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2348	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2349	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2350	+ colorSection.add(ambient);
1752	2351
1753		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1754		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1756		- aConstraints.gridx += 1;
1757		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1758		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1759		- aConstraints.gridx = 0;
1760		- aConstraints.gridy += 1;
1761		- aConstraints.gridwidth = 1;
	2352	+ cGridBag backlit = new cGridBag();
	2353	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2354	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2355	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2356	+ colorSection.add(backlit);
1762	2357
1763		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1764		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1765		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1766		- aConstraints.gridx += 1;
1767		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1768		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1769		- aConstraints.gridx = 0;
1770		- aConstraints.gridy += 1;
1771		- aConstraints.gridwidth = 1;
	2358	+ //panel.add(new JSeparator());
	2359	+
	2360	+ //panel.add(globalSection);
	2361	+
	2362	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2363	+
	2364	+ cGridBag textureSection = new cGridBag().setVertical(true);
1772	2365
1773		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1774		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1776		- aConstraints.gridx += 1;
1777		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1778		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1779		- aConstraints.gridx = 0;
1780		- aConstraints.gridy += 1;
1781		- aConstraints.gridwidth = 1;
	2366	+ cGridBag bump = new cGridBag();
	2367	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2368	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2369	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2370	+ textureSection.add(bump);
1782	2371
1783		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1784		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1786		- aConstraints.gridx += 1;
1787		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1788		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1789		- aConstraints.gridx = 0;
1790		- aConstraints.gridy += 1;
1791		- aConstraints.gridwidth = 1;
	2372	+ cGridBag noise = new cGridBag();
	2373	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2374	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2376	+ textureSection.add(noise);
1792	2377
1793		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1794		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1795		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1796		- aConstraints.gridx += 1;
1797		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1798		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1799		- aConstraints.gridx = 0;
1800		- aConstraints.gridy += 1;
1801		- aConstraints.gridwidth = 1;
	2378	+ cGridBag power = new cGridBag();
	2379	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2380	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2381	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2382	+ textureSection.add(power);
1802	2383
1803		- //aConstraints.weighty = 1;
1804		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805		- //aConstraints.gridx += 1;
1806		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807		- aConstraints.weighty = 0;
	2384	+ cGridBag borderfade = new cGridBag();
	2385	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2386	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2387	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2388	+ textureSection.add(borderfade);
1808	2389
1809		- aConstraints.gridx = 0;
1810		- aConstraints.gridy = 0;
1811		- aConstraints.gridwidth = 1;
	2390	+ cGridBag fog = new cGridBag();
	2391	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2392	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2393	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2394	+ textureSection.add(fog);
	2395	+
	2396	+ cGridBag opacityPower = new cGridBag();
	2397	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2398	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2399	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2400	+ textureSection.add(opacityPower);
	2401	+
	2402	+ panel.add(GetSeparator());
	2403	+
	2404	+ panel.add(textureSection);
	2405	+
	2406	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	2407
1813	2408	SetMaterial(copy); // .GetMaterial());
1814	2409
1815		- colorField.addChangeListener(this);
1816		- modulationField.addChangeListener(this);
	2410	+ //colorField.addChangeListener(this);
	2411	+// modulationField.addChangeListener(this);
1817	2412	metalnessField.addChangeListener(this);
1818	2413	diffuseField.addChangeListener(this);
1819	2414	specularField.addChangeListener(this);
..	..	@@ -1843,12 +2438,15 @@
1843	2438	opacityPowerField.addChangeListener(this);
1844	2439	/**/
1845	2440
1846		- resetSlidersButton.addActionListener(this);
1847	2441	clearMaterialButton.addActionListener(this);
1848	2442	createMaterialButton.addActionListener(this);
1849		-
1850		- propagateToggle.addItemListener(this);
1851		- multiplyToggle.addItemListener(this);
	2443	+
	2444	+ if (Globals.ADVANCED)
	2445	+ {
	2446	+ resetSlidersButton.addActionListener(this);
	2447	+ propagateToggle.addItemListener(this);
	2448	+ multiplyToggle.addItemListener(this);
	2449	+ }
1852	2450	}
1853	2451
1854	2452	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1866,8 +2464,9 @@
1866	2464	// 3D models
1867	2465	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1868	2466	{
1869		- lastConverter = new com.jmex.model.converters.MaxToJme();
1870		- LoadFile(filename, lastConverter);
	2467	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2468	+ //LoadFile(filename, lastConverter);
	2469	+ LoadObjFile(filename); // New 3ds loader
1871	2470	continue;
1872	2471	}
1873	2472	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2019,7 +2618,7 @@
2019	2618
2020	2619	//? flashIt = false;
2021	2620	CameraPane pane = (CameraPane) cameraView;
2022		- pane.clickStart(location.x, location.y, 0);
	2621	+ pane.clickStart(location.x, location.y, 0, 0);
2023	2622	pane.clickEnd(location.x, location.y, 0, true);
2024	2623
2025	2624	if (group.selection.size() == 1)
..	..	@@ -2068,6 +2667,7 @@
2068	2667	e2.printStackTrace();
2069	2668	}
2070	2669	}
	2670	+
2071	2671	LoadJMEThread loadThread;
2072	2672
2073	2673	class LoadJMEThread extends Thread
..	..	@@ -2125,6 +2725,7 @@
2125	2725	//LoadFile0(filename, converter);
2126	2726	}
2127	2727	}
	2728	+
2128	2729	LoadOBJThread loadObjThread;
2129	2730
2130	2731	class LoadOBJThread extends Thread
..	..	@@ -2203,19 +2804,19 @@
2203	2804
2204	2805	void LoadObjFile(String fullname)
2205	2806	{
2206		- /*
	2807	+ System.out.println("Loading " + fullname);
	2808	+ /**/
2207	2809	//lastFilename = fullname;
2208	2810	if(loadObjThread == null)
2209	2811	{
2210		- loadObjThread = new LoadOBJThread();
2211		- loadObjThread.start();
	2812	+ loadObjThread = new LoadOBJThread();
	2813	+ loadObjThread.start();
2212	2814	}
2213	2815
2214	2816	loadObjThread.add(fullname);
2215		- */
	2817	+ /**/
2216	2818
2217		- System.out.println("Loading " + fullname);
2218		- makeSomething(new FileObject(fullname, true), true);
	2819	+ //makeSomething(new FileObject(fullname, true), true);
2219	2820	}
2220	2821
2221	2822	void LoadGFDFile(String fullname)
..	..	@@ -2476,11 +3077,11 @@
2476	3077
2477	3078	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2478	3079	{
2479		- if (GrafreeD.standAlone)
	3080	+ if (Grafreed.standAlone)
2480	3081	{
2481	3082	/**/
2482	3083	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2483		- browser.show();
	3084	+ browser.setVisible(true);
2484	3085	String filename = browser.getFile();
2485	3086	if (filename != null && filename.length() > 0)
2486	3087	{
..	..	@@ -2591,6 +3192,7 @@
2591	3192	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2592	3193	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2593	3194	}
	3195	+
2594	3196	//cJME.count++;
2595	3197	//cJME.count %= 12;
2596	3198	if (gc)
..	..	@@ -2625,6 +3227,7 @@
2625	3227	}
2626	3228	if (input == null)
2627	3229	{
	3230	+ new Exception().printStackTrace();
2628	3231	System.exit(0);
2629	3232	}
2630	3233
..	..	@@ -2773,6 +3376,7 @@
2773	3376	}
2774	3377	}
2775	3378	}
	3379	+
2776	3380	cFileSystemPane FSPane;
2777	3381
2778	3382	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2782,7 +3386,7 @@
2782	3386
2783	3387	freezematerial = true;
2784	3388	colorField.setFloat(mat.color);
2785		- modulationField.setFloat(mat.modulation);
	3389	+ saturationField.setFloat(mat.modulation);
2786	3390	metalnessField.setFloat(mat.metalness);
2787	3391	diffuseField.setFloat(mat.diffuse);
2788	3392	specularField.setFloat(mat.specular);
..	..	@@ -2826,11 +3430,14 @@
2826	3430	}
2827	3431	}
2828	3432	}
	3433	+
2829	3434	freezematerial = false;
2830	3435	}
2831	3436
2832	3437	void SetMaterial(Object3D object)
2833	3438	{
	3439	+ latestObject = object;
	3440	+
2834	3441	cMaterial mat = object.material;
2835	3442
2836	3443	if (mat == null)
..	..	@@ -2839,7 +3446,8 @@
2839	3446	return;
2840	3447	}
2841	3448
2842		- multiplyToggle.setSelected(mat.multiply);
	3449	+ if (multiplyToggle != null)
	3450	+ multiplyToggle.setSelected(mat.multiply);
2843	3451
2844	3452	assert (object.projectedVertices != null);
2845	3453
..	..	@@ -2941,12 +3549,17 @@
2941	3549	// }
2942	3550
2943	3551	/**/
2944		- if (deselect)
	3552	+ if (deselect \|\| child == null)
2945	3553	{
2946	3554	//group.deselectAll();
2947	3555	//freeze = true;
2948	3556	GetTree().clearSelection();
2949	3557	//freeze = false;
	3558	+
	3559	+ if (child == null)
	3560	+ {
	3561	+ return;
	3562	+ }
2950	3563	}
2951	3564
2952	3565	//group.addSelectee(child);
..	..	@@ -2980,6 +3593,17 @@
2980	3593	public void itemStateChanged(ItemEvent event)
2981	3594	{
2982	3595	// System.out.println("Propagate = " + propagate);
	3596	+ if (event.getSource() == pinButton)
	3597	+ {
	3598	+ copy.pinned ^= true;
	3599	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3600	+ {
	3601	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3602	+ copy.CloseUI();
	3603	+ //copy.editWindow.refreshContents();
	3604	+ }
	3605	+ }
	3606	+ else
2983	3607	if (event.getSource() == propagateToggle)
2984	3608	{
2985	3609	propagate ^= true;
..	..	@@ -3015,7 +3639,7 @@
3015	3639	cameraView.ToggleDL();
3016	3640	cameraView.repaint();
3017	3641	return;
3018		- } else if (event.getSource() == toggleTextureItem)
	3642	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3019	3643	{
3020	3644	cameraView.ToggleTexture();
3021	3645	// june 2013 copy.HardTouch();
..	..	@@ -3054,9 +3678,9 @@
3054	3678	frame.validate();
3055	3679
3056	3680	return;
3057		- } else if (event.getSource() == toggleRandomItem)
	3681	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3058	3682	{
3059		- cameraView.ToggleRandom();
	3683	+ cameraView.ToggleSwitch();
3060	3684	cameraView.repaint();
3061	3685	return;
3062	3686	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3084,12 +3708,17 @@
3084	3708	} else if (event.getSource() == liveCB)
3085	3709	{
3086	3710	copy.live ^= true;
	3711	+ objEditor.refreshContents(true); // To show item colors
	3712	+ return;
	3713	+ } else if (event.getSource() == selectableCB)
	3714	+ {
	3715	+ copy.dontselect ^= true;
3087	3716	return;
3088	3717	} else if (event.getSource() == hideCB)
3089	3718	{
3090	3719	copy.hide ^= true;
3091	3720	copy.Touch(); // display list issue
3092		- objEditor.refreshContents();
	3721	+ objEditor.refreshContents(true); // To show item colors
3093	3722	return;
3094	3723	} else if (event.getSource() == link2masterCB)
3095	3724	{
..	..	@@ -3099,6 +3728,7 @@
3099	3728	if (event.getSource() == randomCB)
3100	3729	{
3101	3730	copy.random ^= true;
	3731	+ objEditor.refreshContents();
3102	3732	return;
3103	3733	}
3104	3734	if (event.getSource() == speedupCB)
..	..	@@ -3122,8 +3752,9 @@
3122	3752
3123	3753	public void actionPerformed(ActionEvent event)
3124	3754	{
	3755	+ Object source = event.getSource();
3125	3756	// SCRIPT DIALOG
3126		- if (event.getSource() == okbutton)
	3757	+ if (source == okbutton)
3127	3758	{
3128	3759	textpanel.setVisible(false);
3129	3760	textpanel.remove(textarea);
..	..	@@ -3135,7 +3766,7 @@
3135	3766	textarea = null;
3136	3767	textpanel = null;
3137	3768	}
3138		- if (event.getSource() == cancelbutton)
	3769	+ if (source == cancelbutton)
3139	3770	{
3140	3771	textpanel.setVisible(false);
3141	3772	textpanel.remove(textarea);
..	..	@@ -3147,50 +3778,50 @@
3147	3778	//applySelf();
3148	3779	//client.refreshEditWindow();
3149	3780	//refreshContents();
3150		- if (event.getSource() == nameField)
	3781	+ if (source == nameField)
3151	3782	{
3152	3783	//System.out.println("ObjEditor " + event);
3153	3784	applySelf0(true);
3154	3785	//parent.applySelf();
3155	3786	objEditor.refreshContents();
3156		- } else if (event.getSource() == resetButton)
	3787	+ } else if (source == resetButton)
3157	3788	{
3158	3789	CameraPane.fullreset = true;
3159	3790	copy.Reset(); // ResetMeshes();
3160	3791	copy.Touch();
3161	3792	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepItem)
	3793	+ } else if (source == stepItem)
3163	3794	{
3164	3795	//cameraView.ONESTEP = true;
3165	3796	Globals.ONESTEP = true;
3166	3797	cameraView.repaint();
3167	3798	return;
3168		- } else if (event.getSource() == stepButton)
	3799	+ } else if (source == stepButton)
3169	3800	{
3170	3801	copy.Step();
3171	3802	copy.Touch();
3172	3803	objEditor.refreshContents();
3173		- } else if (event.getSource() == slowerButton)
	3804	+ } else if (source == slowerButton)
3174	3805	{
3175	3806	copy.Slower();
3176	3807	copy.Touch();
3177	3808	objEditor.refreshContents();
3178		- } else if (event.getSource() == fasterButton)
	3809	+ } else if (source == fasterButton)
3179	3810	{
3180	3811	copy.Faster();
3181	3812	copy.Touch();
3182	3813	objEditor.refreshContents();
3183		- } else if (event.getSource() == remarkButton)
	3814	+ } else if (source == remarkButton)
3184	3815	{
3185	3816	copy.Remark();
3186	3817	copy.Touch();
3187	3818	objEditor.refreshContents();
3188		- } else if (event.getSource() == stepAllButton)
	3819	+ } else if (source == stepAllButton)
3189	3820	{
3190	3821	copy.StepAll();
3191	3822	copy.Touch();
3192	3823	objEditor.refreshContents();
3193		- } else if (event.getSource() == resetAllButton)
	3824	+ } else if (source == resetAllButton)
3194	3825	{
3195	3826	//CameraPane.fullreset = true;
3196	3827	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3223,53 +3854,79 @@
3223	3854	// Close();
3224	3855	// }
3225	3856	// else
3226		- if (event.getSource() == resetSlidersButton)
	3857	+ if (source == resetSlidersButton)
3227	3858	{
3228	3859	ResetSliders();
3229		- } else if (event.getSource() == clearMaterialButton)
	3860	+ } else if (source == clearMaterialButton)
3230	3861	{
3231	3862	ClearMaterial();
3232		- } else if (event.getSource() == createMaterialButton)
	3863	+ } else if (source == createMaterialButton)
3233	3864	{
3234	3865	CreateMaterial();
3235		- } else if (event.getSource() == clearPanelButton)
	3866	+ } else if (source == clearPanelButton)
3236	3867	{
3237	3868	copy.ClearUI();
3238	3869	refreshContents(true);
3239		- } /*
3240		- }
3241		-
3242		- public boolean action(Event event, Object arg)
3243		- {
3244		- */ else if (event.getSource() == closeItem)
	3870	+ } else if (source == importGFDItem)
	3871	+ {
	3872	+ ImportGFD();
	3873	+ } else
	3874	+ if (source == importVRMLX3DItem)
	3875	+ {
	3876	+ ImportVRMLX3D();
	3877	+ } else
	3878	+ if (source == import3DSItem)
	3879	+ {
	3880	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3881	+ } else
	3882	+ if (source == importOBJItem)
	3883	+ {
	3884	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3885	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3886	+ browser.setVisible(true);
	3887	+ String filename = browser.getFile();
	3888	+ if (filename != null && filename.length() > 0)
	3889	+ {
	3890	+ String fullname = browser.getDirectory() + filename;
	3891	+ makeSomething(ReadOBJ(fullname), true);
	3892	+ }
	3893	+ } else
	3894	+ if (source == closeItem)
3245	3895	{
3246	3896	Close();
3247	3897	//return true;
3248		- } else if (event.getSource() == loadItem)
	3898	+ } else if (source == openItem)
3249	3899	{
3250		- load();
	3900	+ Open();
3251	3901	//return true;
3252		- } else if (event.getSource() == saveItem)
	3902	+ } else if (source == newItem)
	3903	+ {
	3904	+ New();
	3905	+ } else if (source == saveItem)
3253	3906	{
3254	3907	save();
3255	3908	//return true;
3256		- } else if (event.getSource() == saveAsItem)
	3909	+ } else if (source == saveAsItem)
3257	3910	{
3258	3911	saveAs();
3259	3912	//return true;
3260		- } else if (event.getSource() == reexportItem)
	3913	+ } else if (source == reexportItem)
3261	3914	{
3262	3915	reexport();
3263	3916	//return true;
3264		- } else if (event.getSource() == exportAsItem)
	3917	+ } else if (source == exportAsItem)
3265	3918	{
3266	3919	export();
3267	3920	//return true;
3268		- } else if (event.getSource() == povItem)
	3921	+ } else if (source == povItem)
3269	3922	{
3270	3923	generatePOV();
3271	3924	//return true;
3272		- } else if (event.getSource() == zBufferItem)
	3925	+ } else if (event.getSource() == archiveItem)
	3926	+ {
	3927	+ cTools.Archive(frame);
	3928	+ return;
	3929	+ } else if (source == zBufferItem)
3273	3930	{
3274	3931	try
3275	3932	{
..	..	@@ -3291,21 +3948,8 @@
3291	3948	cameraView.repaint();
3292	3949	//return true;
3293	3950	}
3294		- */ else if (event.getSource() == editCameraItem)
3295		- {
3296		- cameraView.ProtectCamera();
3297		- cameraView.repaint();
3298		- return;
3299		- } else if (event.getSource() == revertCameraItem)
3300		- {
3301		- cameraView.RevertCamera();
3302		- cameraView.repaint();
3303		- return;
3304		-// } else if (event.getSource() == textureButton)
3305		-// {
3306		-// return; // true;
3307		- } else // combos...
3308		- if (event.getSource() == texresMenu)
	3951	+ */ else // combos...
	3952	+ if (source == texresMenu)
3309	3953	{
3310	3954	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3311	3955	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3317,12 +3961,472 @@
3317	3961	}
3318	3962	}
3319	3963
	3964	+ void New()
	3965	+ {
	3966	+ while (copy.Size() > 1)
	3967	+ {
	3968	+ copy.remove(1);
	3969	+ }
	3970	+
	3971	+ ResetModel();
	3972	+ objEditor.refreshContents();
	3973	+ }
	3974	+
	3975	+ static public byte[] Compress(Object3D o)
	3976	+ {
	3977	+ // Slower to actually compress.
	3978	+ try
	3979	+ {
	3980	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3981	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3982	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3983	+
	3984	+ Object3D parent = o.parent;
	3985	+ o.parent = null;
	3986	+
	3987	+ out.writeObject(o);
	3988	+
	3989	+ o.parent = parent;
	3990	+
	3991	+ out.flush();
	3992	+
	3993	+ baos //zstream
	3994	+ .close();
	3995	+ out.close();
	3996	+
	3997	+ byte[] bytes = baos.toByteArray();
	3998	+
	3999	+ System.out.println("save #bytes = " + bytes.length);
	4000	+ return bytes;
	4001	+ } catch (Exception e)
	4002	+ {
	4003	+ System.err.println(e);
	4004	+ return null;
	4005	+ }
	4006	+ }
	4007	+
	4008	+ static public Object Uncompress(byte[] bytes)
	4009	+ {
	4010	+ System.out.println("restore #bytes = " + bytes.length);
	4011	+ try
	4012	+ {
	4013	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4014	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4015	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4016	+ Object obj = in.readObject();
	4017	+
	4018	+ bais //istream
	4019	+ .close();
	4020	+ in.close();
	4021	+
	4022	+ return obj;
	4023	+ } catch (Exception e)
	4024	+ {
	4025	+ System.err.println(e);
	4026	+ return null;
	4027	+ }
	4028	+ }
	4029	+
	4030	+ static public Object clone(Object o)
	4031	+ {
	4032	+ try
	4033	+ {
	4034	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4035	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4036	+
	4037	+ out.writeObject(o);
	4038	+
	4039	+ out.flush();
	4040	+ out.close();
	4041	+
	4042	+ byte[] bytes = baos.toByteArray();
	4043	+
	4044	+ System.out.println("clone = " + bytes.length);
	4045	+
	4046	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4047	+ ObjectInputStream in = new ObjectInputStream(bais);
	4048	+ Object obj = in.readObject();
	4049	+ in.close();
	4050	+
	4051	+ return obj;
	4052	+ } catch (Exception e)
	4053	+ {
	4054	+ System.err.println(e);
	4055	+ return null;
	4056	+ }
	4057	+ }
	4058	+
	4059	+ cRadio GetCurrentTab()
	4060	+ {
	4061	+ cRadio ab;
	4062	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4063	+ {
	4064	+ ab = (cRadio)e.nextElement();
	4065	+ if(ab.GetObject() == copy)
	4066	+ {
	4067	+ return ab;
	4068	+ }
	4069	+ }
	4070	+
	4071	+ return null;
	4072	+ }
	4073	+
	4074	+
	4075	+ public void Save()
	4076	+ {
	4077	+ //Save(true);
	4078	+ Replace();
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
	4082	+ private boolean Equal(byte[] compress, byte[] name)
	4083	+ {
	4084	+ if (compress.length != name.length)
	4085	+ {
	4086	+ return false;
	4087	+ }
	4088	+
	4089	+ for (int i=compress.length; --i>=0;)
	4090	+ {
	4091	+ if (compress[i] != name[i])
	4092	+ return false;
	4093	+ }
	4094	+
	4095	+ return true;
	4096	+ }
	4097	+
	4098	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4099	+
	4100	+ void DeleteVersion()
	4101	+ {
	4102	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4103	+ {
	4104	+ copy.versionlist[i] = copy.versionlist[i+1];
	4105	+ }
	4106	+
	4107	+ CopyChanged();
	4108	+
	4109	+ SetUndoStates();
	4110	+ }
	4111	+
	4112	+ public boolean Save(boolean user)
	4113	+ {
	4114	+ System.err.println("Save");
	4115	+ //Replace();
	4116	+
	4117	+ cRadio tab = GetCurrentTab();
	4118	+
	4119	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4120	+
	4121	+ boolean thesame = false;
	4122	+
	4123	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4124	+// {
	4125	+// thesame = true;
	4126	+// }
	4127	+
	4128	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4129	+ if (!thesame)
	4130	+ {
	4131	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4132	+ {
	4133	+ copy.versionlist[i] = copy.versionlist[i-1];
	4134	+ }
	4135	+
	4136	+ //tab.user[tab.versionindex] = user;
	4137	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4138	+
	4139	+ copy.versionlist[++copy.versionindex] = compress;
	4140	+
	4141	+ // if (increment)
	4142	+ // tab.versionindex++;
	4143	+ }
	4144	+
	4145	+ //copy.RestoreBigData(versiontable);
	4146	+
	4147	+ //assert(hashtable.isEmpty());
	4148	+
	4149	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4150	+// {
	4151	+// //tab.user[i] = false;
	4152	+// copy.versionlist[i] = null;
	4153	+// }
	4154	+
	4155	+ SetUndoStates();
	4156	+
	4157	+ // test save
	4158	+ if (false)
	4159	+ {
	4160	+ try
	4161	+ {
	4162	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4163	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4164	+
	4165	+ p.writeObject(copy);
	4166	+
	4167	+ p.flush();
	4168	+
	4169	+ ostream.close();
	4170	+ } catch (Exception e)
	4171	+ {
	4172	+ e.printStackTrace();
	4173	+ }
	4174	+ }
	4175	+
	4176	+ return !thesame;
	4177	+ }
	4178	+
	4179	+ boolean flashIt = true;
	4180	+
	4181	+ void RefreshSelection()
	4182	+ {
	4183	+ Object3D selection = new Object3D();
	4184	+
	4185	+ for (int i = 0; i < copy.selection.size(); i++)
	4186	+ {
	4187	+ Object3D elem = copy.selection.elementAt(i);
	4188	+
	4189	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4190	+
	4191	+ if (obj == null)
	4192	+ {
	4193	+ copy.selection.remove(i--);
	4194	+ }
	4195	+ else
	4196	+ {
	4197	+ selection.add(obj);
	4198	+ copy.selection.setElementAt(obj, i);
	4199	+ }
	4200	+ }
	4201	+
	4202	+ flashIt = false;
	4203	+ GetTree().clearSelection();
	4204	+ for (int i = 0; i < selection.size(); i++)
	4205	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4206	+ flashIt = true;
	4207	+
	4208	+ //refreshContents(false);
	4209	+ }
	4210	+
	4211	+ void CopyChanged()
	4212	+ {
	4213	+ Object3D obj = copy.versionlist[copy.versionindex];
	4214	+
	4215	+ SetUndoStates();
	4216	+
	4217	+ boolean temp = CameraPane.SWITCH;
	4218	+ CameraPane.SWITCH = false;
	4219	+
	4220	+ copy.ExtractBigData(versiontable);
	4221	+
	4222	+ copy.clear();
	4223	+
	4224	+ copy.skyboxname = obj.skyboxname;
	4225	+ copy.skyboxext = obj.skyboxext;
	4226	+
	4227	+ for (int i=0; i<obj.Size(); i++)
	4228	+ {
	4229	+ copy.add(obj.get(i));
	4230	+ }
	4231	+
	4232	+ copy.RestoreBigData(versiontable);
	4233	+
	4234	+ CameraPane.SWITCH = temp;
	4235	+
	4236	+ RefreshSelection();
	4237	+ //assert(hashtable.isEmpty());
	4238	+
	4239	+ copy.Touch();
	4240	+
	4241	+ ResetModel();
	4242	+ copy.HardTouch(); // recompile?
	4243	+
	4244	+ cRadio ab;
	4245	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4246	+ {
	4247	+ ab = (cRadio)e.nextElement();
	4248	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4249	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4250	+ if (test != null)
	4251	+ {
	4252	+ test.editWindow = ab.object.editWindow;
	4253	+ ab.object = test;
	4254	+ }
	4255	+ }
	4256	+
	4257	+ refreshContents(true);
	4258	+ }
	4259	+
	4260	+ cButton previousVersionButton;
	4261	+ cButton restoreButton;
	4262	+ cButton replaceButton;
	4263	+ cButton nextVersionButton;
	4264	+ cButton saveVersionButton;
	4265	+ cButton deleteVersionButton;
	4266	+
	4267	+ boolean muteSlider;
	4268	+
	4269	+ int VersionCount()
	4270	+ {
	4271	+ int count = 0;
	4272	+
	4273	+ for (int i = copy.versionlist.length; --i >= 0;)
	4274	+ {
	4275	+ if (copy.versionlist[i] != null)
	4276	+ count++;
	4277	+ }
	4278	+
	4279	+ return count;
	4280	+ }
	4281	+
	4282	+ void SetUndoStates()
	4283	+ {
	4284	+ cRadio tab = GetCurrentTab();
	4285	+
	4286	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4287	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4288	+
	4289	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4290	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4291	+
	4292	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4293	+ copy.versionlist[copy.versionindex + 1] != null);
	4294	+
	4295	+ muteSlider = true;
	4296	+ versionSlider.setMaximum(VersionCount() - 1);
	4297	+ versionSlider.setInteger(copy.versionindex);
	4298	+ muteSlider = false;
	4299	+ }
	4300	+
	4301	+ public boolean PreviousVersion()
	4302	+ {
	4303	+ // Option?
	4304	+ Replace();
	4305	+
	4306	+ System.err.println("Undo");
	4307	+
	4308	+ cRadio tab = GetCurrentTab();
	4309	+
	4310	+ if (copy.versionindex == 0)
	4311	+ {
	4312	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4313	+ return false;
	4314	+ }
	4315	+
	4316	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4317	+// {
	4318	+// if (Save(false))
	4319	+// tab.versionindex -= 1;
	4320	+// else
	4321	+// {
	4322	+// if (tab.versionindex <= 0)
	4323	+// return false;
	4324	+// else
	4325	+// tab.versionindex -= 1;
	4326	+// }
	4327	+// }
	4328	+
	4329	+ copy.versionindex -= 1;
	4330	+
	4331	+ CopyChanged();
	4332	+
	4333	+ return true;
	4334	+ }
	4335	+
	4336	+ public boolean Restore()
	4337	+ {
	4338	+ System.err.println("Restore");
	4339	+
	4340	+ cRadio tab = GetCurrentTab();
	4341	+
	4342	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4343	+ {
	4344	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4345	+ return false;
	4346	+ }
	4347	+
	4348	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4349	+ CopyChanged();
	4350	+
	4351	+ return true;
	4352	+ }
	4353	+
	4354	+ public boolean Replace()
	4355	+ {
	4356	+ System.err.println("Replace");
	4357	+
	4358	+ cRadio tab = GetCurrentTab();
	4359	+
	4360	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4361	+ {
	4362	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4363	+ return false;
	4364	+ }
	4365	+
	4366	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4367	+
	4368	+ return true;
	4369	+ }
	4370	+
	4371	+ public void NextVersion()
	4372	+ {
	4373	+ // Option?
	4374	+ Replace();
	4375	+
	4376	+ cRadio tab = GetCurrentTab();
	4377	+
	4378	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4379	+ {
	4380	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4381	+ return;
	4382	+ }
	4383	+
	4384	+ copy.versionindex += 1;
	4385	+
	4386	+ CopyChanged();
	4387	+
	4388	+ //if (!tab.user[tab.versionindex])
	4389	+ // tab.graphs[tab.versionindex] = null;
	4390	+ }
	4391	+
	4392	+ void ImportGFD()
	4393	+ {
	4394	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4395	+ browser.show();
	4396	+ String filename = browser.getFile();
	4397	+ if (filename != null && filename.length() > 0)
	4398	+ {
	4399	+ String fullname = browser.getDirectory() + filename;
	4400	+
	4401	+ //Object3D readobj =
	4402	+ objEditor.ReadGFD(fullname, objEditor);
	4403	+ //makeSomething(readobj);
	4404	+ }
	4405	+ }
	4406	+
	4407	+ void ImportVRMLX3D()
	4408	+ {
	4409	+ if (Grafreed.standAlone)
	4410	+ {
	4411	+ /**/
	4412	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4413	+ browser.show();
	4414	+ String filename = browser.getFile();
	4415	+ if (filename != null && filename.length() > 0)
	4416	+ {
	4417	+ String fullname = browser.getDirectory() + filename;
	4418	+ LoadVRMLX3D(fullname);
	4419	+ }
	4420	+ /**/
	4421	+ }
	4422	+ }
	4423	+
3320	4424	void ToggleAnimation()
3321	4425	{
3322	4426	if (!Globals.ANIMATION)
3323	4427	{
3324	4428	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3325		- browser.show();
	4429	+ browser.setVisible(true);
3326	4430	String filename = browser.getFile();
3327	4431	if (filename != null && filename.length() > 0)
3328	4432	{
..	..	@@ -3332,8 +4436,8 @@
3332	4436
3333	4437	Globals.ANIMATION ^= true;
3334	4438
3335		- GrafreeD.wav.cursor = 0;
3336		- GrafreeD.wav.loop = 0;
	4439	+ Grafreed.wav.cursor = 0;
	4440	+ Grafreed.wav.loop = 0;
3337	4441	}
3338	4442	} else
3339	4443	{
..	..	@@ -3383,7 +4487,7 @@
3383	4487	void CreateMaterial()
3384	4488	{
3385	4489	//copy.ClearMaterial(); // PATCH
3386		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4490	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3387	4491	if (copy.selection.size() > 0)
3388	4492	//SetMaterial(copy);
3389	4493	{
..	..	@@ -3434,7 +4538,7 @@
3434	4538	assert false;
3435	4539	}
3436	4540
3437		- void EditSelection()
	4541	+ void EditSelection(boolean newWindow)
3438	4542	{
3439	4543	}
3440	4544
..	..	@@ -3442,11 +4546,11 @@
3442	4546	{
3443	4547	copy.ResetBlockLoop(); // temporary problem
3444	4548
3445		- boolean random = CameraPane.RANDOM;
3446		- CameraPane.RANDOM = false; // parse everything
	4549	+ boolean random = CameraPane.SWITCH;
	4550	+ CameraPane.SWITCH = false; // parse everything
3447	4551	copy.ResetDisplayList();
3448	4552	copy.HardTouch();
3449		- CameraPane.RANDOM = random;
	4553	+ CameraPane.SWITCH = random;
3450	4554	}
3451	4555
3452	4556	// public void applySelf()
..	..	@@ -3493,7 +4597,7 @@
3493	4597	//copy.material = new cMaterial(copy.GetMaterial());
3494	4598
3495	4599	current.color = (float) colorField.getFloat();
3496		- current.modulation = (float) modulationField.getFloat();
	4600	+ current.modulation = (float) saturationField.getFloat();
3497	4601	current.metalness = (float) metalnessField.getFloat();
3498	4602	current.diffuse = (float) diffuseField.getFloat();
3499	4603	current.specular = (float) specularField.getFloat();
..	..	@@ -3516,10 +4620,40 @@
3516	4620	current.fakedepth = (float) fakedepthField.getFloat();
3517	4621	current.shadowbias = (float) shadowbiasField.getFloat();
3518	4622
3519		- if (!NumberSlider.frozen)
	4623	+ if (!cNumberSlider.frozen)
3520	4624	{
3521	4625	//System.out.println("Propagate = " + propagate);
3522	4626	copy.UpdateMaterial(anchor, current, propagate);
	4627	+
	4628	+ if (copy.material != null)
	4629	+ {
	4630	+ cMaterial mat = copy.material;
	4631	+
	4632	+ colorField.SetToolTipValue((mat.color));
	4633	+ saturationField.SetToolTipValue((mat.modulation));
	4634	+ metalnessField.SetToolTipValue((mat.metalness));
	4635	+ diffuseField.SetToolTipValue((mat.diffuse));
	4636	+ specularField.SetToolTipValue((mat.specular));
	4637	+ shininessField.SetToolTipValue((mat.shininess));
	4638	+ shiftField.SetToolTipValue((mat.shift));
	4639	+ ambientField.SetToolTipValue((mat.ambient));
	4640	+ lightareaField.SetToolTipValue((mat.lightarea));
	4641	+ diffusenessField.SetToolTipValue((mat.factor));
	4642	+ velvetField.SetToolTipValue((mat.velvet));
	4643	+ sheenField.SetToolTipValue((mat.sheen));
	4644	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4645	+ backlitField.SetToolTipValue((mat.bump));
	4646	+ anisoField.SetToolTipValue((mat.aniso));
	4647	+ anisoVField.SetToolTipValue((mat.anisoV));
	4648	+ cameraField.SetToolTipValue((mat.cameralight));
	4649	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4650	+ shadowField.SetToolTipValue((mat.shadow));
	4651	+ textureField.SetToolTipValue((mat.texture));
	4652	+ opacityField.SetToolTipValue((mat.opacity));
	4653	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4654	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4655	+ }
	4656	+
3523	4657	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3524	4658	{
3525	4659	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3548,9 +4682,26 @@
3548	4682	//copy.Touch();
3549	4683	}
3550	4684
	4685	+ cNumberSlider versionSlider;
	4686	+
3551	4687	public void stateChanged(ChangeEvent e)
3552	4688	{
3553	4689	// assert(false);
	4690	+ if (e.getSource() == versionSlider)
	4691	+ {
	4692	+ if (muteSlider)
	4693	+ return;
	4694	+
	4695	+ int version = versionSlider.getInteger();
	4696	+
	4697	+ if (copy.versionlist[version] != null)
	4698	+ {
	4699	+ copy.versionindex = version;
	4700	+ CopyChanged();
	4701	+ }
	4702	+
	4703	+ return;
	4704	+ }
3554	4705
3555	4706	if (freezematerial)
3556	4707	{
..	..	@@ -3564,6 +4715,7 @@
3564	4715	\|\| e.getSource() == apertureField
3565	4716	\|\| e.getSource() == shadowblurField)
3566	4717	{
	4718	+ new Exception().printStackTrace();
3567	4719	System.exit(0);
3568	4720	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3569	4721	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3585,6 +4737,12 @@
3585	4737	{
3586	4738	//System.out.println("stateChanged = " + this);
3587	4739	materialtouched = true;
	4740	+
	4741	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4742	+ {
	4743	+ saturationField.setFloat(1);
	4744	+ }
	4745	+
3588	4746	applySelf();
3589	4747	//System.out.println("this = " + this);
3590	4748	//System.out.println("PARENT = " + parent);
..	..	@@ -3634,7 +4792,7 @@
3634	4792	}
3635	4793
3636	4794	if (normalpushField != null)
3637		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4795	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3638	4796	}
3639	4797
3640	4798	void SnapObject()
..	..	@@ -3884,20 +5042,26 @@
3884	5042	{
3885	5043	if (GetTree() != null)
3886	5044	{
	5045	+ GetTree().revalidate();
3887	5046	GetTree().repaint();
3888	5047	}
3889	5048
3890	5049	radioPanel.revalidate();
3891	5050	radioPanel.repaint();
3892		- ctrlPanel.revalidate(); // ? new
	5051	+ ctrlPanel.validate(); // ? new
3893	5052	ctrlPanel.repaint();
3894	5053	}
	5054	+
	5055	+ if (previousVersionButton != null && copy.versionlist != null)
	5056	+ SetUndoStates();
3895	5057	}
3896	5058
3897	5059	static TweenManager tweenManager = new TweenManager();
3898	5060
3899	5061	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3900	5062	{
	5063	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5064	+ Save();
3901	5065	//Tween.set(thing, 0).target(1).start(tweenManager);
3902	5066	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3903	5067	// if (thing instanceof GenericJointDemo)
..	..	@@ -3984,6 +5148,12 @@
3984	5148	{
3985	5149	ResetModel();
3986	5150	Select(thing.GetTreePath(), true, false); // unselect... false);
	5151	+
	5152	+ if (thing.Size() == 0)
	5153	+ {
	5154	+ //EditSelection(false);
	5155	+ }
	5156	+
3987	5157	refreshContents();
3988	5158	}
3989	5159
..	..	@@ -4101,6 +5271,7 @@
4101	5271	}
4102	5272	}
4103	5273	}
	5274	+
4104	5275	LoadGFDThread loadGFDThread;
4105	5276
4106	5277	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4120,8 +5291,10 @@
4120	5291
4121	5292	try
4122	5293	{
	5294	+ // Try compressed version first.
4123	5295	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4124		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5296	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5297	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4125	5298
4126	5299	readobj = (Object3D) p.readObject();
4127	5300	istream.close();
..	..	@@ -4129,7 +5302,22 @@
4129	5302	readobj.ResetDisplayList();
4130	5303	} catch (Exception e)
4131	5304	{
4132		- e.printStackTrace();
	5305	+ if (!e.toString().contains("GZIP"))
	5306	+ e.printStackTrace();
	5307	+
	5308	+ try
	5309	+ {
	5310	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5311	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5312	+
	5313	+ readobj = (Object3D) p.readObject();
	5314	+ istream.close();
	5315	+
	5316	+ readobj.ResetDisplayList();
	5317	+ } catch (Exception e2)
	5318	+ {
	5319	+ e2.printStackTrace();
	5320	+ }
4133	5321	}
4134	5322	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4135	5323	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4175,6 +5363,12 @@
4175	5363
4176	5364	void LoadIt(Object obj)
4177	5365	{
	5366	+ if (obj == null)
	5367	+ {
	5368	+ // Invalid file
	5369	+ return;
	5370	+ }
	5371	+
4178	5372	System.out.println("Loaded " + obj);
4179	5373	//new Exception().printStackTrace();
4180	5374	Object3D readobj = (Object3D) obj;
..	..	@@ -4184,10 +5378,14 @@
4184	5378
4185	5379	if (readobj != null)
4186	5380	{
	5381	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5382	+ // Save();
4187	5383	try
4188	5384	{
4189	5385	//readobj.deepCopySelf(copy);
4190	5386	copy.clear(); // june 2014
	5387	+ copy.skyboxname = readobj.skyboxname;
	5388	+ copy.skyboxext = readobj.skyboxext;
4191	5389	for (int i = 0; i < readobj.size(); i++)
4192	5390	{
4193	5391	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4228,6 +5426,7 @@
4228	5426	}
4229	5427	} catch (ClassCastException e)
4230	5428	{
	5429	+ e.printStackTrace();
4231	5430	assert (false);
4232	5431	Composite c = (Composite) copy;
4233	5432	c.children.clear();
..	..	@@ -4238,17 +5437,28 @@
4238	5437	c.addChild(csg);
4239	5438	}
4240	5439
	5440	+ copy.versionlist = readobj.versionlist;
	5441	+ copy.versionindex = readobj.versionindex;
	5442	+
	5443	+ if (copy.versionlist == null)
	5444	+ {
	5445	+ copy.versionlist = new Object3D[100];
	5446	+ copy.versionindex = -1;
	5447	+ }
	5448	+
	5449	+ //? SetUndoStates();
	5450	+
4241	5451	ResetModel();
4242	5452	copy.HardTouch(); // recompile?
4243	5453	refreshContents();
4244	5454	}
4245	5455	}
4246	5456
4247		- void load() // throws ClassNotFoundException
	5457	+ void Open() // throws ClassNotFoundException
4248	5458	{
4249		- if (GrafreeD.standAlone)
	5459	+ if (Grafreed.standAlone)
4250	5460	{
4251		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5461	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4252	5462	browser.show();
4253	5463	String filename = browser.getFile();
4254	5464	if (filename != null && filename.length() > 0)
..	..	@@ -4333,11 +5543,13 @@
4333	5543	try
4334	5544	{
4335	5545	FileOutputStream ostream = new FileOutputStream(lastname);
4336		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5546	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5547	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4337	5548
4338	5549	p.writeObject(copy);
4339	5550	p.flush();
4340	5551
	5552	+ zstream.close();
4341	5553	ostream.close();
4342	5554
4343	5555	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4345,19 +5557,23 @@
4345	5557	//ps.print(buffer.toString());
4346	5558	} catch (IOException e)
4347	5559	{
	5560	+ e.printStackTrace();
4348	5561	}
4349	5562	}
	5563	+
4350	5564	String lastname;
4351	5565
4352	5566	void saveAs()
4353	5567	{
4354		- if (GrafreeD.standAlone)
	5568	+ if (Grafreed.standAlone)
4355	5569	{
4356	5570	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4357	5571	browser.setVisible(true);
4358	5572	String filename = browser.getFile();
4359	5573	if (filename != null && filename.length() > 0)
4360	5574	{
	5575	+ if (!filename.endsWith(".gfd"))
	5576	+ filename += ".gfd";
4361	5577	lastname = browser.getDirectory() + filename;
4362	5578	save();
4363	5579	}
..	..	@@ -4456,13 +5672,13 @@
4456	5672	try
4457	5673	{
4458	5674	FileOutputStream ostream = new FileOutputStream(filename);
4459		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4460		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5675	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5676	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4461	5677
4462	5678	Object3D objectparent = obj.parent;
4463	5679	obj.parent = null;
4464	5680
4465		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5681	+ Object3D object = (Object3D) Grafreed.clone(obj);
4466	5682
4467	5683	obj.parent = objectparent;
4468	5684
..	..	@@ -4474,8 +5690,8 @@
4474	5690	p.writeObject(object);
4475	5691	p.flush();
4476	5692
	5693	+ zstream.close();
4477	5694	ostream.close();
4478		- // zstream.close();
4479	5695
4480	5696	// group.selection.get(0).parent = parent;
4481	5697	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4496,7 +5712,7 @@
4496	5712	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4497	5713	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4498	5714	copy.generatePOV(buffer);
4499		- if (GrafreeD.standAlone)
	5715	+ if (Grafreed.standAlone)
4500	5716	{
4501	5717	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4502	5718	browser.show();
..	..	@@ -4522,21 +5738,20 @@
4522	5738	Object3D client;
4523	5739	Object3D copy;
4524	5740	MenuBar menuBar;
4525		- Menu windowMenu;
4526		- MenuItem loadItem;
	5741	+ Menu fileMenu;
	5742	+ MenuItem newItem;
	5743	+ MenuItem openItem;
4527	5744	MenuItem saveItem;
4528	5745	MenuItem saveAsItem;
4529	5746	MenuItem exportAsItem;
4530	5747	MenuItem reexportItem;
4531	5748	MenuItem povItem;
4532	5749	MenuItem closeItem;
4533		- Menu cameraMenu;
	5750	+
4534	5751	CheckboxMenuItem zBufferItem;
4535	5752	//MenuItem normalLensItem;
4536		- MenuItem editCameraItem;
4537		- MenuItem revertCameraItem;
4538		- CheckboxMenuItem toggleLiveItem;
4539	5753	MenuItem stepItem;
	5754	+ CheckboxMenuItem toggleLiveItem;
4540	5755	CheckboxMenuItem toggleFullScreenItem;
4541	5756	CheckboxMenuItem toggleTimelineItem;
4542	5757	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4545,25 +5760,40 @@
4545	5760	CheckboxMenuItem toggleFootContactItem;
4546	5761	CheckboxMenuItem toggleDLItem;
4547	5762	CheckboxMenuItem toggleTextureItem;
4548		- CheckboxMenuItem toggleRandomItem;
	5763	+ CheckboxMenuItem toggleSwitchItem;
4549	5764	CheckboxMenuItem toggleRootItem;
4550	5765	CheckboxMenuItem animationItem;
	5766	+ MenuItem archiveItem;
4551	5767	CheckboxMenuItem toggleHandleItem;
4552	5768	CheckboxMenuItem togglePaintItem;
4553	5769	JSplitPane mainPanel;
4554	5770	JScrollPane scrollpane;
	5771	+
4555	5772	JPanel toolbarPanel;
4556		- JPanel treePanel;
	5773	+
	5774	+ cGridBag treePanel;
	5775	+
4557	5776	JPanel radioPanel;
4558	5777	ButtonGroup buttonGroup;
4559		- JPanel ctrlPanel;
4560		- JPanel materialPanel;
	5778	+
	5779	+ cGridBag toolboxPanel;
	5780	+ cGridBag skyboxPanel;
	5781	+ cGridBag materialPanel;
	5782	+ cGridBag ctrlPanel;
	5783	+
4561	5784	JScrollPane infoPanel;
4562		- JPanel optionsPanel;
	5785	+
	5786	+ cGridBag optionsPanel;
	5787	+
4563	5788	JTabbedPane objectPanel;
	5789	+ boolean materialFlushed;
	5790	+ Object3D latestObject;
	5791	+
4564	5792	cGridBag XYZPanel;
	5793	+
4565	5794	JSplitPane gridPanel;
4566	5795	JSplitPane bigPanel;
	5796	+
4567	5797	cGridBag bigThree;
4568	5798	cGridBag scenePanel;
4569	5799	cGridBag centralPanel;
..	..	@@ -4619,67 +5849,72 @@
4619	5849	// MATERIAL
4620	5850	JLabel materialLabel;
4621	5851	JLabel colorLabel;
4622		- NumberSlider colorField;
	5852	+ cNumberSlider colorField;
4623	5853	JLabel modulationLabel;
4624		- NumberSlider modulationField;
	5854	+ cNumberSlider saturationField;
4625	5855	JLabel metalnessLabel;
4626		- NumberSlider metalnessField;
	5856	+ cNumberSlider metalnessField;
4627	5857	JLabel diffuseLabel;
4628		- NumberSlider diffuseField;
	5858	+ cNumberSlider diffuseField;
4629	5859	JLabel specularLabel;
4630		- NumberSlider specularField;
	5860	+ cNumberSlider specularField;
4631	5861	JLabel shininessLabel;
4632		- NumberSlider shininessField;
	5862	+ cNumberSlider shininessField;
4633	5863	JLabel shiftLabel;
4634		- NumberSlider shiftField;
	5864	+ cNumberSlider shiftField;
4635	5865	JLabel ambientLabel;
4636		- NumberSlider ambientField;
	5866	+ cNumberSlider ambientField;
4637	5867	JLabel lightareaLabel;
4638		- NumberSlider lightareaField;
	5868	+ cNumberSlider lightareaField;
4639	5869	JLabel diffusenessLabel;
4640		- NumberSlider diffusenessField;
	5870	+ cNumberSlider diffusenessField;
4641	5871	JLabel velvetLabel;
4642		- NumberSlider velvetField;
	5872	+ cNumberSlider velvetField;
4643	5873	JLabel sheenLabel;
4644		- NumberSlider sheenField;
	5874	+ cNumberSlider sheenField;
4645	5875	JLabel subsurfaceLabel;
4646		- NumberSlider subsurfaceField;
	5876	+ cNumberSlider subsurfaceField;
4647	5877	//JLabel bumpLabel;
4648	5878	//NumberSlider bumpField;
4649	5879	JLabel backlitLabel;
4650		- NumberSlider backlitField;
	5880	+ cNumberSlider backlitField;
4651	5881	JLabel anisoLabel;
4652		- NumberSlider anisoField;
	5882	+ cNumberSlider anisoField;
4653	5883	JLabel anisoVLabel;
4654		- NumberSlider anisoVField;
	5884	+ cNumberSlider anisoVField;
4655	5885	JLabel cameraLabel;
4656		- NumberSlider cameraField;
	5886	+ cNumberSlider cameraField;
4657	5887	JLabel selfshadowLabel;
4658		- NumberSlider selfshadowField;
	5888	+ cNumberSlider selfshadowField;
4659	5889	JLabel shadowLabel;
4660		- NumberSlider shadowField;
	5890	+ cNumberSlider shadowField;
4661	5891	JLabel textureLabel;
4662		- NumberSlider textureField;
	5892	+ cNumberSlider textureField;
4663	5893	JLabel opacityLabel;
4664		- NumberSlider opacityField;
	5894	+ cNumberSlider opacityField;
4665	5895	JLabel fakedepthLabel;
4666		- NumberSlider fakedepthField;
	5896	+ cNumberSlider fakedepthField;
4667	5897	JLabel shadowbiasLabel;
4668		- NumberSlider shadowbiasField;
	5898	+ cNumberSlider shadowbiasField;
4669	5899	JLabel bumpLabel;
4670		- NumberSlider bumpField;
	5900	+ cNumberSlider bumpField;
4671	5901	JLabel noiseLabel;
4672		- NumberSlider noiseField;
	5902	+ cNumberSlider noiseField;
4673	5903	JLabel powerLabel;
4674		- NumberSlider powerField;
	5904	+ cNumberSlider powerField;
4675	5905	JLabel borderfadeLabel;
4676		- NumberSlider borderfadeField;
	5906	+ cNumberSlider borderfadeField;
4677	5907	JLabel fogLabel;
4678		- NumberSlider fogField;
	5908	+ cNumberSlider fogField;
4679	5909	JLabel opacityPowerLabel;
4680		- NumberSlider opacityPowerField;
4681		- JTree jTree;
	5910	+ cNumberSlider opacityPowerField;
	5911	+ cTree jTree;
4682	5912	//ObjectUI parent;
4683	5913
4684		- NumberSlider normalpushField;
	5914	+ cNumberSlider normalpushField;
	5915	+
	5916	+ private MenuItem importGFDItem;
	5917	+ private MenuItem importVRMLX3DItem;
	5918	+ private MenuItem import3DSItem;
	5919	+ private MenuItem importOBJItem;
4685	5920	}