~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,
..	..	@@ -33,6 +39,81 @@
33	39
34	40	GroupEditor callee;
35	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	+ }
36	117
37	118	// SCRIPT
38	119
..	..	@@ -124,7 +205,7 @@
124	205	void keyPressed(int key, int modifiers)
125	206	{
126	207	System.out.println("KEY PRESSED");
127		- CameraPane.theRenderer.keyPressed(key, modifiers);
	208	+ Globals.theRenderer.keyPressed(key, modifiers);
128	209	}
129	210	*/
130	211
..	..	@@ -136,34 +217,42 @@
136	217	public void closeUI()
137	218	{
138	219	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	220	+// System.out.println("this = " + this);
	221	+// System.out.println("objEditor = " + objEditor);
141	222	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	223	+// objEditor.ctrlPanel.remove(nameField);
143	224
144		- if (!GroupEditor.allparams)
	225	+ objEditor.ctrlPanel.remove(namePanel);
	226	+
	227	+ if (!allparams)
145	228	return;
146	229
147		- objEditor.ctrlPanel.remove(liveCB);
148		- objEditor.ctrlPanel.remove(hideCB);
149		- objEditor.ctrlPanel.remove(markCB);
150		-
151		- objEditor.ctrlPanel.remove(randomCB);
152		- objEditor.ctrlPanel.remove(speedupCB);
153		- objEditor.ctrlPanel.remove(rewindCB);
154		-
155		- objEditor.ctrlPanel.remove(resetButton);
156		- objEditor.ctrlPanel.remove(stepButton);
157		-// objEditor.ctrlPanel.remove(stepAllButton);
158		-// objEditor.ctrlPanel.remove(resetAllButton);
159		- objEditor.ctrlPanel.remove(link2masterCB);
160		- //objEditor.ctrlPanel.remove(flipVCB);
161		- //objEditor.ctrlPanel.remove(texresMenu);
162		- objEditor.ctrlPanel.remove(slowerButton);
163		- objEditor.ctrlPanel.remove(fasterButton);
164		- 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);
165	248
166		- Remove(normalpushField);
	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);
167	256	}
168	257
169	258	public ObjEditor GetEditor()
..	..	@@ -207,6 +296,12 @@
207	296	client = inClient;
208	297	copy = client;
209	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
210	305	// "this" is not called: SetupUI2(objEditor);
211	306	}
212	307
..	..	@@ -220,6 +315,12 @@
220	315	client = inClient;
221	316	copy = client;
222	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
223	324	SetupUI2(callee.GetEditor());
224	325	}
225	326
..	..	@@ -234,6 +335,7 @@
234	335	//localCopy.parent = null;
235	336
236	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
237	339	objEditor = this;
238	340	this.callee = callee;
239	341
..	..	@@ -251,6 +353,12 @@
251	353	copy = localCopy;
252	354	copy.editWindow = this;
253	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
254	362	SetupMenu();
255	363
256	364	//SetupName(objEditor); // new
..	..	@@ -264,28 +372,49 @@
264	372	return frame.action(event, obj);
265	373	}
266	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	+
267	380	void SetupMenu()
268	381	{
269	382	frame.setMenuBar(menuBar = new MenuBar());
270		- menuBar.add(windowMenu = new Menu("File"));
271		- windowMenu.add(loadItem = new MenuItem("Load..."));
272		- windowMenu.add("-");
273		- windowMenu.add(saveItem = new MenuItem("Save"));
274		- 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..."));
275	403	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276		- windowMenu.add("-");
277		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279		- windowMenu.add("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
280	408	if (client.parent != null)
281	409	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	411	} else
284	412	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	414	}
287	415
288		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
289	418	saveItem.addActionListener(this);
290	419	saveAsItem.addActionListener(this);
291	420	exportAsItem.addActionListener(this);
..	..	@@ -293,82 +422,69 @@
293	422	//povItem.addActionListener(this);
294	423	closeItem.addActionListener(this);
295	424
296		- menuBar.add(cameraMenu = new Menu("View"));
297		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298		- //zBufferItem.addActionListener(this);
299		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300		- //normalLensItem.addActionListener(this);
301		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302		- revertCameraItem.addActionListener(this);
303		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304		- toggleTimelineItem.addItemListener(this);
305		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306		- toggleFullScreenItem.addItemListener(this);
307		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308		- cameraMenu.add("-");
309		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310		- toggleTextureItem.addItemListener(this);
311		- toggleTextureItem.setState(CameraPane.textureon);
312		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313		- toggleLiveItem.addItemListener(this);
314		- toggleLiveItem.setState(Globals.isLIVE());
315		- cameraMenu.add(stepItem = new MenuItem("Step"));
316		- stepItem.addActionListener(this);
317		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318		-// toggleDLItem.addItemListener(this);
319		-// toggleDLItem.setState(false);
320		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321		- toggleRenderItem.addItemListener(this);
322		- toggleRenderItem.setState(!CameraPane.frozen);
323		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324		- toggleDebugItem.addItemListener(this);
325		- toggleDebugItem.setState(CameraPane.DEBUG);
326		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327		- toggleFrustumItem.addItemListener(this);
328		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330		- toggleFootContactItem.addItemListener(this);
331		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333		- toggleRandomItem.addItemListener(this);
334		- toggleRandomItem.setState(CameraPane.RANDOM);
335		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336		- toggleHandleItem.addItemListener(this);
337		- toggleHandleItem.setState(CameraPane.HANDLES);
338		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339		- togglePaintItem.addItemListener(this);
340		- togglePaintItem.setState(CameraPane.PAINTMODE);
341		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342		-// toggleRootItem.addItemListener(this);
343		-// toggleRootItem.setState(false);
344		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345		-// animationItem.addItemListener(this);
346		-// animationItem.setState(CameraPane.ANIMATION);
347		- cameraMenu.add("-");
348		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349		- editCameraItem.addActionListener(this);
350		-
351	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	+
352	452	toolbarPanel = new JPanel();
353	453	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	454	+
	455	+ treePanel = new cGridBag();
355	456	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
359		- 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	+
360	473	/JTextPane/
361	474	infoarea = createTextPane();
	475	+ doc = infoarea.getStyledDocument();
	476	+
362	477	infoarea.setEditable(true);
363	478	SetText();
	479	+
364	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	481	// infoarea.setOpaque(false);
366	482	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	483	+// TEXTAREA infoarea.setLineWrap(true);
	484	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370		- infoPanel.setPreferredSize(new Dimension(50, 200));
371		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
372	488	//infoPanel.setLayout(new BorderLayout());
373	489	//infoPanel.add(createTextPane());
374	490
..	..	@@ -376,16 +492,23 @@
376	492	mainPanel.setName("Main");
377	493	mainPanel.setContinuousLayout(true);
378	494	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	495	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
382		-
	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	+
383	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	507	//mainPanel.setLayout(new GridBagLayout());
385	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	509	+// treePanel.setLayout(new GridBagLayout());
	510	+ //ctrlPanel.setLayout(new GridBagLayout());
	511	+ //materialPanel.setLayout(new GridBagLayout());
389	512
390	513	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	514	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +547,7 @@
424	547	static String newline = "\n";
425	548	protected static final String buttonString = "JButton";
426	549	StyledDocument doc;
427		- JTextArea infoarea;
	550	+ JTextPane infoarea;
428	551
429	552	void ClearInfo()
430	553	{
..	..	@@ -447,10 +570,10 @@
447	570	e.printStackTrace();
448	571	}
449	572
450		- String selection = infoarea.getText();
451		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452		- java.awt.datatransfer.Clipboard clipboard =
453		- 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();
454	577	//clipboard.setContents(data, data);
455	578	}
456	579
..	..	@@ -473,13 +596,13 @@
473	596	//SendInfo("Name:", "bold");
474	597	if (sel.GetTextures() != null \|\| debug)
475	598	{
476		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	601	if (sel.Size() > 0)
479	602	{
480	603	si.SendInfo("#children = " + sel.Size(), "regular");
481	604	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	606	if (debug)
484	607	{
485	608	try
..	..	@@ -491,7 +614,10 @@
491	614	}
492	615
493	616	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	617	+ {
	618	+ si.SendInfo(" BBox min: " + minima, "regular");
	619	+ si.SendInfo(" BBox max: " + maxima, "regular");
	620	+ }
495	621
496	622	if (sel.bRep != null)
497	623	{
..	..	@@ -518,7 +644,7 @@
518	644	}
519	645	if (sel.support != null)
520	646	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	648	}
523	649	if (sel.scriptnode != null)
524	650	{
..	..	@@ -589,6 +715,9 @@
589	715	{
590	716	CameraPane.pointflow = (PointFlow) sel;
591	717	}
	718	+
	719	+ si.SendInfo("_____________________", "regular");
	720	+ si.SendInfo("", "regular");
592	721	}
593	722	}
594	723
..	..	@@ -604,68 +733,194 @@
604	733	}
605	734	}
606	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	+
607	794	void ToggleFullScreen()
608	795	{
609		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
610	801	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- 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	+
614	825	} else
615	826	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- 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);
619	849	}
620		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
621	853	}
622	854
623		- private JTextArea createTextPane()
	855	+ private Object3D CompressCopy()
624	856	{
625		- String[] initString =
626		- {
627		- "This is an editable JTextPane, ", //regular
628		- "another ", //italic
629		- "styled ", //bold
630		- "text ", //small
631		- "component, ", //large
632		- "which supports embedded components..." + newline,//regular
633		- " " + newline, //button
634		- "...and embedded icons..." + newline, //regular
635		- " ", //icon
636		- newline + "JTextPane is a subclass of JEditorPane that "
637		- + "uses a StyledEditorKit and StyledDocument, and provides "
638		- + "cover methods for interacting with those objects."
639		- };
	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	+ }
640	877
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
	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	+// }
647	922
648		- JTextPane textPane = new JTextPane();
649		- textPane.setEditable(true);
650		- /StyledDocument/ doc = textPane.getStyledDocument();
651		- addStylesToDocument(doc);
652		-
653		- try
654		- {
655		- for (int j = 0; j < 2; j++)
656		- {
657		- for (int i = 0; i < initString.length; i++)
658		- {
659		- doc.insertString(doc.getLength(), initString[i],
660		- doc.getStyle(initStyles[i]));
661		- }
662		- }
663		- } catch (BadLocationException ble)
664		- {
665		- System.err.println("Couldn't insert initial text into text pane.");
666		- }
667		-
668		- return new JTextArea(); // textPane;
	923	+ return new JTextPane(); // textPane;
