~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,53 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
	49	+ }
	50	+
	51	+ cToggleButton GetToggleButton(String name, boolean border)
	52	+ {
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
	55	+ }
	56	+
	57	+ cCheckBox GetCheckBox(String name, boolean border)
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
	65	+ try
	66	+ {
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	72	+ Graphics2D g = resized.createGraphics();
	73	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+ g.dispose();
	77	+
	78	+ image = resized;
	79	+ }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
	83	+ }
	84	+ catch (Exception e)
	85	+ {
	86	+ return null;
	87	+ }
	88	+ }
38	89
39	90	// SCRIPT
40	91
..	..	@@ -138,34 +189,42 @@
138	189	public void closeUI()
139	190	{
140	191	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	192	+// System.out.println("this = " + this);
	193	+// System.out.println("objEditor = " + objEditor);
143	194	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	195	+// objEditor.ctrlPanel.remove(nameField);
145	196
146		- if (!GroupEditor.allparams)
	197	+ objEditor.ctrlPanel.remove(namePanel);
	198	+
	199	+ if (!allparams)
147	200	return;
148	201
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	202	+// objEditor.ctrlPanel.remove(liveCB);
	203	+// objEditor.ctrlPanel.remove(hideCB);
	204	+// objEditor.ctrlPanel.remove(markCB);
	205	+//
	206	+// objEditor.ctrlPanel.remove(randomCB);
	207	+// objEditor.ctrlPanel.remove(speedupCB);
	208	+// objEditor.ctrlPanel.remove(rewindCB);
	209	+//
	210	+// objEditor.ctrlPanel.remove(resetButton);
	211	+// objEditor.ctrlPanel.remove(stepButton);
	212	+//// objEditor.ctrlPanel.remove(stepAllButton);
	213	+//// objEditor.ctrlPanel.remove(resetAllButton);
	214	+// objEditor.ctrlPanel.remove(link2masterCB);
	215	+// //objEditor.ctrlPanel.remove(flipVCB);
	216	+// //objEditor.ctrlPanel.remove(texresMenu);
	217	+// objEditor.ctrlPanel.remove(slowerButton);
	218	+// objEditor.ctrlPanel.remove(fasterButton);
	219	+// objEditor.ctrlPanel.remove(remarkButton);
167	220
168		- Remove(normalpushField);
	221	+ objEditor.ctrlPanel.remove(setupPanel);
	222	+ objEditor.ctrlPanel.remove(setupPanel2);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	224	+ objEditor.ctrlPanel.remove(pushPanel);
	225	+ //objEditor.ctrlPanel.remove(fillPanel);
	226	+
	227	+ //Remove(normalpushField);
169	228	}
170	229
171	230	public ObjEditor GetEditor()
..	..	@@ -209,6 +268,12 @@
209	268	client = inClient;
210	269	copy = client;
211	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
212	277	// "this" is not called: SetupUI2(objEditor);
213	278	}
214	279
..	..	@@ -222,6 +287,12 @@
222	287	client = inClient;
223	288	copy = client;
224	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
225	296	SetupUI2(callee.GetEditor());
226	297	}
227	298
..	..	@@ -236,6 +307,7 @@
236	307	//localCopy.parent = null;
237	308
238	309	frame = new JFrame();
	310	+ frame.setUndecorated(false);
239	311	objEditor = this;
240	312	this.callee = callee;
241	313
..	..	@@ -253,6 +325,12 @@
253	325	copy = localCopy;
254	326	copy.editWindow = this;
255	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
256	334	SetupMenu();
257	335
258	336	//SetupName(objEditor); // new
..	..	@@ -266,28 +344,49 @@
266	344	return frame.action(event, obj);
267	345	}
268	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
269	352	void SetupMenu()
270	353	{
271	354	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	355	+ menuBar.add(fileMenu = new Menu("File"));
	356	+ fileMenu.add(newItem = new MenuItem("New"));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
	358	+
	359	+ //oe.menuBar.add(menu = new Menu("Include"));
	360	+ Menu menu = new Menu("Import");
	361	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	362	+ importOBJItem.addActionListener(this);
	363	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	364	+ import3DSItem.addActionListener(this);
	365	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	366	+ importVRMLX3DItem.addActionListener(this);
	367	+ menu.add("-");
	368	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	369	+ importGFDItem.addActionListener(this);
	370	+ fileMenu.add(menu);
	371	+ fileMenu.add("-");
	372	+
	373	+ fileMenu.add(saveItem = new MenuItem("Save"));
	374	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	375	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	376	+ fileMenu.add("-");
	377	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	378	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	379	+ fileMenu.add("-");
282	380	if (client.parent != null)
283	381	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	382	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	383	} else
286	384	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	385	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	386	}
289	387
290		- loadItem.addActionListener(this);
	388	+ newItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
291	390	saveItem.addActionListener(this);
292	391	saveAsItem.addActionListener(this);
293	392	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +394,69 @@
295	394	//povItem.addActionListener(this);
296	395	closeItem.addActionListener(this);
297	396
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
354	424	toolbarPanel = new JPanel();
355	425	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	426	+
	427	+ treePanel = new cGridBag();
357	428	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
361		- materialPanel.setName("Material");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
	433	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	434	+
	435	+ editCommandsPanel = new cGridBag();
	436	+ editPanel.add(editCommandsPanel);
	437	+ editPanel.add(ctrlPanel);
	438	+
	439	+ toolboxPanel = new cGridBag().setVertical(false);
	440	+ //toolboxPanel.setName("Toolbox");
	441	+
	442	+ materialPanel = new cGridBag().setVertical(true);
	443	+ //materialPanel.setName("Material");
	444	+
362	445	/JTextPane/
363	446	infoarea = createTextPane();
	447	+ doc = infoarea.getStyledDocument();
	448	+
364	449	infoarea.setEditable(true);
365	450	SetText();
	451	+
366	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	453	// infoarea.setOpaque(false);
368	454	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	455	+// TEXTAREA infoarea.setLineWrap(true);
	456	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
373		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
374	460	//infoPanel.setLayout(new BorderLayout());
375	461	//infoPanel.add(createTextPane());
376	462
..	..	@@ -378,16 +464,23 @@
378	464	mainPanel.setName("Main");
379	465	mainPanel.setContinuousLayout(true);
380	466	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	467	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	468	+ mainPanel.setDividerLocation(0.5); //1.0);
	469	+ mainPanel.setResizeWeight(0.5);
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
385	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	479	//mainPanel.setLayout(new GridBagLayout());
387	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	481	+// treePanel.setLayout(new GridBagLayout());
	482	+ //ctrlPanel.setLayout(new GridBagLayout());
	483	+ //materialPanel.setLayout(new GridBagLayout());
391	484
392	485	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	486	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +519,7 @@
426	519	static String newline = "\n";
427	520	protected static final String buttonString = "JButton";
428	521	StyledDocument doc;
429		- JTextArea infoarea;
	522	+ JTextPane infoarea;
430	523
431	524	void ClearInfo()
432	525	{
..	..	@@ -449,10 +542,10 @@
449	542	e.printStackTrace();
450	543	}
451	544
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	545	+// String selection = infoarea.getText();
	546	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	547	+// java.awt.datatransfer.Clipboard clipboard =
	548	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	549	//clipboard.setContents(data, data);
457	550	}
458	551
..	..	@@ -475,13 +568,13 @@
475	568	//SendInfo("Name:", "bold");
476	569	if (sel.GetTextures() != null \|\| debug)
477	570	{
478		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	573	if (sel.Size() > 0)
481	574	{
482	575	si.SendInfo("#children = " + sel.Size(), "regular");
483	576	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	578	if (debug)
486	579	{
487	580	try
..	..	@@ -493,7 +586,10 @@
493	586	}
494	587
495	588	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	589	+ {
	590	+ si.SendInfo(" BBox min: " + minima, "regular");
	591	+ si.SendInfo(" BBox max: " + maxima, "regular");
	592	+ }
497	593
498	594	if (sel.bRep != null)
499	595	{
..	..	@@ -520,7 +616,7 @@
520	616	}
521	617	if (sel.support != null)
522	618	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	620	}
525	621	if (sel.scriptnode != null)
526	622	{
..	..	@@ -591,6 +687,9 @@
591	687	{
592	688	CameraPane.pointflow = (PointFlow) sel;
593	689	}
	690	+
	691	+ si.SendInfo("_____________________", "regular");
	692	+ si.SendInfo("", "regular");
594	693	}
595	694	}
596	695
..	..	@@ -606,68 +705,191 @@
606	705	}
607	706	}
608	707
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	710	+
	711	+ Rectangle keeprect;
	712	+ cRadio radio;
	713	+
	714	+cButton keepButton;
	715	+ cButton twoButton; // Full 3D
	716	+ cButton sixButton;
	717	+ cButton threeButton;
	718	+ cButton sevenButton;
	719	+ cButton fourButton; // full panel
	720	+ cButton oneButton; // full XYZ
	721	+ //cButton currentLayout;
	722	+
	723	+ boolean maximized;
	724	+
	725	+ cButton fullscreenLayout;
	726	+
	727	+ void Minimize()
	728	+ {
	729	+ frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
	731	+ }
	732	+
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	736	+ void Maximize()
	737	+ {
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
	743	+ if (maximized)
	744	+ {
	745	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+ }
	747	+ else
	748	+ {
	749	+ keeprect = frame.getBounds();
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	753	+// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	755	+ }
	756	+
	757	+ maximized ^= true;
	758	+
	759	+ frame.validate();
	760	+ }
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
	765	+
609	766	void ToggleFullScreen()
610	767	{
611		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
612	773	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	774	+ device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
	780	+ //frame.setVisible(false);
	781	+// frame.removeNotify();
	782	+// frame.setUndecorated(false);
	783	+// frame.addNotify();
	784	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	785	+
	786	+// X frame.getContentPane().remove(/"Center",/bigThree);
	787	+// X framePanel.add(bigThree);
	788	+// X frame.getContentPane().add(/"Center",/framePanel);
	789	+ framePanel.setDividerLocation(46);
	790	+
	791	+ //frame.setVisible(true);
	792	+ radio.layout = keepButton;
	793	+ //theFrame = null;
	794	+ keepButton = null;
	795	+ radio.layout.doClick();
	796	+
616	797	} else
617	798	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	799	+ keepButton = radio.layout;
	800	+ //keeprect = frame.getBounds();
	801	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	802	+// frame.getToolkit().getScreenSize().height);
	803	+ //frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
	807	+ device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
	810	+// frame.removeNotify();
	811	+// frame.setUndecorated(true);
	812	+// frame.addNotify();
	813	+// X frame.getContentPane().remove(/"Center",/framePanel);
	814	+// X framePanel.remove(bigThree);
	815	+// X frame.getContentPane().add(/"Center",/bigThree);
	816	+ framePanel.setDividerLocation(0);
	817	+
	818	+ radio.layout = fullscreenLayout;
	819	+ radio.layout.doClick();
	820	+ //frame.setVisible(true);
621	821	}
622		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
623	823	}
624	824
625		- private JTextArea createTextPane()
	825	+ private byte[] CompressCopy()
