~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.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -31,6 +37,84 @@
31	37	boolean timeline;
32	38	boolean wasFullScreen;
33	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
	117	+
34	118	// SCRIPT
35	119
36	120	transient JFrame textpanel = null;
..	..	@@ -121,51 +205,62 @@
121	205	void keyPressed(int key, int modifiers)
122	206	{
123	207	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	208	+ Globals.theRenderer.keyPressed(key, modifiers);
125	209	}
126	210	*/
127	211
128	212	static GridBagConstraints aConstraints;
129	213	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	214	+
132	215	static int GRIDWIDTH = 100; // 4;
133	216
134	217	public void closeUI()
135	218	{
136	219	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	220	+// System.out.println("this = " + this);
	221	+// System.out.println("objEditor = " + objEditor);
139	222	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	223	+// objEditor.ctrlPanel.remove(nameField);
141	224
142		- if (!GroupEditor.allparams)
	225	+ objEditor.ctrlPanel.remove(namePanel);
	226	+
	227	+ if (!allparams)
143	228	return;
144	229
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	230	+// objEditor.ctrlPanel.remove(liveCB);
	231	+// objEditor.ctrlPanel.remove(hideCB);
	232	+// objEditor.ctrlPanel.remove(markCB);
	233	+//
	234	+// objEditor.ctrlPanel.remove(randomCB);
	235	+// objEditor.ctrlPanel.remove(speedupCB);
	236	+// objEditor.ctrlPanel.remove(rewindCB);
	237	+//
	238	+// objEditor.ctrlPanel.remove(resetButton);
	239	+// objEditor.ctrlPanel.remove(stepButton);
	240	+//// objEditor.ctrlPanel.remove(stepAllButton);
	241	+//// objEditor.ctrlPanel.remove(resetAllButton);
	242	+// objEditor.ctrlPanel.remove(link2masterCB);
	243	+// //objEditor.ctrlPanel.remove(flipVCB);
	244	+// //objEditor.ctrlPanel.remove(texresMenu);
	245	+// objEditor.ctrlPanel.remove(slowerButton);
	246	+// objEditor.ctrlPanel.remove(fasterButton);
	247	+// objEditor.ctrlPanel.remove(remarkButton);
	248	+
	249	+ objEditor.ctrlPanel.remove(setupPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	252	+ objEditor.ctrlPanel.remove(pushPanel);
	253	+ //objEditor.ctrlPanel.remove(fillPanel);
	254	+
	255	+ //Remove(normalpushField);
163	256	}
164	257
165	258	public ObjEditor GetEditor()
166	259	{
167	260	return objEditor; //.GetEditor();
168	261	}
	262	+
	263	+ // Sometimes myself, sometimes my callee's.
169	264	ObjEditor objEditor;
170	265
171	266	/*
..	..	@@ -201,6 +296,12 @@
201	296	client = inClient;
202	297	copy = client;
203	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
204	305	// "this" is not called: SetupUI2(objEditor);
205	306	}
206	307
..	..	@@ -214,6 +315,12 @@
214	315	client = inClient;
215	316	copy = client;
216	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
217	324	SetupUI2(callee.GetEditor());
218	325	}
219	326
..	..	@@ -228,6 +335,7 @@
228	335	//localCopy.parent = null;
229	336
230	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
231	339	objEditor = this;
232	340	this.callee = callee;
233	341
..	..	@@ -245,6 +353,12 @@
245	353	copy = localCopy;
246	354	copy.editWindow = this;
247	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
248	362	SetupMenu();
249	363
250	364	//SetupName(objEditor); // new
..	..	@@ -258,28 +372,49 @@
258	372	return frame.action(event, obj);
259	373	}
260	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
261	380	void SetupMenu()
262	381	{
263	382	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	403	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
274	408	if (client.parent != null)
275	409	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	411	} else
278	412	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	414	}
281	415
282		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
283	418	saveItem.addActionListener(this);
284	419	saveAsItem.addActionListener(this);
285	420	exportAsItem.addActionListener(this);
..	..	@@ -287,82 +422,69 @@
287	422	//povItem.addActionListener(this);
288	423	closeItem.addActionListener(this);
289	424
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
346	452	toolbarPanel = new JPanel();
347	453	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	454	+
	455	+ treePanel = new cGridBag();
349	456	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
353		- materialPanel.setName("Material");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
	461	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
354	473	/JTextPane/
355	474	infoarea = createTextPane();
	475	+ doc = infoarea.getStyledDocument();
	476	+
356	477	infoarea.setEditable(true);
357	478	SetText();
	479	+
358	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	481	// infoarea.setOpaque(false);
360	482	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	483	+// TEXTAREA infoarea.setLineWrap(true);
	484	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364		- infoPanel.setPreferredSize(new Dimension(50, 200));
365		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
366	488	//infoPanel.setLayout(new BorderLayout());
367	489	//infoPanel.add(createTextPane());
368	490
..	..	@@ -370,16 +492,23 @@
370	492	mainPanel.setName("Main");
371	493	mainPanel.setContinuousLayout(true);
372	494	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	495	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	496	+ mainPanel.setDividerLocation(0.5); //1.0);
	497	+ mainPanel.setResizeWeight(0.5);
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
377	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	507	//mainPanel.setLayout(new GridBagLayout());
379	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	509	+// treePanel.setLayout(new GridBagLayout());
	510	+ //ctrlPanel.setLayout(new GridBagLayout());
	511	+ //materialPanel.setLayout(new GridBagLayout());
383	512
384	513	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	514	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +547,7 @@
418	547	static String newline = "\n";
419	548	protected static final String buttonString = "JButton";
420	549	StyledDocument doc;
421		- JTextArea infoarea;
	550	+ JTextPane infoarea;
422	551
423	552	void ClearInfo()
424	553	{
..	..	@@ -441,10 +570,10 @@
441	570	e.printStackTrace();
442	571	}
443	572
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	577	//clipboard.setContents(data, data);
449	578	}
450	579
..	..	@@ -467,13 +596,13 @@
467	596	//SendInfo("Name:", "bold");
468	597	if (sel.GetTextures() != null \|\| debug)
469	598	{
470		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	601	if (sel.Size() > 0)
473	602	{
474	603	si.SendInfo("#children = " + sel.Size(), "regular");
475	604	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	606	if (debug)
478	607	{
479	608	try
..	..	@@ -485,7 +614,10 @@
485	614	}
486	615
487	616	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	617	+ {
	618	+ si.SendInfo(" BBox min: " + minima, "regular");
	619	+ si.SendInfo(" BBox max: " + maxima, "regular");
	620	+ }
489	621
490	622	if (sel.bRep != null)
491	623	{
..	..	@@ -512,7 +644,7 @@
512	644	}
513	645	if (sel.support != null)
514	646	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	648	}
517	649	if (sel.scriptnode != null)
518	650	{
..	..	@@ -583,6 +715,9 @@
583	715	{
584	716	CameraPane.pointflow = (PointFlow) sel;
585	717	}
	718	+
	719	+ si.SendInfo("_____________________", "regular");
	720	+ si.SendInfo("", "regular");
586	721	}
587	722	}
588	723
..	..	@@ -598,68 +733,194 @@
598	733	}
599	734	}
600	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
601	794	void ToggleFullScreen()
602	795	{
603		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
604	801	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
608	825	} else
609	826	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
613	849	}
614		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
615	853	}
616	854
617		- private JTextArea createTextPane()
	855	+ private Object3D CompressCopy()
618	856	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
634	877
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
	878	+ private JTextPane createTextPane()
	879	+ {
	880	+// TEXTAREA String[] initString =
	881	+// {
	882	+// "This is an editable JTextPane, ", //regular
	883	+// "another ", //italic
	884	+// "styled ", //bold
	885	+// "text ", //small
	886	+// "component, ", //large
	887	+// "which supports embedded components..." + newline,//regular
	888	+// " " + newline, //button
	889	+// "...and embedded icons..." + newline, //regular
	890	+// " ", //icon
	891	+// newline + "JTextPane is a subclass of JEditorPane that "
	892	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	893	+// + "cover methods for interacting with those objects."
	894	+// };
	895	+//
	896	+// String[] initStyles =
	897	+// {
	898	+// "regular", "italic", "bold", "small", "large",
	899	+// "regular", "button", "regular", "icon",
	900	+// "regular"
	901	+// };
	902	+//
	903	+// JTextPane textPane = new JTextPane();
	904	+// textPane.setEditable(true);
	905	+// /StyledDocument/ doc = textPane.getStyledDocument();
	906	+// addStylesToDocument(doc);
	907	+//
	908	+// try
	909	+// {
	910	+// for (int j = 0; j < 2; j++)
	911	+// {
	912	+// for (int i = 0; i < initString.length; i++)
	913	+// {
	914	+// doc.insertString(doc.getLength(), initString[i],
	915	+// doc.getStyle(initStyles[i]));
	916	+// }
	917	+// }
	918	+// } catch (BadLocationException ble)
	919	+// {
	920	+// System.err.println("Couldn't insert initial text into text pane.");
	921	+// }
641	922
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	923	+ return new JTextPane(); // textPane;
663	924	}
664	925
665	926	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +973,7 @@
712	973	protected static ImageIcon createImageIcon(String path,
713	974	String description)
714	975	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	976	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	977	if (imgURL != null)
717	978	{
718	979	return new ImageIcon(imgURL, description);
..	..	@@ -735,6 +996,7 @@
735	996	{
736	997	SetupMaterial(materialPanel);
737	998	}
	999	+
738	1000	//SetupName();
739	1001	//SetupViews();
740	1002	}
..	..	@@ -744,6 +1006,7 @@
744	1006	// NumberSlider vDivsField;
745	1007	// JCheckBox endcaps;
746	1008	JCheckBox liveCB;
	1009	+ JCheckBox selectableCB;
747	1010	JCheckBox hideCB;
748	1011	JCheckBox link2masterCB;
749	1012	JCheckBox markCB;
..	..	@@ -751,7 +1014,12 @@
751	1014	JCheckBox speedupCB;
752	1015	JCheckBox rewindCB;
753	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
754	1021	JComboBox texresMenu;
	1022	+
755	1023	JButton resetButton;
756	1024	JButton stepButton;
757	1025	JButton stepAllButton;
..	..	@@ -759,115 +1027,87 @@
759	1027	JButton slowerButton;
760	1028	JButton fasterButton;
761	1029	JButton remarkButton;
	1030	+
	1031	+ cGridBag editPanel;
	1032	+ cGridBag editCommandsPanel;
	1033	+
	1034	+ cGridBag namePanel;
	1035	+ cGridBag setupPanel;
	1036	+ cGridBag setupPanel2;
	1037	+ cGridBag objectCommandsPanel;
	1038	+ cGridBag pushPanel;
	1039	+ cGridBag fillPanel;
762	1040
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1041	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	1042	{
765	1043	JCheckBox cb;
766	1044
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1045	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	1046	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	1047
777	1048	return cb;
778	1049	}
779	1050
780		- cButton AddButton(ObjEditor oe, String label)
	1051	+ cButton AddButton(cGridBag panel, String label)
781	1052	{
782	1053	cButton cb;
783	1054
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1055	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	1056	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	1057
794	1058	return cb;
795	1059	}
796	1060
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1061	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	1062	{
799	1063	JComboBox combo;
800	1064
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	1065	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	1066	combo.addActionListener(this);
805	1067
806	1068	return combo;
807	1069	}
808	1070
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1071	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	1072	{
811		- NumberSlider combo;
	1073	+ cGridBag control = new cGridBag();
	1074	+
	1075	+ cNumberSlider combo;
812	1076
813	1077	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	1078	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	1079	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1080	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	1081	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	1082	+
	1083	+ panel.add(control);
	1084	+
	1085	+ return control;
833	1086	}
834	1087
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1088	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	1089	{
837		- NumberSlider combo;
	1090	+ cGridBag control = new cGridBag();
	1091	+
	1092	+ cNumberSlider combo;
838	1093
839	1094	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1095	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1096	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1097	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1098	combo.setInteger(current);
853	1099
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1100	+ panel.add(control);
	1101	+
	1102	+ return control;
859	1103	}
860	1104
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1105	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1106	{
863	1107	JTextArea text;
864	1108
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1109	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1110	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1111
872	1112	return text;
873	1113	}
..	..	@@ -897,9 +1137,16 @@
897	1137	objEditor.ctrlPanel.remove(j);
898	1138	}
899	1139
	1140	+ void Remove(cNumberSlider j)
	1141	+ {
	1142	+ j.removeChangeListener(this);
	1143	+ //objEditor.ctrlPanel.remove(j.label);
	1144	+ objEditor.ctrlPanel.remove(j);
	1145	+ }
	1146	+
900	1147	/*
901	1148	*/
902		- void Return() // ObjEditor oe)
	1149	+ void Return0() // ObjEditor oe)
903	1150	{
904	1151	aConstraints.gridy += 1;
905	1152	aConstraints.gridx = 0;
..	..	@@ -954,35 +1201,81 @@
954	1201
955	1202	void SetupUI2(ObjEditor oe)
956	1203	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1204	+ //SetupName(oe);
962	1205
963		- if (!GroupEditor.allparams)
	1206	+ namePanel = new cGridBag();
	1207	+
	1208	+ nameField = AddText(namePanel, copy.GetName());
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1210	+ oe.ctrlPanel.add(namePanel);
	1211	+
	1212	+ oe.ctrlPanel.Return();
	1213	+
	1214	+ if (!allparams)
964	1215	return;
965	1216
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1217	+ setupPanel = new cGridBag().setVertical(false);
	1218	+
	1219	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1220	+ liveCB.setToolTipText("Animate object");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
969	1223	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1224	+
	1225	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1226	+ hideCB.setToolTipText("Hide object");
	1227	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1228	+ markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1231	+
	1232	+ setupPanel2 = new cGridBag().setVertical(false);
	1233	+
	1234	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1235	+ rewindCB.setToolTipText("Rewind animation");
	1236	+
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1238	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1239	+
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
	1243	+ if (Globals.ADVANCED)
	1244	+ {
	1245	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1246	+ speedupCB.setToolTipText("Option motion capture");
	1247	+ }
	1248	+
	1249	+ oe.ctrlPanel.add(setupPanel);
	1250	+ oe.ctrlPanel.Return();
	1251	+ oe.ctrlPanel.add(setupPanel2);
	1252	+ oe.ctrlPanel.Return();
	1253	+
	1254	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1255	+
	1256	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1257	+ resetButton.setToolTipText("Jump to frame zero");
	1258	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1259	+ stepButton.setToolTipText("Step one frame");
976	1260	// resetAllButton = AddButton(oe, "Reset All");
977	1261	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1262	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1263	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1264	+ slowerButton.setToolTipText("Decrease animation speed");
	1265	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1266	+ fasterButton.setToolTipText("Increase animation speed");
	1267	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1268	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1269
984		- Return();
	1270	+ oe.ctrlPanel.add(objectCommandsPanel);
	1271	+ oe.ctrlPanel.Return();
985	1272
	1273	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1274	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1275	+ //Return();
	1276	+
	1277	+ oe.ctrlPanel.Return();
	1278	+
986	1279	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1280	// ObjEditor.aConstraints.gridx += 1;
988	1281
..	..	@@ -1076,7 +1369,7 @@
1076	1369	oe.aConstraints.gridwidth = 1;
1077	1370	/**/
1078	1371	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1372	+ oe.ctrlPanel.Return();
1080	1373
1081	1374	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1375	//textureButton.setEnabled(false);
..	..	@@ -1178,11 +1471,25 @@
1178	1471	//JPanel worldPanel =
1179	1472	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1473	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1474	+ centralPanel = new cGridBag();
	1475	+ centralPanel.preferredWidth = 20;
	1476	+
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ timelinePanel = new JPanel(new BorderLayout());
	1480	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1481
	1482	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1483	+ cameraPanel.setContinuousLayout(true);
	1484	+ cameraPanel.setOneTouchExpandable(true);
	1485	+// cameraPanel.setDividerLocation(0.9);
	1486	+// cameraPanel.setDividerSize(9);
	1487	+ cameraPanel.setResizeWeight(1.0);
	1488	+
	1489	+ }
	1490	+
1185	1491	centralPanel.add(cameraView);
	1492	+ centralPanel.setFocusable(true);
1186	1493	//frame.setJMenuBar(timelineMenubar);
1187	1494	//centralPanel.add(timelinePanel);
1188	1495
..	..	@@ -1201,12 +1508,14 @@
1201	1508	//frontView.object = copy;
1202	1509	//sideView.object = copy;
1203	1510
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1511	+ XYZPanel = new cGridBag().setVertical(true);
	1512	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1513
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1514	+ XYZPanel.preferredWidth = 5;
	1515	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1516	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1517	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1210	1519
1211	1520	/*
1212	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,11 +1553,29 @@
1244	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1554	//tmp.setName("Edit");
1246	1555	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
1251		- objectPanel.add(infoPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
	1559	+// JPanel north = new JPanel(new BorderLayout());
	1560	+// north.setName("Edit");
	1561	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1562	+// objectPanel.add(north);
	1563	+ objectPanel.add(editPanel);
	1564	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1566	+
	1567	+ //if (Globals.ADVANCED)
	1568	+ objectPanel.add(infoPanel);
	1569	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1570	+ objectPanel.setToolTipTextAt(2, "Information");
	1571	+
	1572	+ objectPanel.add(XYZPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1575	+
	1576	+ objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1252	1579
1253	1580	/*
1254	1581	aConstraints.gridx = 0;
..	..	@@ -1257,7 +1584,7 @@
1257	1584	aConstraints.gridy += 1;
1258	1585	aConstraints.gridwidth = 1;
1259	1586	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1587	+ */
1261	1588
1262	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,16 +1595,23 @@
1268	1595	scrollpane.setWheelScrollingEnabled(true);
1269	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1597
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1598	+ /JTabbedPane/ scenePanel = new cGridBag();
	1599	+ scenePanel.preferredWidth = 5;
	1600	+
	1601	+ JTabbedPane tabbedPane = new JTabbedPane();
	1602	+ tabbedPane.add(scrollpane);
1273	1603
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1277	1605
1278	1606	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1607	+
	1608	+ AddOptions(optionsPanel); //, aConstraints);
	1609	+
	1610	+ tabbedPane.add(optionsPanel);
	1611	+
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1613
	1614	+ scenePanel.add(tabbedPane);
1281	1615
1282	1616	/*
1283	1617	cTree jTree = new cTree(null);
..	..	@@ -1311,6 +1645,7 @@
1311	1645	//bigPanel.setSize(new Dimension(10,10));
1312	1646	//bigPanel.add(ctrlPanel);
1313	1647	//bigPanel.add(gridPanel);
	1648	+ /**
1314	1649	bigThree = new JPanel();
1315	1650	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1651	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1669,13 @@
1334	1669	// aConstraints.gridheight = 3;
1335	1670	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1671	bigThree.add(XYZPanel, aWindowConstraints);
	1672	+ /**/
1337	1673
	1674	+ bigThree = new cGridBag();
	1675	+ bigThree.addComponent(scenePanel);
	1676	+ bigThree.addComponent(centralPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
	1678	+
1338	1679	// // SIDE EFFECT!!!
1339	1680	// aConstraints.gridx = 0;
1340	1681	// aConstraints.gridy = 0;
..	..	@@ -1342,9 +1683,9 @@
1342	1683	// aConstraints.gridheight = 1;
1343	1684
1344	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1345		- framePanel.setContinuousLayout(true);
1346		- framePanel.setOneTouchExpandable(true);
1347		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1348	1689	//framePanel.setDividerSize(15);
1349	1690	//framePanel.setResizeWeight(0.15);
1350	1691	framePanel.setName("Frame");
..	..	@@ -1355,20 +1696,25 @@
1355	1696	//worldPane.add(bigPanel);
1356	1697	//worldPane.add(worldPanel);
1357	1698	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1699	+ //frame.getContentPane().add(/"Center",/framePanel);
	1700	+ frame.add(/"Center",/framePanel);
1359	1701	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1702
1361	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1704
1363		- frame.setSize(1024, 768);
1364		- frame.show();
1365		-
	1705	+ frame.setSize(1280, 860);
	1706	+
	1707	+ cameraView.requestFocusInWindow();
	1708	+
1366	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1367	1714
1368	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1369	1716	frame.addWindowListener(new WindowAdapter()
1370	1717	{
1371		-
1372	1718	public void windowClosing(WindowEvent e)
1373	1719	{
1374	1720	Close();
..	..	@@ -1376,6 +1722,10 @@
1376	1722	});
1377	1723	}
1378	1724
	1725	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1726	+ {
	1727	+ }
	1728	+
1379	1729	JTree GetTree()
1380	1730	{
1381	1731	return objEditor.jTree;
..	..	@@ -1387,260 +1737,257 @@
1387	1737	ctrlPanel.removeAll();
1388	1738	}
1389	1739
1390		- void SetupMaterial(JPanel ctrlPanel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1391	1741	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1744	+ skin.addMouseListener(new MouseAdapter()
	1745	+ {
	1746	+ public void mouseClicked(MouseEvent e)
	1747	+ {
	1748	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1749	+ cMaterial material = object.material;
	1750	+
	1751	+ // Skin
	1752	+ colorField.setFloat(material.color);
	1753	+ saturationField.setFloat(material.modulation);
	1754	+ subsurfaceField.setFloat(material.subsurface);
	1755	+ selfshadowField.setFloat(material.diffuseness);
	1756	+ diffusenessField.setFloat(material.factor);
	1757	+ shininessField.setFloat(material.shininess);
	1758	+ shadowbiasField.setFloat(material.shadowbias);
	1759	+ diffuseField.setFloat(material.diffuse);
	1760	+ specularField.setFloat(material.specular);
	1761	+
	1762	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1763	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1764	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1765	+
	1766	+ materialtouched = true;
	1767	+ applySelf();
	1768	+ }
	1769	+ });
	1770	+ presetpanel.add(skin);
	1771	+
	1772	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1773	+ rough2.addMouseListener(new MouseAdapter()
	1774	+ {
	1775	+ public void mouseClicked(MouseEvent e)
	1776	+ {
	1777	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1778	+ cMaterial material = object.material;
	1779	+
	1780	+ shininessField.setFloat(material.shininess);
	1781	+ velvetField.setFloat(material.velvet);
	1782	+
	1783	+ materialtouched = true;
	1784	+ applySelf();
	1785	+ }
	1786	+ });
	1787	+ presetpanel.add(rough2);
	1788	+
	1789	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1790	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1791	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1792	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1793	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1794	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1795	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1796	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1797	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1798	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1799	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1800	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1801	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1802	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1803	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1804	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1805	+
	1806	+ cGridBag panel = new cGridBag().setVertical(true);
	1807	+
	1808	+ presetpanel.preferredWidth = 1;
	1809	+
	1810	+ materialpanel.add(panel);
	1811	+ materialpanel.add(presetpanel);
	1812	+
	1813	+ panel.preferredWidth = 8;
	1814	+
	1815	+ /*
1395	1816	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	1817	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399		- */
	1818	+ */
1400	1819
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	1820	+ cGridBag editBar = new cGridBag().setVertical(false);
	1821	+
	1822	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1823	+ createMaterialButton.setToolTipText("Create material");
1406	1824
1407	1825	/*
1408	1826	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	1827	*/
1413	1828
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	1829	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1830	+ clearMaterialButton.setToolTipText("Clear material");
	1831	+
	1832	+ if (Globals.ADVANCED)
	1833	+ {
	1834	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1835	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1836	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1837	+ }
1416	1838
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	1839	+ editBar.preferredHeight = 15;
	1840	+
	1841	+ panel.add(editBar);
	1842	+
1431	1843	/**/
1432	1844	//aConstraints.weighty = 0;
1433	1845	////aConstraints.weightx = 1;
1434	1846	//aConstraints.weighty = 1;
1435	1847	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	1848	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	1849	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	1850
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	1851	+ cGridBag colorSection = new cGridBag().setVertical(true);
1453	1852
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	1853	+ cGridBag huepanel = new cGridBag();
	1854	+ cGridBag huelabel = new cGridBag();
	1855	+ skin = GetLabel("icons/hue.png", false);
	1856	+ skin.fit = true;
	1857	+ huelabel.add(skin);
	1858	+ huelabel.preferredWidth = 20;
	1859	+ huepanel.add(new cGridBag()); // Label
	1860	+ huepanel.add(huelabel); // Field/slider
	1861	+
	1862	+ huepanel.preferredHeight = 7;
1463	1863
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	1864	+ colorSection.add(huepanel);
	1865	+
	1866	+ cGridBag color = new cGridBag();
	1867	+
	1868	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1869	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	1871
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	1872	+ //colorField.preferredWidth = 200;
	1873	+ colorSection.add(color);
1483	1874
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	1875	+ cGridBag modulation = new cGridBag();
	1876	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1877	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1878	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1879	+ colorSection.add(modulation);
1493	1880
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	1881	+ cGridBag opacity = new cGridBag();
	1882	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1883	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1884	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1885	+ colorSection.add(opacity);
1503	1886
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1887	+ colorSection.add(GetSeparator());
	1888	+
	1889	+ cGridBag texture = new cGridBag();
	1890	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1891	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1892	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1893	+ colorSection.add(texture);
1512	1894
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1895	+ panel.add(GetSeparator());
	1896	+
	1897	+ panel.add(colorSection);
	1898	+
	1899	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1900	+
	1901	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1902	+
	1903	+ cGridBag diffuse = new cGridBag();
	1904	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1905	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1906	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1907	+ diffuseSection.add(diffuse);
1522	1908
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1909	+ cGridBag diffuseness = new cGridBag();
	1910	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1911	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1912	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1913	+ diffuseSection.add(diffuseness);
1532	1914
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1915	+ cGridBag selfshadow = new cGridBag();
	1916	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1917	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1918	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1919	+ diffuseSection.add(selfshadow);
1542	1920
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	1921	+ cGridBag sheen = new cGridBag();
	1922	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1923	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1924	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1925	+ diffuseSection.add(sheen);
1552	1926
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	1927	+ cGridBag subsurface = new cGridBag();
	1928	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1929	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1930	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1931	+ diffuseSection.add(subsurface);
1562	1932
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	1933	+ cGridBag shadow = new cGridBag();
	1934	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1935	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1936	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1937	+ diffuseSection.add(shadow);
1572	1938
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	1939	+ cGridBag fakedepth = new cGridBag();
	1940	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1941	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1942	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1943	+ diffuseSection.add(fakedepth);
1582	1944
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1945	+ cGridBag shadowbias = new cGridBag();
	1946	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1947	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1948	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1949	+ diffuseSection.add(shadowbias);
1591	1950
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1951	+ panel.add(GetSeparator());
	1952	+
	1953	+ panel.add(diffuseSection);
	1954	+
	1955	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1956	+
	1957	+ cGridBag specularSection = new cGridBag().setVertical(true);
1601	1958
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1959	+ cGridBag specular = new cGridBag();
	1960	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1961	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1962	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1963	+ specularSection.add(specular);
1611	1964
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	1965	+ cGridBag lightarea = new cGridBag();
	1966	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1967	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1968	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1969	+ specularSection.add(lightarea);
1621	1970
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	1971	+ cGridBag shininess = new cGridBag();
	1972	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1973	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1974	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1975	+ specularSection.add(shininess);
1631	1976
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
	1977	+ cGridBag metalness = new cGridBag();
	1978	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1979	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1980	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1981	+ specularSection.add(metalness);
1641	1982
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	1983	+ cGridBag velvet = new cGridBag();
	1984	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1985	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1986	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1987	+ specularSection.add(velvet);
	1988	+
	1989	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1990	+ //Return();
1644	1991	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	1992	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	1993	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +1998,99 @@
1651	1998	// aConstraints.gridy += 1;
1652	1999	// aConstraints.gridwidth = 1;
1653	2000
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
	2001	+ cGridBag anisoU = new cGridBag();
	2002	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2003	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2004	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2005	+ specularSection.add(anisoU);
1662	2006
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	2007	+ cGridBag anisoV = new cGridBag();
	2008	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2009	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2010	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2011	+ specularSection.add(anisoV);
1672	2012
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
1682	2013
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	2014	+ panel.add(GetSeparator());
	2015	+
	2016	+ panel.add(specularSection);
	2017	+
	2018	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2019	+
	2020	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1692	2021
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	2022	+ cGridBag camera = new cGridBag();
	2023	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2024	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2025	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2026	+ colorSection.add(camera);
1703	2027
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	2028	+ cGridBag ambient = new cGridBag();
	2029	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2030	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2031	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2032	+ colorSection.add(ambient);
1713	2033
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	2034	+ cGridBag backlit = new cGridBag();
	2035	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2036	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2037	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2038	+ colorSection.add(backlit);
1723	2039
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	2040	+ //panel.add(new JSeparator());
	2041	+
	2042	+ //panel.add(globalSection);
	2043	+
	2044	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2045	+
	2046	+ cGridBag textureSection = new cGridBag().setVertical(true);
1733	2047
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	2048	+ cGridBag bump = new cGridBag();
	2049	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2050	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2051	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2052	+ textureSection.add(bump);
1743	2053
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	2054	+ cGridBag noise = new cGridBag();
	2055	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2056	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2057	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2058	+ textureSection.add(noise);
1753	2059
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	2060	+ cGridBag power = new cGridBag();
	2061	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2062	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2063	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2064	+ textureSection.add(power);
1763	2065
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	2066	+ cGridBag borderfade = new cGridBag();
	2067	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2068	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2069	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2070	+ textureSection.add(borderfade);
1769	2071
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	2072	+ cGridBag fog = new cGridBag();
	2073	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2074	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2075	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2076	+ textureSection.add(fog);
	2077	+
	2078	+ cGridBag opacityPower = new cGridBag();
	2079	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2080	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2081	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2082	+ textureSection.add(opacityPower);
	2083	+
	2084	+ panel.add(GetSeparator());
	2085	+
	2086	+ panel.add(textureSection);
	2087	+
	2088	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	2089
1774	2090	SetMaterial(copy); // .GetMaterial());
1775	2091
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	2092	+ //colorField.addChangeListener(this);
	2093	+// modulationField.addChangeListener(this);
1778	2094	metalnessField.addChangeListener(this);
1779	2095	diffuseField.addChangeListener(this);
1780	2096	specularField.addChangeListener(this);
..	..	@@ -1804,12 +2120,15 @@
1804	2120	opacityPowerField.addChangeListener(this);
1805	2121	/**/
1806	2122
1807		- resetSlidersButton.addActionListener(this);
1808	2123	clearMaterialButton.addActionListener(this);
1809	2124	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	2125	+
	2126	+ if (Globals.ADVANCED)
	2127	+ {
	2128	+ resetSlidersButton.addActionListener(this);
	2129	+ propagateToggle.addItemListener(this);
	2130	+ multiplyToggle.addItemListener(this);
	2131	+ }
1813	2132	}
1814	2133
1815	2134	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1827,8 +2146,9 @@
1827	2146	// 3D models
1828	2147	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1829	2148	{
1830		- lastConverter = new com.jmex.model.converters.MaxToJme();
1831		- LoadFile(filename, lastConverter);
	2149	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2150	+ //LoadFile(filename, lastConverter);
	2151	+ LoadObjFile(filename); // New 3ds loader
1832	2152	continue;
1833	2153	}
1834	2154	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1980,7 +2300,7 @@
1980	2300
1981	2301	//? flashIt = false;
1982	2302	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2303	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2304	pane.clickEnd(location.x, location.y, 0, true);
1985	2305
1986	2306	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2349,7 @@
2029	2349	e2.printStackTrace();
2030	2350	}
2031	2351	}
	2352	+