669	924	}
670	925
671	926	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +973,7 @@
718	973	protected static ImageIcon createImageIcon(String path,
719	974	String description)
720	975	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	976	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	977	if (imgURL != null)
723	978	{
724	979	return new ImageIcon(imgURL, description);
..	..	@@ -741,6 +996,7 @@
741	996	{
742	997	SetupMaterial(materialPanel);
743	998	}
	999	+
744	1000	//SetupName();
745	1001	//SetupViews();
746	1002	}
..	..	@@ -750,6 +1006,7 @@
750	1006	// NumberSlider vDivsField;
751	1007	// JCheckBox endcaps;
752	1008	JCheckBox liveCB;
	1009	+ JCheckBox selectableCB;
753	1010	JCheckBox hideCB;
754	1011	JCheckBox link2masterCB;
755	1012	JCheckBox markCB;
..	..	@@ -757,7 +1014,12 @@
757	1014	JCheckBox speedupCB;
758	1015	JCheckBox rewindCB;
759	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
760	1021	JComboBox texresMenu;
	1022	+
761	1023	JButton resetButton;
762	1024	JButton stepButton;
763	1025	JButton stepAllButton;
..	..	@@ -765,115 +1027,87 @@
765	1027	JButton slowerButton;
766	1028	JButton fasterButton;
767	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;
768	1040
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1041	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	1042	{
771	1043	JCheckBox cb;
772	1044
773		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774		- oe.aConstraints.gridwidth = 1; // 3;
775		-// oe.aConstraints.weightx = 1;
776		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777		- 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);
778	1046	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	1047
783	1048	return cb;
784	1049	}
785	1050
786		- cButton AddButton(ObjEditor oe, String label)
	1051	+ cButton AddButton(cGridBag panel, String label)
787	1052	{
788	1053	cButton cb;
789	1054
790		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791		- oe.aConstraints.gridwidth = 1;
792		-// oe.aConstraints.weightx = 1;
793		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794		- 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);
795	1056	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	1057
800	1058	return cb;
801	1059	}
802	1060
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1061	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	1062	{
805	1063	JComboBox combo;
806	1064
807		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809		- oe.aConstraints.gridx += 1;
	1065	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	1066	combo.addActionListener(this);
811	1067
812	1068	return combo;
813	1069	}
814	1070
815		- 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)
816	1072	{
817		- NumberSlider combo;
	1073	+ cGridBag control = new cGridBag();
	1074	+
	1075	+ cNumberSlider combo;
818	1076
819	1077	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1078	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 1;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1079	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1080	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1081	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1082	+
	1083	+ panel.add(control);
	1084	+
	1085	+ return control;
839	1086	}
840	1087
841		- 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)
842	1089	{
843		- NumberSlider combo;
	1090	+ cGridBag control = new cGridBag();
	1091	+
	1092	+ cNumberSlider combo;
844	1093
845	1094	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	1095	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849		- aConstraints.gridwidth = 2;
850		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851		- aConstraints.gridx += 1;
852		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855		- aConstraints.gridx += 1;
856		- aConstraints.gridwidth = 1;
857		-
	1096	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1097	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1098	combo.setInteger(current);
859	1099
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	1100	+ panel.add(control);
	1101	+
	1102	+ return control;
865	1103	}
866	1104
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	1105	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	1106	{
869	1107	JTextArea text;
870	1108
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1109	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	1110	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	1111
878	1112	return text;
879	1113	}
..	..	@@ -903,9 +1137,16 @@
903	1137	objEditor.ctrlPanel.remove(j);
904	1138	}
905	1139
	1140	+ void Remove(cNumberSlider j)
	1141	+ {
	1142	+ j.removeChangeListener(this);
	1143	+ //objEditor.ctrlPanel.remove(j.label);
	1144	+ objEditor.ctrlPanel.remove(j);
	1145	+ }
	1146	+
906	1147	/*
907	1148	*/
908		- void Return() // ObjEditor oe)
	1149	+ void Return0() // ObjEditor oe)
909	1150	{
910	1151	aConstraints.gridy += 1;
911	1152	aConstraints.gridx = 0;
..	..	@@ -960,37 +1201,80 @@
960	1201
961	1202	void SetupUI2(ObjEditor oe)
962	1203	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1204	+ //SetupName(oe);
968	1205
969		- 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)
970	1215	return;
971	1216
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- 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");
975	1223	// Return();
976		- markCB = AddCheckBox(oe, "Mark", copy.marked);
977		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978		- randomCB = AddCheckBox(oe, "Rand", copy.random);
979		- Return();
980		- resetButton = AddButton(oe, "Reset");
981		- 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");
982	1260	// resetAllButton = AddButton(oe, "Reset All");
983	1261	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1262	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- 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");
989	1269
990		- Return();
	1270	+ oe.ctrlPanel.add(objectCommandsPanel);
	1271	+ oe.ctrlPanel.Return();
991	1272
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	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();
994	1278
995	1279	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1280	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1369,7 @@
1085	1369	oe.aConstraints.gridwidth = 1;
1086	1370	/**/
1087	1371	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1372	+ oe.ctrlPanel.Return();
1089	1373
1090	1374	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1375	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1471,13 @@
1187	1471	//JPanel worldPanel =
1188	1472	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1473	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- 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);
1193	1481
1194	1482	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1483	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1486,10 @@
1198	1486	// cameraPanel.setDividerSize(9);
1199	1487	cameraPanel.setResizeWeight(1.0);
1200	1488
	1489	+ }
	1490	+
1201	1491	centralPanel.add(cameraView);
	1492	+ centralPanel.setFocusable(true);
1202	1493	//frame.setJMenuBar(timelineMenubar);
1203	1494	//centralPanel.add(timelinePanel);
1204	1495
..	..	@@ -1217,12 +1508,14 @@
1217	1508	//frontView.object = copy;
1218	1509	//sideView.object = copy;
1219	1510
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1511	+ XYZPanel = new cGridBag().setVertical(true);
	1512	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1513
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- 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");
1226	1519
1227	1520	/*
1228	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,12 +1553,30 @@
1260	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1554	//tmp.setName("Edit");
1262	1555	objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
1267		- objectPanel.add(infoPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
	1559	+ objectPanel.add(toolboxPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
1268	1562
	1563	+// JPanel north = new JPanel(new BorderLayout());
	1564	+// north.setName("Edit");
	1565	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1566	+// objectPanel.add(north);
	1567	+ objectPanel.add(editPanel);
	1568	+ objectPanel.setIconAt(2, GetIcon("icons/write.png"));
	1569	+ objectPanel.setToolTipTextAt(2, "Edit controls");
	1570	+
	1571	+ //if (Globals.ADVANCED)
	1572	+ objectPanel.add(infoPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/info.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "Information");
	1575	+
	1576	+ objectPanel.add(XYZPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1579	+
1269	1580	/*
1270	1581	aConstraints.gridx = 0;
1271	1582	aConstraints.gridwidth = 1;
..	..	@@ -1273,7 +1584,7 @@
1273	1584	aConstraints.gridy += 1;
1274	1585	aConstraints.gridwidth = 1;
1275	1586	mainPanel.add(objectPanel, aConstraints);
1276		- */
	1587	+ */
1277	1588
1278	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1279	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1284,16 +1595,23 @@
1284	1595	scrollpane.setWheelScrollingEnabled(true);
1285	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1597
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1598	+ /JTabbedPane/ scenePanel = new cGridBag();
	1599	+ scenePanel.preferredWidth = 5;
	1600	+
	1601	+ JTabbedPane tabbedPane = new JTabbedPane();
	1602	+ tabbedPane.add(scrollpane);
1289	1603
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
1291		-
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1293	1605
1294	1606	optionsPanel.setName("Options");
1295		- scenePanel.add(optionsPanel);
	1607	+
	1608	+ AddOptions(optionsPanel); //, aConstraints);
	1609	+
	1610	+ tabbedPane.add(optionsPanel);
	1611	+
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1296	1613
	1614	+ scenePanel.add(tabbedPane);
1297	1615
1298	1616	/*
1299	1617	cTree jTree = new cTree(null);
..	..	@@ -1327,6 +1645,7 @@
1327	1645	//bigPanel.setSize(new Dimension(10,10));
1328	1646	//bigPanel.add(ctrlPanel);
1329	1647	//bigPanel.add(gridPanel);
	1648	+ /**
1330	1649	bigThree = new JPanel();
1331	1650	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1332	1651	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1350,7 +1669,13 @@
1350	1669	// aConstraints.gridheight = 3;
1351	1670	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1352	1671	bigThree.add(XYZPanel, aWindowConstraints);
	1672	+ /**/