626	826	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
642	846
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	847	+ private JTextPane createTextPane()
	848	+ {
	849	+// TEXTAREA String[] initString =
	850	+// {
	851	+// "This is an editable JTextPane, ", //regular
	852	+// "another ", //italic
	853	+// "styled ", //bold
	854	+// "text ", //small
	855	+// "component, ", //large
	856	+// "which supports embedded components..." + newline,//regular
	857	+// " " + newline, //button
	858	+// "...and embedded icons..." + newline, //regular
	859	+// " ", //icon
	860	+// newline + "JTextPane is a subclass of JEditorPane that "
	861	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	862	+// + "cover methods for interacting with those objects."
	863	+// };
	864	+//
	865	+// String[] initStyles =
	866	+// {
	867	+// "regular", "italic", "bold", "small", "large",
	868	+// "regular", "button", "regular", "icon",
	869	+// "regular"
	870	+// };
	871	+//
	872	+// JTextPane textPane = new JTextPane();
	873	+// textPane.setEditable(true);
	874	+// /StyledDocument/ doc = textPane.getStyledDocument();
	875	+// addStylesToDocument(doc);
	876	+//
	877	+// try
	878	+// {
	879	+// for (int j = 0; j < 2; j++)
	880	+// {
	881	+// for (int i = 0; i < initString.length; i++)
	882	+// {
	883	+// doc.insertString(doc.getLength(), initString[i],
	884	+// doc.getStyle(initStyles[i]));
	885	+// }
	886	+// }
	887	+// } catch (BadLocationException ble)
	888	+// {
	889	+// System.err.println("Couldn't insert initial text into text pane.");
	890	+// }
649	891
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	892	+ return new JTextPane(); // textPane;
671	893	}
672	894
673	895	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +942,7 @@
720	942	protected static ImageIcon createImageIcon(String path,
721	943	String description)
722	944	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	945	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	946	if (imgURL != null)
725	947	{
726	948	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +974,7 @@
752	974	// NumberSlider vDivsField;
753	975	// JCheckBox endcaps;
754	976	JCheckBox liveCB;
	977	+ JCheckBox selectCB;
755	978	JCheckBox hideCB;
756	979	JCheckBox link2masterCB;
757	980	JCheckBox markCB;
..	..	@@ -759,7 +982,12 @@
759	982	JCheckBox speedupCB;
760	983	JCheckBox rewindCB;
761	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
762	989	JComboBox texresMenu;
	990	+
763	991	JButton resetButton;
764	992	JButton stepButton;
765	993	JButton stepAllButton;
..	..	@@ -767,115 +995,87 @@
767	995	JButton slowerButton;
768	996	JButton fasterButton;
769	997	JButton remarkButton;
	998	+
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
	1002	+ cGridBag namePanel;
	1003	+ cGridBag setupPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
	1006	+ cGridBag pushPanel;
	1007	+ cGridBag fillPanel;
770	1008
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1009	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1010	{
773	1011	JCheckBox cb;
774	1012
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1013	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1014	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1015
785	1016	return cb;
786	1017	}
787	1018
788		- cButton AddButton(ObjEditor oe, String label)
	1019	+ cButton AddButton(cGridBag panel, String label)
789	1020	{
790	1021	cButton cb;
791	1022
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1023	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1024	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1025
802	1026	return cb;
803	1027	}
804	1028
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1029	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1030	{
807	1031	JComboBox combo;
808	1032
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	1033	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1034	combo.addActionListener(this);
813	1035
814	1036	return combo;
815	1037	}
816	1038
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1039	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1040	{
819		- NumberSlider combo;
	1041	+ cGridBag control = new cGridBag();
	1042	+
	1043	+ cNumberSlider combo;
820	1044
821	1045	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1046	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1047	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1048	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1049	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1050	+
	1051	+ panel.add(control);
	1052	+
	1053	+ return control;
841	1054	}
842	1055
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1056	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	1057	{
845		- NumberSlider combo;
	1058	+ cGridBag control = new cGridBag();
	1059	+
	1060	+ cNumberSlider combo;
846	1061
847	1062	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1063	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	1064	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1065	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1066	combo.setInteger(current);
861	1067
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1068	+ panel.add(control);
	1069	+
	1070	+ return control;
867	1071	}
868	1072
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1073	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1074	{
871	1075	JTextArea text;
872	1076
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1077	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1078	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1079
880	1080	return text;
881	1081	}
..	..	@@ -905,9 +1105,16 @@
905	1105	objEditor.ctrlPanel.remove(j);
906	1106	}
907	1107
	1108	+ void Remove(cNumberSlider j)
	1109	+ {
	1110	+ j.removeChangeListener(this);
	1111	+ //objEditor.ctrlPanel.remove(j.label);
	1112	+ objEditor.ctrlPanel.remove(j);
	1113	+ }
	1114	+
908	1115	/*
909	1116	*/
910		- void Return() // ObjEditor oe)
	1117	+ void Return0() // ObjEditor oe)
911	1118	{
912	1119	aConstraints.gridy += 1;
913	1120	aConstraints.gridx = 0;
..	..	@@ -962,37 +1169,77 @@
962	1169
963	1170	void SetupUI2(ObjEditor oe)
964	1171	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1172	+ //SetupName(oe);
970	1173
971		- if (!GroupEditor.allparams)
	1174	+ namePanel = new cGridBag();
	1175	+
	1176	+ nameField = AddText(namePanel, copy.GetName());
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1178	+ oe.ctrlPanel.add(namePanel);
	1179	+
	1180	+ oe.ctrlPanel.Return();
	1181	+
	1182	+ if (!allparams)
972	1183	return;
973	1184
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1185	+ setupPanel = new cGridBag().setVertical(false);
	1186	+
	1187	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1188	+ liveCB.setToolTipText("Animate object");
	1189	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectCB.setToolTipText("Make object selectable");
977	1191	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- stepButton = AddButton(oe, "Step");
	1192	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1193	+ hideCB.setToolTipText("Hide object");
	1194	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1195	+ markCB.setToolTipText("As animation target transform");
	1196	+
	1197	+ setupPanel2 = new cGridBag().setVertical(false);
	1198	+
	1199	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1200	+ rewindCB.setToolTipText("Rewind animation");
	1201	+
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1203	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1204	+
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
	1208	+ if (Globals.ADVANCED)
	1209	+ {
	1210	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1211	+ speedupCB.setToolTipText("Option motion capture");
	1212	+ }
	1213	+
	1214	+ oe.ctrlPanel.add(setupPanel);
	1215	+ oe.ctrlPanel.Return();
	1216	+ oe.ctrlPanel.add(setupPanel2);
	1217	+ oe.ctrlPanel.Return();
	1218	+
	1219	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1220	+
	1221	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1222	+ resetButton.setToolTipText("Jump to frame zero");
	1223	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1224	+ stepButton.setToolTipText("Step one frame");
984	1225	// resetAllButton = AddButton(oe, "Reset All");
985	1226	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1227	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1228	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1229	+ slowerButton.setToolTipText("Decrease animation speed");
	1230	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1231	+ fasterButton.setToolTipText("Increase animation speed");
	1232	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1233	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1234
992		- Return();
	1235	+ oe.ctrlPanel.add(objectCommandsPanel);
	1236	+ oe.ctrlPanel.Return();
993	1237
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1238	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1239	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1240	+ //Return();
	1241	+
	1242	+ oe.ctrlPanel.Return();
996	1243
997	1244	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1245	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1334,7 @@
1087	1334	oe.aConstraints.gridwidth = 1;
1088	1335	/**/
1089	1336	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1337	+ oe.ctrlPanel.Return();
1091	1338
1092	1339	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1340	//textureButton.setEnabled(false);
..	..	@@ -1189,9 +1436,13 @@
1189	1436	//JPanel worldPanel =
1190	1437	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1438	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
1193		- timelinePanel = new JPanel(new BorderLayout());
1194		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1439	+ centralPanel = new cGridBag();
	1440	+ centralPanel.preferredWidth = 20;
	1441	+
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ timelinePanel = new JPanel(new BorderLayout());
	1445	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1446
1196	1447	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1197	1448	cameraPanel.setContinuousLayout(true);
..	..	@@ -1200,7 +1451,10 @@
1200	1451	// cameraPanel.setDividerSize(9);
1201	1452	cameraPanel.setResizeWeight(1.0);
1202	1453
	1454	+ }
	1455	+