2032	2353	LoadJMEThread loadThread;
2033	2354
2034	2355	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2407,7 @@
2086	2407	//LoadFile0(filename, converter);
2087	2408	}
2088	2409	}
	2410	+
2089	2411	LoadOBJThread loadObjThread;
2090	2412
2091	2413	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2486,19 @@
2164	2486
2165	2487	void LoadObjFile(String fullname)
2166	2488	{
2167		- /*
	2489	+ System.out.println("Loading " + fullname);
	2490	+ /**/
2168	2491	//lastFilename = fullname;
2169	2492	if(loadObjThread == null)
2170	2493	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2494	+ loadObjThread = new LoadOBJThread();
	2495	+ loadObjThread.start();
2173	2496	}
2174	2497
2175	2498	loadObjThread.add(fullname);
2176		- */
	2499	+ /**/
2177	2500
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2501	+ //makeSomething(new FileObject(fullname, true), true);
2180	2502	}
2181	2503
2182	2504	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +2759,11 @@
2437	2759
2438	2760	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	2761	{
2440		- if (GrafreeD.standAlone)
	2762	+ if (Grafreed.standAlone)
2441	2763	{
2442	2764	/**/
2443	2765	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	2766	+ browser.setVisible(true);
2445	2767	String filename = browser.getFile();
2446	2768	if (filename != null && filename.length() > 0)
2447	2769	{
..	..	@@ -2552,6 +2874,7 @@
2552	2874	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2553	2875	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2554	2876	}
	2877	+
2555	2878	//cJME.count++;
2556	2879	//cJME.count %= 12;
2557	2880	if (gc)
..	..	@@ -2586,6 +2909,7 @@
2586	2909	}
2587	2910	if (input == null)
2588	2911	{
	2912	+ new Exception().printStackTrace();
2589	2913	System.exit(0);
2590	2914	}
2591	2915
..	..	@@ -2734,6 +3058,7 @@
2734	3058	}
2735	3059	}
2736	3060	}
	3061	+