1353	1673
	1674	+ bigThree = new cGridBag();
	1675	+ bigThree.addComponent(scenePanel);
	1676	+ bigThree.addComponent(centralPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
	1678	+
1354	1679	// // SIDE EFFECT!!!
1355	1680	// aConstraints.gridx = 0;
1356	1681	// aConstraints.gridy = 0;
..	..	@@ -1358,9 +1683,9 @@
1358	1683	// aConstraints.gridheight = 1;
1359	1684
1360	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1361		- framePanel.setContinuousLayout(true);
1362		- framePanel.setOneTouchExpandable(true);
1363		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1364	1689	//framePanel.setDividerSize(15);
1365	1690	//framePanel.setResizeWeight(0.15);
1366	1691	framePanel.setName("Frame");
..	..	@@ -1377,15 +1702,19 @@
1377	1702
1378	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1379	1704
1380		- frame.setSize(1024, 768);
1381		- frame.show();
1382		-
	1705	+ frame.setSize(1280, 860);
	1706	+
	1707	+ cameraView.requestFocusInWindow();
	1708	+
1383	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1384	1714
1385	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1386	1716	frame.addWindowListener(new WindowAdapter()
1387	1717	{
1388		-
1389	1718	public void windowClosing(WindowEvent e)
1390	1719	{
1391	1720	Close();
..	..	@@ -1393,6 +1722,10 @@
1393	1722	});
1394	1723	}
1395	1724
	1725	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1726	+ {
	1727	+ }
	1728	+
1396	1729	JTree GetTree()
1397	1730	{
1398	1731	return objEditor.jTree;
..	..	@@ -1404,260 +1737,556 @@
1404	1737	ctrlPanel.removeAll();
1405	1738	}
1406	1739
1407		- void SetupMaterial(JPanel ctrlPanel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1408	1741	{
1409		- aConstraints.weighty = 0;
1410		- //aConstraints.weightx = 1;
1411		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+
	1744	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1745	+ skin.setToolTipText("Skin");
	1746	+ skin.addMouseListener(new MouseAdapter()
	1747	+ {
	1748	+ public void mouseClicked(MouseEvent e)
	1749	+ {
	1750	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1751	+ cMaterial material = object.material;
	1752	+
	1753	+ // Skin
	1754	+ colorField.setFloat(material.color);
	1755	+ saturationField.setFloat(material.modulation);
	1756	+ subsurfaceField.setFloat(material.subsurface);
	1757	+ selfshadowField.setFloat(material.diffuseness);
	1758	+ diffusenessField.setFloat(material.factor);
	1759	+ shininessField.setFloat(material.shininess);
	1760	+ shadowbiasField.setFloat(material.shadowbias);
	1761	+ diffuseField.setFloat(material.diffuse);
	1762	+ specularField.setFloat(material.specular);
	1763	+
	1764	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1765	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1766	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1767	+
	1768	+ materialtouched = true;
	1769	+ applySelf();
	1770	+ }
	1771	+ });
	1772	+ presetpanel.add(skin);
	1773	+
	1774	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1775	+ lambert.setToolTipText("Diffuse");
	1776	+ lambert.addMouseListener(new MouseAdapter()
	1777	+ {
	1778	+ public void mouseClicked(MouseEvent e)
	1779	+ {
	1780	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1781	+ cMaterial material = object.material;
	1782	+
	1783	+ diffusenessField.setFloat(material.factor);
	1784	+ selfshadowField.setFloat(material.diffuseness);
	1785	+
	1786	+ materialtouched = true;
	1787	+ applySelf();
	1788	+ }
	1789	+ });
	1790	+ presetpanel.add(lambert);
	1791	+
	1792	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1793	+ diffuse2.setToolTipText("Diffuse2");
	1794	+ diffuse2.addMouseListener(new MouseAdapter()
	1795	+ {
	1796	+ public void mouseClicked(MouseEvent e)
	1797	+ {
	1798	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1799	+ cMaterial material = object.material;
	1800	+
	1801	+ diffusenessField.setFloat(material.factor);
	1802	+ selfshadowField.setFloat(material.diffuseness);
	1803	+
	1804	+ materialtouched = true;
	1805	+ applySelf();
	1806	+ }
	1807	+ });
	1808	+ presetpanel.add(diffuse2);
	1809	+
	1810	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1811	+ diffusemoon.setToolTipText("Moon");
	1812	+ diffusemoon.addMouseListener(new MouseAdapter()
	1813	+ {
	1814	+ public void mouseClicked(MouseEvent e)
	1815	+ {
	1816	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1817	+ cMaterial material = object.material;
	1818	+
	1819	+ diffusenessField.setFloat(material.factor);
	1820	+ selfshadowField.setFloat(material.diffuseness);
	1821	+
	1822	+ materialtouched = true;
	1823	+ applySelf();
	1824	+ }
	1825	+ });
	1826	+ presetpanel.add(diffusemoon);
	1827	+
	1828	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1829	+ diffusemoon2.setToolTipText("Moon2");
	1830	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ diffusenessField.setFloat(material.factor);
	1838	+ selfshadowField.setFloat(material.diffuseness);
	1839	+
	1840	+ materialtouched = true;
	1841	+ applySelf();
	1842	+ }
	1843	+ });
	1844	+ presetpanel.add(diffusemoon2);
	1845	+
	1846	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1847	+ diffusemoon3.setToolTipText("Moon3");
	1848	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1849	+ {
	1850	+ public void mouseClicked(MouseEvent e)
	1851	+ {
	1852	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1853	+ cMaterial material = object.material;
	1854	+
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ selfshadowField.setFloat(material.diffuseness);
	1857	+
	1858	+ materialtouched = true;
	1859	+ applySelf();
	1860	+ }
	1861	+ });
	1862	+ presetpanel.add(diffusemoon3);
	1863	+
	1864	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1865	+ diffusesheen.setToolTipText("Sheen");
	1866	+ diffusesheen.addMouseListener(new MouseAdapter()
	1867	+ {
	1868	+ public void mouseClicked(MouseEvent e)
	1869	+ {
	1870	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1871	+ cMaterial material = object.material;
	1872	+
	1873	+ sheenField.setFloat(material.sheen);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusesheen);
	1880	+
	1881	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1882	+ rough.setToolTipText("Rough metal");
	1883	+ rough.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ shininessField.setFloat(material.shininess);
	1891	+ velvetField.setFloat(material.velvet);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(rough);
	1898	+
	1899	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1900	+ rough2.setToolTipText("Medium metal");
	1901	+ rough2.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ lightareaField.setFloat(material.lightarea);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(rough2);
	1916	+
	1917	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1918	+ shini0.setToolTipText("Shiny");
	1919	+ shini0.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ shininessField.setFloat(material.shininess);
	1927	+ lightareaField.setFloat(material.lightarea);
	1928	+
	1929	+ materialtouched = true;
	1930	+ applySelf();
	1931	+ }
	1932	+ });
	1933	+ presetpanel.add(shini0);
	1934	+
	1935	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1936	+ shini1.setToolTipText("Shiny2");
	1937	+ shini1.addMouseListener(new MouseAdapter()
	1938	+ {
	1939	+ public void mouseClicked(MouseEvent e)
	1940	+ {
	1941	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1942	+ cMaterial material = object.material;
	1943	+
	1944	+ shininessField.setFloat(material.shininess);
	1945	+ lightareaField.setFloat(material.lightarea);
	1946	+
	1947	+ materialtouched = true;
	1948	+ applySelf();
	1949	+ }
	1950	+ });
	1951	+ presetpanel.add(shini1);
	1952	+
	1953	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1954	+ shini2.setToolTipText("Shiny3");
	1955	+ shini2.addMouseListener(new MouseAdapter()
	1956	+ {
	1957	+ public void mouseClicked(MouseEvent e)
	1958	+ {
	1959	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1960	+ cMaterial material = object.material;
	1961	+
	1962	+ shininessField.setFloat(material.shininess);
	1963	+ lightareaField.setFloat(material.lightarea);
	1964	+
	1965	+ materialtouched = true;
	1966	+ applySelf();
	1967	+ }
	1968	+ });
	1969	+ presetpanel.add(shini2);
	1970	+
	1971	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1972	+ aniso.setToolTipText("AnisoU");
	1973	+ aniso.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ anisoField.setFloat(material.aniso);
	1981	+ anisoVField.setFloat(material.anisoV);
	1982	+
	1983	+ materialtouched = true;
	1984	+ applySelf();
	1985	+ }
	1986	+ });
	1987	+ presetpanel.add(aniso);
	1988	+
	1989	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	1990	+ aniso2.setToolTipText("AnisoV");
	1991	+ aniso2.addMouseListener(new MouseAdapter()
	1992	+ {
	1993	+ public void mouseClicked(MouseEvent e)
	1994	+ {
	1995	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	1996	+ cMaterial material = object.material;
	1997	+
	1998	+ anisoField.setFloat(material.aniso);
	1999	+ anisoVField.setFloat(material.anisoV);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(aniso2);
	2006	+
	2007	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2008	+ aniso3.setToolTipText("AnisoUV");
	2009	+ aniso3.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ anisoField.setFloat(material.aniso);
	2017	+ anisoVField.setFloat(material.anisoV);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(aniso3);
	2024	+
	2025	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2026	+ velvet0.setToolTipText("Velvet");
	2027	+ velvet0.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ diffusenessField.setFloat(material.factor);
	2035	+ selfshadowField.setFloat(material.diffuseness);
	2036	+ sheenField.setFloat(material.sheen);
	2037	+ shininessField.setFloat(material.shininess);
	2038	+ velvetField.setFloat(material.velvet);
	2039	+ shiftField.setFloat(material.shift);
	2040	+
	2041	+ materialtouched = true;
	2042	+ applySelf();
	2043	+ }
	2044	+ });
	2045	+ presetpanel.add(velvet0);
	2046	+
	2047	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2048	+ bump0.setToolTipText("Bump texture");
	2049	+ bump0.addMouseListener(new MouseAdapter()
	2050	+ {
	2051	+ public void mouseClicked(MouseEvent e)
	2052	+ {
	2053	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2054	+ cMaterial material = object.material;
	2055	+
	2056	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2057	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2058	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(bump0);
	2065	+
	2066	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2067	+ halo.setToolTipText("Halo");
	2068	+ halo.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2076	+
	2077	+ materialtouched = true;
	2078	+ applySelf();
	2079	+ }
	2080	+ });
	2081	+ presetpanel.add(halo);
	2082	+
	2083	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2084	+ candle.setToolTipText("Candle");
	2085	+ candle.addMouseListener(new MouseAdapter()
	2086	+ {
	2087	+ public void mouseClicked(MouseEvent e)
	2088	+ {
	2089	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2090	+ cMaterial material = object.material;
	2091	+
	2092	+ subsurfaceField.setFloat(material.subsurface);
	2093	+ shadowbiasField.setFloat(material.shadowbias);
	2094	+ ambientField.setFloat(material.ambient);
	2095	+ specularField.setFloat(material.specular);
	2096	+ lightareaField.setFloat(material.lightarea);
	2097	+ shininessField.setFloat(material.shininess);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(candle);
	2104	+
	2105	+ cGridBag panel = new cGridBag().setVertical(true);
	2106	+
	2107	+ presetpanel.preferredWidth = 1;
	2108	+
	2109	+ materialpanel.add(presetpanel);
	2110	+ materialpanel.add(panel);
	2111	+
	2112	+ panel.preferredWidth = 8;
	2113	+
	2114	+ /*
1412	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1413	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415		- aConstraints.gridx += 1;
1416		- */
	2117	+ */
1417	2118
1418		- aConstraints.gridwidth = 1;
1419		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420		- aConstraints.gridx += 1;
1421		- aConstraints.weighty = 0;
1422		- aConstraints.gridwidth = 1;
	2119	+ cGridBag editBar = new cGridBag().setVertical(false);
	2120	+
	2121	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2122	+ createMaterialButton.setToolTipText("Create material");
1423	2123
1424	2124	/*
1425	2125	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426		- aConstraints.gridx += 1;
1427		- aConstraints.weighty = 0;
1428		- aConstraints.gridwidth = 1;
1429	2126	*/
1430	2127
1431		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432		- aConstraints.gridx += 1;
	2128	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2129	+ clearMaterialButton.setToolTipText("Clear material");
	2130	+
	2131	+ if (Globals.ADVANCED)
	2132	+ {
	2133	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2134	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2135	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2136	+ }
1433	2137
1434		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435		-
1436		- aConstraints.gridx += 1;
1437		-
1438		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439		-
1440		- aConstraints.gridx += 1;
1441		-
1442		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443		-
1444		- aConstraints.gridx = 0;
1445		- aConstraints.gridy += 1;
1446		- aConstraints.weighty = 0;
1447		- aConstraints.gridwidth = 1;
	2138	+ editBar.preferredHeight = 15;
	2139	+
	2140	+ panel.add(editBar);
	2141	+
1448	2142	/**/
1449	2143	//aConstraints.weighty = 0;
1450	2144	////aConstraints.weightx = 1;
1451	2145	//aConstraints.weighty = 1;
1452	2146	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1453	2147	//aConstraints.gridx += 1;
1454		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455		- aConstraints.weighty = 0;
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	2148	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	2149
1460		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- //aConstraints.weightx = 0;
1466		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	2150	+ cGridBag colorSection = new cGridBag().setVertical(true);
1470	2151
1471		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	2152	+ cGridBag huepanel = new cGridBag();
	2153	+ cGridBag huelabel = new cGridBag();
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
	2157	+ huelabel.preferredWidth = 20;
	2158	+ huepanel.add(new cGridBag()); // Label
	2159	+ huepanel.add(huelabel); // Field/slider
	2160	+
	2161	+ huepanel.preferredHeight = 7;
1480	2162
1481		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- aConstraints.gridwidth = 1;
	2163	+ colorSection.add(huepanel);
	2164	+
	2165	+ cGridBag color = new cGridBag();
	2166	+
	2167	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2168	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2169	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1490	2170
1491		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- aConstraints.gridwidth = 1;
	2171	+ //colorField.preferredWidth = 200;
	2172	+ colorSection.add(color);
1500	2173
1501		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- aConstraints.gridwidth = 1;
	2174	+ cGridBag modulation = new cGridBag();
	2175	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2176	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2178	+ colorSection.add(modulation);
1510	2179
1511		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514		- aConstraints.gridx += 1;
1515		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517		- aConstraints.gridx = 0;
1518		- aConstraints.gridy += 1;
1519		- aConstraints.gridwidth = 1;
	2180	+ cGridBag opacity = new cGridBag();
	2181	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2182	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2183	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2184	+ colorSection.add(opacity);
1520	2185
1521		- //aConstraints.weighty = 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523		- //aConstraints.gridx += 1;
1524		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525		- aConstraints.weighty = 0;
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	2186	+ colorSection.add(GetSeparator());
	2187	+
	2188	+ cGridBag texture = new cGridBag();
	2189	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2190	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2191	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2192	+ colorSection.add(texture);
1529	2193
1530		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	2194	+ panel.add(GetSeparator());
	2195	+
	2196	+ panel.add(colorSection);
	2197	+
	2198	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2199	+
	2200	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2201	+
	2202	+ cGridBag diffuse = new cGridBag();
	2203	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2204	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2205	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2206	+ diffuseSection.add(diffuse);
1539	2207
1540		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	2208	+ cGridBag diffuseness = new cGridBag();
	2209	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2210	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2211	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2212	+ diffuseSection.add(diffuseness);
1549	2213
1550		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	2214	+ cGridBag selfshadow = new cGridBag();
	2215	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2216	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2217	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2218	+ diffuseSection.add(selfshadow);
1559	2219
1560		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- aConstraints.gridwidth = 1;
	2220	+ cGridBag sheen = new cGridBag();
	2221	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2222	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2223	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2224	+ diffuseSection.add(sheen);
1569	2225
1570		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- aConstraints.gridwidth = 1;
	2226	+ cGridBag subsurface = new cGridBag();
	2227	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2228	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2229	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2230	+ diffuseSection.add(subsurface);
1579	2231
1580		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- aConstraints.gridwidth = 1;
	2232	+ cGridBag shadow = new cGridBag();
	2233	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2234	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2236	+ diffuseSection.add(shadow);
1589	2237
1590		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593		- aConstraints.gridx += 1;
1594		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596		- aConstraints.gridx = 0;
1597		- aConstraints.gridy += 1;
1598		- aConstraints.gridwidth = 1;
	2238	+ cGridBag fakedepth = new cGridBag();
	2239	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2240	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2241	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2242	+ diffuseSection.add(fakedepth);
1599	2243
1600		- //aConstraints.weighty = 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602		- //aConstraints.gridx += 1;
1603		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604		- aConstraints.weighty = 0;
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	2244	+ cGridBag shadowbias = new cGridBag();
	2245	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2246	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2247	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2248	+ diffuseSection.add(shadowbias);
1608	2249
1609		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	2250	+ panel.add(GetSeparator());
	2251	+
	2252	+ panel.add(diffuseSection);
	2253	+
	2254	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2255	+
	2256	+ cGridBag specularSection = new cGridBag().setVertical(true);
1618	2257
1619		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- aConstraints.gridwidth = 1;
	2258	+ cGridBag specular = new cGridBag();
	2259	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2260	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2261	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2262	+ specularSection.add(specular);
1628	2263
1629		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	2264	+ cGridBag lightarea = new cGridBag();
	2265	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2266	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2267	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2268	+ specularSection.add(lightarea);
1638	2269
1639		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	2270	+ cGridBag shininess = new cGridBag();
	2271	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2272	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2273	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2274	+ specularSection.add(shininess);
1648	2275
1649		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
	2276	+ cGridBag metalness = new cGridBag();
	2277	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2278	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2279	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2280	+ specularSection.add(metalness);
1658	2281
1659		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660		- Return();
	2282	+ cGridBag velvet = new cGridBag();
	2283	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2284	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2285	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2286	+ specularSection.add(velvet);
	2287	+
	2288	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2289	+ //Return();
1661	2290	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1662	2291	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663	2292	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1668,130 +2297,99 @@
1668	2297	// aConstraints.gridy += 1;
1669	2298	// aConstraints.gridwidth = 1;
1670	2299
1671		- //aConstraints.weighty = 1;
1672		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673		- //aConstraints.gridx += 1;
1674		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675		- aConstraints.weighty = 0;
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
	2300	+ cGridBag anisoU = new cGridBag();
	2301	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2302	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2303	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2304	+ specularSection.add(anisoU);
1679	2305
1680		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	2306	+ cGridBag anisoV = new cGridBag();
	2307	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2308	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2309	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2310	+ specularSection.add(anisoV);
1689	2311
1690		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
1699	2312
1700		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	2313	+ panel.add(GetSeparator());
	2314	+
	2315	+ panel.add(specularSection);
	2316	+
	2317	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2318	+
	2319	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1709	2320
1710		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
1719		- aConstraints.weighty = 0;
	2321	+ cGridBag camera = new cGridBag();
	2322	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2323	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2324	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2325	+ colorSection.add(camera);
1720	2326
1721		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	2327	+ cGridBag ambient = new cGridBag();
	2328	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2329	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2330	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2331	+ colorSection.add(ambient);
1730	2332
1731		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	2333	+ cGridBag backlit = new cGridBag();
	2334	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2335	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2336	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2337	+ colorSection.add(backlit);
1740	2338
1741		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- aConstraints.gridwidth = 1;
	2339	+ //panel.add(new JSeparator());
	2340	+
	2341	+ //panel.add(globalSection);
	2342	+
	2343	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2344	+
	2345	+ cGridBag textureSection = new cGridBag().setVertical(true);
1750	2346
1751		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- aConstraints.gridwidth = 1;
	2347	+ cGridBag bump = new cGridBag();
	2348	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2349	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2350	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2351	+ textureSection.add(bump);
1760	2352
1761		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- aConstraints.gridwidth = 1;
	2353	+ cGridBag noise = new cGridBag();
	2354	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2355	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2357	+ textureSection.add(noise);
1770	2358
1771		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774		- aConstraints.gridx += 1;
1775		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy += 1;
1779		- aConstraints.gridwidth = 1;
	2359	+ cGridBag power = new cGridBag();
	2360	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2361	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2362	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2363	+ textureSection.add(power);
1780	2364
1781		- //aConstraints.weighty = 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783		- //aConstraints.gridx += 1;
1784		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785		- aConstraints.weighty = 0;
	2365	+ cGridBag borderfade = new cGridBag();
	2366	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2367	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2368	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2369	+ textureSection.add(borderfade);
1786	2370
1787		- aConstraints.gridx = 0;
1788		- aConstraints.gridy = 0;
1789		- aConstraints.gridwidth = 1;
	2371	+ cGridBag fog = new cGridBag();
	2372	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2373	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2374	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2375	+ textureSection.add(fog);
	2376	+
	2377	+ cGridBag opacityPower = new cGridBag();
	2378	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2379	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2380	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2381	+ textureSection.add(opacityPower);
	2382	+
	2383	+ panel.add(GetSeparator());
	2384	+
	2385	+ panel.add(textureSection);
	2386	+
	2387	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1790	2388
1791	2389	SetMaterial(copy); // .GetMaterial());
1792	2390
1793		- colorField.addChangeListener(this);
1794		- modulationField.addChangeListener(this);
	2391	+ //colorField.addChangeListener(this);
	2392	+// modulationField.addChangeListener(this);
1795	2393	metalnessField.addChangeListener(this);
1796	2394	diffuseField.addChangeListener(this);
1797	2395	specularField.addChangeListener(this);
..	..	@@ -1821,12 +2419,15 @@
1821	2419	opacityPowerField.addChangeListener(this);
1822	2420	/**/
1823	2421
1824		- resetSlidersButton.addActionListener(this);
1825	2422	clearMaterialButton.addActionListener(this);
1826	2423	createMaterialButton.addActionListener(this);
1827		-
1828		- propagateToggle.addItemListener(this);
1829		- multiplyToggle.addItemListener(this);
	2424	+
	2425	+ if (Globals.ADVANCED)
	2426	+ {
	2427	+ resetSlidersButton.addActionListener(this);
	2428	+ propagateToggle.addItemListener(this);
	2429	+ multiplyToggle.addItemListener(this);
	2430	+ }
1830	2431	}
1831	2432
1832	2433	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1844,8 +2445,9 @@
1844	2445	// 3D models
1845	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1846	2447	{
1847		- lastConverter = new com.jmex.model.converters.MaxToJme();
1848		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1849	2451	continue;
1850	2452	}
1851	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1997,7 +2599,7 @@
1997	2599
1998	2600	//? flashIt = false;
1999	2601	CameraPane pane = (CameraPane) cameraView;
2000		- pane.clickStart(location.x, location.y, 0);
	2602	+ pane.clickStart(location.x, location.y, 0, 0);
2001	2603	pane.clickEnd(location.x, location.y, 0, true);
2002	2604
2003	2605	if (group.selection.size() == 1)
..	..	@@ -2046,6 +2648,7 @@
2046	2648	e2.printStackTrace();
2047	2649	}
2048	2650	}
	2651	+