1203	1456	centralPanel.add(cameraView);
	1457	+ centralPanel.setFocusable(true);
1204	1458	//frame.setJMenuBar(timelineMenubar);
1205	1459	//centralPanel.add(timelinePanel);
1206	1460
..	..	@@ -1222,9 +1476,11 @@
1222	1476	XYZPanel = new cGridBag().setVertical(true);
1223	1477	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1478
	1479	+ XYZPanel.preferredWidth = 5;
1225	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1228	1484
1229	1485	/*
1230	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1262,11 +1518,23 @@
1262	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1519	//tmp.setName("Edit");
1264	1520	objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
1269		- objectPanel.add(infoPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1522	+// JPanel north = new JPanel(new BorderLayout());
	1523	+// north.setName("Edit");
	1524	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1525	+// objectPanel.add(north);
	1526	+ objectPanel.add(editPanel);
	1527	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1528	+
	1529	+ //if (Globals.ADVANCED)
	1530	+ objectPanel.add(infoPanel);
	1531	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1532	+
	1533	+ objectPanel.add(XYZPanel);
	1534	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1535	+
	1536	+ objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1270	1538
1271	1539	/*
1272	1540	aConstraints.gridx = 0;
..	..	@@ -1275,7 +1543,7 @@
1275	1543	aConstraints.gridy += 1;
1276	1544	aConstraints.gridwidth = 1;
1277	1545	mainPanel.add(objectPanel, aConstraints);
1278		- */
	1546	+ */
1279	1547
1280	1548	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1281	1549	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1286,19 +1554,23 @@
1286	1554	scrollpane.setWheelScrollingEnabled(true);
1287	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1556
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1557	+ /JTabbedPane/ scenePanel = new cGridBag();
	1558	+ scenePanel.preferredWidth = 5;
	1559	+
	1560	+ JTabbedPane tabbedPane = new JTabbedPane();
	1561	+ tabbedPane.add(scrollpane);
1291	1562
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
1293		-
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1563	+ optionsPanel = new cGridBag().setVertical(false);
1295	1564
1296	1565	optionsPanel.setName("Options");
1297	1566
1298		- AddOptions(optionsPanel, aConstraints);
	1567	+ AddOptions(optionsPanel); //, aConstraints);
1299	1568
1300		- scenePanel.add(optionsPanel);
	1569	+ tabbedPane.add(optionsPanel);
	1570	+
	1571	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1301	1572
	1573	+ scenePanel.add(tabbedPane);
1302	1574
1303	1575	/*
1304	1576	cTree jTree = new cTree(null);
..	..	@@ -1361,7 +1633,7 @@
1361	1633	bigThree = new cGridBag();
1362	1634	bigThree.addComponent(scenePanel);
1363	1635	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1365	1637
1366	1638	// // SIDE EFFECT!!!
1367	1639	// aConstraints.gridx = 0;
..	..	@@ -1370,9 +1642,9 @@
1370	1642	// aConstraints.gridheight = 1;
1371	1643
1372	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1376	1648	//framePanel.setDividerSize(15);
1377	1649	//framePanel.setResizeWeight(0.15);
1378	1650	framePanel.setName("Frame");
..	..	@@ -1389,10 +1661,15 @@
1389	1661
1390	1662	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1663
1392		- frame.setSize(1024, 768);
1393		- frame.show();
1394		-
	1664	+ frame.setSize(1280, 860);
	1665	+
	1666	+ cameraView.requestFocusInWindow();
	1667	+
1395	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1396	1673
1397	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1405,7 +1682,7 @@
1405	1682	});
1406	1683	}
1407	1684
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1685	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	1686	{
1410	1687	}
1411	1688
..	..	@@ -1420,260 +1697,161 @@
1420	1697	ctrlPanel.removeAll();
1421	1698	}
1422	1699
1423		- void SetupMaterial(JPanel ctrlPanel)
	1700	+ void SetupMaterial(cGridBag panel)
1424	1701	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	1702	+ /*
1428	1703	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	1704	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432	1705	*/
1433	1706
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	1707	+ cGridBag editBar = new cGridBag().setVertical(false);
	1708	+
	1709	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1710	+ createMaterialButton.setToolTipText("Create material");
1439	1711
1440	1712	/*
1441	1713	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	1714	*/
1446	1715
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	1716	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1717	+ clearMaterialButton.setToolTipText("Clear material");
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1722	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1723	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1724	+ }
1449	1725
1450		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1451		-
1452		- aConstraints.gridx += 1;
1453		-
1454		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1455		-
1456		- aConstraints.gridx += 1;
1457		-
1458		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1459		-
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridwidth = 1;
	1726	+ editBar.preferredHeight = 15;
	1727	+
	1728	+ panel.add(editBar);
	1729	+
1464	1730	/**/
1465	1731	//aConstraints.weighty = 0;
1466	1732	////aConstraints.weightx = 1;
1467	1733	//aConstraints.weighty = 1;
1468	1734	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	1735	//aConstraints.gridx += 1;
1470		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1471		- aConstraints.weighty = 0;
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	1736	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	1737
1476		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1477		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- //aConstraints.weightx = 0;
1482		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1483		- aConstraints.gridx = 0;
1484		- aConstraints.gridy += 1;
1485		- aConstraints.gridwidth = 1;
	1738	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1739	+
	1740	+ cGridBag color = new cGridBag();
	1741	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1742	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1744	+ //colorField.preferredWidth = 200;
	1745	+ colorSection.add(color);
1486	1746
1487		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1488		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1489		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1490		- aConstraints.gridx += 1;
1491		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1492		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1493		- aConstraints.gridx = 0;
1494		- aConstraints.gridy += 1;
1495		- aConstraints.gridwidth = 1;
	1747	+ cGridBag modulation = new cGridBag();
	1748	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1749	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1750	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1751	+ colorSection.add(modulation);
1496	1752
1497		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1498		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1499		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1500		- aConstraints.gridx += 1;
1501		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1502		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1503		- aConstraints.gridx = 0;
1504		- aConstraints.gridy += 1;
1505		- aConstraints.gridwidth = 1;
	1753	+ cGridBag texture = new cGridBag();
	1754	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1755	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1756	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1757	+ colorSection.add(texture);
1506	1758
1507		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1508		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1510		- aConstraints.gridx += 1;
1511		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1512		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1513		- aConstraints.gridx = 0;
1514		- aConstraints.gridy += 1;
1515		- aConstraints.gridwidth = 1;
	1759	+ panel.add(new JSeparator());
	1760	+
	1761	+ panel.add(colorSection);
	1762	+
	1763	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1764	+
	1765	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1766	+
	1767	+ cGridBag diffuse = new cGridBag();
	1768	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1769	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1770	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1771	+ diffuseSection.add(diffuse);
1516	1772
1517		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1518		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1519		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1520		- aConstraints.gridx += 1;
1521		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1522		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	1773	+ cGridBag diffuseness = new cGridBag();
	1774	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1775	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(diffuseness);
1526	1778
1527		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1528		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1779	+ cGridBag selfshadow = new cGridBag();
	1780	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1781	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1782	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1783	+ diffuseSection.add(selfshadow);
1536	1784
1537		- //aConstraints.weighty = 1;
1538		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1539		- //aConstraints.gridx += 1;
1540		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1541		- aConstraints.weighty = 0;
1542		- aConstraints.gridx = 0;
1543		- aConstraints.gridy += 1;
1544		- aConstraints.gridwidth = 1;
	1785	+ cGridBag sheen = new cGridBag();
	1786	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1787	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1788	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1789	+ diffuseSection.add(sheen);
1545	1790
1546		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1547		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1548		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1549		- aConstraints.gridx += 1;
1550		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1551		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1552		- aConstraints.gridx = 0;
1553		- aConstraints.gridy += 1;
1554		- aConstraints.gridwidth = 1;
	1791	+ cGridBag subsurface = new cGridBag();
	1792	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1793	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1794	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1795	+ diffuseSection.add(subsurface);
1555	1796
1556		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1557		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1559		- aConstraints.gridx += 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1561		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1562		- aConstraints.gridx = 0;
1563		- aConstraints.gridy += 1;
1564		- aConstraints.gridwidth = 1;
	1797	+ cGridBag shadow = new cGridBag();
	1798	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1799	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1800	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1801	+ diffuseSection.add(shadow);
1565	1802
1566		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1567		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1569		- aConstraints.gridx += 1;
1570		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1571		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1572		- aConstraints.gridx = 0;
1573		- aConstraints.gridy += 1;
1574		- aConstraints.gridwidth = 1;
	1803	+ cGridBag fakedepth = new cGridBag();
	1804	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1805	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1806	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1807	+ diffuseSection.add(fakedepth);