2737	3062	cFileSystemPane FSPane;
2738	3063
2739	3064	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2743,7 +3068,7 @@
2743	3068
2744	3069	freezematerial = true;
2745	3070	colorField.setFloat(mat.color);
2746		- modulationField.setFloat(mat.modulation);
	3071	+ saturationField.setFloat(mat.modulation);
2747	3072	metalnessField.setFloat(mat.metalness);
2748	3073	diffuseField.setFloat(mat.diffuse);
2749	3074	specularField.setFloat(mat.specular);
..	..	@@ -2787,11 +3112,14 @@
2787	3112	}
2788	3113	}
2789	3114	}
	3115	+
2790	3116	freezematerial = false;
2791	3117	}
2792	3118
2793	3119	void SetMaterial(Object3D object)
2794	3120	{
	3121	+ latestObject = object;
	3122	+
2795	3123	cMaterial mat = object.material;
2796	3124
2797	3125	if (mat == null)
..	..	@@ -2800,7 +3128,8 @@
2800	3128	return;
2801	3129	}
2802	3130
2803		- multiplyToggle.setSelected(mat.multiply);
	3131	+ if (multiplyToggle != null)
	3132	+ multiplyToggle.setSelected(mat.multiply);
2804	3133
2805	3134	assert (object.projectedVertices != null);
2806	3135
..	..	@@ -2902,12 +3231,17 @@
2902	3231	// }
2903	3232
2904	3233	/**/
2905		- if (deselect)
	3234	+ if (deselect \|\| child == null)