2049	2652	LoadJMEThread loadThread;
2050	2653
2051	2654	class LoadJMEThread extends Thread
..	..	@@ -2103,6 +2706,7 @@
2103	2706	//LoadFile0(filename, converter);
2104	2707	}
2105	2708	}
	2709	+
2106	2710	LoadOBJThread loadObjThread;
2107	2711
2108	2712	class LoadOBJThread extends Thread
..	..	@@ -2181,19 +2785,19 @@
2181	2785
2182	2786	void LoadObjFile(String fullname)
2183	2787	{
2184		- /*
	2788	+ System.out.println("Loading " + fullname);
	2789	+ /**/
2185	2790	//lastFilename = fullname;
2186	2791	if(loadObjThread == null)
2187	2792	{
2188		- loadObjThread = new LoadOBJThread();
2189		- loadObjThread.start();
	2793	+ loadObjThread = new LoadOBJThread();
	2794	+ loadObjThread.start();
2190	2795	}
2191	2796
2192	2797	loadObjThread.add(fullname);
2193		- */
	2798	+ /**/
2194	2799
2195		- System.out.println("Loading " + fullname);
2196		- makeSomething(new FileObject(fullname, true), true);
	2800	+ //makeSomething(new FileObject(fullname, true), true);
2197	2801	}
2198	2802
2199	2803	void LoadGFDFile(String fullname)
..	..	@@ -2454,11 +3058,11 @@
2454	3058
2455	3059	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2456	3060	{
2457		- if (GrafreeD.standAlone)
	3061	+ if (Grafreed.standAlone)
2458	3062	{
2459	3063	/**/
2460	3064	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2461		- browser.show();
	3065	+ browser.setVisible(true);
2462	3066	String filename = browser.getFile();
2463	3067	if (filename != null && filename.length() > 0)
2464	3068	{
..	..	@@ -2569,6 +3173,7 @@
2569	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2570	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2571	3175	}
	3176	+
2572	3177	//cJME.count++;
2573	3178	//cJME.count %= 12;
2574	3179	if (gc)
..	..	@@ -2603,6 +3208,7 @@
2603	3208	}
2604	3209	if (input == null)
2605	3210	{
	3211	+ new Exception().printStackTrace();
2606	3212	System.exit(0);
2607	3213	}
2608	3214
..	..	@@ -2751,6 +3357,7 @@
2751	3357	}
2752	3358	}
2753	3359	}
	3360	+