1575	1808
1576		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1577		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1579		- aConstraints.gridx += 1;
1580		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1581		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1582		- aConstraints.gridx = 0;
1583		- aConstraints.gridy += 1;
1584		- aConstraints.gridwidth = 1;
	1809	+ cGridBag shadowbias = new cGridBag();
	1810	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1811	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ diffuseSection.add(shadowbias);
1585	1814
1586		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1587		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1588		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1589		- aConstraints.gridx += 1;
1590		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1591		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1592		- aConstraints.gridx = 0;
1593		- aConstraints.gridy += 1;
1594		- aConstraints.gridwidth = 1;
	1815	+ panel.add(new JSeparator());
	1816	+
	1817	+ panel.add(diffuseSection);
	1818	+
	1819	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1820	+
	1821	+ cGridBag specularSection = new cGridBag().setVertical(true);
1595	1822
1596		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1597		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1598		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1599		- aConstraints.gridx += 1;
1600		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1601		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	1823	+ cGridBag specular = new cGridBag();
	1824	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1825	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1826	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1827	+ specularSection.add(specular);
1605	1828
1606		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1607		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1829	+ cGridBag lightarea = new cGridBag();
	1830	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1831	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1833	+ specularSection.add(lightarea);
1615	1834
1616		- //aConstraints.weighty = 1;
1617		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1618		- //aConstraints.gridx += 1;
1619		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1620		- aConstraints.weighty = 0;
1621		- aConstraints.gridx = 0;
1622		- aConstraints.gridy += 1;
1623		- aConstraints.gridwidth = 1;
	1835	+ cGridBag shininess = new cGridBag();
	1836	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1837	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1839	+ specularSection.add(shininess);
1624	1840
1625		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1626		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1627		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1628		- aConstraints.gridx += 1;
1629		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1630		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1631		- aConstraints.gridx = 0;
1632		- aConstraints.gridy += 1;
1633		- aConstraints.gridwidth = 1;
	1841	+ cGridBag metalness = new cGridBag();
	1842	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1843	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1844	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1845	+ specularSection.add(metalness);
1634	1846
1635		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1636		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1638		- aConstraints.gridx += 1;
1639		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1640		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	1847	+ cGridBag velvet = new cGridBag();
	1848	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1849	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1850	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1851	+ specularSection.add(velvet);
1644	1852
1645		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1646		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
1654		-
1655		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1656		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
1664		-
1665		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1666		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
1674		-
1675		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1676		- Return();
	1853	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1854	+ //Return();
1677	1855	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	1856	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	1857	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +1862,105 @@
1684	1862	// aConstraints.gridy += 1;
1685	1863	// aConstraints.gridwidth = 1;
1686	1864
1687		- //aConstraints.weighty = 1;
1688		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1689		- //aConstraints.gridx += 1;
1690		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1691		- aConstraints.weighty = 0;
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
	1865	+ cGridBag anisoU = new cGridBag();
	1866	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1867	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1869	+ specularSection.add(anisoU);
1695	1870
1696		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1697		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	1871	+ cGridBag anisoV = new cGridBag();
	1872	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1873	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1875	+ specularSection.add(anisoV);
1705	1876
1706		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1707		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
1715	1877
1716		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1717		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	1878	+ panel.add(new JSeparator());
	1879	+
	1880	+ panel.add(specularSection);
	1881	+
	1882	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1883	+
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1725	1885
1726		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1727		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
1735		- aConstraints.weighty = 0;
	1886	+ cGridBag camera = new cGridBag();
	1887	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1888	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1889	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1890	+ colorSection.add(camera);
1736	1891
1737		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1738		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1739		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1740		- aConstraints.gridx += 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1742		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1743		- aConstraints.gridx = 0;
1744		- aConstraints.gridy += 1;
1745		- aConstraints.gridwidth = 1;
	1892	+ cGridBag ambient = new cGridBag();
	1893	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1894	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1895	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1896	+ colorSection.add(ambient);
1746	1897
1747		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1748		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1749		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1750		- aConstraints.gridx += 1;
1751		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1752		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1753		- aConstraints.gridx = 0;
1754		- aConstraints.gridy += 1;
1755		- aConstraints.gridwidth = 1;
	1898	+ cGridBag backlit = new cGridBag();
	1899	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1900	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1901	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1902	+ colorSection.add(backlit);
1756	1903
1757		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1758		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1760		- aConstraints.gridx += 1;
1761		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1762		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1763		- aConstraints.gridx = 0;
1764		- aConstraints.gridy += 1;
1765		- aConstraints.gridwidth = 1;
	1904	+ cGridBag opacity = new cGridBag();
	1905	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1906	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1907	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1908	+ colorSection.add(opacity);
1766	1909
1767		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1768		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1769		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1770		- aConstraints.gridx += 1;
1771		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1772		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1773		- aConstraints.gridx = 0;
1774		- aConstraints.gridy += 1;
1775		- aConstraints.gridwidth = 1;
	1910	+ //panel.add(new JSeparator());
	1911	+
	1912	+ //panel.add(globalSection);
	1913	+
	1914	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1915	+
	1916	+ cGridBag textureSection = new cGridBag().setVertical(true);
1776	1917
1777		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1778		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1780		- aConstraints.gridx += 1;
1781		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1782		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1783		- aConstraints.gridx = 0;
1784		- aConstraints.gridy += 1;
1785		- aConstraints.gridwidth = 1;
	1918	+ cGridBag bump = new cGridBag();
	1919	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1920	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1921	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1922	+ textureSection.add(bump);
1786	1923
1787		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1788		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1790		- aConstraints.gridx += 1;
1791		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1792		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1793		- aConstraints.gridx = 0;
1794		- aConstraints.gridy += 1;
1795		- aConstraints.gridwidth = 1;
	1924	+ cGridBag noise = new cGridBag();
	1925	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1926	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1927	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1928	+ textureSection.add(noise);
1796	1929
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	1930	+ cGridBag power = new cGridBag();
	1931	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1932	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1933	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1934	+ textureSection.add(power);
1802	1935
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	1936	+ cGridBag borderfade = new cGridBag();
	1937	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1938	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1939	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1940	+ textureSection.add(borderfade);
	1941	+
	1942	+ cGridBag fog = new cGridBag();
	1943	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1944	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1945	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1946	+ textureSection.add(fog);
	1947	+
	1948	+ cGridBag opacityPower = new cGridBag();
	1949	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1950	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1951	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1952	+ textureSection.add(opacityPower);
	1953	+
	1954	+ panel.add(new JSeparator());
	1955	+
	1956	+ panel.add(textureSection);
	1957	+
	1958	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	1959
1807	1960	SetMaterial(copy); // .GetMaterial());
1808	1961
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	1962	+ //colorField.addChangeListener(this);
	1963	+// modulationField.addChangeListener(this);
1811	1964	metalnessField.addChangeListener(this);
1812	1965	diffuseField.addChangeListener(this);
1813	1966	specularField.addChangeListener(this);
..	..	@@ -1837,12 +1990,15 @@
1837	1990	opacityPowerField.addChangeListener(this);
1838	1991	/**/
1839	1992
1840		- resetSlidersButton.addActionListener(this);
1841	1993	clearMaterialButton.addActionListener(this);
1842	1994	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	1995	+
	1996	+ if (Globals.ADVANCED)
	1997	+ {
	1998	+ resetSlidersButton.addActionListener(this);
	1999	+ propagateToggle.addItemListener(this);
	2000	+ multiplyToggle.addItemListener(this);
	2001	+ }
1846	2002	}
1847	2003
1848	2004	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1860,8 +2016,9 @@
1860	2016	// 3D models
1861	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1862	2018	{
1863		- lastConverter = new com.jmex.model.converters.MaxToJme();
1864		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1865	2022	continue;
1866	2023	}
1867	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2013,7 +2170,7 @@
2013	2170
2014	2171	//? flashIt = false;
2015	2172	CameraPane pane = (CameraPane) cameraView;
2016		- pane.clickStart(location.x, location.y, 0);
	2173	+ pane.clickStart(location.x, location.y, 0, 0);
2017	2174	pane.clickEnd(location.x, location.y, 0, true);
2018	2175
2019	2176	if (group.selection.size() == 1)
..	..	@@ -2062,6 +2219,7 @@
2062	2219	e2.printStackTrace();
2063	2220	}
2064	2221	}
	2222	+
2065	2223	LoadJMEThread loadThread;
2066	2224
2067	2225	class LoadJMEThread extends Thread
..	..	@@ -2119,6 +2277,7 @@
2119	2277	//LoadFile0(filename, converter);
2120	2278	}
2121	2279	}
	2280	+