2906	3235	{
2907	3236	//group.deselectAll();
2908	3237	//freeze = true;
2909	3238	GetTree().clearSelection();
2910	3239	//freeze = false;
	3240	+
	3241	+ if (child == null)
	3242	+ {
	3243	+ return;
	3244	+ }
2911	3245	}
2912	3246
2913	3247	//group.addSelectee(child);
..	..	@@ -2976,7 +3310,7 @@
2976	3310	cameraView.ToggleDL();
2977	3311	cameraView.repaint();
2978	3312	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3313	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3314	{
2981	3315	cameraView.ToggleTexture();
2982	3316	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3323,8 @@
2989	3323	if (timeline)
2990	3324	{
2991	3325	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3326	+ cameraPanel.add(cameraView);
	3327	+ centralPanel.add(cameraPanel);
2993	3328	frame.setJMenuBar(timelineMenubar);
2994	3329	wasFullScreen = CameraPane.FULLSCREEN;
2995	3330	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3333,7 @@
2998	3333	}
2999	3334	else
3000	3335	{
3001		- centralPanel.remove(timelinePanel);
	3336	+ centralPanel.remove(cameraPanel);
3002	3337	centralPanel.add(cameraView);
3003	3338	frame.setJMenuBar(null);
3004	3339	if (!wasFullScreen)
..	..	@@ -3014,9 +3349,9 @@
3014	3349	frame.validate();
3015	3350
3016	3351	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3352	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3353	{
3019		- cameraView.ToggleRandom();
	3354	+ cameraView.ToggleSwitch();
3020	3355	cameraView.repaint();
3021	3356	return;
3022	3357	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3044,12 +3379,17 @@
3044	3379	} else if (event.getSource() == liveCB)
3045	3380	{
3046	3381	copy.live ^= true;
	3382	+ objEditor.refreshContents(true); // To show item colors
	3383	+ return;
	3384	+ } else if (event.getSource() == selectableCB)
	3385	+ {
	3386	+ copy.dontselect ^= true;
3047	3387	return;
3048	3388	} else if (event.getSource() == hideCB)
3049	3389	{
3050	3390	copy.hide ^= true;
3051	3391	copy.Touch(); // display list issue
3052		- objEditor.refreshContents();
	3392	+ objEditor.refreshContents(true); // To show item colors
3053	3393	return;
3054	3394	} else if (event.getSource() == link2masterCB)
3055	3395	{
..	..	@@ -3059,6 +3399,7 @@
3059	3399	if (event.getSource() == randomCB)
3060	3400	{
3061	3401	copy.random ^= true;
	3402	+ objEditor.refreshContents();
3062	3403	return;
3063	3404	}
3064	3405	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3423,9 @@
3082	3423
3083	3424	public void actionPerformed(ActionEvent event)
3084	3425	{
	3426	+ Object source = event.getSource();
3085	3427	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3428	+ if (source == okbutton)
3087	3429	{
3088	3430	textpanel.setVisible(false);
3089	3431	textpanel.remove(textarea);
..	..	@@ -3095,7 +3437,7 @@
3095	3437	textarea = null;
3096	3438	textpanel = null;
3097	3439	}
3098		- if (event.getSource() == cancelbutton)
	3440	+ if (source == cancelbutton)
3099	3441	{
3100	3442	textpanel.setVisible(false);
3101	3443	textpanel.remove(textarea);
..	..	@@ -3107,49 +3449,50 @@
3107	3449	//applySelf();
3108	3450	//client.refreshEditWindow();
3109	3451	//refreshContents();
3110		- if (event.getSource() == nameField)
	3452	+ if (source == nameField)
3111	3453	{
3112	3454	//System.out.println("ObjEditor " + event);
3113	3455	applySelf0(true);
3114	3456	//parent.applySelf();
3115	3457	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3458	+ } else if (source == resetButton)
3117	3459	{
3118	3460	CameraPane.fullreset = true;
3119	3461	copy.Reset(); // ResetMeshes();
3120	3462	copy.Touch();
3121	3463	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3464	+ } else if (source == stepItem)
3123	3465	{
3124		- cameraView.ONESTEP = true;
	3466	+ //cameraView.ONESTEP = true;
	3467	+ Globals.ONESTEP = true;
3125	3468	cameraView.repaint();
3126	3469	return;
3127		- } else if (event.getSource() == stepButton)
	3470	+ } else if (source == stepButton)
3128	3471	{
3129	3472	copy.Step();
3130	3473	copy.Touch();
3131	3474	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3475	+ } else if (source == slowerButton)
3133	3476	{
3134	3477	copy.Slower();
3135	3478	copy.Touch();
3136	3479	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3480	+ } else if (source == fasterButton)
3138	3481	{
3139	3482	copy.Faster();
3140	3483	copy.Touch();
3141	3484	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3485	+ } else if (source == remarkButton)
3143	3486	{
3144	3487	copy.Remark();
3145	3488	copy.Touch();
3146	3489	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3490	+ } else if (source == stepAllButton)
3148	3491	{
3149	3492	copy.StepAll();
3150	3493	copy.Touch();
3151	3494	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3495	+ } else if (source == resetAllButton)
3153	3496	{
3154	3497	//CameraPane.fullreset = true;
3155	3498	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3525,79 @@
3182	3525	// Close();
3183	3526	// }
3184	3527	// else
3185		- if (event.getSource() == resetSlidersButton)
	3528	+ if (source == resetSlidersButton)
3186	3529	{
3187	3530	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3531	+ } else if (source == clearMaterialButton)
3189	3532	{
3190	3533	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3534	+ } else if (source == createMaterialButton)
3192	3535	{
3193	3536	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	3537	+ } else if (source == clearPanelButton)
3195	3538	{
3196	3539	copy.ClearUI();
3197	3540	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	3541	+ } else if (source == importGFDItem)
	3542	+ {
	3543	+ ImportGFD();
	3544	+ } else
	3545	+ if (source == importVRMLX3DItem)
	3546	+ {
	3547	+ ImportVRMLX3D();
	3548	+ } else
	3549	+ if (source == import3DSItem)
	3550	+ {
	3551	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3552	+ } else
	3553	+ if (source == importOBJItem)
	3554	+ {
	3555	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3556	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3557	+ browser.setVisible(true);
	3558	+ String filename = browser.getFile();
	3559	+ if (filename != null && filename.length() > 0)
	3560	+ {
	3561	+ String fullname = browser.getDirectory() + filename;
	3562	+ makeSomething(ReadOBJ(fullname), true);
	3563	+ }
	3564	+ } else
	3565	+ if (source == closeItem)
3204	3566	{
3205	3567	Close();
3206	3568	//return true;
3207		- } else if (event.getSource() == loadItem)
	3569	+ } else if (source == openItem)
3208	3570	{
3209		- load();
	3571	+ Open();
3210	3572	//return true;
3211		- } else if (event.getSource() == saveItem)
	3573	+ } else if (source == newItem)
	3574	+ {
	3575	+ New();
	3576	+ } else if (source == saveItem)
3212	3577	{
3213	3578	save();
3214	3579	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	3580	+ } else if (source == saveAsItem)
3216	3581	{
3217	3582	saveAs();
3218	3583	//return true;
3219		- } else if (event.getSource() == reexportItem)
	3584	+ } else if (source == reexportItem)
3220	3585	{
3221	3586	reexport();
3222	3587	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	3588	+ } else if (source == exportAsItem)
3224	3589	{
3225	3590	export();
3226	3591	//return true;
3227		- } else if (event.getSource() == povItem)
	3592	+ } else if (source == povItem)
3228	3593	{
3229	3594	generatePOV();
3230	3595	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	3596	+ } else if (event.getSource() == archiveItem)
	3597	+ {
	3598	+ cTools.Archive(frame);
	3599	+ return;
	3600	+ } else if (source == zBufferItem)
3232	3601	{
3233	3602	try
3234	3603	{
..	..	@@ -3250,21 +3619,8 @@
3250	3619	cameraView.repaint();
3251	3620	//return true;
3252	3621	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	3622	+ */ else // combos...
	3623	+ if (source == texresMenu)
3268	3624	{
3269	3625	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	3626	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +3632,487 @@
3276	3632	}
3277	3633	}
3278	3634
3279		- void ToggleAnimation()
	3635	+ void New()
3280	3636	{
3281		- if (!CameraPane.ANIMATION)
	3637	+ while (copy.Size() > 1)
3282	3638	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3639	+ copy.remove(1);
	3640	+ }
	3641	+
	3642	+ ResetModel();
	3643	+ objEditor.refreshContents();
	3644	+ }
	3645	+
	3646	+ static public byte[] Compress(Object3D o)
	3647	+ {
	3648	+ // Slower to actually compress.
	3649	+ try
	3650	+ {
	3651	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3652	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3653	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3654	+
	3655	+ Object3D parent = o.parent;
	3656	+ o.parent = null;
	3657	+
	3658	+ out.writeObject(o);
	3659	+
	3660	+ o.parent = parent;
	3661	+
	3662	+ out.flush();
	3663	+
	3664	+ baos //zstream
	3665	+ .close();
	3666	+ out.close();
	3667	+
	3668	+ byte[] bytes = baos.toByteArray();
	3669	+
	3670	+ System.out.println("save #bytes = " + bytes.length);
	3671	+ return bytes;
	3672	+ } catch (Exception e)
	3673	+ {
	3674	+ System.err.println(e);
	3675	+ return null;
	3676	+ }
	3677	+ }
	3678	+
	3679	+ static public Object Uncompress(byte[] bytes)
	3680	+ {
	3681	+ System.out.println("restore #bytes = " + bytes.length);
	3682	+ try
	3683	+ {
	3684	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3685	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3686	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3687	+ Object obj = in.readObject();
	3688	+
	3689	+ bais //istream
	3690	+ .close();
	3691	+ in.close();
	3692	+
	3693	+ return obj;
	3694	+ } catch (Exception e)
	3695	+ {
	3696	+ System.err.println(e);
	3697	+ return null;
	3698	+ }
	3699	+ }
	3700	+
	3701	+ static public Object clone(Object o)
	3702	+ {
	3703	+ try
	3704	+ {
	3705	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3706	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3707	+
	3708	+ out.writeObject(o);
	3709	+
	3710	+ out.flush();
	3711	+ out.close();
	3712	+
	3713	+ byte[] bytes = baos.toByteArray();
	3714	+
	3715	+ System.out.println("clone = " + bytes.length);
	3716	+
	3717	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3718	+ ObjectInputStream in = new ObjectInputStream(bais);
	3719	+ Object obj = in.readObject();
	3720	+ in.close();
	3721	+
	3722	+ return obj;
	3723	+ } catch (Exception e)
	3724	+ {
	3725	+ System.err.println(e);
	3726	+ return null;
	3727	+ }
	3728	+ }
	3729	+
	3730	+ cRadio GetCurrentTab()
	3731	+ {
	3732	+ cRadio ab;
	3733	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3734	+ {
	3735	+ ab = (cRadio)e.nextElement();
	3736	+ if(ab.GetObject() == copy)
	3737	+ {
	3738	+ return ab;
	3739	+ }
	3740	+ }
	3741	+
	3742	+ return null;
	3743	+ }
	3744	+
	3745	+
	3746	+ public void Save()
	3747	+ {
	3748	+ //Save(true);
	3749	+ Replace();
	3750	+ SetUndoStates();
	3751	+ }
	3752	+
	3753	+ private boolean Equal(byte[] compress, byte[] name)
	3754	+ {
	3755	+ if (compress.length != name.length)
	3756	+ {
	3757	+ return false;
	3758	+ }
	3759	+
	3760	+ for (int i=compress.length; --i>=0;)
	3761	+ {
	3762	+ if (compress[i] != name[i])
	3763	+ return false;
	3764	+ }
	3765	+
	3766	+ return true;
	3767	+ }
	3768	+
	3769	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3770	+
	3771	+ void DeleteVersion()
	3772	+ {
	3773	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	3774	+ {
	3775	+ copy.versionlist[i] = copy.versionlist[i+1];
	3776	+ }
	3777	+
	3778	+ CopyChanged();
	3779	+
	3780	+ SetUndoStates();
	3781	+ }
	3782	+
	3783	+ public boolean Save(boolean user)
	3784	+ {
	3785	+ System.err.println("Save");
	3786	+ //Replace();
	3787	+
	3788	+ cRadio tab = GetCurrentTab();
	3789	+
	3790	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	3791	+
	3792	+ boolean thesame = false;
	3793	+
	3794	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3795	+// {
	3796	+// thesame = true;
	3797	+// }
	3798	+
	3799	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3800	+ if (!thesame)
	3801	+ {
	3802	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	3803	+ {
	3804	+ copy.versionlist[i] = copy.versionlist[i-1];
	3805	+ }
	3806	+
	3807	+ //tab.user[tab.versionindex] = user;
	3808	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3809	+
	3810	+ copy.versionlist[++copy.versionindex] = compress;
	3811	+
	3812	+ // if (increment)
	3813	+ // tab.versionindex++;
	3814	+ }
	3815	+
	3816	+ //copy.RestoreBigData(versiontable);
	3817	+
	3818	+ //assert(hashtable.isEmpty());
	3819	+
	3820	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3821	+// {
	3822	+// //tab.user[i] = false;
	3823	+// copy.versionlist[i] = null;
	3824	+// }
	3825	+
	3826	+ SetUndoStates();
	3827	+
	3828	+ // test save
	3829	+ if (false)
	3830	+ {
	3831	+ try
	3832	+ {
	3833	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3834	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3835	+
	3836	+ p.writeObject(copy);
	3837	+
	3838	+ p.flush();
	3839	+
	3840	+ ostream.close();
	3841	+ } catch (Exception e)
	3842	+ {
	3843	+ e.printStackTrace();
	3844	+ }
	3845	+ }
	3846	+
	3847	+ return !thesame;
	3848	+ }
	3849	+
	3850	+ boolean flashIt = true;
	3851	+
	3852	+ void RefreshSelection()
	3853	+ {
	3854	+ Object3D selection = new Object3D();
	3855	+
	3856	+ for (int i = 0; i < copy.selection.size(); i++)
	3857	+ {
	3858	+ Object3D elem = copy.selection.elementAt(i);
	3859	+
	3860	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3861	+
	3862	+ if (obj == null)
	3863	+ {
	3864	+ copy.selection.remove(i--);
	3865	+ }
	3866	+ else
	3867	+ {
	3868	+ selection.add(obj);
	3869	+ copy.selection.setElementAt(obj, i);
	3870	+ }
	3871	+ }
	3872	+
	3873	+ flashIt = false;
	3874	+ GetTree().clearSelection();
	3875	+ for (int i = 0; i < selection.size(); i++)
	3876	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3877	+ flashIt = true;
	3878	+
	3879	+ //refreshContents(false);
	3880	+ }
	3881	+
	3882	+ void CopyChanged()
	3883	+ {
	3884	+ Object3D obj = copy.versionlist[copy.versionindex];
	3885	+
	3886	+ SetUndoStates();
	3887	+
	3888	+ boolean temp = CameraPane.SWITCH;
	3889	+ CameraPane.SWITCH = false;
	3890	+
	3891	+ copy.ExtractBigData(versiontable);
	3892	+
	3893	+ copy.clear();
	3894	+
	3895	+ copy.skyboxname = obj.skyboxname;
	3896	+ copy.skyboxext = obj.skyboxext;
	3897	+
	3898	+ for (int i=0; i<obj.Size(); i++)
	3899	+ {
	3900	+ copy.add(obj.get(i));
	3901	+ }
	3902	+
	3903	+ copy.RestoreBigData(versiontable);
	3904	+
	3905	+ CameraPane.SWITCH = temp;
	3906	+
	3907	+ RefreshSelection();
	3908	+ //assert(hashtable.isEmpty());
	3909	+
	3910	+ copy.Touch();
	3911	+
	3912	+ ResetModel();
	3913	+ copy.HardTouch(); // recompile?
	3914	+
	3915	+ cRadio ab;
	3916	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3917	+ {
	3918	+ ab = (cRadio)e.nextElement();
	3919	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3920	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3921	+ if (test != null)
	3922	+ {
	3923	+ test.editWindow = ab.object.editWindow;
	3924	+ ab.object = test;
	3925	+ }
	3926	+ }
	3927	+
	3928	+ refreshContents(true);
	3929	+ }
	3930	+
	3931	+ cButton previousVersionButton;
	3932	+ cButton restoreButton;
	3933	+ cButton replaceButton;
	3934	+ cButton nextVersionButton;
	3935	+ cButton saveVersionButton;
	3936	+ cButton deleteVersionButton;
	3937	+
	3938	+ boolean muteSlider;
	3939	+
	3940	+ int VersionCount()
	3941	+ {
	3942	+ int count = 0;
	3943	+
	3944	+ for (int i = copy.versionlist.length; --i >= 0;)
	3945	+ {
	3946	+ if (copy.versionlist[i] != null)
	3947	+ count++;
	3948	+ }
	3949	+
	3950	+ return count;
	3951	+ }
	3952	+
	3953	+ void SetUndoStates()
	3954	+ {
	3955	+ cRadio tab = GetCurrentTab();
	3956	+
	3957	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	3958	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	3959	+
	3960	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	3961	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3962	+
	3963	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	3964	+ copy.versionlist[copy.versionindex + 1] != null);
	3965	+
	3966	+ muteSlider = true;
	3967	+ versionSlider.setMaximum(VersionCount() - 1);
	3968	+ versionSlider.setInteger(copy.versionindex);
	3969	+ muteSlider = false;
	3970	+ }
	3971	+
	3972	+ public boolean PreviousVersion()
	3973	+ {
	3974	+ // Option?
	3975	+ Replace();
	3976	+
	3977	+ System.err.println("Undo");
	3978	+
	3979	+ cRadio tab = GetCurrentTab();
	3980	+
	3981	+ if (copy.versionindex == 0)
	3982	+ {
	3983	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3984	+ return false;
	3985	+ }
	3986	+
	3987	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3988	+// {
	3989	+// if (Save(false))
	3990	+// tab.versionindex -= 1;
	3991	+// else
	3992	+// {
	3993	+// if (tab.versionindex <= 0)
	3994	+// return false;
	3995	+// else
	3996	+// tab.versionindex -= 1;
	3997	+// }
	3998	+// }
	3999	+
	4000	+ copy.versionindex -= 1;
	4001	+
	4002	+ CopyChanged();
	4003	+
	4004	+ return true;
	4005	+ }
	4006	+
	4007	+ public boolean Restore()
	4008	+ {
	4009	+ System.err.println("Restore");
	4010	+
	4011	+ cRadio tab = GetCurrentTab();
	4012	+
	4013	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4014	+ {
	4015	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4016	+ return false;
	4017	+ }
	4018	+
	4019	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4020	+ CopyChanged();
	4021	+
	4022	+ return true;
	4023	+ }
	4024	+
	4025	+ public boolean Replace()
	4026	+ {
	4027	+ System.err.println("Replace");
	4028	+
	4029	+ cRadio tab = GetCurrentTab();
	4030	+
	4031	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4032	+ {
	4033	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4034	+ return false;
	4035	+ }
	4036	+
	4037	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4038	+
	4039	+ return true;
	4040	+ }
	4041	+
	4042	+ public void NextVersion()
	4043	+ {
	4044	+ // Option?
	4045	+ Replace();
	4046	+
	4047	+ cRadio tab = GetCurrentTab();
	4048	+
	4049	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4050	+ {
	4051	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4052	+ return;
	4053	+ }
	4054	+
	4055	+ copy.versionindex += 1;
	4056	+
	4057	+ CopyChanged();
	4058	+
	4059	+ //if (!tab.user[tab.versionindex])
	4060	+ // tab.graphs[tab.versionindex] = null;
	4061	+ }
	4062	+
	4063	+ void ImportGFD()
	4064	+ {
	4065	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	4066	browser.show();
3285	4067	String filename = browser.getFile();
3286	4068	if (filename != null && filename.length() > 0)
3287	4069	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	4070	+ String fullname = browser.getDirectory() + filename;
	4071	+
	4072	+ //Object3D readobj =
	4073	+ objEditor.ReadGFD(fullname, objEditor);
	4074	+ //makeSomething(readobj);
	4075	+ }
	4076	+ }
	4077	+
	4078	+ void ImportVRMLX3D()
	4079	+ {
	4080	+ if (Grafreed.standAlone)
	4081	+ {
	4082	+ /**/
	4083	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4084	+ browser.show();
	4085	+ String filename = browser.getFile();
	4086	+ if (filename != null && filename.length() > 0)
	4087	+ {
	4088	+ String fullname = browser.getDirectory() + filename;
	4089	+ LoadVRMLX3D(fullname);
	4090	+ }
	4091	+ /**/
	4092	+ }
	4093	+ }
	4094	+
	4095	+ void ToggleAnimation()
	4096	+ {
	4097	+ if (!Globals.ANIMATION)
	4098	+ {
	4099	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4100	+ browser.setVisible(true);
	4101	+ String filename = browser.getFile();
	4102	+ if (filename != null && filename.length() > 0)
	4103	+ {
	4104	+ Globals.filename = browser.getDirectory() + filename;
3289	4105	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	4106	+ Globals.imagecount = 0;
3291	4107
3292		- CameraPane.ANIMATION ^= true;
	4108	+ Globals.ANIMATION ^= true;
3293	4109
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	4110	+ Grafreed.wav.cursor = 0;
	4111	+ Grafreed.wav.loop = 0;
3296	4112	}
3297	4113	} else
3298	4114	{
3299		- CameraPane.ANIMATION ^= true;
	4115	+ Globals.ANIMATION ^= true;
3300	4116	}
3301	4117	}
3302	4118
..	..	@@ -3342,7 +4158,7 @@
3342	4158	void CreateMaterial()
3343	4159	{
3344	4160	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4161	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	4162	if (copy.selection.size() > 0)
3347	4163	//SetMaterial(copy);
3348	4164	{
..	..	@@ -3393,7 +4209,7 @@
3393	4209	assert false;
3394	4210	}
3395	4211
3396		- void EditSelection()
	4212	+ void EditSelection(boolean newWindow)
3397	4213	{
3398	4214	}
3399	4215
..	..	@@ -3401,11 +4217,11 @@
3401	4217	{
3402	4218	copy.ResetBlockLoop(); // temporary problem
3403	4219
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	4220	+ boolean random = CameraPane.SWITCH;
	4221	+ CameraPane.SWITCH = false; // parse everything
3406	4222	copy.ResetDisplayList();
3407	4223	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	4224	+ CameraPane.SWITCH = random;
3409	4225	}
3410	4226
3411	4227	// public void applySelf()
..	..	@@ -3452,7 +4268,7 @@
3452	4268	//copy.material = new cMaterial(copy.GetMaterial());
3453	4269
3454	4270	current.color = (float) colorField.getFloat();
3455		- current.modulation = (float) modulationField.getFloat();
	4271	+ current.modulation = (float) saturationField.getFloat();
3456	4272	current.metalness = (float) metalnessField.getFloat();
3457	4273	current.diffuse = (float) diffuseField.getFloat();
3458	4274	current.specular = (float) specularField.getFloat();
..	..	@@ -3475,10 +4291,40 @@
3475	4291	current.fakedepth = (float) fakedepthField.getFloat();
3476	4292	current.shadowbias = (float) shadowbiasField.getFloat();
3477	4293
3478		- if (!NumberSlider.frozen)
	4294	+ if (!cNumberSlider.frozen)
3479	4295	{
3480	4296	//System.out.println("Propagate = " + propagate);
3481	4297	copy.UpdateMaterial(anchor, current, propagate);
	4298	+
	4299	+ if (copy.material != null)
	4300	+ {
	4301	+ cMaterial mat = copy.material;
	4302	+
	4303	+ colorField.SetToolTipValue((mat.color));
	4304	+ saturationField.SetToolTipValue((mat.modulation));
	4305	+ metalnessField.SetToolTipValue((mat.metalness));
	4306	+ diffuseField.SetToolTipValue((mat.diffuse));
	4307	+ specularField.SetToolTipValue((mat.specular));
	4308	+ shininessField.SetToolTipValue((mat.shininess));
	4309	+ shiftField.SetToolTipValue((mat.shift));
	4310	+ ambientField.SetToolTipValue((mat.ambient));
	4311	+ lightareaField.SetToolTipValue((mat.lightarea));
	4312	+ diffusenessField.SetToolTipValue((mat.factor));
	4313	+ velvetField.SetToolTipValue((mat.velvet));
	4314	+ sheenField.SetToolTipValue((mat.sheen));
	4315	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4316	+ backlitField.SetToolTipValue((mat.bump));
	4317	+ anisoField.SetToolTipValue((mat.aniso));
	4318	+ anisoVField.SetToolTipValue((mat.anisoV));
	4319	+ cameraField.SetToolTipValue((mat.cameralight));
	4320	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4321	+ shadowField.SetToolTipValue((mat.shadow));
	4322	+ textureField.SetToolTipValue((mat.texture));
	4323	+ opacityField.SetToolTipValue((mat.opacity));
	4324	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4325	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4326	+ }
	4327	+
3482	4328	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	4329	{
3484	4330	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3507,9 +4353,26 @@
3507	4353	//copy.Touch();
3508	4354	}
3509	4355
	4356	+ cNumberSlider versionSlider;
	4357	+
3510	4358	public void stateChanged(ChangeEvent e)
3511	4359	{
3512	4360	// assert(false);
	4361	+ if (e.getSource() == versionSlider)
	4362	+ {
	4363	+ if (muteSlider)
	4364	+ return;
	4365	+
	4366	+ int version = versionSlider.getInteger();
	4367	+
	4368	+ if (copy.versionlist[version] != null)
	4369	+ {
	4370	+ copy.versionindex = version;
	4371	+ CopyChanged();
	4372	+ }
	4373	+
	4374	+ return;
	4375	+ }
3513	4376
3514	4377	if (freezematerial)
3515	4378	{
..	..	@@ -3523,6 +4386,7 @@
3523	4386	\|\| e.getSource() == apertureField
3524	4387	\|\| e.getSource() == shadowblurField)
3525	4388	{
	4389	+ new Exception().printStackTrace();
3526	4390	System.exit(0);
3527	4391	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	4392	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3544,12 +4408,24 @@
3544	4408	{
3545	4409	//System.out.println("stateChanged = " + this);
3546	4410	materialtouched = true;
	4411	+
	4412	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4413	+ {
	4414	+ saturationField.setFloat(1);
	4415	+ }
	4416	+
3547	4417	applySelf();
3548	4418	//System.out.println("this = " + this);
3549	4419	//System.out.println("PARENT = " + parent);
3550	4420	//if (parent != null)
3551	4421	// parent.applySelf();
3552		- refreshContents();
	4422	+ if (e.getSource() == normalpushField)
	4423	+ {
	4424	+ objEditor.refreshContents();
	4425	+ //Refresh();
	4426	+ }
	4427	+ else
	4428	+ refreshContents();
3553	4429	// ??? client.refreshEditWindow();
3554	4430	}
3555	4431	//else
..	..	@@ -3561,7 +4437,7 @@
3561	4437	//group.name = nameField.getText();
3562	4438	//objEditor.applySelf();
3563	4439
3564		- assert (objEditor == this);
	4440	+ // OCT2018: assert (objEditor == this);
3565	4441	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	4442	//super.applySelf()
3567	4443	; else
..	..	@@ -3585,6 +4461,9 @@
3585	4461	objEditor.copy = keep;
3586	4462	}
3587	4463	}
	4464	+
	4465	+ if (normalpushField != null)
	4466	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	4467	}
3589	4468
3590	4469	void SnapObject()
..	..	@@ -3834,20 +4713,26 @@
3834	4713	{
3835	4714	if (GetTree() != null)
3836	4715	{
	4716	+ GetTree().revalidate();
3837	4717	GetTree().repaint();
3838	4718	}
3839	4719
3840	4720	radioPanel.revalidate();
3841	4721	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	4722	+ ctrlPanel.validate(); // ? new
3843	4723	ctrlPanel.repaint();
3844	4724	}
	4725	+
	4726	+ if (previousVersionButton != null && copy.versionlist != null)
	4727	+ SetUndoStates();
3845	4728	}
3846	4729
3847	4730	static TweenManager tweenManager = new TweenManager();
3848	4731
3849	4732	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	4733	{
	4734	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4735	+ Save();
3851	4736	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	4737	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	4738	// if (thing instanceof GenericJointDemo)
..	..	@@ -3934,6 +4819,12 @@
3934	4819	{
3935	4820	ResetModel();
3936	4821	Select(thing.GetTreePath(), true, false); // unselect... false);
	4822	+
	4823	+ if (thing.Size() == 0)
	4824	+ {
	4825	+ //EditSelection(false);
	4826	+ }
	4827	+
3937	4828	refreshContents();
3938	4829	}
3939	4830
..	..	@@ -4051,6 +4942,7 @@
4051	4942	}
4052	4943	}
4053	4944	}
	4945	+