2754	3361	cFileSystemPane FSPane;
2755	3362
2756	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2760,7 +3367,7 @@
2760	3367
2761	3368	freezematerial = true;
2762	3369	colorField.setFloat(mat.color);
2763		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2764	3371	metalnessField.setFloat(mat.metalness);
2765	3372	diffuseField.setFloat(mat.diffuse);
2766	3373	specularField.setFloat(mat.specular);
..	..	@@ -2804,11 +3411,14 @@
2804	3411	}
2805	3412	}
2806	3413	}
	3414	+
2807	3415	freezematerial = false;
2808	3416	}
2809	3417
2810	3418	void SetMaterial(Object3D object)
2811	3419	{
	3420	+ latestObject = object;
	3421	+
2812	3422	cMaterial mat = object.material;
2813	3423
2814	3424	if (mat == null)
..	..	@@ -2817,7 +3427,8 @@
2817	3427	return;
2818	3428	}
2819	3429
2820		- multiplyToggle.setSelected(mat.multiply);
	3430	+ if (multiplyToggle != null)
	3431	+ multiplyToggle.setSelected(mat.multiply);
2821	3432
2822	3433	assert (object.projectedVertices != null);
2823	3434
..	..	@@ -2919,12 +3530,17 @@
2919	3530	// }
2920	3531
2921	3532	/**/
2922		- if (deselect)
	3533	+ if (deselect \|\| child == null)
2923	3534	{
2924	3535	//group.deselectAll();
2925	3536	//freeze = true;
2926	3537	GetTree().clearSelection();
2927	3538	//freeze = false;
	3539	+
	3540	+ if (child == null)
	3541	+ {
	3542	+ return;
	3543	+ }
2928	3544	}
2929	3545
2930	3546	//group.addSelectee(child);
..	..	@@ -2993,7 +3609,7 @@
2993	3609	cameraView.ToggleDL();
2994	3610	cameraView.repaint();
2995	3611	return;
2996		- } else if (event.getSource() == toggleTextureItem)
	3612	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2997	3613	{
2998	3614	cameraView.ToggleTexture();
2999	3615	// june 2013 copy.HardTouch();
..	..	@@ -3032,9 +3648,9 @@
3032	3648	frame.validate();
3033	3649
3034	3650	return;
3035		- } else if (event.getSource() == toggleRandomItem)
	3651	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3036	3652	{
3037		- cameraView.ToggleRandom();
	3653	+ cameraView.ToggleSwitch();
3038	3654	cameraView.repaint();
3039	3655	return;
3040	3656	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3062,12 +3678,17 @@
3062	3678	} else if (event.getSource() == liveCB)
3063	3679	{
3064	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
	3682	+ return;
	3683	+ } else if (event.getSource() == selectableCB)
	3684	+ {
	3685	+ copy.dontselect ^= true;
3065	3686	return;
3066	3687	} else if (event.getSource() == hideCB)
3067	3688	{
3068	3689	copy.hide ^= true;
3069	3690	copy.Touch(); // display list issue
3070		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3071	3692	return;
3072	3693	} else if (event.getSource() == link2masterCB)
3073	3694	{
..	..	@@ -3077,6 +3698,7 @@
3077	3698	if (event.getSource() == randomCB)
3078	3699	{
3079	3700	copy.random ^= true;
	3701	+ objEditor.refreshContents();
3080	3702	return;
3081	3703	}
3082	3704	if (event.getSource() == speedupCB)
..	..	@@ -3100,8 +3722,9 @@
3100	3722
3101	3723	public void actionPerformed(ActionEvent event)
3102	3724	{
	3725	+ Object source = event.getSource();
3103	3726	// SCRIPT DIALOG
3104		- if (event.getSource() == okbutton)
	3727	+ if (source == okbutton)
3105	3728	{
3106	3729	textpanel.setVisible(false);
3107	3730	textpanel.remove(textarea);
..	..	@@ -3113,7 +3736,7 @@
3113	3736	textarea = null;
3114	3737	textpanel = null;
3115	3738	}
3116		- if (event.getSource() == cancelbutton)
	3739	+ if (source == cancelbutton)
3117	3740	{
3118	3741	textpanel.setVisible(false);
3119	3742	textpanel.remove(textarea);
..	..	@@ -3125,50 +3748,50 @@
3125	3748	//applySelf();
3126	3749	//client.refreshEditWindow();
3127	3750	//refreshContents();
3128		- if (event.getSource() == nameField)
	3751	+ if (source == nameField)
3129	3752	{
3130	3753	//System.out.println("ObjEditor " + event);
3131	3754	applySelf0(true);
3132	3755	//parent.applySelf();
3133	3756	objEditor.refreshContents();
3134		- } else if (event.getSource() == resetButton)
	3757	+ } else if (source == resetButton)
3135	3758	{
3136	3759	CameraPane.fullreset = true;
3137	3760	copy.Reset(); // ResetMeshes();
3138	3761	copy.Touch();
3139	3762	objEditor.refreshContents();
3140		- } else if (event.getSource() == stepItem)
	3763	+ } else if (source == stepItem)
3141	3764	{
3142	3765	//cameraView.ONESTEP = true;
3143	3766	Globals.ONESTEP = true;
3144	3767	cameraView.repaint();
3145	3768	return;
3146		- } else if (event.getSource() == stepButton)
	3769	+ } else if (source == stepButton)
3147	3770	{
3148	3771	copy.Step();
3149	3772	copy.Touch();
3150	3773	objEditor.refreshContents();
3151		- } else if (event.getSource() == slowerButton)
	3774	+ } else if (source == slowerButton)
3152	3775	{
3153	3776	copy.Slower();
3154	3777	copy.Touch();
3155	3778	objEditor.refreshContents();
3156		- } else if (event.getSource() == fasterButton)
	3779	+ } else if (source == fasterButton)
3157	3780	{
3158	3781	copy.Faster();
3159	3782	copy.Touch();
3160	3783	objEditor.refreshContents();
3161		- } else if (event.getSource() == remarkButton)
	3784	+ } else if (source == remarkButton)
3162	3785	{
3163	3786	copy.Remark();
3164	3787	copy.Touch();
3165	3788	objEditor.refreshContents();
3166		- } else if (event.getSource() == stepAllButton)
	3789	+ } else if (source == stepAllButton)
3167	3790	{
3168	3791	copy.StepAll();
3169	3792	copy.Touch();
3170	3793	objEditor.refreshContents();
3171		- } else if (event.getSource() == resetAllButton)
	3794	+ } else if (source == resetAllButton)
3172	3795	{
3173	3796	//CameraPane.fullreset = true;
3174	3797	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3201,53 +3824,79 @@
3201	3824	// Close();
3202	3825	// }
3203	3826	// else
3204		- if (event.getSource() == resetSlidersButton)
	3827	+ if (source == resetSlidersButton)
3205	3828	{
3206	3829	ResetSliders();
3207		- } else if (event.getSource() == clearMaterialButton)
	3830	+ } else if (source == clearMaterialButton)
3208	3831	{
3209	3832	ClearMaterial();
3210		- } else if (event.getSource() == createMaterialButton)
	3833	+ } else if (source == createMaterialButton)
3211	3834	{
3212	3835	CreateMaterial();
3213		- } else if (event.getSource() == clearPanelButton)
	3836	+ } else if (source == clearPanelButton)
3214	3837	{
3215	3838	copy.ClearUI();
3216	3839	refreshContents(true);
3217		- } /*
3218		- }
3219		-
3220		- public boolean action(Event event, Object arg)
3221		- {
3222		- */ else if (event.getSource() == closeItem)
	3840	+ } else if (source == importGFDItem)
	3841	+ {
	3842	+ ImportGFD();
	3843	+ } else
	3844	+ if (source == importVRMLX3DItem)
	3845	+ {
	3846	+ ImportVRMLX3D();
	3847	+ } else
	3848	+ if (source == import3DSItem)
	3849	+ {
	3850	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3851	+ } else
	3852	+ if (source == importOBJItem)
	3853	+ {
	3854	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3855	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3856	+ browser.setVisible(true);
	3857	+ String filename = browser.getFile();
	3858	+ if (filename != null && filename.length() > 0)
	3859	+ {
	3860	+ String fullname = browser.getDirectory() + filename;
	3861	+ makeSomething(ReadOBJ(fullname), true);
	3862	+ }
	3863	+ } else
	3864	+ if (source == closeItem)
3223	3865	{
3224	3866	Close();
3225	3867	//return true;
3226		- } else if (event.getSource() == loadItem)
	3868	+ } else if (source == openItem)
3227	3869	{
3228		- load();
	3870	+ Open();
3229	3871	//return true;
3230		- } else if (event.getSource() == saveItem)
	3872	+ } else if (source == newItem)
	3873	+ {
	3874	+ New();
	3875	+ } else if (source == saveItem)
3231	3876	{
3232	3877	save();
3233	3878	//return true;
3234		- } else if (event.getSource() == saveAsItem)
	3879	+ } else if (source == saveAsItem)
3235	3880	{
3236	3881	saveAs();
3237	3882	//return true;
3238		- } else if (event.getSource() == reexportItem)
	3883	+ } else if (source == reexportItem)
3239	3884	{
3240	3885	reexport();
3241	3886	//return true;
3242		- } else if (event.getSource() == exportAsItem)
	3887	+ } else if (source == exportAsItem)