2122	2281	LoadOBJThread loadObjThread;
2123	2282
2124	2283	class LoadOBJThread extends Thread
..	..	@@ -2197,19 +2356,19 @@
2197	2356
2198	2357	void LoadObjFile(String fullname)
2199	2358	{
2200		- /*
	2359	+ System.out.println("Loading " + fullname);
	2360	+ /**/
2201	2361	//lastFilename = fullname;
2202	2362	if(loadObjThread == null)
2203	2363	{
2204		- loadObjThread = new LoadOBJThread();
2205		- loadObjThread.start();
	2364	+ loadObjThread = new LoadOBJThread();
	2365	+ loadObjThread.start();
2206	2366	}
2207	2367
2208	2368	loadObjThread.add(fullname);
2209		- */
	2369	+ /**/
2210	2370
2211		- System.out.println("Loading " + fullname);
2212		- makeSomething(new FileObject(fullname, true), true);
	2371	+ //makeSomething(new FileObject(fullname, true), true);
2213	2372	}
2214	2373
2215	2374	void LoadGFDFile(String fullname)
..	..	@@ -2470,11 +2629,11 @@
2470	2629
2471	2630	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2472	2631	{
2473		- if (GrafreeD.standAlone)
	2632	+ if (Grafreed.standAlone)
2474	2633	{
2475	2634	/**/
2476	2635	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2477		- browser.show();
	2636	+ browser.setVisible(true);
2478	2637	String filename = browser.getFile();
2479	2638	if (filename != null && filename.length() > 0)
2480	2639	{
..	..	@@ -2585,6 +2744,7 @@
2585	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2586	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2587	2746	}
	2747	+
2588	2748	//cJME.count++;
2589	2749	//cJME.count %= 12;
2590	2750	if (gc)
..	..	@@ -2619,6 +2779,7 @@
2619	2779	}
2620	2780	if (input == null)
2621	2781	{
	2782	+ new Exception().printStackTrace();
2622	2783	System.exit(0);
2623	2784	}
2624	2785
..	..	@@ -2767,6 +2928,7 @@
2767	2928	}
2768	2929	}
2769	2930	}
	2931	+
2770	2932	cFileSystemPane FSPane;
2771	2933
2772	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2820,11 +2982,14 @@
2820	2982	}
2821	2983	}
2822	2984	}
	2985	+
2823	2986	freezematerial = false;
2824	2987	}
2825	2988
2826	2989	void SetMaterial(Object3D object)
2827	2990	{
	2991	+ latestObject = object;
	2992	+
2828	2993	cMaterial mat = object.material;
2829	2994
2830	2995	if (mat == null)
..	..	@@ -2833,7 +2998,8 @@
2833	2998	return;
2834	2999	}
2835	3000
2836		- multiplyToggle.setSelected(mat.multiply);
	3001	+ if (multiplyToggle != null)
	3002	+ multiplyToggle.setSelected(mat.multiply);
2837	3003
2838	3004	assert (object.projectedVertices != null);
2839	3005
..	..	@@ -2935,12 +3101,17 @@
2935	3101	// }
2936	3102
2937	3103	/**/
2938		- if (deselect)
	3104	+ if (deselect \|\| child == null)
2939	3105	{
2940	3106	//group.deselectAll();
2941	3107	//freeze = true;
2942	3108	GetTree().clearSelection();
2943	3109	//freeze = false;
	3110	+
	3111	+ if (child == null)
	3112	+ {
	3113	+ return;
	3114	+ }
2944	3115	}
2945	3116
2946	3117	//group.addSelectee(child);
..	..	@@ -3009,7 +3180,7 @@
3009	3180	cameraView.ToggleDL();
3010	3181	cameraView.repaint();
3011	3182	return;
3012		- } else if (event.getSource() == toggleTextureItem)
	3183	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3013	3184	{
3014	3185	cameraView.ToggleTexture();
3015	3186	// june 2013 copy.HardTouch();
..	..	@@ -3048,9 +3219,9 @@
3048	3219	frame.validate();
3049	3220
3050	3221	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	3222	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3052	3223	{
3053		- cameraView.ToggleRandom();
	3224	+ cameraView.ToggleSwitch();
3054	3225	cameraView.repaint();
3055	3226	return;
3056	3227	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3079,6 +3250,10 @@
3079	3250	{
3080	3251	copy.live ^= true;
3081	3252	return;
	3253	+ } else if (event.getSource() == selectCB)
	3254	+ {
	3255	+ copy.dontselect ^= true;
	3256	+ return;
3082	3257	} else if (event.getSource() == hideCB)
3083	3258	{
3084	3259	copy.hide ^= true;
..	..	@@ -3093,6 +3268,7 @@
3093	3268	if (event.getSource() == randomCB)
3094	3269	{
3095	3270	copy.random ^= true;
	3271	+ objEditor.refreshContents();
3096	3272	return;
3097	3273	}
3098	3274	if (event.getSource() == speedupCB)
..	..	@@ -3116,8 +3292,9 @@
3116	3292
3117	3293	public void actionPerformed(ActionEvent event)
3118	3294	{
	3295	+ Object source = event.getSource();
3119	3296	// SCRIPT DIALOG
3120		- if (event.getSource() == okbutton)
	3297	+ if (source == okbutton)
3121	3298	{
3122	3299	textpanel.setVisible(false);
3123	3300	textpanel.remove(textarea);
..	..	@@ -3129,7 +3306,7 @@
3129	3306	textarea = null;
3130	3307	textpanel = null;
3131	3308	}
3132		- if (event.getSource() == cancelbutton)
	3309	+ if (source == cancelbutton)
3133	3310	{
3134	3311	textpanel.setVisible(false);
3135	3312	textpanel.remove(textarea);
..	..	@@ -3141,50 +3318,50 @@
3141	3318	//applySelf();
3142	3319	//client.refreshEditWindow();
3143	3320	//refreshContents();
3144		- if (event.getSource() == nameField)
	3321	+ if (source == nameField)
3145	3322	{
3146	3323	//System.out.println("ObjEditor " + event);
3147	3324	applySelf0(true);
3148	3325	//parent.applySelf();
3149	3326	objEditor.refreshContents();
3150		- } else if (event.getSource() == resetButton)
	3327	+ } else if (source == resetButton)
3151	3328	{
3152	3329	CameraPane.fullreset = true;
3153	3330	copy.Reset(); // ResetMeshes();
3154	3331	copy.Touch();
3155	3332	objEditor.refreshContents();
3156		- } else if (event.getSource() == stepItem)
	3333	+ } else if (source == stepItem)
3157	3334	{
3158	3335	//cameraView.ONESTEP = true;
3159	3336	Globals.ONESTEP = true;
3160	3337	cameraView.repaint();
3161	3338	return;
3162		- } else if (event.getSource() == stepButton)
	3339	+ } else if (source == stepButton)
3163	3340	{
3164	3341	copy.Step();
3165	3342	copy.Touch();
3166	3343	objEditor.refreshContents();
3167		- } else if (event.getSource() == slowerButton)
	3344	+ } else if (source == slowerButton)
3168	3345	{
3169	3346	copy.Slower();
3170	3347	copy.Touch();
3171	3348	objEditor.refreshContents();
3172		- } else if (event.getSource() == fasterButton)
	3349	+ } else if (source == fasterButton)
3173	3350	{
3174	3351	copy.Faster();
3175	3352	copy.Touch();
3176	3353	objEditor.refreshContents();
3177		- } else if (event.getSource() == remarkButton)
	3354	+ } else if (source == remarkButton)
3178	3355	{
3179	3356	copy.Remark();
3180	3357	copy.Touch();
3181	3358	objEditor.refreshContents();
3182		- } else if (event.getSource() == stepAllButton)
	3359	+ } else if (source == stepAllButton)
3183	3360	{
3184	3361	copy.StepAll();
3185	3362	copy.Touch();
3186	3363	objEditor.refreshContents();
3187		- } else if (event.getSource() == resetAllButton)
	3364	+ } else if (source == resetAllButton)
3188	3365	{
3189	3366	//CameraPane.fullreset = true;
3190	3367	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3217,53 +3394,79 @@
3217	3394	// Close();
3218	3395	// }
3219	3396	// else
3220		- if (event.getSource() == resetSlidersButton)
	3397	+ if (source == resetSlidersButton)
3221	3398	{
3222	3399	ResetSliders();
3223		- } else if (event.getSource() == clearMaterialButton)
	3400	+ } else if (source == clearMaterialButton)
3224	3401	{
3225	3402	ClearMaterial();
3226		- } else if (event.getSource() == createMaterialButton)
	3403	+ } else if (source == createMaterialButton)
3227	3404	{
3228	3405	CreateMaterial();
3229		- } else if (event.getSource() == clearPanelButton)
	3406	+ } else if (source == clearPanelButton)
3230	3407	{
3231	3408	copy.ClearUI();
3232	3409	refreshContents(true);
3233		- } /*
3234		- }
3235		-
3236		- public boolean action(Event event, Object arg)
3237		- {
3238		- */ else if (event.getSource() == closeItem)
	3410	+ } else if (source == importGFDItem)
	3411	+ {
	3412	+ ImportGFD();
	3413	+ } else
	3414	+ if (source == importVRMLX3DItem)
	3415	+ {
	3416	+ ImportVRMLX3D();
	3417	+ } else
	3418	+ if (source == import3DSItem)
	3419	+ {
	3420	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3421	+ } else
	3422	+ if (source == importOBJItem)
	3423	+ {
	3424	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3425	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3426	+ browser.setVisible(true);
	3427	+ String filename = browser.getFile();
	3428	+ if (filename != null && filename.length() > 0)
	3429	+ {
	3430	+ String fullname = browser.getDirectory() + filename;
	3431	+ makeSomething(ReadOBJ(fullname), true);
	3432	+ }
	3433	+ } else
	3434	+ if (source == closeItem)
3239	3435	{
3240	3436	Close();
3241	3437	//return true;
3242		- } else if (event.getSource() == loadItem)
	3438	+ } else if (source == openItem)
3243	3439	{
3244		- load();
	3440	+ Open();
3245	3441	//return true;
3246		- } else if (event.getSource() == saveItem)
	3442	+ } else if (source == newItem)
	3443	+ {
	3444	+ New();
	3445	+ } else if (source == saveItem)