4054	4946	LoadGFDThread loadGFDThread;
4055	4947
4056	4948	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +4962,10 @@
4070	4962
4071	4963	try
4072	4964	{
	4965	+ // Try compressed version first.
4073	4966	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4967	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4968	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	4969
4076	4970	readobj = (Object3D) p.readObject();
4077	4971	istream.close();
..	..	@@ -4079,7 +4973,22 @@
4079	4973	readobj.ResetDisplayList();
4080	4974	} catch (Exception e)
4081	4975	{
4082		- e.printStackTrace();
	4976	+ if (!e.toString().contains("GZIP"))
	4977	+ e.printStackTrace();
	4978	+
	4979	+ try
	4980	+ {
	4981	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4982	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4983	+
	4984	+ readobj = (Object3D) p.readObject();
	4985	+ istream.close();
	4986	+
	4987	+ readobj.ResetDisplayList();
	4988	+ } catch (Exception e2)
	4989	+ {
	4990	+ e2.printStackTrace();
	4991	+ }
4083	4992	}
4084	4993	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	4994	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +5034,12 @@
4125	5034
4126	5035	void LoadIt(Object obj)
4127	5036	{
	5037	+ if (obj == null)
	5038	+ {
	5039	+ // Invalid file
	5040	+ return;
	5041	+ }
	5042	+
4128	5043	System.out.println("Loaded " + obj);
4129	5044	//new Exception().printStackTrace();
4130	5045	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,10 +5049,14 @@
4134	5049
4135	5050	if (readobj != null)
4136	5051	{
	5052	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5053	+ // Save();
4137	5054	try
4138	5055	{
4139	5056	//readobj.deepCopySelf(copy);
4140	5057	copy.clear(); // june 2014
	5058	+ copy.skyboxname = readobj.skyboxname;
	5059	+ copy.skyboxext = readobj.skyboxext;
4141	5060	for (int i = 0; i < readobj.size(); i++)
4142	5061	{
4143	5062	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4178,6 +5097,7 @@
4178	5097	}
4179	5098	} catch (ClassCastException e)
4180	5099	{
	5100	+ e.printStackTrace();
4181	5101	assert (false);
4182	5102	Composite c = (Composite) copy;
4183	5103	c.children.clear();
..	..	@@ -4188,17 +5108,28 @@
4188	5108	c.addChild(csg);
4189	5109	}
4190	5110
	5111	+ copy.versionlist = readobj.versionlist;
	5112	+ copy.versionindex = readobj.versionindex;
	5113	+
	5114	+ if (copy.versionlist == null)
	5115	+ {
	5116	+ copy.versionlist = new Object3D[100];
	5117	+ copy.versionindex = -1;
	5118	+ }
	5119	+
	5120	+ //? SetUndoStates();
	5121	+
4191	5122	ResetModel();
4192	5123	copy.HardTouch(); // recompile?
4193	5124	refreshContents();
4194	5125	}
4195	5126	}
4196	5127
4197		- void load() // throws ClassNotFoundException
	5128	+ void Open() // throws ClassNotFoundException