3243	3888	{
3244	3889	export();
3245	3890	//return true;
3246		- } else if (event.getSource() == povItem)
	3891	+ } else if (source == povItem)
3247	3892	{
3248	3893	generatePOV();
3249	3894	//return true;
3250		- } else if (event.getSource() == zBufferItem)
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
	3899	+ } else if (source == zBufferItem)
3251	3900	{
3252	3901	try
3253	3902	{
..	..	@@ -3269,21 +3918,8 @@
3269	3918	cameraView.repaint();
3270	3919	//return true;
3271	3920	}
3272		- */ else if (event.getSource() == editCameraItem)
3273		- {
3274		- cameraView.ProtectCamera();
3275		- cameraView.repaint();
3276		- return;
3277		- } else if (event.getSource() == revertCameraItem)
3278		- {
3279		- cameraView.RevertCamera();
3280		- cameraView.repaint();
3281		- return;
3282		-// } else if (event.getSource() == textureButton)
3283		-// {
3284		-// return; // true;
3285		- } else // combos...
3286		- if (event.getSource() == texresMenu)
	3921	+ */ else // combos...
	3922	+ if (source == texresMenu)
3287	3923	{
3288	3924	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3289	3925	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3295,12 +3931,472 @@
3295	3931	}
3296	3932	}
3297	3933
	3934	+ void New()
	3935	+ {
	3936	+ while (copy.Size() > 1)
	3937	+ {
	3938	+ copy.remove(1);
	3939	+ }
	3940	+
	3941	+ ResetModel();
	3942	+ objEditor.refreshContents();
	3943	+ }
	3944	+
	3945	+ static public byte[] Compress(Object3D o)
	3946	+ {
	3947	+ // Slower to actually compress.
	3948	+ try
	3949	+ {
	3950	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3953	+
	3954	+ Object3D parent = o.parent;
	3955	+ o.parent = null;
	3956	+
	3957	+ out.writeObject(o);
	3958	+
	3959	+ o.parent = parent;
	3960	+
	3961	+ out.flush();
	3962	+
	3963	+ baos //zstream
	3964	+ .close();
	3965	+ out.close();
	3966	+
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
	3971	+ } catch (Exception e)
	3972	+ {
	3973	+ System.err.println(e);
	3974	+ return null;
	3975	+ }
	3976	+ }
	3977	+
	3978	+ static public Object Uncompress(byte[] bytes)
	3979	+ {
	3980	+ System.out.println("restore #bytes = " + bytes.length);
	3981	+ try
	3982	+ {
	3983	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3986	+ Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
	3990	+ in.close();
	3991	+
	3992	+ return obj;
	3993	+ } catch (Exception e)
	3994	+ {
	3995	+ System.err.println(e);
	3996	+ return null;
	3997	+ }
	3998	+ }
	3999	+
	4000	+ static public Object clone(Object o)
	4001	+ {
	4002	+ try
	4003	+ {
	4004	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4005	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4006	+
	4007	+ out.writeObject(o);
	4008	+
	4009	+ out.flush();
	4010	+ out.close();
	4011	+
	4012	+ byte[] bytes = baos.toByteArray();
	4013	+
	4014	+ System.out.println("clone = " + bytes.length);
	4015	+
	4016	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4017	+ ObjectInputStream in = new ObjectInputStream(bais);
	4018	+ Object obj = in.readObject();
	4019	+ in.close();
	4020	+
	4021	+ return obj;
	4022	+ } catch (Exception e)
	4023	+ {
	4024	+ System.err.println(e);
	4025	+ return null;
	4026	+ }
	4027	+ }
	4028	+
	4029	+ cRadio GetCurrentTab()
	4030	+ {
	4031	+ cRadio ab;
	4032	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4033	+ {
	4034	+ ab = (cRadio)e.nextElement();
	4035	+ if(ab.GetObject() == copy)
	4036	+ {
	4037	+ return ab;
	4038	+ }
	4039	+ }
	4040	+
	4041	+ return null;
	4042	+ }
	4043	+
	4044	+
	4045	+ public void Save()
	4046	+ {
	4047	+ //Save(true);
	4048	+ Replace();
	4049	+ SetUndoStates();
	4050	+ }
	4051	+
	4052	+ private boolean Equal(byte[] compress, byte[] name)
	4053	+ {
	4054	+ if (compress.length != name.length)
	4055	+ {
	4056	+ return false;
	4057	+ }
	4058	+
	4059	+ for (int i=compress.length; --i>=0;)
	4060	+ {
	4061	+ if (compress[i] != name[i])
	4062	+ return false;
	4063	+ }
	4064	+
	4065	+ return true;
	4066	+ }
	4067	+
	4068	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4069	+
	4070	+ void DeleteVersion()
	4071	+ {
	4072	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4073	+ {
	4074	+ copy.versionlist[i] = copy.versionlist[i+1];
	4075	+ }
	4076	+
	4077	+ CopyChanged();
	4078	+
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
	4082	+ public boolean Save(boolean user)
	4083	+ {
	4084	+ System.err.println("Save");
	4085	+ //Replace();
	4086	+
	4087	+ cRadio tab = GetCurrentTab();
	4088	+
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4090	+
	4091	+ boolean thesame = false;
	4092	+
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
	4097	+
	4098	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4099	+ if (!thesame)
	4100	+ {
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
	4106	+ //tab.user[tab.versionindex] = user;
	4107	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4108	+
	4109	+ copy.versionlist[++copy.versionindex] = compress;
	4110	+
	4111	+ // if (increment)
	4112	+ // tab.versionindex++;
	4113	+ }
	4114	+
	4115	+ //copy.RestoreBigData(versiontable);
	4116	+
	4117	+ //assert(hashtable.isEmpty());
	4118	+
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
	4124	+
	4125	+ SetUndoStates();
	4126	+
	4127	+ // test save
	4128	+ if (false)
	4129	+ {
	4130	+ try
	4131	+ {
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4133	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4134	+
	4135	+ p.writeObject(copy);
	4136	+
	4137	+ p.flush();
	4138	+
	4139	+ ostream.close();
	4140	+ } catch (Exception e)
	4141	+ {
	4142	+ e.printStackTrace();
	4143	+ }
	4144	+ }
	4145	+
	4146	+ return !thesame;
	4147	+ }
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
	4152	+ {
	4153	+ Object3D selection = new Object3D();
	4154	+
	4155	+ for (int i = 0; i < copy.selection.size(); i++)
	4156	+ {
	4157	+ Object3D elem = copy.selection.elementAt(i);
	4158	+
	4159	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4160	+
	4161	+ if (obj == null)
	4162	+ {
	4163	+ copy.selection.remove(i--);
	4164	+ }
	4165	+ else
	4166	+ {
	4167	+ selection.add(obj);
	4168	+ copy.selection.setElementAt(obj, i);
	4169	+ }
	4170	+ }
	4171	+
	4172	+ flashIt = false;
	4173	+ GetTree().clearSelection();
	4174	+ for (int i = 0; i < selection.size(); i++)
	4175	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4176	+ flashIt = true;
	4177	+
	4178	+ //refreshContents(false);
	4179	+ }
	4180	+
	4181	+ void CopyChanged()
	4182	+ {
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
	4185	+ SetUndoStates();
	4186	+
	4187	+ boolean temp = CameraPane.SWITCH;
	4188	+ CameraPane.SWITCH = false;
	4189	+
	4190	+ copy.ExtractBigData(versiontable);
	4191	+
	4192	+ copy.clear();
	4193	+
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
	4197	+ for (int i=0; i<obj.Size(); i++)
	4198	+ {
	4199	+ copy.add(obj.get(i));
	4200	+ }
	4201	+
	4202	+ copy.RestoreBigData(versiontable);
	4203	+
	4204	+ CameraPane.SWITCH = temp;
	4205	+
	4206	+ RefreshSelection();
	4207	+ //assert(hashtable.isEmpty());
	4208	+
	4209	+ copy.Touch();
	4210	+
	4211	+ ResetModel();
	4212	+ copy.HardTouch(); // recompile?
	4213	+
	4214	+ cRadio ab;
	4215	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4216	+ {
	4217	+ ab = (cRadio)e.nextElement();
	4218	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4219	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4220	+ if (test != null)
	4221	+ {
	4222	+ test.editWindow = ab.object.editWindow;
	4223	+ ab.object = test;
	4224	+ }
	4225	+ }
	4226	+
	4227	+ refreshContents(true);
	4228	+ }
	4229	+
	4230	+ cButton previousVersionButton;
	4231	+ cButton restoreButton;
	4232	+ cButton replaceButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
	4236	+
	4237	+ boolean muteSlider;
	4238	+
	4239	+ int VersionCount()
	4240	+ {
	4241	+ int count = 0;
	4242	+
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
	4244	+ {
	4245	+ if (copy.versionlist[i] != null)
	4246	+ count++;
	4247	+ }
	4248	+
	4249	+ return count;
	4250	+ }
	4251	+
	4252	+ void SetUndoStates()
	4253	+ {
	4254	+ cRadio tab = GetCurrentTab();
	4255	+
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4258	+
	4259	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4260	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4261	+
	4262	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4263	+ copy.versionlist[copy.versionindex + 1] != null);
	4264	+
	4265	+ muteSlider = true;
	4266	+ versionSlider.setMaximum(VersionCount() - 1);
	4267	+ versionSlider.setInteger(copy.versionindex);
	4268	+ muteSlider = false;
	4269	+ }
	4270	+
	4271	+ public boolean PreviousVersion()
	4272	+ {
	4273	+ // Option?
	4274	+ Replace();
	4275	+
	4276	+ System.err.println("Undo");
	4277	+
	4278	+ cRadio tab = GetCurrentTab();
	4279	+
	4280	+ if (copy.versionindex == 0)
	4281	+ {
	4282	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4283	+ return false;
	4284	+ }
	4285	+
	4286	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4287	+// {
	4288	+// if (Save(false))
	4289	+// tab.versionindex -= 1;
	4290	+// else
	4291	+// {
	4292	+// if (tab.versionindex <= 0)
	4293	+// return false;
	4294	+// else
	4295	+// tab.versionindex -= 1;
	4296	+// }
	4297	+// }
	4298	+
	4299	+ copy.versionindex -= 1;
	4300	+
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
	4304	+ }
	4305	+
	4306	+ public boolean Restore()
	4307	+ {
	4308	+ System.err.println("Restore");
	4309	+
	4310	+ cRadio tab = GetCurrentTab();
	4311	+
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4313	+ {
	4314	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4315	+ return false;
	4316	+ }
	4317	+
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
	4320	+
	4321	+ return true;
	4322	+ }
	4323	+
	4324	+ public boolean Replace()
	4325	+ {
	4326	+ System.err.println("Replace");
	4327	+
	4328	+ cRadio tab = GetCurrentTab();
	4329	+
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4331	+ {
	4332	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4333	+ return false;
	4334	+ }
	4335	+
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4337	+
	4338	+ return true;
	4339	+ }
	4340	+
	4341	+ public void NextVersion()
	4342	+ {
	4343	+ // Option?
	4344	+ Replace();
	4345	+
	4346	+ cRadio tab = GetCurrentTab();
	4347	+
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4349	+ {
	4350	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4351	+ return;
	4352	+ }
	4353	+
	4354	+ copy.versionindex += 1;
	4355	+
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
	4360	+ }
	4361	+
	4362	+ void ImportGFD()
	4363	+ {
	4364	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4365	+ browser.show();
	4366	+ String filename = browser.getFile();
	4367	+ if (filename != null && filename.length() > 0)
	4368	+ {
	4369	+ String fullname = browser.getDirectory() + filename;
	4370	+
	4371	+ //Object3D readobj =
	4372	+ objEditor.ReadGFD(fullname, objEditor);
	4373	+ //makeSomething(readobj);
	4374	+ }
	4375	+ }
	4376	+
	4377	+ void ImportVRMLX3D()
	4378	+ {
	4379	+ if (Grafreed.standAlone)
	4380	+ {
	4381	+ /**/
	4382	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4383	+ browser.show();
	4384	+ String filename = browser.getFile();
	4385	+ if (filename != null && filename.length() > 0)
	4386	+ {
	4387	+ String fullname = browser.getDirectory() + filename;
	4388	+ LoadVRMLX3D(fullname);
	4389	+ }
	4390	+ /**/
	4391	+ }
	4392	+ }
	4393	+