3247	3446	{
3248	3447	save();
3249	3448	//return true;
3250		- } else if (event.getSource() == saveAsItem)
	3449	+ } else if (source == saveAsItem)
3251	3450	{
3252	3451	saveAs();
3253	3452	//return true;
3254		- } else if (event.getSource() == reexportItem)
	3453	+ } else if (source == reexportItem)
3255	3454	{
3256	3455	reexport();
3257	3456	//return true;
3258		- } else if (event.getSource() == exportAsItem)
	3457	+ } else if (source == exportAsItem)
3259	3458	{
3260	3459	export();
3261	3460	//return true;
3262		- } else if (event.getSource() == povItem)
	3461	+ } else if (source == povItem)
3263	3462	{
3264	3463	generatePOV();
3265	3464	//return true;
3266		- } else if (event.getSource() == zBufferItem)
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
	3469	+ } else if (source == zBufferItem)
3267	3470	{
3268	3471	try
3269	3472	{
..	..	@@ -3285,21 +3488,8 @@
3285	3488	cameraView.repaint();
3286	3489	//return true;
3287	3490	}
3288		- */ else if (event.getSource() == editCameraItem)
3289		- {
3290		- cameraView.ProtectCamera();
3291		- cameraView.repaint();
3292		- return;
3293		- } else if (event.getSource() == revertCameraItem)
3294		- {
3295		- cameraView.RevertCamera();
3296		- cameraView.repaint();
3297		- return;
3298		-// } else if (event.getSource() == textureButton)
3299		-// {
3300		-// return; // true;
3301		- } else // combos...
3302		- if (event.getSource() == texresMenu)
	3491	+ */ else // combos...
	3492	+ if (source == texresMenu)
3303	3493	{
3304	3494	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3305	3495	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3311,12 +3501,409 @@
3311	3501	}
3312	3502	}
3313	3503
	3504	+ void New()
	3505	+ {
	3506	+ while (copy.Size() > 1)
	3507	+ {
	3508	+ copy.remove(1);
	3509	+ }
	3510	+
	3511	+ ResetModel();
	3512	+ objEditor.refreshContents();
	3513	+ }
	3514	+
	3515	+ static public byte[] Compress(Object3D o)
	3516	+ {
	3517	+ try
	3518	+ {
	3519	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3522	+
	3523	+ Object3D parent = o.parent;
	3524	+ o.parent = null;
	3525	+
	3526	+ out.writeObject(o);
	3527	+
	3528	+ o.parent = parent;
	3529	+
	3530	+ out.flush();
	3531	+
	3532	+ baos //zstream
	3533	+ .close();
	3534	+ out.close();
	3535	+
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
	3540	+ } catch (Exception e)
	3541	+ {
	3542	+ System.err.println(e);
	3543	+ return null;
	3544	+ }
	3545	+ }
	3546	+
	3547	+ static public Object Uncompress(byte[] bytes)
	3548	+ {
	3549	+ System.out.println("restore #bytes = " + bytes.length);
	3550	+ try
	3551	+ {
	3552	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3555	+ Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
	3559	+ in.close();
	3560	+
	3561	+ return obj;
	3562	+ } catch (Exception e)
	3563	+ {
	3564	+ System.err.println(e);
	3565	+ return null;
	3566	+ }
	3567	+ }
	3568	+
	3569	+ static public Object clone(Object o)
	3570	+ {
	3571	+ try
	3572	+ {
	3573	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3575	+
	3576	+ out.writeObject(o);
	3577	+
	3578	+ out.flush();
	3579	+ out.close();
	3580	+
	3581	+ byte[] bytes = baos.toByteArray();
	3582	+
	3583	+ System.out.println("clone = " + bytes.length);
	3584	+
	3585	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3586	+ ObjectInputStream in = new ObjectInputStream(bais);
	3587	+ Object obj = in.readObject();
	3588	+ in.close();
	3589	+
	3590	+ return obj;
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ System.err.println(e);
	3594	+ return null;
	3595	+ }
	3596	+ }
	3597	+
	3598	+ cRadio GetCurrentTab()
	3599	+ {
	3600	+ cRadio ab;
	3601	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3602	+ {
	3603	+ ab = (cRadio)e.nextElement();
	3604	+ if(ab.GetObject() == copy)
	3605	+ {
	3606	+ return ab;
	3607	+ }
	3608	+ }
	3609	+
	3610	+ return null;
	3611	+ }
	3612	+
	3613	+
	3614	+ public void Save()
	3615	+ {
	3616	+ //Save(true);
	3617	+ Replace();
	3618	+ }
	3619	+
	3620	+ private boolean Equal(byte[] compress, byte[] name)
	3621	+ {
	3622	+ if (compress.length != name.length)
	3623	+ {
	3624	+ return false;
	3625	+ }
	3626	+
	3627	+ for (int i=compress.length; --i>=0;)
	3628	+ {
	3629	+ if (compress[i] != name[i])
	3630	+ return false;
	3631	+ }
	3632	+
	3633	+ return true;
	3634	+ }
	3635	+
	3636	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3637	+
	3638	+ public boolean Save(boolean user)
	3639	+ {
	3640	+ System.err.println("Save");
	3641	+
	3642	+ cRadio tab = GetCurrentTab();
	3643	+
	3644	+ byte[] compress = CompressCopy();
	3645	+
	3646	+ boolean thesame = false;
	3647	+
	3648	+ // Quick heuristic using length. Works only when stream is compressed.
	3649	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3650	+ {
	3651	+ thesame = true;
	3652	+ }
	3653	+
	3654	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3655	+ if (!thesame)
	3656	+ {
	3657	+ //tab.user[tab.versionindex] = user;
	3658	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3659	+
	3660	+ copy.versions[++copy.versionindex] = compress;
	3661	+
	3662	+ // if (increment)
	3663	+ // tab.versionindex++;
	3664	+ }
	3665	+
	3666	+ //copy.RestoreBigData(versiontable);
	3667	+
	3668	+ //assert(hashtable.isEmpty());
	3669	+
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3671	+ {
	3672	+ //tab.user[i] = false;
	3673	+ copy.versions[i] = null;
	3674	+ }
	3675	+
	3676	+ SetUndoStates();
	3677	+
	3678	+ // test save
	3679	+ if (false)
	3680	+ {
	3681	+ try
	3682	+ {
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3684	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3685	+
	3686	+ p.writeObject(copy);
	3687	+
	3688	+ p.flush();
	3689	+
	3690	+ ostream.close();
	3691	+ } catch (Exception e)
	3692	+ {
	3693	+ e.printStackTrace();
	3694	+ }
	3695	+ }
	3696	+
	3697	+ return !thesame;
	3698	+ }
	3699	+
	3700	+ void CopyChanged(Object3D obj)
	3701	+ {
	3702	+ SetUndoStates();
	3703	+
	3704	+ boolean temp = CameraPane.SWITCH;
	3705	+ CameraPane.SWITCH = false;
	3706	+
	3707	+ copy.ExtractBigData(versiontable);
	3708	+
	3709	+ copy.clear();
	3710	+
	3711	+ for (int i=0; i<obj.Size(); i++)
	3712	+ {
	3713	+ copy.add(obj.get(i));
	3714	+ }
	3715	+
	3716	+ copy.RestoreBigData(versiontable);
	3717	+
	3718	+ CameraPane.SWITCH = temp;
	3719	+
	3720	+ //assert(hashtable.isEmpty());
	3721	+
	3722	+ copy.Touch();
	3723	+
	3724	+ ResetModel();
	3725	+ copy.HardTouch(); // recompile?
	3726	+
	3727	+ cRadio ab;
	3728	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3729	+ {
	3730	+ ab = (cRadio)e.nextElement();
	3731	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3732	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3733	+ if (test != null)
	3734	+ {
	3735	+ test.editWindow = ab.object.editWindow;
	3736	+ ab.object = test;
	3737	+ }
	3738	+ }
	3739	+
	3740	+ refreshContents();
	3741	+ }
	3742	+
	3743	+ cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
	3746	+ cButton redoButton;
	3747	+
	3748	+ boolean muteSlider;
	3749	+
	3750	+ int VersionCount()
	3751	+ {
	3752	+ int count = 0;
	3753	+
	3754	+ for (int i = copy.versions.length; --i >= 0;)
	3755	+ {
	3756	+ if (copy.versions[i] != null)
	3757	+ count++;
	3758	+ }
	3759	+
	3760	+ return count;
	3761	+ }
	3762	+
	3763	+ void SetUndoStates()
	3764	+ {
	3765	+ cRadio tab = GetCurrentTab();
	3766	+
	3767	+ restoreButton.setEnabled(copy.versionindex != -1);
	3768	+ replaceButton.setEnabled(copy.versionindex != -1);
	3769	+
	3770	+ undoButton.setEnabled(copy.versionindex > 0);
	3771	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3772	+
	3773	+ muteSlider = true;
	3774	+ versionSlider.setMaximum(VersionCount() - 1);
	3775	+ versionSlider.setInteger(copy.versionindex);
	3776	+ muteSlider = false;
	3777	+ }
	3778	+
	3779	+ public boolean Undo()
	3780	+ {
	3781	+ // Option?
	3782	+ Replace();
	3783	+
	3784	+ System.err.println("Undo");
	3785	+
	3786	+ cRadio tab = GetCurrentTab();
	3787	+
	3788	+ if (copy.versionindex == 0)
	3789	+ {
	3790	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3791	+ return false;
	3792	+ }
	3793	+
	3794	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3795	+// {
	3796	+// if (Save(false))
	3797	+// tab.versionindex -= 1;
	3798	+// else
	3799	+// {
	3800	+// if (tab.versionindex <= 0)
	3801	+// return false;
	3802	+// else
	3803	+// tab.versionindex -= 1;
	3804	+// }
	3805	+// }
	3806	+
	3807	+ copy.versionindex -= 1;
	3808	+
	3809	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3810	+
	3811	+ return true;
	3812	+ }
	3813	+
	3814	+ public boolean Restore()
	3815	+ {
	3816	+ System.err.println("Restore");
	3817	+
	3818	+ cRadio tab = GetCurrentTab();
	3819	+
	3820	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3821	+ {
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
	3824	+ }
	3825	+
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
	3830	+
	3831	+ public boolean Replace()
	3832	+ {
	3833	+ System.err.println("Replace");
	3834	+
	3835	+ cRadio tab = GetCurrentTab();
	3836	+
	3837	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3838	+ {
	3839	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3840	+ return false;
	3841	+ }
	3842	+
	3843	+ copy.versions[copy.versionindex] = CompressCopy();
	3844	+
	3845	+ return true;
	3846	+ }
	3847	+
	3848	+ public void Redo()
	3849	+ {
	3850	+ // Option?
	3851	+ Replace();
	3852	+
	3853	+ cRadio tab = GetCurrentTab();
	3854	+
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
	3856	+ {
	3857	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3858	+ return;
	3859	+ }
	3860	+
	3861	+ copy.versionindex += 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
	3867	+ }
	3868	+
	3869	+ void ImportGFD()
	3870	+ {
	3871	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3872	+ browser.show();
	3873	+ String filename = browser.getFile();
	3874	+ if (filename != null && filename.length() > 0)
	3875	+ {
	3876	+ String fullname = browser.getDirectory() + filename;
	3877	+
	3878	+ //Object3D readobj =
	3879	+ objEditor.ReadGFD(fullname, objEditor);
	3880	+ //makeSomething(readobj);
	3881	+ }
	3882	+ }
	3883	+
	3884	+ void ImportVRMLX3D()
	3885	+ {
	3886	+ if (Grafreed.standAlone)
	3887	+ {
	3888	+ /**/
	3889	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3890	+ browser.show();
	3891	+ String filename = browser.getFile();
	3892	+ if (filename != null && filename.length() > 0)
	3893	+ {
	3894	+ String fullname = browser.getDirectory() + filename;
	3895	+ LoadVRMLX3D(fullname);
	3896	+ }
	3897	+ /**/
	3898	+ }
	3899	+ }
	3900	+
3314	3901	void ToggleAnimation()
3315	3902	{
3316	3903	if (!Globals.ANIMATION)
3317	3904	{
3318	3905	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	3906	+ browser.setVisible(true);
3320	3907	String filename = browser.getFile();
3321	3908	if (filename != null && filename.length() > 0)
3322	3909	{
..	..	@@ -3326,8 +3913,8 @@
3326	3913
3327	3914	Globals.ANIMATION ^= true;
3328	3915
3329		- GrafreeD.wav.cursor = 0;
3330		- GrafreeD.wav.loop = 0;
	3916	+ Grafreed.wav.cursor = 0;
	3917	+ Grafreed.wav.loop = 0;
3331	3918	}
3332	3919	} else
3333	3920	{
..	..	@@ -3377,7 +3964,7 @@
3377	3964	void CreateMaterial()
3378	3965	{
3379	3966	//copy.ClearMaterial(); // PATCH
3380		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3967	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3381	3968	if (copy.selection.size() > 0)
3382	3969	//SetMaterial(copy);
3383	3970	{
..	..	@@ -3428,7 +4015,7 @@
3428	4015	assert false;
3429	4016	}
3430	4017
3431		- void EditSelection()
	4018	+ void EditSelection(boolean newWindow)
3432	4019	{
3433	4020	}
3434	4021
..	..	@@ -3436,11 +4023,11 @@
3436	4023	{
3437	4024	copy.ResetBlockLoop(); // temporary problem
3438	4025
3439		- boolean random = CameraPane.RANDOM;
3440		- CameraPane.RANDOM = false; // parse everything
	4026	+ boolean random = CameraPane.SWITCH;
	4027	+ CameraPane.SWITCH = false; // parse everything
3441	4028	copy.ResetDisplayList();
3442	4029	copy.HardTouch();
3443		- CameraPane.RANDOM = random;
	4030	+ CameraPane.SWITCH = random;
3444	4031	}
3445	4032
3446	4033	// public void applySelf()
..	..	@@ -3510,10 +4097,40 @@
3510	4097	current.fakedepth = (float) fakedepthField.getFloat();
3511	4098	current.shadowbias = (float) shadowbiasField.getFloat();
3512	4099
3513		- if (!NumberSlider.frozen)
	4100	+ if (!cNumberSlider.frozen)
3514	4101	{
3515	4102	//System.out.println("Propagate = " + propagate);
3516	4103	copy.UpdateMaterial(anchor, current, propagate);
	4104	+
	4105	+ if (copy.material != null)
	4106	+ {
	4107	+ cMaterial mat = copy.material;
	4108	+
	4109	+ colorField.SetToolTipValue((mat.color));
	4110	+ modulationField.SetToolTipValue((mat.modulation));
	4111	+ metalnessField.SetToolTipValue((mat.metalness));
	4112	+ diffuseField.SetToolTipValue((mat.diffuse));
	4113	+ specularField.SetToolTipValue((mat.specular));
	4114	+ shininessField.SetToolTipValue((mat.shininess));
	4115	+ shiftField.SetToolTipValue((mat.shift));
	4116	+ ambientField.SetToolTipValue((mat.ambient));
	4117	+ lightareaField.SetToolTipValue((mat.lightarea));
	4118	+ diffusenessField.SetToolTipValue((mat.factor));
	4119	+ velvetField.SetToolTipValue((mat.velvet));
	4120	+ sheenField.SetToolTipValue((mat.sheen));
	4121	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4122	+ backlitField.SetToolTipValue((mat.bump));
	4123	+ anisoField.SetToolTipValue((mat.aniso));
	4124	+ anisoVField.SetToolTipValue((mat.anisoV));
	4125	+ cameraField.SetToolTipValue((mat.cameralight));
	4126	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4127	+ shadowField.SetToolTipValue((mat.shadow));
	4128	+ textureField.SetToolTipValue((mat.texture));
	4129	+ opacityField.SetToolTipValue((mat.opacity));
	4130	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4131	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4132	+ }
	4133	+
3517	4134	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3518	4135	{
3519	4136	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3542,9 +4159,25 @@
3542	4159	//copy.Touch();
3543	4160	}
3544	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3545	4164	public void stateChanged(ChangeEvent e)
3546	4165	{
3547	4166	// assert(false);
	4167	+ if (e.getSource() == versionSlider)
	4168	+ {
	4169	+ if (muteSlider)
	4170	+ return;
	4171	+
	4172	+ int version = versionSlider.getInteger();
	4173	+
	4174	+ if (copy.versions[version] != null)
	4175	+ {
	4176	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4177	+ }
	4178	+
	4179	+ return;
	4180	+ }
3548	4181
3549	4182	if (freezematerial)
3550	4183	{
..	..	@@ -3558,6 +4191,7 @@
3558	4191	\|\| e.getSource() == apertureField
3559	4192	\|\| e.getSource() == shadowblurField)
3560	4193	{
	4194	+ new Exception().printStackTrace();
3561	4195	System.exit(0);
3562	4196	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	4197	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3628,7 +4262,7 @@
3628	4262	}
3629	4263
3630	4264	if (normalpushField != null)
3631		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4265	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3632	4266	}
3633	4267
3634	4268	void SnapObject()
..	..	@@ -3883,7 +4517,7 @@
3883	4517
3884	4518	radioPanel.revalidate();
3885	4519	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	4520	+ ctrlPanel.validate(); // ? new
3887	4521	ctrlPanel.repaint();
3888	4522	}
3889	4523	}
..	..	@@ -3892,6 +4526,8 @@
3892	4526
3893	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3894	4528	{
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4530	+ Save();
3895	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
3896	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3897	4533	// if (thing instanceof GenericJointDemo)
..	..	@@ -3978,6 +4614,12 @@
3978	4614	{
3979	4615	ResetModel();
3980	4616	Select(thing.GetTreePath(), true, false); // unselect... false);
	4617	+
	4618	+ if (thing.Size() == 0)
	4619	+ {
	4620	+ //EditSelection(false);
	4621	+ }
	4622	+
3981	4623	refreshContents();
3982	4624	}
3983	4625
..	..	@@ -4095,6 +4737,7 @@
4095	4737	}
4096	4738	}
4097	4739	}
	4740	+
4098	4741	LoadGFDThread loadGFDThread;
4099	4742
4100	4743	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4114,8 +4757,10 @@
4114	4757
4115	4758	try
4116	4759	{
	4760	+ // Try compressed version first.
4117	4761	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4118		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4762	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4763	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4119	4764
4120	4765	readobj = (Object3D) p.readObject();
4121	4766	istream.close();
..	..	@@ -4123,7 +4768,20 @@
4123	4768	readobj.ResetDisplayList();
4124	4769	} catch (Exception e)
4125	4770	{
4126		- e.printStackTrace();
	4771	+ //e.printStackTrace();
	4772	+ try
	4773	+ {
	4774	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4775	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4776	+
	4777	+ readobj = (Object3D) p.readObject();
	4778	+ istream.close();
	4779	+
	4780	+ readobj.ResetDisplayList();
	4781	+ } catch (Exception e2)
	4782	+ {
	4783	+ e2.printStackTrace();
	4784	+ }
4127	4785	}
4128	4786	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4129	4787	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4169,6 +4827,12 @@
4169	4827
4170	4828	void LoadIt(Object obj)
4171	4829	{
	4830	+ if (obj == null)
	4831	+ {
	4832	+ // Invalid file
	4833	+ return;
	4834	+ }
	4835	+
4172	4836	System.out.println("Loaded " + obj);
4173	4837	//new Exception().printStackTrace();
4174	4838	Object3D readobj = (Object3D) obj;
..	..	@@ -4178,6 +4842,8 @@
4178	4842
4179	4843	if (readobj != null)
4180	4844	{
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4181	4847	try
4182	4848	{
4183	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4232,15 +4898,26 @@
4232	4898	c.addChild(csg);
4233	4899	}
4234	4900
	4901	+ copy.versions = readobj.versions;
	4902	+ copy.versionindex = readobj.versionindex;
	4903	+
	4904	+ if (copy.versions == null)
	4905	+ {
	4906	+ copy.versions = new byte[100][];
	4907	+ copy.versionindex = -1;
	4908	+ }
	4909	+
	4910	+ //? SetUndoStates();
	4911	+
4235	4912	ResetModel();
4236	4913	copy.HardTouch(); // recompile?
4237	4914	refreshContents();
4238	4915	}
4239	4916	}
4240	4917
4241		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4242	4919	{
4243		- if (GrafreeD.standAlone)
	4920	+ if (Grafreed.standAlone)
4244	4921	{
4245	4922	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4246	4923	browser.show();
..	..	@@ -4327,11 +5004,13 @@
4327	5004	try
4328	5005	{
4329	5006	FileOutputStream ostream = new FileOutputStream(lastname);
4330		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5007	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5008	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4331	5009
4332	5010	p.writeObject(copy);
4333	5011	p.flush();
4334	5012
	5013	+ zstream.close();
4335	5014	ostream.close();
4336	5015
4337	5016	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4341,17 +5020,20 @@
4341	5020	{
4342	5021	}
4343	5022	}
	5023	+
4344	5024	String lastname;
4345	5025
4346	5026	void saveAs()
4347	5027	{
4348		- if (GrafreeD.standAlone)
	5028	+ if (Grafreed.standAlone)
4349	5029	{
4350	5030	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4351	5031	browser.setVisible(true);
4352	5032	String filename = browser.getFile();
4353	5033	if (filename != null && filename.length() > 0)
4354	5034	{
	5035	+ if (!filename.endsWith(".gfd"))
	5036	+ filename += ".gfd";
4355	5037	lastname = browser.getDirectory() + filename;
4356	5038	save();
4357	5039	}
..	..	@@ -4450,13 +5132,13 @@
4450	5132	try
4451	5133	{
4452	5134	FileOutputStream ostream = new FileOutputStream(filename);
4453		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4454		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5135	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5136	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4455	5137
4456	5138	Object3D objectparent = obj.parent;
4457	5139	obj.parent = null;
4458	5140
4459		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5141	+ Object3D object = (Object3D) Grafreed.clone(obj);
4460	5142
4461	5143	obj.parent = objectparent;
4462	5144
..	..	@@ -4468,8 +5150,8 @@
4468	5150	p.writeObject(object);
4469	5151	p.flush();
4470	5152
	5153	+ zstream.close();
4471	5154	ostream.close();
4472		- // zstream.close();
4473	5155
4474	5156	// group.selection.get(0).parent = parent;
4475	5157	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4490,7 +5172,7 @@
4490	5172	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4491	5173	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4492	5174	copy.generatePOV(buffer);
4493		- if (GrafreeD.standAlone)
	5175	+ if (Grafreed.standAlone)
4494	5176	{
4495	5177	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4496	5178	browser.show();
..	..	@@ -4516,21 +5198,20 @@
4516	5198	Object3D client;
4517	5199	Object3D copy;
4518	5200	MenuBar menuBar;
4519		- Menu windowMenu;
4520		- MenuItem loadItem;
	5201	+ Menu fileMenu;
	5202	+ MenuItem newItem;
	5203	+ MenuItem openItem;
4521	5204	MenuItem saveItem;
4522	5205	MenuItem saveAsItem;
4523	5206	MenuItem exportAsItem;
4524	5207	MenuItem reexportItem;
4525	5208	MenuItem povItem;
4526	5209	MenuItem closeItem;
4527		- Menu cameraMenu;
	5210	+
4528	5211	CheckboxMenuItem zBufferItem;
4529	5212	//MenuItem normalLensItem;
4530		- MenuItem editCameraItem;
4531		- MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	5213	MenuItem stepItem;
	5214	+ CheckboxMenuItem toggleLiveItem;
4534	5215	CheckboxMenuItem toggleFullScreenItem;
4535	5216	CheckboxMenuItem toggleTimelineItem;
4536	5217	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,28 +5220,42 @@
4539	5220	CheckboxMenuItem toggleFootContactItem;
4540	5221	CheckboxMenuItem toggleDLItem;
4541	5222	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	5223	+ CheckboxMenuItem toggleSwitchItem;
4543	5224	CheckboxMenuItem toggleRootItem;
4544	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4545	5227	CheckboxMenuItem toggleHandleItem;
4546	5228	CheckboxMenuItem togglePaintItem;
4547	5229	JSplitPane mainPanel;
4548	5230	JScrollPane scrollpane;
	5231	+
4549	5232	JPanel toolbarPanel;
4550		- JPanel treePanel;
	5233	+
	5234	+ cGridBag treePanel;
	5235	+
4551	5236	JPanel radioPanel;
4552	5237	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	5238	+
	5239	+ cGridBag toolboxPanel;
	5240	+ cGridBag materialPanel;
	5241	+ cGridBag ctrlPanel;
	5242	+
4555	5243	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	5244	+
	5245	+ cGridBag optionsPanel;
	5246	+
4557	5247	JTabbedPane objectPanel;
	5248	+ boolean materialFlushed;
	5249	+ Object3D latestObject;
	5250	+
4558	5251	cGridBag XYZPanel;
	5252	+
4559	5253	JSplitPane gridPanel;
4560	5254	JSplitPane bigPanel;
	5255	+
4561	5256	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	5257	+ cGridBag scenePanel;
	5258	+ cGridBag centralPanel;
4564	5259	JSplitPane cameraPanel;
4565	5260	JPanel timelinePanel;
4566	5261	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +5308,72 @@
4613	5308	// MATERIAL
4614	5309	JLabel materialLabel;
4615	5310	JLabel colorLabel;
4616		- NumberSlider colorField;
	5311	+ cNumberSlider colorField;
4617	5312	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	5313	+ cNumberSlider modulationField;
4619	5314	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	5315	+ cNumberSlider metalnessField;
4621	5316	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	5317	+ cNumberSlider diffuseField;
4623	5318	JLabel specularLabel;
4624		- NumberSlider specularField;
	5319	+ cNumberSlider specularField;
4625	5320	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	5321	+ cNumberSlider shininessField;
4627	5322	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	5323	+ cNumberSlider shiftField;
4629	5324	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	5325	+ cNumberSlider ambientField;
4631	5326	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	5327	+ cNumberSlider lightareaField;
4633	5328	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	5329	+ cNumberSlider diffusenessField;
4635	5330	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	5331	+ cNumberSlider velvetField;
4637	5332	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	5333	+ cNumberSlider sheenField;
4639	5334	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	5335	+ cNumberSlider subsurfaceField;
4641	5336	//JLabel bumpLabel;
4642	5337	//NumberSlider bumpField;
4643	5338	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	5339	+ cNumberSlider backlitField;
4645	5340	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	5341	+ cNumberSlider anisoField;
4647	5342	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	5343	+ cNumberSlider anisoVField;
4649	5344	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	5345	+ cNumberSlider cameraField;
4651	5346	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	5347	+ cNumberSlider selfshadowField;
4653	5348	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	5349	+ cNumberSlider shadowField;
4655	5350	JLabel textureLabel;
4656		- NumberSlider textureField;
	5351	+ cNumberSlider textureField;
4657	5352	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	5353	+ cNumberSlider opacityField;
4659	5354	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	5355	+ cNumberSlider fakedepthField;
4661	5356	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	5357	+ cNumberSlider shadowbiasField;
4663	5358	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	5359	+ cNumberSlider bumpField;
4665	5360	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	5361	+ cNumberSlider noiseField;
4667	5362	JLabel powerLabel;
4668		- NumberSlider powerField;
	5363	+ cNumberSlider powerField;
4669	5364	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	5365	+ cNumberSlider borderfadeField;
4671	5366	JLabel fogLabel;
4672		- NumberSlider fogField;
	5367	+ cNumberSlider fogField;
4673	5368	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
4675		- JTree jTree;
	5369	+ cNumberSlider opacityPowerField;
	5370	+ cTree jTree;
4676	5371	//ObjectUI parent;
4677	5372
4678		- NumberSlider normalpushField;
	5373	+ cNumberSlider normalpushField;
	5374	+
	5375	+ private MenuItem importGFDItem;
	5376	+ private MenuItem importVRMLX3DItem;
	5377	+ private MenuItem import3DSItem;
	5378	+ private MenuItem importOBJItem;
4679	5379	}