4198	5129	{
4199		- if (GrafreeD.standAlone)
	5130	+ if (Grafreed.standAlone)
4200	5131	{
4201		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5132	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4202	5133	browser.show();
4203	5134	String filename = browser.getFile();
4204	5135	if (filename != null && filename.length() > 0)
..	..	@@ -4283,11 +5214,13 @@
4283	5214	try
4284	5215	{
4285	5216	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5217	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5218	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	5219
4288	5220	p.writeObject(copy);
4289	5221	p.flush();
4290	5222
	5223	+ zstream.close();
4291	5224	ostream.close();
4292	5225
4293	5226	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4295,19 +5228,23 @@
4295	5228	//ps.print(buffer.toString());
4296	5229	} catch (IOException e)
4297	5230	{
	5231	+ e.printStackTrace();
4298	5232	}
4299	5233	}
	5234	+
4300	5235	String lastname;
4301	5236
4302	5237	void saveAs()
4303	5238	{
4304		- if (GrafreeD.standAlone)
	5239	+ if (Grafreed.standAlone)
4305	5240	{
4306	5241	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	5242	browser.setVisible(true);
4308	5243	String filename = browser.getFile();
4309	5244	if (filename != null && filename.length() > 0)
4310	5245	{
	5246	+ if (!filename.endsWith(".gfd"))
	5247	+ filename += ".gfd";
4311	5248	lastname = browser.getDirectory() + filename;
4312	5249	save();
4313	5250	}
..	..	@@ -4406,13 +5343,13 @@
4406	5343	try
4407	5344	{
4408	5345	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5346	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5347	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	5348
4412	5349	Object3D objectparent = obj.parent;
4413	5350	obj.parent = null;
4414	5351
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5352	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	5353
4417	5354	obj.parent = objectparent;
4418	5355
..	..	@@ -4424,8 +5361,8 @@
4424	5361	p.writeObject(object);
4425	5362	p.flush();
4426	5363
	5364	+ zstream.close();
4427	5365	ostream.close();
4428		- // zstream.close();
4429	5366
4430	5367	// group.selection.get(0).parent = parent;
4431	5368	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +5383,7 @@
4446	5383	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	5384	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	5385	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	5386	+ if (Grafreed.standAlone)
4450	5387	{
4451	5388	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	5389	browser.show();
..	..	@@ -4472,21 +5409,20 @@
4472	5409	Object3D client;
4473	5410	Object3D copy;
4474	5411	MenuBar menuBar;
4475		- Menu windowMenu;
4476		- MenuItem loadItem;
	5412	+ Menu fileMenu;
	5413	+ MenuItem newItem;
	5414	+ MenuItem openItem;
4477	5415	MenuItem saveItem;
4478	5416	MenuItem saveAsItem;
4479	5417	MenuItem exportAsItem;
4480	5418	MenuItem reexportItem;
4481	5419	MenuItem povItem;
4482	5420	MenuItem closeItem;
4483		- Menu cameraMenu;
	5421	+
4484	5422	CheckboxMenuItem zBufferItem;
4485	5423	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	5424	MenuItem stepItem;
	5425	+ CheckboxMenuItem toggleLiveItem;
4490	5426	CheckboxMenuItem toggleFullScreenItem;
4491	5427	CheckboxMenuItem toggleTimelineItem;
4492	5428	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +5431,43 @@
4495	5431	CheckboxMenuItem toggleFootContactItem;
4496	5432	CheckboxMenuItem toggleDLItem;
4497	5433	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	5434	+ CheckboxMenuItem toggleSwitchItem;
4499	5435	CheckboxMenuItem toggleRootItem;
4500	5436	CheckboxMenuItem animationItem;
	5437	+ MenuItem archiveItem;
4501	5438	CheckboxMenuItem toggleHandleItem;
4502	5439	CheckboxMenuItem togglePaintItem;
4503	5440	JSplitPane mainPanel;
4504	5441	JScrollPane scrollpane;
	5442	+
4505	5443	JPanel toolbarPanel;
4506		- JPanel treePanel;
	5444	+
	5445	+ cGridBag treePanel;
	5446	+
4507	5447	JPanel radioPanel;
4508	5448	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	5449	+
	5450	+ cGridBag toolboxPanel;
	5451	+ cGridBag materialPanel;
	5452	+ cGridBag ctrlPanel;
	5453	+
4511	5454	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	5455	+
	5456	+ cGridBag optionsPanel;
	5457	+
4513	5458	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	5459	+ boolean materialFlushed;
	5460	+ Object3D latestObject;
	5461	+
	5462	+ cGridBag XYZPanel;
	5463	+
4515	5464	JSplitPane gridPanel;
4516	5465	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	5466	+
	5467	+ cGridBag bigThree;
	5468	+ cGridBag scenePanel;
	5469	+ cGridBag centralPanel;
	5470	+ JSplitPane cameraPanel;
4520	5471	JPanel timelinePanel;
4521	5472	JMenuBar timelineMenubar;
4522	5473	JSplitPane framePanel;
..	..	@@ -4568,65 +5519,72 @@
4568	5519	// MATERIAL
4569	5520	JLabel materialLabel;
4570	5521	JLabel colorLabel;
4571		- NumberSlider colorField;
	5522	+ cNumberSlider colorField;
4572	5523	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	5524	+ cNumberSlider saturationField;
4574	5525	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	5526	+ cNumberSlider metalnessField;
4576	5527	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	5528	+ cNumberSlider diffuseField;
4578	5529	JLabel specularLabel;
4579		- NumberSlider specularField;
	5530	+ cNumberSlider specularField;
4580	5531	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	5532	+ cNumberSlider shininessField;
4582	5533	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	5534	+ cNumberSlider shiftField;
4584	5535	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	5536	+ cNumberSlider ambientField;
4586	5537	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	5538	+ cNumberSlider lightareaField;
4588	5539	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	5540	+ cNumberSlider diffusenessField;
4590	5541	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	5542	+ cNumberSlider velvetField;
4592	5543	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	5544	+ cNumberSlider sheenField;
4594	5545	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	5546	+ cNumberSlider subsurfaceField;
4596	5547	//JLabel bumpLabel;
4597	5548	//NumberSlider bumpField;
4598	5549	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	5550	+ cNumberSlider backlitField;
4600	5551	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	5552	+ cNumberSlider anisoField;
4602	5553	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	5554	+ cNumberSlider anisoVField;
4604	5555	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	5556	+ cNumberSlider cameraField;
4606	5557	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	5558	+ cNumberSlider selfshadowField;
4608	5559	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	5560	+ cNumberSlider shadowField;
4610	5561	JLabel textureLabel;
4611		- NumberSlider textureField;
	5562	+ cNumberSlider textureField;
4612	5563	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	5564	+ cNumberSlider opacityField;
4614	5565	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	5566	+ cNumberSlider fakedepthField;
4616	5567	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	5568	+ cNumberSlider shadowbiasField;
4618	5569	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	5570	+ cNumberSlider bumpField;
4620	5571	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	5572	+ cNumberSlider noiseField;
4622	5573	JLabel powerLabel;
4623		- NumberSlider powerField;
	5574	+ cNumberSlider powerField;
4624	5575	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	5576	+ cNumberSlider borderfadeField;
4626	5577	JLabel fogLabel;
4627		- NumberSlider fogField;
	5578	+ cNumberSlider fogField;
4628	5579	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	5580	+ cNumberSlider opacityPowerField;
	5581	+ cTree jTree;
4631	5582	//ObjectUI parent;
	5583	+
	5584	+ cNumberSlider normalpushField;
	5585	+
	5586	+ private MenuItem importGFDItem;
	5587	+ private MenuItem importVRMLX3DItem;
	5588	+ private MenuItem import3DSItem;
	5589	+ private MenuItem importOBJItem;
4632	5590	}