3298	4394	void ToggleAnimation()
3299	4395	{
3300	4396	if (!Globals.ANIMATION)
3301	4397	{
3302	4398	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3303		- browser.show();
	4399	+ browser.setVisible(true);
3304	4400	String filename = browser.getFile();
3305	4401	if (filename != null && filename.length() > 0)
3306	4402	{
..	..	@@ -3310,8 +4406,8 @@
3310	4406
3311	4407	Globals.ANIMATION ^= true;
3312	4408
3313		- GrafreeD.wav.cursor = 0;
3314		- GrafreeD.wav.loop = 0;
	4409	+ Grafreed.wav.cursor = 0;
	4410	+ Grafreed.wav.loop = 0;
3315	4411	}
3316	4412	} else
3317	4413	{
..	..	@@ -3361,7 +4457,7 @@
3361	4457	void CreateMaterial()
3362	4458	{
3363	4459	//copy.ClearMaterial(); // PATCH
3364		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4460	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3365	4461	if (copy.selection.size() > 0)
3366	4462	//SetMaterial(copy);
3367	4463	{
..	..	@@ -3412,7 +4508,7 @@
3412	4508	assert false;
3413	4509	}
3414	4510
3415		- void EditSelection()
	4511	+ void EditSelection(boolean newWindow)
3416	4512	{
3417	4513	}
3418	4514
..	..	@@ -3420,11 +4516,11 @@
3420	4516	{
3421	4517	copy.ResetBlockLoop(); // temporary problem
3422	4518
3423		- boolean random = CameraPane.RANDOM;
3424		- CameraPane.RANDOM = false; // parse everything
	4519	+ boolean random = CameraPane.SWITCH;
	4520	+ CameraPane.SWITCH = false; // parse everything
3425	4521	copy.ResetDisplayList();
3426	4522	copy.HardTouch();
3427		- CameraPane.RANDOM = random;
	4523	+ CameraPane.SWITCH = random;
3428	4524	}
3429	4525
3430	4526	// public void applySelf()
..	..	@@ -3471,7 +4567,7 @@
3471	4567	//copy.material = new cMaterial(copy.GetMaterial());
3472	4568
3473	4569	current.color = (float) colorField.getFloat();
3474		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3475	4571	current.metalness = (float) metalnessField.getFloat();
3476	4572	current.diffuse = (float) diffuseField.getFloat();
3477	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3494,10 +4590,40 @@
3494	4590	current.fakedepth = (float) fakedepthField.getFloat();
3495	4591	current.shadowbias = (float) shadowbiasField.getFloat();
3496	4592
3497		- if (!NumberSlider.frozen)
	4593	+ if (!cNumberSlider.frozen)
3498	4594	{
3499	4595	//System.out.println("Propagate = " + propagate);
3500	4596	copy.UpdateMaterial(anchor, current, propagate);
	4597	+
	4598	+ if (copy.material != null)
	4599	+ {
	4600	+ cMaterial mat = copy.material;
	4601	+
	4602	+ colorField.SetToolTipValue((mat.color));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
	4604	+ metalnessField.SetToolTipValue((mat.metalness));
	4605	+ diffuseField.SetToolTipValue((mat.diffuse));
	4606	+ specularField.SetToolTipValue((mat.specular));
	4607	+ shininessField.SetToolTipValue((mat.shininess));
	4608	+ shiftField.SetToolTipValue((mat.shift));
	4609	+ ambientField.SetToolTipValue((mat.ambient));
	4610	+ lightareaField.SetToolTipValue((mat.lightarea));
	4611	+ diffusenessField.SetToolTipValue((mat.factor));
	4612	+ velvetField.SetToolTipValue((mat.velvet));
	4613	+ sheenField.SetToolTipValue((mat.sheen));
	4614	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4615	+ backlitField.SetToolTipValue((mat.bump));
	4616	+ anisoField.SetToolTipValue((mat.aniso));
	4617	+ anisoVField.SetToolTipValue((mat.anisoV));
	4618	+ cameraField.SetToolTipValue((mat.cameralight));
	4619	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4620	+ shadowField.SetToolTipValue((mat.shadow));
	4621	+ textureField.SetToolTipValue((mat.texture));
	4622	+ opacityField.SetToolTipValue((mat.opacity));
	4623	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4624	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4625	+ }
	4626	+
3501	4627	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3502	4628	{
3503	4629	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3526,9 +4652,26 @@
3526	4652	//copy.Touch();
3527	4653	}
3528	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
3529	4657	public void stateChanged(ChangeEvent e)
3530	4658	{
3531	4659	// assert(false);
	4660	+ if (e.getSource() == versionSlider)
	4661	+ {
	4662	+ if (muteSlider)
	4663	+ return;
	4664	+
	4665	+ int version = versionSlider.getInteger();
	4666	+
	4667	+ if (copy.versionlist[version] != null)
	4668	+ {
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
	4671	+ }
	4672	+
	4673	+ return;
	4674	+ }
3532	4675
3533	4676	if (freezematerial)
3534	4677	{
..	..	@@ -3542,6 +4685,7 @@
3542	4685	\|\| e.getSource() == apertureField
3543	4686	\|\| e.getSource() == shadowblurField)
3544	4687	{
	4688	+ new Exception().printStackTrace();
3545	4689	System.exit(0);
3546	4690	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3547	4691	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3563,6 +4707,12 @@
3563	4707	{
3564	4708	//System.out.println("stateChanged = " + this);
3565	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
3566	4716	applySelf();
3567	4717	//System.out.println("this = " + this);
3568	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -3612,7 +4762,7 @@
3612	4762	}
3613	4763
3614	4764	if (normalpushField != null)
3615		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4765	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3616	4766	}
3617	4767
3618	4768	void SnapObject()
..	..	@@ -3862,20 +5012,26 @@
3862	5012	{
3863	5013	if (GetTree() != null)
3864	5014	{
	5015	+ GetTree().revalidate();
3865	5016	GetTree().repaint();
3866	5017	}
3867	5018
3868	5019	radioPanel.revalidate();
3869	5020	radioPanel.repaint();
3870		- ctrlPanel.revalidate(); // ? new
	5021	+ ctrlPanel.validate(); // ? new
3871	5022	ctrlPanel.repaint();
3872	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
3873	5027	}
3874	5028
3875	5029	static TweenManager tweenManager = new TweenManager();
3876	5030
3877	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3878	5032	{
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5034	+ Save();
3879	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
3880	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3881	5037	// if (thing instanceof GenericJointDemo)
..	..	@@ -3962,6 +5118,12 @@
3962	5118	{
3963	5119	ResetModel();
3964	5120	Select(thing.GetTreePath(), true, false); // unselect... false);
	5121	+
	5122	+ if (thing.Size() == 0)
	5123	+ {
	5124	+ //EditSelection(false);
	5125	+ }
	5126	+
3965	5127	refreshContents();
3966	5128	}
3967	5129
..	..	@@ -4079,6 +5241,7 @@
4079	5241	}
4080	5242	}
4081	5243	}
	5244	+
4082	5245	LoadGFDThread loadGFDThread;
4083	5246
4084	5247	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4098,8 +5261,10 @@
4098	5261
4099	5262	try
4100	5263	{
	5264	+ // Try compressed version first.
4101	5265	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4102		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5266	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5267	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4103	5268
4104	5269	readobj = (Object3D) p.readObject();
4105	5270	istream.close();
..	..	@@ -4107,7 +5272,22 @@
4107	5272	readobj.ResetDisplayList();
4108	5273	} catch (Exception e)
4109	5274	{
4110		- e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
	5278	+ try
	5279	+ {
	5280	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5281	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5282	+
	5283	+ readobj = (Object3D) p.readObject();
	5284	+ istream.close();
	5285	+
	5286	+ readobj.ResetDisplayList();
	5287	+ } catch (Exception e2)
	5288	+ {
	5289	+ e2.printStackTrace();
	5290	+ }
4111	5291	}
4112	5292	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4113	5293	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4153,6 +5333,12 @@
4153	5333
4154	5334	void LoadIt(Object obj)
4155	5335	{
	5336	+ if (obj == null)
	5337	+ {
	5338	+ // Invalid file
	5339	+ return;
	5340	+ }
	5341	+
4156	5342	System.out.println("Loaded " + obj);
4157	5343	//new Exception().printStackTrace();
4158	5344	Object3D readobj = (Object3D) obj;
..	..	@@ -4162,10 +5348,14 @@
4162	5348
4163	5349	if (readobj != null)
4164	5350	{
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4165	5353	try
4166	5354	{
4167	5355	//readobj.deepCopySelf(copy);
4168	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4169	5359	for (int i = 0; i < readobj.size(); i++)
4170	5360	{
4171	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4206,6 +5396,7 @@
4206	5396	}
4207	5397	} catch (ClassCastException e)
4208	5398	{
	5399	+ e.printStackTrace();
4209	5400	assert (false);
4210	5401	Composite c = (Composite) copy;
4211	5402	c.children.clear();
..	..	@@ -4216,17 +5407,28 @@
4216	5407	c.addChild(csg);
4217	5408	}
4218	5409
	5410	+ copy.versionlist = readobj.versionlist;
	5411	+ copy.versionindex = readobj.versionindex;
	5412	+
	5413	+ if (copy.versionlist == null)
	5414	+ {
	5415	+ copy.versionlist = new Object3D[100];
	5416	+ copy.versionindex = -1;
	5417	+ }
	5418	+
	5419	+ //? SetUndoStates();
	5420	+
4219	5421	ResetModel();
4220	5422	copy.HardTouch(); // recompile?
4221	5423	refreshContents();
4222	5424	}
4223	5425	}
4224	5426
4225		- void load() // throws ClassNotFoundException
	5427	+ void Open() // throws ClassNotFoundException
4226	5428	{
4227		- if (GrafreeD.standAlone)
	5429	+ if (Grafreed.standAlone)
4228	5430	{
4229		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4230	5432	browser.show();
4231	5433	String filename = browser.getFile();
4232	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4311,11 +5513,13 @@
4311	5513	try
4312	5514	{
4313	5515	FileOutputStream ostream = new FileOutputStream(lastname);
4314		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5516	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5517	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4315	5518
4316	5519	p.writeObject(copy);
4317	5520	p.flush();
4318	5521
	5522	+ zstream.close();
4319	5523	ostream.close();
4320	5524
4321	5525	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4323,19 +5527,23 @@
4323	5527	//ps.print(buffer.toString());
4324	5528	} catch (IOException e)
4325	5529	{
	5530	+ e.printStackTrace();
4326	5531	}
4327	5532	}
	5533	+
4328	5534	String lastname;
4329	5535
4330	5536	void saveAs()
4331	5537	{
4332		- if (GrafreeD.standAlone)
	5538	+ if (Grafreed.standAlone)
4333	5539	{
4334	5540	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4335	5541	browser.setVisible(true);
4336	5542	String filename = browser.getFile();
4337	5543	if (filename != null && filename.length() > 0)
4338	5544	{
	5545	+ if (!filename.endsWith(".gfd"))
	5546	+ filename += ".gfd";
4339	5547	lastname = browser.getDirectory() + filename;
4340	5548	save();
4341	5549	}
..	..	@@ -4434,13 +5642,13 @@
4434	5642	try
4435	5643	{
4436	5644	FileOutputStream ostream = new FileOutputStream(filename);
4437		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4438		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5645	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5646	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4439	5647
4440	5648	Object3D objectparent = obj.parent;
4441	5649	obj.parent = null;
4442	5650
4443		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5651	+ Object3D object = (Object3D) Grafreed.clone(obj);
4444	5652
4445	5653	obj.parent = objectparent;
4446	5654
..	..	@@ -4452,8 +5660,8 @@
4452	5660	p.writeObject(object);
4453	5661	p.flush();
4454	5662
	5663	+ zstream.close();
4455	5664	ostream.close();
4456		- // zstream.close();
4457	5665
4458	5666	// group.selection.get(0).parent = parent;
4459	5667	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4474,7 +5682,7 @@
4474	5682	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4475	5683	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4476	5684	copy.generatePOV(buffer);
4477		- if (GrafreeD.standAlone)
	5685	+ if (Grafreed.standAlone)
4478	5686	{
4479	5687	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4480	5688	browser.show();
..	..	@@ -4500,21 +5708,20 @@
4500	5708	Object3D client;
4501	5709	Object3D copy;
4502	5710	MenuBar menuBar;
4503		- Menu windowMenu;
4504		- MenuItem loadItem;
	5711	+ Menu fileMenu;
	5712	+ MenuItem newItem;
	5713	+ MenuItem openItem;
4505	5714	MenuItem saveItem;
4506	5715	MenuItem saveAsItem;
4507	5716	MenuItem exportAsItem;
4508	5717	MenuItem reexportItem;
4509	5718	MenuItem povItem;
4510	5719	MenuItem closeItem;
4511		- Menu cameraMenu;
	5720	+
4512	5721	CheckboxMenuItem zBufferItem;
4513	5722	//MenuItem normalLensItem;
4514		- MenuItem editCameraItem;
4515		- MenuItem revertCameraItem;
4516		- CheckboxMenuItem toggleLiveItem;
4517	5723	MenuItem stepItem;
	5724	+ CheckboxMenuItem toggleLiveItem;
4518	5725	CheckboxMenuItem toggleFullScreenItem;
4519	5726	CheckboxMenuItem toggleTimelineItem;
4520	5727	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4523,28 +5730,42 @@
4523	5730	CheckboxMenuItem toggleFootContactItem;
4524	5731	CheckboxMenuItem toggleDLItem;
4525	5732	CheckboxMenuItem toggleTextureItem;
4526		- CheckboxMenuItem toggleRandomItem;
	5733	+ CheckboxMenuItem toggleSwitchItem;
4527	5734	CheckboxMenuItem toggleRootItem;
4528	5735	CheckboxMenuItem animationItem;
	5736	+ MenuItem archiveItem;
4529	5737	CheckboxMenuItem toggleHandleItem;
4530	5738	CheckboxMenuItem togglePaintItem;
4531	5739	JSplitPane mainPanel;
4532	5740	JScrollPane scrollpane;
	5741	+
4533	5742	JPanel toolbarPanel;
4534		- JPanel treePanel;
	5743	+
	5744	+ cGridBag treePanel;
	5745	+
4535	5746	JPanel radioPanel;
4536	5747	ButtonGroup buttonGroup;
4537		- JPanel ctrlPanel;
4538		- JPanel materialPanel;
	5748	+
	5749	+ cGridBag toolboxPanel;
	5750	+ cGridBag materialPanel;
	5751	+ cGridBag ctrlPanel;
	5752	+
4539	5753	JScrollPane infoPanel;
4540		- JPanel optionsPanel;
	5754	+
	5755	+ cGridBag optionsPanel;
	5756	+
4541	5757	JTabbedPane objectPanel;
4542		- JPanel XYZPanel;
	5758	+ boolean materialFlushed;
	5759	+ Object3D latestObject;
	5760	+
	5761	+ cGridBag XYZPanel;
	5762	+
4543	5763	JSplitPane gridPanel;
4544	5764	JSplitPane bigPanel;
4545		- JPanel bigThree;
4546		- JTabbedPane scenePanel;
4547		- JPanel centralPanel;
	5765	+
	5766	+ cGridBag bigThree;
	5767	+ cGridBag scenePanel;
	5768	+ cGridBag centralPanel;
4548	5769	JSplitPane cameraPanel;
4549	5770	JPanel timelinePanel;
4550	5771	JMenuBar timelineMenubar;
..	..	@@ -4597,67 +5818,72 @@
4597	5818	// MATERIAL
4598	5819	JLabel materialLabel;
4599	5820	JLabel colorLabel;
4600		- NumberSlider colorField;
	5821	+ cNumberSlider colorField;
4601	5822	JLabel modulationLabel;
4602		- NumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
4603	5824	JLabel metalnessLabel;
4604		- NumberSlider metalnessField;
	5825	+ cNumberSlider metalnessField;
4605	5826	JLabel diffuseLabel;
4606		- NumberSlider diffuseField;
	5827	+ cNumberSlider diffuseField;
4607	5828	JLabel specularLabel;
4608		- NumberSlider specularField;
	5829	+ cNumberSlider specularField;
4609	5830	JLabel shininessLabel;
4610		- NumberSlider shininessField;
	5831	+ cNumberSlider shininessField;
4611	5832	JLabel shiftLabel;
4612		- NumberSlider shiftField;
	5833	+ cNumberSlider shiftField;
4613	5834	JLabel ambientLabel;
4614		- NumberSlider ambientField;
	5835	+ cNumberSlider ambientField;
4615	5836	JLabel lightareaLabel;
4616		- NumberSlider lightareaField;
	5837	+ cNumberSlider lightareaField;
4617	5838	JLabel diffusenessLabel;
4618		- NumberSlider diffusenessField;
	5839	+ cNumberSlider diffusenessField;
4619	5840	JLabel velvetLabel;
4620		- NumberSlider velvetField;
	5841	+ cNumberSlider velvetField;
4621	5842	JLabel sheenLabel;
4622		- NumberSlider sheenField;
	5843	+ cNumberSlider sheenField;
4623	5844	JLabel subsurfaceLabel;
4624		- NumberSlider subsurfaceField;
	5845	+ cNumberSlider subsurfaceField;
4625	5846	//JLabel bumpLabel;
4626	5847	//NumberSlider bumpField;
4627	5848	JLabel backlitLabel;
4628		- NumberSlider backlitField;
	5849	+ cNumberSlider backlitField;
4629	5850	JLabel anisoLabel;
4630		- NumberSlider anisoField;
	5851	+ cNumberSlider anisoField;
4631	5852	JLabel anisoVLabel;
4632		- NumberSlider anisoVField;
	5853	+ cNumberSlider anisoVField;
4633	5854	JLabel cameraLabel;
4634		- NumberSlider cameraField;
	5855	+ cNumberSlider cameraField;
4635	5856	JLabel selfshadowLabel;
4636		- NumberSlider selfshadowField;
	5857	+ cNumberSlider selfshadowField;
4637	5858	JLabel shadowLabel;
4638		- NumberSlider shadowField;
	5859	+ cNumberSlider shadowField;
4639	5860	JLabel textureLabel;
4640		- NumberSlider textureField;
	5861	+ cNumberSlider textureField;
4641	5862	JLabel opacityLabel;
4642		- NumberSlider opacityField;
	5863	+ cNumberSlider opacityField;
4643	5864	JLabel fakedepthLabel;
4644		- NumberSlider fakedepthField;
	5865	+ cNumberSlider fakedepthField;
4645	5866	JLabel shadowbiasLabel;
4646		- NumberSlider shadowbiasField;
	5867	+ cNumberSlider shadowbiasField;
4647	5868	JLabel bumpLabel;
4648		- NumberSlider bumpField;
	5869	+ cNumberSlider bumpField;
4649	5870	JLabel noiseLabel;
4650		- NumberSlider noiseField;
	5871	+ cNumberSlider noiseField;
4651	5872	JLabel powerLabel;
4652		- NumberSlider powerField;
	5873	+ cNumberSlider powerField;
4653	5874	JLabel borderfadeLabel;
4654		- NumberSlider borderfadeField;
	5875	+ cNumberSlider borderfadeField;
4655	5876	JLabel fogLabel;
4656		- NumberSlider fogField;
	5877	+ cNumberSlider fogField;
4657	5878	JLabel opacityPowerLabel;
4658		- NumberSlider opacityPowerField;
4659		- JTree jTree;
	5879	+ cNumberSlider opacityPowerField;
	5880	+ cTree jTree;
4660	5881	//ObjectUI parent;
4661	5882
4662		- NumberSlider normalpushField;
	5883	+ cNumberSlider normalpushField;
	5884	+
	5885	+ private MenuItem importGFDItem;
	5886	+ private MenuItem importVRMLX3DItem;
	5887	+ private MenuItem import3DSItem;
	5888	+ private MenuItem importOBJItem;
4663	5889	}